31 files changed, 4907 insertions, 4845 deletions
diff --git a/CHANGES b/CHANGES
index 5d5b4a38..6b8e03f8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,16 @@
--- $LynxId: CHANGES,v 1.1152 2024/01/14 11:02:21 tom Exp $
+-- $LynxId: CHANGES,v 1.1159 2024/01/15 21:41:51 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
 
-2024-01-14 (2.9.0dev.13)
+2024-01-15 (2.9.0)
+* change version of OpenSSL used in Windows installers to 3.x and 1.1.1x,
+  for new/old respectively -TD
+* fixes for UBSAN/ASAN issues with clang on Windows -GV
+* modify install-doc rule to use relative path for symbolic links -TD
+* add support for gopher's hURL functionality (patch by Viatrix).
+* allow ^G interrupt to end read from a stalled connection without exiting
+  Lynx (Debian #1033423) -TD
 * allow the ^S keymap to be disabled in the configuration file, e.g.,
     KEYMAP:^S:UNMAPPED
   (report by TG) -TD
diff --git a/PACKAGE/debian/changelog b/PACKAGE/debian/changelog
index 8d7eaace..048e3cfd 100644
--- a/PACKAGE/debian/changelog
+++ b/PACKAGE/debian/changelog
@@ -1,8 +1,8 @@
-lynx-dev (2.9.0dev.13) unstable; urgency=low
+lynx-dev (2.9.0) unstable; urgency=high
 
-  * maintenance updates
+  * new release
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 23 Jan 2023 16:39:23 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 14 Jan 2024 17:15:53 -0500
 
 lynx-dev (2.8.8dev.16) unstable; urgency=high
 
diff --git a/PACKAGE/debian/lynx-dev.lintian-overrides b/PACKAGE/debian/lynx-dev.lintian-overrides
index f19330da..9b0aa406 100644
--- a/PACKAGE/debian/lynx-dev.lintian-overrides
+++ b/PACKAGE/debian/lynx-dev.lintian-overrides
@@ -1,6 +1,3 @@
-# Lynx's version-numbering is not understood by lintian, though legal.
-lynx-dev: rc-version-greater-than-expected-version
-
 # This is intentional because it is referenced from the documentation.
 lynx-dev: extra-license-file usr/share/doc/lynx-dev/COPYING
 
diff --git a/PACKAGE/debian/rules b/PACKAGE/debian/rules
index 6b48b9fe..908ed5e0 100755
--- a/PACKAGE/debian/rules
+++ b/PACKAGE/debian/rules
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-# $LynxId: rules,v 1.18 2023/05/26 22:51:25 tom Exp $
+# $LynxId: rules,v 1.19 2024/01/15 01:16:07 tom Exp $
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -67,6 +67,7 @@ configure-stamp:
 		--sysconfdir=/etc/$(PACKAGE) \
 		--with-cfg-path=/etc/$(PACKAGE):$(docdir)/samples \
 		--localstatedir=/var \
+		--disable-rpath-hack \
 		--libdir=/etc/$(PACKAGE) \
 		--enable-8bit-toupper \
 		--enable-cgi-links \
diff --git a/PACKAGE/lynx-newssl.iss b/PACKAGE/lynx-newssl.iss
index c6ebc979..fb572862 100644
--- a/PACKAGE/lynx-newssl.iss
+++ b/PACKAGE/lynx-newssl.iss
@@ -1,4 +1,4 @@
-; $LynxId: lynx-newssl.iss,v 1.6 2022/12/29 00:38:07 tom Exp $
+; $LynxId: lynx-newssl.iss,v 1.7 2024/01/15 21:35:29 tom Exp $
 ;
 ; This is an installer for Lynx built with "new" OpenSSL (1.1.x).
 ;
@@ -6,8 +6,8 @@
 ; data which is used by the installer (see "lynx.lss" for details).
 
 #define NoScreenDll
-#define SslGlob1      "'libssl-1*.dll'"
-#define SslGlob2      "'libcrypto-1*.dll'"
+#define SslGlob1      "'libssl-3*.dll'"
+#define SslGlob2      "'libcrypto-3*.dll'"
 #define SetupBaseName "lynx-newssl"
 #define SourceExeName "lynx-newssl.exe"
 
diff --git a/PACKAGE/lynx-oldssl.iss b/PACKAGE/lynx-oldssl.iss
index afe026a2..92575d2a 100644
--- a/PACKAGE/lynx-oldssl.iss
+++ b/PACKAGE/lynx-oldssl.iss
@@ -1,4 +1,4 @@
-; $LynxId: lynx-oldssl.iss,v 1.5 2022/12/28 22:37:15 tom Exp $
+; $LynxId: lynx-oldssl.iss,v 1.6 2024/01/15 21:35:19 tom Exp $
 ;
 ; This is an installer for Lynx built with "old" OpenSSL (before 1.1.x).
 ;
@@ -6,10 +6,9 @@
 ; data which is used by the installer (see "lynx.lss" for details).
 
 #define NoScreenDll
-#define SslGlob1      "'ssleay32.dll'"
-#define SslGlob2      "'libeay32.dll'"
+#define SslGlob1      "'libssl-1*.dll'"
+#define SslGlob2      "'libcrypto-1*.dll'"
 #define SetupBaseName "lynx-oldssl"
 #define SourceExeName "lynx-oldssl.exe"
-#define RuntimeBundle "'msvcr120.dll'"
 
 #include "lynx.iss"
diff --git a/PACKAGE/lynx.iss b/PACKAGE/lynx.iss
index bf7550d5..23530670 100644
--- a/PACKAGE/lynx.iss
+++ b/PACKAGE/lynx.iss
@@ -1,4 +1,4 @@
-; $LynxId: lynx.iss,v 1.39 2024/01/07 11:13:00 tom Exp $
+; $LynxId: lynx.iss,v 1.41 2024/01/15 23:28:41 tom Exp $
 ; vile:ts=4 sw=4 notabinsert fk=8bit
 ;
 ; This is the BASE script for different flavors of the installer for Lynx.
@@ -88,10 +88,7 @@
 AppName={#MyAppName}
 #emit 'AppVersion=' + LYNX_VERSION
 #emit 'VersionInfoDescription=Setup for "' + MyAppName + '"'
-#define LYNX_TARGET0 StringChange(LYNX_VERSION,LYNX_RELEASE + "rel.",LYNX_RELEASE + ".00")
-#define LYNX_TARGET1 StringChange(LYNX_TARGET0,LYNX_TARGETS + "dev.",LYNX_RELEASE + ".10")
-#define LYNX_TARGET2 StringChange(LYNX_TARGET1,LYNX_TARGETS + "pre.",LYNX_RELEASE + ".20")
-#emit 'VersionInfoVersion=' + LYNX_TARGET1
+#emit 'VersionInfoVersion=' + LYNX_VERSION
 AppVerName={#MyAppVerName}
 AppPublisher={#MyAppPublisher}
 AppCopyright=� 1997-2023,2024, Thomas E. Dickey
@@ -141,8 +138,8 @@ Name: "{app}\icon"
 #emit 'Source: "' + DllsSrcDir + '\' + BzipExeName + '"; DestDir: "{app}"; DestName: ' + BzipExeName + '; Flags: ignoreversion'
 #emit 'Source: "' + DllsSrcDir + '\' + GzipExeName + '"; DestDir: "{app}"; DestName: ' + GzipExeName + '; Flags: ignoreversion'
 #emit 'Source: "' + DocsSrcDir + '\*.*"; DestDir: "{app}\doc"; Flags: '
-#emit 'Source: "' + DocsSrcDir + '\..\samples\*.*"; DestDir: "{app}\doc\samples"; Flags: '
-#emit 'Source: "' + DocsSrcDir + '\..\test\*.*"; DestDir: "{app}\doc\test"; Flags: '
+#emit 'Source: "' + DocsSrcDir + '\samples\*.*"; DestDir: "{app}\doc\samples"; Flags: '
+#emit 'Source: "' + DocsSrcDir + '\test\*.*"; DestDir: "{app}\doc\test"; Flags: '
 #emit 'Source: "' + HelpSrcDir + '\*.*"; DestDir: "{app}\help"; Flags: '
 #emit 'Source: "' + HelpSrcDir + '\keystrokes\*.*"; DestDir: "{app}\help\keystrokes"; Flags: '
 
diff --git a/PACKAGE/lynx.spec b/PACKAGE/lynx.spec
index bb3ac80e..a11a9a02 100644
--- a/PACKAGE/lynx.spec
+++ b/PACKAGE/lynx.spec
@@ -1,11 +1,11 @@
-# $LynxId: lynx.spec,v 1.70 2024/01/07 18:30:52 tom Exp $
+# $LynxId: lynx.spec,v 1.72 2024/01/15 11:47:26 tom Exp $
 Summary: A text-based Web browser
 Name: lynx-dev
 Version: 2.9.0
-Release: dev.13
+Release: 1
 License: GPLv2
 Group: Applications/Internet
-Source: lynx%{version}%{release}.tgz
+Source: lynx%{version}.tgz
 URL: https://lynx.invisible-island.net
 Provides: webclient >= 0.0
 Provides: text-www-browser >= 0.0
@@ -34,7 +34,7 @@ HTTP, FTP, WAIS, and NNTP servers.
 %prep
 
 %define debug_package %{nil}
-%setup -q -n lynx%{version}%{release}
+%setup -q -n lynx%{version}
 
 %build
 %configure \
@@ -111,6 +111,9 @@ strip $RPM_BUILD_ROOT%{_bindir}/%{name}
 
 %changelog
 
+* Mon Jan 15 2024 Thomas E. Dickey
+- simplified tarball name
+
 * Sun Jan 07 2024 Thomas E. Dickey
 - use rpm #find_lang macro for configuring language files
 - use noreplace flag for *.cfg and *.lss config files
diff --git a/PACKAGE/version.iss b/PACKAGE/version.iss
index ccd47e45..e3fe613b 100644
--- a/PACKAGE/version.iss
+++ b/PACKAGE/version.iss
@@ -1,11 +1,6 @@
 ; version used for Inno Setup files.
 
-; $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$
-#define LYNX_VERSION "2.9.0dev.13"
-
-; most-recent full release and target
-#define LYNX_RELEASE "2.9.0"
-#define LYNX_TARGETS "2.9.0"
+#define LYNX_VERSION "2.9.0"
 
 #define MyAppProg "Lynx"
 #define MyAppName "Lynx - web browser"
diff --git a/README b/README
index d7668273..dd141484 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
                              Lynx README file
 
-Lynx Version 2.8.9 is the latest release (July 2018).
+Lynx Version 2.9.0 is the latest release (January 2024).
 See the CHANGES file for a complete record of all changes and bug fixes.
 New releases are announced on the lynx-dev mailing list (see below).
 
@@ -150,5 +150,5 @@ LYNX-DEV MAILING LIST
 
 ------------------------------------------------------------------------------
 -- vile:txtmode fc=72 noti
--- $LynxId: README,v 1.36 2022/12/28 13:41:40 tom Exp $
+-- $LynxId: README,v 1.37 2024/01/15 01:48:07 tom Exp $
 ------------------------------------------------------------------------------
diff --git a/WWW/Library/Implementation/HTTCP.c b/WWW/Library/Implementation/HTTCP.c
index de5551ef..f4b45977 100644
--- a/WWW/Library/Implementation/HTTCP.c
+++ b/WWW/Library/Implementation/HTTCP.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTTCP.c,v 1.168 2024/01/14 11:00:25 tom Exp $
+ * $LynxId: HTTCP.c,v 1.169 2024/01/14 19:19:39 tom Exp $
  *
  *			Generic Communication Code		HTTCP.c
  *			==========================
@@ -2490,6 +2490,10 @@ int HTDoRead(int fildes,
 	} else if (ret > 0) {
 	    ready = TRUE;
 	} else if (HTWasInterrupted(&result)) {
+#ifdef USE_READPROGRESS
+	    if (tries > TRIES_PER_SECOND)
+		result = 0;
+#endif
 	    break;
 	}
     }
diff --git a/configure b/configure
index 5260b9d0..3de5c353 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,9 @@
 #! /bin/sh
-# From configure.in 2.9.0dev.13.
+# From configure.in Revision: 1.355 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by Autoconf 2.52.20231210.
+# Generated by Autoconf 2.52.20231210 for lynx 2.9.0.
+#
+# Report bugs to <lynx-dev@nongnu.org>.
 #
 # Copyright 2003-2022,2023	Thomas E. Dickey
 # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
@@ -187,11 +189,11 @@ infodir='${datarootdir}/info'
 mandir='${datarootdir}/man'
 
 # Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
+PACKAGE_NAME='lynx'
+PACKAGE_TARNAME='lynx'
+PACKAGE_VERSION='2.9.0'
+PACKAGE_STRING='lynx 2.9.0'
+PACKAGE_BUGREPORT='lynx-dev@nongnu.org'
 
 ac_prev=
 for ac_option
@@ -623,7 +625,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<EOF
-\`configure' configures this package to adapt to many kinds of systems.
+\`configure' configures lynx 2.9.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -695,7 +697,9 @@ EOF
 fi
 
 if test -n "$ac_init_help"; then
-
+  case "$ac_init_help" in
+     short | recursive ) echo "Configuration of lynx 2.9.0:";;
+   esac
   cat <<\EOF
 
 Optional Packages:
@@ -841,6 +845,7 @@ Some influential environment variables:
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
+Report bugs to <lynx-dev@nongnu.org>.
 EOF
 fi
 
@@ -883,6 +888,8 @@ fi
 test -n "$ac_init_help" && exit 0
 if "$ac_init_version"; then
   cat <<\EOF
+lynx configure 2.9.0
+generated by GNU Autoconf 2.52.20231210
 
 Copyright 2003-2022,2023	Thomas E. Dickey
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
@@ -897,7 +904,7 @@ cat >&5 <<EOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by $as_me, which was
+It was created by lynx $as_me 2.9.0, which was
 generated by GNU Autoconf 2.52.20231210.  Invocation command line was
 
   $ $0 $@
@@ -1022,7 +1029,7 @@ if test -z "$CONFIG_SITE"; then
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
-    { echo "$as_me:1025: loading site script $ac_site_file" >&5
+    { echo "$as_me:1032: loading site script $ac_site_file" >&5
 echo "$as_me: loading site script $ac_site_file" >&6;}
     cat "$ac_site_file" >&5
     . "$ac_site_file"
@@ -1033,7 +1040,7 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { echo "$as_me:1036: loading cache $cache_file" >&5
+    { echo "$as_me:1043: loading cache $cache_file" >&5
 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . $cache_file;;
@@ -1041,7 +1048,7 @@ echo "$as_me: loading cache $cache_file" >&6;}
     esac
   fi
 else
-  { echo "$as_me:1044: creating cache $cache_file" >&5
+  { echo "$as_me:1051: creating cache $cache_file" >&5
 echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -1057,21 +1064,21 @@ for ac_var in `(set) 2>&1 |
   eval ac_new_val="\$ac_env_${ac_var}_value"
   case "$ac_old_set,$ac_new_set" in
     set,)
-      { echo "$as_me:1060: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { echo "$as_me:1067: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { echo "$as_me:1064: error: \`$ac_var' was not set in the previous run" >&5
+      { echo "$as_me:1071: error: \`$ac_var' was not set in the previous run" >&5
 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-        { echo "$as_me:1070: error: \`$ac_var' has changed since the previous run:" >&5
+        { echo "$as_me:1077: error: \`$ac_var' has changed since the previous run:" >&5
 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-        { echo "$as_me:1072:   former value:  $ac_old_val" >&5
+        { echo "$as_me:1079:   former value:  $ac_old_val" >&5
 echo "$as_me:   former value:  $ac_old_val" >&2;}
-        { echo "$as_me:1074:   current value: $ac_new_val" >&5
+        { echo "$as_me:1081:   current value: $ac_new_val" >&5
 echo "$as_me:   current value: $ac_new_val" >&2;}
         ac_cache_corrupted=:
       fi;;
@@ -1090,9 +1097,9 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
   fi
 done
 if "$ac_cache_corrupted"; then
-  { echo "$as_me:1093: error: changes in the environment can compromise the build" >&5
+  { echo "$as_me:1100: error: changes in the environment can compromise the build" >&5
 echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:1095: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+  { { echo "$as_me:1102: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1121,10 +1128,10 @@ esac
 echo "#! $SHELL" >conftest.sh
 echo  "exit 0"   >>conftest.sh
 chmod +x conftest.sh
-if { (echo "$as_me:1124: PATH=\".;.\"; conftest.sh") >&5
+if { (echo "$as_me:1131: PATH=\".;.\"; conftest.sh") >&5
   (PATH=".;."; conftest.sh) 2>&5
   ac_status=$?
-  echo "$as_me:1127: \$? = $ac_status" >&5
+  echo "$as_me:1134: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
   ac_path_separator=';'
 else
@@ -1133,6 +1140,17 @@ fi
 PATH_SEPARATOR="$ac_path_separator"
 rm -f conftest.sh
 
+echo "Configuring $PACKAGE_NAME version $PACKAGE_VERSION"
+
+# Save the original $CFLAGS so we can distinguish whether the user set those
+# in the environment, or whether autoconf added -O and -g options:
+ORIGINAL_CFLAGS="$CFLAGS"
+
+# For autoconf 2.13, make sure we have no cache file at the beginning of this
+# script.  That fixes problems with tests whose cached values change from one
+# run to the next, as well as with tests that are order-dependent.
+rm -f config.cache
+
 # autoconf 2.5x defaults to no cache file; we need the cache file's information
 # for building the config page.  But start with it empty to avoid confusion by
 # people who don't do a "make distclean" after applying patches.
@@ -1159,7 +1177,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:1162: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+  { { echo "$as_me:1180: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1169,11 +1187,11 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 
 # Make sure we can run config.sub.
 $ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:1172: error: cannot run $ac_config_sub" >&5
+  { { echo "$as_me:1190: error: cannot run $ac_config_sub" >&5
 echo "$as_me: error: cannot run $ac_config_sub" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:1176: checking build system type" >&5
+echo "$as_me:1194: checking build system type" >&5
 echo $ECHO_N "checking build system type... $ECHO_C" >&6
 if test "${ac_cv_build+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1182,23 +1200,23 @@ else
 test -z "$ac_cv_build_alias" &&
   ac_cv_build_alias=`$ac_config_guess`
 test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:1185: error: cannot guess build type; you must specify one" >&5
+  { { echo "$as_me:1203: error: cannot guess build type; you must specify one" >&5
 echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    { (exit 1); exit 1; }; }
 ac_cv_build=`$ac_config_sub "$ac_cv_build_alias"` ||
-  { { echo "$as_me:1189: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+  { { echo "$as_me:1207: error: $ac_config_sub $ac_cv_build_alias failed." >&5
 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:1194: result: $ac_cv_build" >&5
+echo "$as_me:1212: result: $ac_cv_build" >&5
 echo "${ECHO_T}$ac_cv_build" >&6
 build=$ac_cv_build
 build_cpu=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
 build_vendor=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 build_os=`echo "$ac_cv_build" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 
-echo "$as_me:1201: checking host system type" >&5
+echo "$as_me:1219: checking host system type" >&5
 echo $ECHO_N "checking host system type... $ECHO_C" >&6
 if test "${ac_cv_host+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1207,12 +1225,12 @@ else
 test -z "$ac_cv_host_alias" &&
   ac_cv_host_alias=$ac_cv_build_alias
 ac_cv_host=`$ac_config_sub "$ac_cv_host_alias"` ||
-  { { echo "$as_me:1210: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+  { { echo "$as_me:1228: error: $ac_config_sub $ac_cv_host_alias failed" >&5
 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:1215: result: $ac_cv_host" >&5
+echo "$as_me:1233: result: $ac_cv_host" >&5
 echo "${ECHO_T}$ac_cv_host" >&6
 host=$ac_cv_host
 host_cpu=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
@@ -1220,7 +1238,7 @@ host_vendor=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo "$ac_cv_host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 
 if test -f "$srcdir/config.guess" || test -f "$ac_aux_dir/config.guess" ; then
-	echo "$as_me:1223: checking target system type" >&5
+	echo "$as_me:1241: checking target system type" >&5
 echo $ECHO_N "checking target system type... $ECHO_C" >&6
 if test "${ac_cv_target+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1229,12 +1247,12 @@ else
 test "x$ac_cv_target_alias" = "x" &&
   ac_cv_target_alias=$ac_cv_host_alias
 ac_cv_target=`$ac_config_sub "$ac_cv_target_alias"` ||
-  { { echo "$as_me:1232: error: $ac_config_sub $ac_cv_target_alias failed" >&5
+  { { echo "$as_me:1250: error: $ac_config_sub $ac_cv_target_alias failed" >&5
 echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:1237: result: $ac_cv_target" >&5
+echo "$as_me:1255: result: $ac_cv_target" >&5
 echo "${ECHO_T}$ac_cv_target" >&6
 target=$ac_cv_target
 target_cpu=`echo "$ac_cv_target" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
@@ -1266,13 +1284,13 @@ else
 fi
 
 test -z "$system_name" && system_name="$cf_cv_system_name"
-test -n "$cf_cv_system_name" && echo "$as_me:1269: result: Configuring for $cf_cv_system_name" >&5
+test -n "$cf_cv_system_name" && echo "$as_me:1287: result: Configuring for $cf_cv_system_name" >&5
 echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6
 
 if test ".$system_name" != ".$cf_cv_system_name" ; then
-	echo "$as_me:1273: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
+	echo "$as_me:1291: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
 echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6
-	{ { echo "$as_me:1275: error: \"Please remove config.cache and try again.\"" >&5
+	{ { echo "$as_me:1293: error: \"Please remove config.cache and try again.\"" >&5
 echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1280,7 +1298,7 @@ fi
 # Check whether --with-system-type or --without-system-type was given.
 if test "${with_system_type+set}" = set; then
   withval="$with_system_type"
-  { echo "$as_me:1283: WARNING: overriding system type $host_os to $withval" >&5
+  { echo "$as_me:1301: WARNING: overriding system type $host_os to $withval" >&5
 echo "$as_me: WARNING: overriding system type $host_os to $withval" >&2;}
  host_os=$withval
 fi;
@@ -1298,11 +1316,12 @@ _ACEOF
 program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
 rm conftest.sed
 
-PACKAGE=lynx
-# $Format: "VERSION=$ProjectVersion$"$
-VERSION=2.9.0dev.13
+PACKAGE=$PACKAGE_NAME
+VERSION=$PACKAGE_VERSION
+
+NO_DOTS_VERSION=`echo "$PACKAGE_VERSION" | sed -e 's,\.,-,g'`
 
-echo "$as_me:1305: checking for DESTDIR" >&5
+echo "$as_me:1324: checking for DESTDIR" >&5
 echo $ECHO_N "checking for DESTDIR... $ECHO_C" >&6
 
 # Check whether --with-destdir or --without-destdir was given.
@@ -1338,7 +1357,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:1341: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:1360: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -1347,7 +1366,7 @@ esac
 fi
 eval DESTDIR="$withval"
 
-echo "$as_me:1350: result: $DESTDIR" >&5
+echo "$as_me:1369: result: $DESTDIR" >&5
 echo "${ECHO_T}$DESTDIR" >&6
 
 case "$host_os" in
@@ -1366,7 +1385,7 @@ ac_main_return="return"
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:1369: checking for $ac_word" >&5
+echo "$as_me:1388: 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
@@ -1381,7 +1400,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_tool_prefix}gcc"
-echo "$as_me:1384: found $ac_dir/$ac_word" >&5
+echo "$as_me:1403: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1389,10 +1408,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1392: result: $CC" >&5
+  echo "$as_me:1411: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1395: result: no" >&5
+  echo "$as_me:1414: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1401,7 +1420,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-echo "$as_me:1404: checking for $ac_word" >&5
+echo "$as_me:1423: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1416,7 +1435,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_CC="gcc"
-echo "$as_me:1419: found $ac_dir/$ac_word" >&5
+echo "$as_me:1438: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1424,10 +1443,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1427: result: $ac_ct_CC" >&5
+  echo "$as_me:1446: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1430: result: no" >&5
+  echo "$as_me:1449: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1440,7 +1459,7 @@ if test -z "$CC"; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:1443: checking for $ac_word" >&5
+echo "$as_me:1462: 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
@@ -1455,7 +1474,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_tool_prefix}cc"
-echo "$as_me:1458: found $ac_dir/$ac_word" >&5
+echo "$as_me:1477: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1463,10 +1482,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1466: result: $CC" >&5
+  echo "$as_me:1485: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1469: result: no" >&5
+  echo "$as_me:1488: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1475,7 +1494,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:1478: checking for $ac_word" >&5
+echo "$as_me:1497: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1490,7 +1509,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_CC="cc"
-echo "$as_me:1493: found $ac_dir/$ac_word" >&5
+echo "$as_me:1512: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1498,10 +1517,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1501: result: $ac_ct_CC" >&5
+  echo "$as_me:1520: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1504: result: no" >&5
+  echo "$as_me:1523: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1514,7 +1533,7 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:1517: checking for $ac_word" >&5
+echo "$as_me:1536: 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
@@ -1534,7 +1553,7 @@ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
   continue
 fi
 ac_cv_prog_CC="cc"
-echo "$as_me:1537: found $ac_dir/$ac_word" >&5
+echo "$as_me:1556: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1556,10 +1575,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1559: result: $CC" >&5
+  echo "$as_me:1578: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1562: result: no" >&5
+  echo "$as_me:1581: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1570,7 +1589,7 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:1573: checking for $ac_word" >&5
+echo "$as_me:1592: 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
@@ -1585,7 +1604,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_tool_prefix$ac_prog"
-echo "$as_me:1588: found $ac_dir/$ac_word" >&5
+echo "$as_me:1607: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1593,10 +1612,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1596: result: $CC" >&5
+  echo "$as_me:1615: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1599: result: no" >&5
+  echo "$as_me:1618: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1609,7 +1628,7 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1612: checking for $ac_word" >&5
+echo "$as_me:1631: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1624,7 +1643,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_CC="$ac_prog"
-echo "$as_me:1627: found $ac_dir/$ac_word" >&5
+echo "$as_me:1646: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1632,10 +1651,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1635: result: $ac_ct_CC" >&5
+  echo "$as_me:1654: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1638: result: no" >&5
+  echo "$as_me:1657: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1647,32 +1666,32 @@ fi
 
 fi
 
-test -z "$CC" && { { echo "$as_me:1650: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:1669: error: no acceptable cc found in \$PATH" >&5
 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:1655:" \
+echo "$as_me:1674:" \
      "checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo "$2"`
-{ (eval echo "$as_me:1658: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1677: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1661: \$? = $ac_status" >&5
+  echo "$as_me:1680: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:1663: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1682: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1666: \$? = $ac_status" >&5
+  echo "$as_me:1685: \$? = $ac_status" >&5
   (exit "$ac_status"); }
-{ (eval echo "$as_me:1668: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1687: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1671: \$? = $ac_status" >&5
+  echo "$as_me:1690: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 1675 "configure"
+#line 1694 "configure"
 #include "confdefs.h"
 
 int
@@ -1688,13 +1707,13 @@ ac_clean_files="$ac_clean_files a.out a.exe"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-echo "$as_me:1691: checking for C compiler default output" >&5
+echo "$as_me:1710: checking for C compiler default output" >&5
 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
 ac_link_default=`echo "$ac_link" | sed 's/ -o *"conftest[^"]*"//'`
-if { (eval echo "$as_me:1694: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:1713: \"$ac_link_default\"") >&5
   (eval $ac_link_default) 2>&5
   ac_status=$?
-  echo "$as_me:1697: \$? = $ac_status" >&5
+  echo "$as_me:1716: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
   # Find the output, starting from the most likely.  This scheme is
 # not robust to junk in `.', hence go to wildcards (a.*) only as a last
@@ -1717,34 +1736,34 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-{ { echo "$as_me:1720: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:1739: error: C compiler cannot create executables" >&5
 echo "$as_me: error: C compiler cannot create executables" >&2;}
    { (exit 77); exit 77; }; }
 fi
 
 ac_exeext=$ac_cv_exeext
-echo "$as_me:1726: result: $ac_file" >&5
+echo "$as_me:1745: result: $ac_file" >&5
 echo "${ECHO_T}$ac_file" >&6
 
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:1731: checking whether the C compiler works" >&5
+echo "$as_me:1750: checking whether the C compiler works" >&5
 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
   if { ac_try='./$ac_file'
-  { (eval echo "$as_me:1737: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1756: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1740: \$? = $ac_status" >&5
+  echo "$as_me:1759: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:1747: error: cannot run C compiled programs.
+	{ { echo "$as_me:1766: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'." >&5
 echo "$as_me: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'." >&2;}
@@ -1752,24 +1771,24 @@ If you meant to cross compile, use \`--host'." >&2;}
     fi
   fi
 fi
-echo "$as_me:1755: result: yes" >&5
+echo "$as_me:1774: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 rm -f a.out a.exe "conftest$ac_cv_exeext"
 ac_clean_files=$ac_clean_files_save
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:1762: checking whether we are cross compiling" >&5
+echo "$as_me:1781: checking whether we are cross compiling" >&5
 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:1764: result: $cross_compiling" >&5
+echo "$as_me:1783: result: $cross_compiling" >&5
 echo "${ECHO_T}$cross_compiling" >&6
 
-echo "$as_me:1767: checking for executable suffix" >&5
+echo "$as_me:1786: checking for executable suffix" >&5
 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:1769: \"$ac_link\"") >&5
+if { (eval echo "$as_me:1788: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:1772: \$? = $ac_status" >&5
+  echo "$as_me:1791: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
@@ -1785,25 +1804,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
   esac
 done
 else
-  { { echo "$as_me:1788: error: cannot compute EXEEXT: cannot compile and link" >&5
+  { { echo "$as_me:1807: error: cannot compute EXEEXT: cannot compile and link" >&5
 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f "conftest$ac_cv_exeext"
-echo "$as_me:1794: result: $ac_cv_exeext" >&5
+echo "$as_me:1813: result: $ac_cv_exeext" >&5
 echo "${ECHO_T}$ac_cv_exeext" >&6
 
 rm -f "conftest.$ac_ext"
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-echo "$as_me:1800: checking for object suffix" >&5
+echo "$as_me:1819: checking for object suffix" >&5
 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
 if test "${ac_cv_objext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 1806 "configure"
+#line 1825 "configure"
 #include "confdefs.h"
 
 int
@@ -1815,10 +1834,10 @@ main (void)
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:1818: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1837: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1821: \$? = $ac_status" >&5
+  echo "$as_me:1840: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
   case $ac_file in
@@ -1830,24 +1849,24 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-{ { echo "$as_me:1833: error: cannot compute OBJEXT: cannot compile" >&5
+{ { echo "$as_me:1852: error: cannot compute OBJEXT: cannot compile" >&5
 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f "conftest.$ac_cv_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:1840: result: $ac_cv_objext" >&5
+echo "$as_me:1859: result: $ac_cv_objext" >&5
 echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:1844: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:1863: checking whether we are using the GNU C compiler" >&5
 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 1850 "configure"
+#line 1869 "configure"
 #include "confdefs.h"
 
 int
@@ -1862,16 +1881,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1865: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1884: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1868: \$? = $ac_status" >&5
+  echo "$as_me:1887: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1871: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1890: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1874: \$? = $ac_status" >&5
+  echo "$as_me:1893: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_compiler_gnu=yes
 else
@@ -1883,19 +1902,19 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:1886: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:1905: result: $ac_cv_c_compiler_gnu" >&5
 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
 GCC=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 CFLAGS="-g"
-echo "$as_me:1892: checking whether $CC accepts -g" >&5
+echo "$as_me:1911: checking whether $CC accepts -g" >&5
 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 1898 "configure"
+#line 1917 "configure"
 #include "confdefs.h"
 
 int
@@ -1907,16 +1926,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1910: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1929: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1913: \$? = $ac_status" >&5
+  echo "$as_me:1932: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1916: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1935: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1919: \$? = $ac_status" >&5
+  echo "$as_me:1938: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_prog_cc_g=yes
 else
@@ -1926,7 +1945,7 @@ ac_cv_prog_cc_g=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:1929: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:1948: result: $ac_cv_prog_cc_g" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
@@ -1953,16 +1972,16 @@ cat >"conftest.$ac_ext" <<_ACEOF
 #endif
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1956: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1975: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1959: \$? = $ac_status" >&5
+  echo "$as_me:1978: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1962: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1981: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1965: \$? = $ac_status" >&5
+  echo "$as_me:1984: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   for ac_declaration in \
    ''\
@@ -1974,7 +1993,7 @@ if { (eval echo "$as_me:1956: \"$ac_compile\"") >&5
    'void exit (int);'
 do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 1977 "configure"
+#line 1996 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -1987,16 +2006,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:1990: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2009: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1993: \$? = $ac_status" >&5
+  echo "$as_me:2012: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:1996: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2015: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1999: \$? = $ac_status" >&5
+  echo "$as_me:2018: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -2006,7 +2025,7 @@ continue
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2009 "configure"
+#line 2028 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -2018,16 +2037,16 @@ exit (42);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2021: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2040: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2024: \$? = $ac_status" >&5
+  echo "$as_me:2043: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2027: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2046: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2030: \$? = $ac_status" >&5
+  echo "$as_me:2049: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -2057,11 +2076,11 @@ ac_main_return="return"
 
 GCC_VERSION=none
 if test "$GCC" = yes ; then
-	echo "$as_me:2060: checking version of $CC" >&5
+	echo "$as_me:2079: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 	GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^[^(]*([^)][^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
-	echo "$as_me:2064: result: $GCC_VERSION" >&5
+	echo "$as_me:2083: result: $GCC_VERSION" >&5
 echo "${ECHO_T}$GCC_VERSION" >&6
 fi
 
@@ -2070,12 +2089,12 @@ INTEL_COMPILER=no
 if test "$GCC" = yes ; then
 	case "$host_os" in
 	(linux*|gnu*)
-		echo "$as_me:2073: checking if this is really Intel C compiler" >&5
+		echo "$as_me:2092: checking if this is really Intel C compiler" >&5
 echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS -no-gcc"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 2078 "configure"
+#line 2097 "configure"
 #include "confdefs.h"
 
 int
@@ -2092,16 +2111,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2095: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2114: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2098: \$? = $ac_status" >&5
+  echo "$as_me:2117: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2101: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2120: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2104: \$? = $ac_status" >&5
+  echo "$as_me:2123: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   INTEL_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
@@ -2112,7 +2131,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:2115: result: $INTEL_COMPILER" >&5
+		echo "$as_me:2134: result: $INTEL_COMPILER" >&5
 echo "${ECHO_T}$INTEL_COMPILER" >&6
 		;;
 	esac
@@ -2121,11 +2140,11 @@ fi
 CLANG_COMPILER=no
 
 if test "$GCC" = yes ; then
-	echo "$as_me:2124: checking if this is really Clang C compiler" >&5
+	echo "$as_me:2143: checking if this is really Clang C compiler" >&5
 echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6
 	cf_save_CFLAGS="$CFLAGS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 2128 "configure"
+#line 2147 "configure"
 #include "confdefs.h"
 
 int
@@ -2142,16 +2161,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2145: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2164: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2148: \$? = $ac_status" >&5
+  echo "$as_me:2167: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2151: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2170: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2154: \$? = $ac_status" >&5
+  echo "$as_me:2173: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   CLANG_COMPILER=yes
 
@@ -2161,7 +2180,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	CFLAGS="$cf_save_CFLAGS"
-	echo "$as_me:2164: result: $CLANG_COMPILER" >&5
+	echo "$as_me:2183: result: $CLANG_COMPILER" >&5
 echo "${ECHO_T}$CLANG_COMPILER" >&6
 fi
 
@@ -2170,30 +2189,30 @@ CLANG_VERSION=none
 if test "x$CLANG_COMPILER" = "xyes" ; then
 	case "$CC" in
 	(c[1-9][0-9]|*/c[1-9][0-9])
-		{ echo "$as_me:2173: WARNING: replacing broken compiler alias $CC" >&5
+		{ echo "$as_me:2192: WARNING: replacing broken compiler alias $CC" >&5
 echo "$as_me: WARNING: replacing broken compiler alias $CC" >&2;}
 		CFLAGS="$CFLAGS -std=`echo "$CC" | sed -e 's%.*/%%'`"
 		CC=clang
 		;;
 	esac
 
-	echo "$as_me:2180: checking version of $CC" >&5
+	echo "$as_me:2199: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 	CLANG_VERSION="`$CC --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(CLANG[^)]*) //' -e 's/^.*(Debian[^)]*) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$CLANG_VERSION" && CLANG_VERSION=unknown
-	echo "$as_me:2184: result: $CLANG_VERSION" >&5
+	echo "$as_me:2203: result: $CLANG_VERSION" >&5
 echo "${ECHO_T}$CLANG_VERSION" >&6
 
 	for cf_clang_opt in \
 		-Qunused-arguments \
 		-Wno-error=implicit-function-declaration
 	do
-		echo "$as_me:2191: checking if option $cf_clang_opt works" >&5
+		echo "$as_me:2210: checking if option $cf_clang_opt works" >&5
 echo $ECHO_N "checking if option $cf_clang_opt works... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $cf_clang_opt"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 2196 "configure"
+#line 2215 "configure"
 #include "confdefs.h"
 
 			#include <stdio.h>
@@ -2207,16 +2226,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:2210: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2229: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2213: \$? = $ac_status" >&5
+  echo "$as_me:2232: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:2216: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2235: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2219: \$? = $ac_status" >&5
+  echo "$as_me:2238: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_clang_optok=yes
@@ -2227,13 +2246,13 @@ cat "conftest.$ac_ext" >&5
 			cf_clang_optok=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:2230: result: $cf_clang_optok" >&5
+		echo "$as_me:2249: result: $cf_clang_optok" >&5
 echo "${ECHO_T}$cf_clang_optok" >&6
 		CFLAGS="$cf_save_CFLAGS"
 		if test "$cf_clang_optok" = yes; then
 			test -n "$verbose" && echo "	adding option $cf_clang_opt" 1>&6
 
-echo "${as_me:-configure}:2236: testing adding option $cf_clang_opt ..." 1>&5
+echo "${as_me:-configure}:2255: testing adding option $cf_clang_opt ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_clang_opt"
@@ -2242,7 +2261,7 @@ echo "${as_me:-configure}:2236: testing adding option $cf_clang_opt ..." 1>&5
 	done
 fi
 
-echo "$as_me:2245: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:2264: checking for $CC option to accept ANSI C" >&5
 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2250,7 +2269,7 @@ else
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 2253 "configure"
+#line 2272 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -2297,16 +2316,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO
 do
   CC="$ac_save_CC $ac_arg"
   rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:2300: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2319: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2303: \$? = $ac_status" >&5
+  echo "$as_me:2322: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:2306: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2325: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2309: \$? = $ac_status" >&5
+  echo "$as_me:2328: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_prog_cc_stdc=$ac_arg
 break
@@ -2323,10 +2342,10 @@ fi
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)
-    echo "$as_me:2326: result: none needed" >&5
+    echo "$as_me:2345: result: none needed" >&5
 echo "${ECHO_T}none needed" >&6 ;;
   *)
-    echo "$as_me:2329: result: $ac_cv_prog_cc_stdc" >&5
+    echo "$as_me:2348: result: $ac_cv_prog_cc_stdc" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
     CC="$CC $ac_cv_prog_cc_stdc" ;;
 esac
@@ -2334,13 +2353,13 @@ esac
 # This should have been defined by AC_PROG_CC
 : "${CC:=cc}"
 
-echo "$as_me:2337: checking \$CFLAGS variable" >&5
+echo "$as_me:2356: checking \$CFLAGS variable" >&5
 echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
 case "x$CFLAGS" in
 (*-[IUD]*)
-	echo "$as_me:2341: result: broken" >&5
+	echo "$as_me:2360: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:2343: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
+	{ echo "$as_me:2362: 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=
@@ -2448,18 +2467,18 @@ fi
 	done
 	;;
 (*)
-	echo "$as_me:2451: result: ok" >&5
+	echo "$as_me:2470: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
 
-echo "$as_me:2456: checking \$CC variable" >&5
+echo "$as_me:2475: checking \$CC variable" >&5
 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
 case "$CC" in
 (*[\ \	]-*)
-	echo "$as_me:2460: result: broken" >&5
+	echo "$as_me:2479: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:2462: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
+	{ echo "$as_me:2481: 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/[ ]*[ ]-[^ ].*//'`
@@ -2576,19 +2595,19 @@ fi
 	done
 	test -n "$verbose" && echo "	resulting CC: '$CC'" 1>&6
 
-echo "${as_me:-configure}:2579: testing resulting CC: '$CC' ..." 1>&5
+echo "${as_me:-configure}:2598: testing resulting CC: '$CC' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CFLAGS: '$CFLAGS'" 1>&6
 
-echo "${as_me:-configure}:2583: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+echo "${as_me:-configure}:2602: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
 
-echo "${as_me:-configure}:2587: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+echo "${as_me:-configure}:2606: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
 
 	;;
 (*)
-	echo "$as_me:2591: result: ok" >&5
+	echo "$as_me:2610: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
@@ -2597,7 +2616,7 @@ for ac_prog in ggrep grep
 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:2600: checking for $ac_word" >&5
+echo "$as_me:2619: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_GREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2612,7 +2631,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_GREP="$ac_prog"
-echo "$as_me:2615: found $ac_dir/$ac_word" >&5
+echo "$as_me:2634: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2620,10 +2639,10 @@ fi
 fi
 GREP=$ac_cv_prog_GREP
 if test -n "$GREP"; then
-  echo "$as_me:2623: result: $GREP" >&5
+  echo "$as_me:2642: result: $GREP" >&5
 echo "${ECHO_T}$GREP" >&6
 else
-  echo "$as_me:2626: result: no" >&5
+  echo "$as_me:2645: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2631,7 +2650,7 @@ fi
 done
 test -n "$GREP" || GREP=": "
 
-echo "$as_me:2634: checking for egrep" >&5
+echo "$as_me:2653: checking for egrep" >&5
 echo $ECHO_N "checking for egrep... $ECHO_C" >&6
 if test "${ac_cv_path_EGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2643,7 +2662,7 @@ else
 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:2646: checking for $ac_word" >&5
+echo "$as_me:2665: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_EGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2660,7 +2679,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_EGREP="$ac_dir/$ac_word"
-   echo "$as_me:2663: found $ac_dir/$ac_word" >&5
+   echo "$as_me:2682: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -2671,10 +2690,10 @@ fi
 EGREP=$ac_cv_path_EGREP
 
 if test -n "$EGREP"; then
-  echo "$as_me:2674: result: $EGREP" >&5
+  echo "$as_me:2693: result: $EGREP" >&5
 echo "${ECHO_T}$EGREP" >&6
 else
-  echo "$as_me:2677: result: no" >&5
+  echo "$as_me:2696: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2682,12 +2701,12 @@ fi
 done
 test -n "$EGREP" || EGREP=": "
 
-     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2685: error: cannot find workable egrep" >&5
+     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:2704: error: cannot find workable egrep" >&5
 echo "$as_me: error: cannot find workable egrep" >&2;}
    { (exit 1); exit 1; }; }
    fi
 fi
-echo "$as_me:2690: result: $ac_cv_path_EGREP" >&5
+echo "$as_me:2709: result: $ac_cv_path_EGREP" >&5
 echo "${ECHO_T}$ac_cv_path_EGREP" >&6
  EGREP="$ac_cv_path_EGREP"
 
@@ -2697,7 +2716,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS "conftest.$ac_ext" >&5'
 ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ext" $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
-echo "$as_me:2700: checking how to run the C preprocessor" >&5
+echo "$as_me:2719: checking how to run the C preprocessor" >&5
 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
@@ -2718,18 +2737,18 @@ do
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2721 "configure"
+#line 2740 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2726: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2745: \"$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:2732: \$? = $ac_status" >&5
+  echo "$as_me:2751: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2752,17 +2771,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2755 "configure"
+#line 2774 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2759: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2778: \"$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:2765: \$? = $ac_status" >&5
+  echo "$as_me:2784: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2799,7 +2818,7 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:2802: result: $CPP" >&5
+echo "$as_me:2821: result: $CPP" >&5
 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -2809,18 +2828,18 @@ do
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2812 "configure"
+#line 2831 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2817: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2836: \"$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:2823: \$? = $ac_status" >&5
+  echo "$as_me:2842: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2843,17 +2862,17 @@ rm -f conftest.err "conftest.$ac_ext"
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 2846 "configure"
+#line 2865 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2850: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:2869: \"$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:2856: \$? = $ac_status" >&5
+  echo "$as_me:2875: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2881,7 +2900,7 @@ rm -f conftest.err "conftest.$ac_ext"
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:2884: error: C preprocessor \"$CPP\" fails sanity check" >&5
+  { { echo "$as_me:2903: error: C preprocessor \"$CPP\" fails sanity check" >&5
 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -2893,7 +2912,7 @@ ac_link='$CC -o "conftest$ac_exeext" $CFLAGS $CPPFLAGS $LDFLAGS "conftest.$ac_ex
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return="return"
 
-echo "$as_me:2896: checking if preprocessor -C option works" >&5
+echo "$as_me:2915: checking if preprocessor -C option works" >&5
 echo $ECHO_N "checking if preprocessor -C option works... $ECHO_C" >&6
 if test "${cf_cv_prog_cpp_comments+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2918,34 +2937,34 @@ rm -f conftest.[ci]
 
 fi
 
-echo "$as_me:2921: result: $cf_cv_prog_cpp_comments" >&5
+echo "$as_me:2940: result: $cf_cv_prog_cpp_comments" >&5
 echo "${ECHO_T}$cf_cv_prog_cpp_comments" >&6
 if test x$cf_cv_prog_cpp_comments = xyes
 then
 	CPP="$CPP -C"
 fi
 
-echo "$as_me:2928: checking whether ln -s works" >&5
+echo "$as_me:2947: checking whether ln -s works" >&5
 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  echo "$as_me:2932: result: yes" >&5
+  echo "$as_me:2951: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:2935: result: no, using $LN_S" >&5
+  echo "$as_me:2954: result: no, using $LN_S" >&5
 echo "${ECHO_T}no, using $LN_S" >&6
 fi
 
 case "$host_os" in
 (mingw*)
 LN_S="cp -p"
-echo "$as_me:2942: result: Override: No symbolic links in mingw." >&5
+echo "$as_me:2961: result: Override: No symbolic links in mingw." >&5
 echo "${ECHO_T}Override: No symbolic links in mingw." >&6
 	;;
 (*)
 	;;
 esac
-echo "$as_me:2948: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:2967: checking whether ${MAKE-make} sets \${MAKE}" >&5
 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
@@ -2965,11 +2984,11 @@ fi
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:2968: result: yes" >&5
+  echo "$as_me:2987: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$as_me:2972: result: no" >&5
+  echo "$as_me:2991: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
@@ -2986,7 +3005,7 @@ fi
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:2989: checking for a BSD compatible install" >&5
+echo "$as_me:3008: checking for a BSD compatible install" >&5
 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
@@ -3035,7 +3054,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:3038: result: $INSTALL" >&5
+echo "$as_me:3057: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -3050,7 +3069,7 @@ for ac_prog in byacc 'bison -y'
 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:3053: checking for $ac_word" >&5
+echo "$as_me:3072: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_YACC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3065,7 +3084,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_YACC="$ac_prog"
-echo "$as_me:3068: found $ac_dir/$ac_word" >&5
+echo "$as_me:3087: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3073,10 +3092,10 @@ fi
 fi
 YACC=$ac_cv_prog_YACC
 if test -n "$YACC"; then
-  echo "$as_me:3076: result: $YACC" >&5
+  echo "$as_me:3095: result: $YACC" >&5
 echo "${ECHO_T}$YACC" >&6
 else
-  echo "$as_me:3079: result: no" >&5
+  echo "$as_me:3098: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3084,7 +3103,7 @@ fi
 done
 test -n "$YACC" || YACC="yacc"
 
-echo "$as_me:3087: checking for egrep" >&5
+echo "$as_me:3106: checking for egrep" >&5
 echo $ECHO_N "checking for egrep... $ECHO_C" >&6
 if test "${ac_cv_path_EGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3096,7 +3115,7 @@ else
 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:3099: checking for $ac_word" >&5
+echo "$as_me:3118: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_EGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3113,7 +3132,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_EGREP="$ac_dir/$ac_word"
-   echo "$as_me:3116: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3135: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -3124,10 +3143,10 @@ fi
 EGREP=$ac_cv_path_EGREP
 
 if test -n "$EGREP"; then
-  echo "$as_me:3127: result: $EGREP" >&5
+  echo "$as_me:3146: result: $EGREP" >&5
 echo "${ECHO_T}$EGREP" >&6
 else
-  echo "$as_me:3130: result: no" >&5
+  echo "$as_me:3149: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3135,12 +3154,12 @@ fi
 done
 test -n "$EGREP" || EGREP=": "
 
-     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:3138: error: cannot find workable egrep" >&5
+     test "x$ac_cv_path_EGREP" = "x:" && { { echo "$as_me:3157: error: cannot find workable egrep" >&5
 echo "$as_me: error: cannot find workable egrep" >&2;}
    { (exit 1); exit 1; }; }
    fi
 fi
-echo "$as_me:3143: result: $ac_cv_path_EGREP" >&5
+echo "$as_me:3162: result: $ac_cv_path_EGREP" >&5
 echo "${ECHO_T}$ac_cv_path_EGREP" >&6
  EGREP="$ac_cv_path_EGREP"
 
@@ -3148,7 +3167,7 @@ for ac_prog in lint cppcheck splint
 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:3151: checking for $ac_word" >&5
+echo "$as_me:3170: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_LINT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3163,7 +3182,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_LINT="$ac_prog"
-echo "$as_me:3166: found $ac_dir/$ac_word" >&5
+echo "$as_me:3185: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3171,10 +3190,10 @@ fi
 fi
 LINT=$ac_cv_prog_LINT
 if test -n "$LINT"; then
-  echo "$as_me:3174: result: $LINT" >&5
+  echo "$as_me:3193: result: $LINT" >&5
 echo "${ECHO_T}$LINT" >&6
 else
-  echo "$as_me:3177: result: no" >&5
+  echo "$as_me:3196: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3187,7 +3206,7 @@ case "x$LINT" in
 	;;
 esac
 
-echo "$as_me:3190: checking for fgrep" >&5
+echo "$as_me:3209: checking for fgrep" >&5
 echo $ECHO_N "checking for fgrep... $ECHO_C" >&6
 if test "${ac_cv_path_FGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3199,7 +3218,7 @@ else
 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:3202: checking for $ac_word" >&5
+echo "$as_me:3221: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_FGREP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3216,7 +3235,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_FGREP="$ac_dir/$ac_word"
-   echo "$as_me:3219: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3238: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -3227,10 +3246,10 @@ fi
 FGREP=$ac_cv_path_FGREP
 
 if test -n "$FGREP"; then
-  echo "$as_me:3230: result: $FGREP" >&5
+  echo "$as_me:3249: result: $FGREP" >&5
 echo "${ECHO_T}$FGREP" >&6
 else
-  echo "$as_me:3233: result: no" >&5
+  echo "$as_me:3252: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3238,16 +3257,16 @@ fi
 done
 test -n "$FGREP" || FGREP=": "
 
-     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:3241: error: cannot find workable fgrep" >&5
+     test "x$ac_cv_path_FGREP" = "x:" && { { echo "$as_me:3260: error: cannot find workable fgrep" >&5
 echo "$as_me: error: cannot find workable fgrep" >&2;}
    { (exit 1); exit 1; }; }
    fi
 fi
-echo "$as_me:3246: result: $ac_cv_path_FGREP" >&5
+echo "$as_me:3265: result: $ac_cv_path_FGREP" >&5
 echo "${ECHO_T}$ac_cv_path_FGREP" >&6
  FGREP="$ac_cv_path_FGREP"
 
-echo "$as_me:3250: checking for makeflags variable" >&5
+echo "$as_me:3269: checking for makeflags variable" >&5
 echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6
 if test "${cf_cv_makeflags+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3277,7 +3296,7 @@ CF_EOF
 			;;
 		(*)
 
-echo "${as_me:-configure}:3280: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
+echo "${as_me:-configure}:3299: testing given option \"$cf_option\",no match \"$cf_result\" ..." 1>&5
 
 			;;
 		esac
@@ -3285,10 +3304,10 @@ echo "${as_me:-configure}:3280: testing given option \"$cf_option\",no match \"$
 	rm -f cf_makeflags.tmp
 
 fi
-echo "$as_me:3288: result: $cf_cv_makeflags" >&5
+echo "$as_me:3307: result: $cf_cv_makeflags" >&5
 echo "${ECHO_T}$cf_cv_makeflags" >&6
 
-echo "$as_me:3291: checking for \".PHONY\" make-support" >&5
+echo "$as_me:3310: checking for \".PHONY\" make-support" >&5
 echo $ECHO_N "checking for \".PHONY\" make-support... $ECHO_C" >&6
 if test "${cf_cv_make_PHONY+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3343,14 +3362,14 @@ CF_EOF
 	rm -rf conftest*
 
 fi
-echo "$as_me:3346: result: $cf_cv_make_PHONY" >&5
+echo "$as_me:3365: result: $cf_cv_make_PHONY" >&5
 echo "${ECHO_T}$cf_cv_make_PHONY" >&6
 MAKE_NO_PHONY="#"
 MAKE_PHONY="#"
 test "x$cf_cv_make_PHONY" = xyes && MAKE_PHONY=
 test "x$cf_cv_make_PHONY" != xyes && MAKE_NO_PHONY=
 
-echo "$as_me:3353: checking if filesystem supports mixed-case filenames" >&5
+echo "$as_me:3372: checking if filesystem supports mixed-case filenames" >&5
 echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6
 if test "${cf_cv_mixedcase+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3377,7 +3396,7 @@ else
 fi
 
 fi
-echo "$as_me:3380: result: $cf_cv_mixedcase" >&5
+echo "$as_me:3399: result: $cf_cv_mixedcase" >&5
 echo "${ECHO_T}$cf_cv_mixedcase" >&6
 test "$cf_cv_mixedcase" = yes &&
 cat >>confdefs.h <<\EOF
@@ -3388,7 +3407,7 @@ for ac_prog in exctags ctags
 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:3391: checking for $ac_word" >&5
+echo "$as_me:3410: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CTAGS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3403,7 +3422,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_CTAGS="$ac_prog"
-echo "$as_me:3406: found $ac_dir/$ac_word" >&5
+echo "$as_me:3425: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3411,10 +3430,10 @@ fi
 fi
 CTAGS=$ac_cv_prog_CTAGS
 if test -n "$CTAGS"; then
-  echo "$as_me:3414: result: $CTAGS" >&5
+  echo "$as_me:3433: result: $CTAGS" >&5
 echo "${ECHO_T}$CTAGS" >&6
 else
-  echo "$as_me:3417: result: no" >&5
+  echo "$as_me:3436: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3425,7 +3444,7 @@ for ac_prog in exetags etags
 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:3428: checking for $ac_word" >&5
+echo "$as_me:3447: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ETAGS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3440,7 +3459,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_ETAGS="$ac_prog"
-echo "$as_me:3443: found $ac_dir/$ac_word" >&5
+echo "$as_me:3462: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3448,10 +3467,10 @@ fi
 fi
 ETAGS=$ac_cv_prog_ETAGS
 if test -n "$ETAGS"; then
-  echo "$as_me:3451: result: $ETAGS" >&5
+  echo "$as_me:3470: result: $ETAGS" >&5
 echo "${ECHO_T}$ETAGS" >&6
 else
-  echo "$as_me:3454: result: no" >&5
+  echo "$as_me:3473: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3460,7 +3479,7 @@ done
 
 # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args.
 set dummy ${CTAGS:-ctags}; ac_word=$2
-echo "$as_me:3463: checking for $ac_word" >&5
+echo "$as_me:3482: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3475,7 +3494,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_MAKE_LOWER_TAGS="yes"
-echo "$as_me:3478: found $ac_dir/$ac_word" >&5
+echo "$as_me:3497: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3484,17 +3503,17 @@ fi
 fi
 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
 if test -n "$MAKE_LOWER_TAGS"; then
-  echo "$as_me:3487: result: $MAKE_LOWER_TAGS" >&5
+  echo "$as_me:3506: result: $MAKE_LOWER_TAGS" >&5
 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
 else
-  echo "$as_me:3490: result: no" >&5
+  echo "$as_me:3509: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 if test "$cf_cv_mixedcase" = yes ; then
 	# Extract the first word of "${ETAGS:-etags}", so it can be a program name with args.
 set dummy ${ETAGS:-etags}; ac_word=$2
-echo "$as_me:3497: checking for $ac_word" >&5
+echo "$as_me:3516: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3509,7 +3528,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_MAKE_UPPER_TAGS="yes"
-echo "$as_me:3512: found $ac_dir/$ac_word" >&5
+echo "$as_me:3531: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3518,10 +3537,10 @@ fi
 fi
 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
 if test -n "$MAKE_UPPER_TAGS"; then
-  echo "$as_me:3521: result: $MAKE_UPPER_TAGS" >&5
+  echo "$as_me:3540: result: $MAKE_UPPER_TAGS" >&5
 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
 else
-  echo "$as_me:3524: result: no" >&5
+  echo "$as_me:3543: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3544,7 +3563,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
 set dummy ${ac_tool_prefix}windres; ac_word=$2
-echo "$as_me:3547: checking for $ac_word" >&5
+echo "$as_me:3566: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_WINDRES+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3561,7 +3580,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_WINDRES="$ac_dir/$ac_word"
-   echo "$as_me:3564: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3583: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -3572,10 +3591,10 @@ fi
 WINDRES=$ac_cv_path_WINDRES
 
 if test -n "$WINDRES"; then
-  echo "$as_me:3575: result: $WINDRES" >&5
+  echo "$as_me:3594: result: $WINDRES" >&5
 echo "${ECHO_T}$WINDRES" >&6
 else
-  echo "$as_me:3578: result: no" >&5
+  echo "$as_me:3597: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3584,7 +3603,7 @@ if test -z "$ac_cv_path_WINDRES"; then
   ac_pt_WINDRES=$WINDRES
   # Extract the first word of "windres", so it can be a program name with args.
 set dummy windres; ac_word=$2
-echo "$as_me:3587: checking for $ac_word" >&5
+echo "$as_me:3606: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_ac_pt_WINDRES+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3601,7 +3620,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_WINDRES="$ac_dir/$ac_word"
-   echo "$as_me:3604: found $ac_dir/$ac_word" >&5
+   echo "$as_me:3623: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -3613,10 +3632,10 @@ fi
 ac_pt_WINDRES=$ac_cv_path_ac_pt_WINDRES
 
 if test -n "$ac_pt_WINDRES"; then
-  echo "$as_me:3616: result: $ac_pt_WINDRES" >&5
+  echo "$as_me:3635: result: $ac_pt_WINDRES" >&5
 echo "${ECHO_T}$ac_pt_WINDRES" >&6
 else
-  echo "$as_me:3619: result: no" >&5
+  echo "$as_me:3638: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3644,7 +3663,7 @@ else
 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:3647: checking for $ac_word" >&5
+echo "$as_me:3666: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_BUILD_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3659,7 +3678,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_BUILD_CC="$ac_prog"
-echo "$as_me:3662: found $ac_dir/$ac_word" >&5
+echo "$as_me:3681: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3667,10 +3686,10 @@ fi
 fi
 BUILD_CC=$ac_cv_prog_BUILD_CC
 if test -n "$BUILD_CC"; then
-  echo "$as_me:3670: result: $BUILD_CC" >&5
+  echo "$as_me:3689: result: $BUILD_CC" >&5
 echo "${ECHO_T}$BUILD_CC" >&6
 else
-  echo "$as_me:3673: result: no" >&5
+  echo "$as_me:3692: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3679,12 +3698,12 @@ done
 test -n "$BUILD_CC" || BUILD_CC="none"
 
 fi;
-	echo "$as_me:3682: checking for native build C compiler" >&5
+	echo "$as_me:3701: checking for native build C compiler" >&5
 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
-	echo "$as_me:3684: result: $BUILD_CC" >&5
+	echo "$as_me:3703: result: $BUILD_CC" >&5
 echo "${ECHO_T}$BUILD_CC" >&6
 
-	echo "$as_me:3687: checking for native build C preprocessor" >&5
+	echo "$as_me:3706: checking for native build C preprocessor" >&5
 echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6
 
 # Check whether --with-build-cpp or --without-build-cpp was given.
@@ -3694,10 +3713,10 @@ if test "${with_build_cpp+set}" = set; then
 else
   BUILD_CPP='${BUILD_CC} -E'
 fi;
-	echo "$as_me:3697: result: $BUILD_CPP" >&5
+	echo "$as_me:3716: result: $BUILD_CPP" >&5
 echo "${ECHO_T}$BUILD_CPP" >&6
 
-	echo "$as_me:3700: checking for native build C flags" >&5
+	echo "$as_me:3719: checking for native build C flags" >&5
 echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6
 
 # Check whether --with-build-cflags or --without-build-cflags was given.
@@ -3705,10 +3724,10 @@ if test "${with_build_cflags+set}" = set; then
   withval="$with_build_cflags"
   BUILD_CFLAGS="$withval"
 fi;
-	echo "$as_me:3708: result: $BUILD_CFLAGS" >&5
+	echo "$as_me:3727: result: $BUILD_CFLAGS" >&5
 echo "${ECHO_T}$BUILD_CFLAGS" >&6
 
-	echo "$as_me:3711: checking for native build C preprocessor-flags" >&5
+	echo "$as_me:3730: checking for native build C preprocessor-flags" >&5
 echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6
 
 # Check whether --with-build-cppflags or --without-build-cppflags was given.
@@ -3716,10 +3735,10 @@ if test "${with_build_cppflags+set}" = set; then
   withval="$with_build_cppflags"
   BUILD_CPPFLAGS="$withval"
 fi;
-	echo "$as_me:3719: result: $BUILD_CPPFLAGS" >&5
+	echo "$as_me:3738: result: $BUILD_CPPFLAGS" >&5
 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
 
-	echo "$as_me:3722: checking for native build linker-flags" >&5
+	echo "$as_me:3741: checking for native build linker-flags" >&5
 echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6
 
 # Check whether --with-build-ldflags or --without-build-ldflags was given.
@@ -3727,10 +3746,10 @@ if test "${with_build_ldflags+set}" = set; then
   withval="$with_build_ldflags"
   BUILD_LDFLAGS="$withval"
 fi;
-	echo "$as_me:3730: result: $BUILD_LDFLAGS" >&5
+	echo "$as_me:3749: result: $BUILD_LDFLAGS" >&5
 echo "${ECHO_T}$BUILD_LDFLAGS" >&6
 
-	echo "$as_me:3733: checking for native build linker-libraries" >&5
+	echo "$as_me:3752: checking for native build linker-libraries" >&5
 echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6
 
 # Check whether --with-build-libs or --without-build-libs was given.
@@ -3738,7 +3757,7 @@ if test "${with_build_libs+set}" = set; then
   withval="$with_build_libs"
   BUILD_LIBS="$withval"
 fi;
-	echo "$as_me:3741: result: $BUILD_LIBS" >&5
+	echo "$as_me:3760: result: $BUILD_LIBS" >&5
 echo "${ECHO_T}$BUILD_LIBS" >&6
 
 	# this assumes we're on Unix.
@@ -3747,7 +3766,7 @@ echo "${ECHO_T}$BUILD_LIBS" >&6
 
 	: ${BUILD_CC:='${CC}'}
 
-	echo "$as_me:3750: checking if the build-compiler \"$BUILD_CC\" works" >&5
+	echo "$as_me:3769: checking if the build-compiler \"$BUILD_CC\" works" >&5
 echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6
 
 	cf_save_crossed=$cross_compiling
@@ -3761,7 +3780,7 @@ echo $ECHO_N "checking if the build-compiler \"$BUILD_CC\" works... $ECHO_C" >&6
   cf_ok_build_cc=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 3764 "configure"
+#line 3783 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 		int main(int argc, char *argv[])
@@ -3771,15 +3790,15 @@ else
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:3774: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3793: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3777: \$? = $ac_status" >&5
+  echo "$as_me:3796: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:3779: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3798: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3782: \$? = $ac_status" >&5
+  echo "$as_me:3801: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_ok_build_cc=yes
 else
@@ -3794,12 +3813,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:3816: 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:3821: 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 +3839,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:3842: 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 +3854,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:3857: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3843,10 +3862,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:3846: result: $RANLIB" >&5
+  echo "$as_me:3865: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:3849: result: no" >&5
+  echo "$as_me:3868: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3855,7 +3874,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:3877: 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 +3889,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:3892: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3879,10 +3898,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:3901: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:3885: result: no" >&5
+  echo "$as_me:3904: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3894,7 +3913,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:3916: 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 +3928,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:3931: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3917,10 +3936,10 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:3920: result: $AR" >&5
+  echo "$as_me:3939: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 else
-  echo "$as_me:3923: result: no" >&5
+  echo "$as_me:3942: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3929,7 +3948,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:3951: 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 +3963,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:3966: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3953,10 +3972,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:3975: result: $ac_ct_AR" >&5
 echo "${ECHO_T}$ac_ct_AR" >&6
 else
-  echo "$as_me:3959: result: no" >&5
+  echo "$as_me:3978: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3965,7 +3984,7 @@ else
   AR="$ac_cv_prog_AR"
 fi
 
-echo "$as_me:3968: checking for options to update archives" >&5
+echo "$as_me:3987: 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 +4021,13 @@ else
 			rm -f conftest.a
 
 			cat >"conftest.$ac_ext" <<EOF
-#line 4005 "configure"
+#line 4024 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-			if { (eval echo "$as_me:4008: \"$ac_compile\"") >&5
+			if { (eval echo "$as_me:4027: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4011: \$? = $ac_status" >&5
+  echo "$as_me:4030: \$? = $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 +4038,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}:4041: testing cannot compile test-program ..." 1>&5
 
 				break
 			fi
@@ -4029,7 +4048,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:4051: result: $cf_cv_ar_flags" >&5
 echo "${ECHO_T}$cf_cv_ar_flags" >&6
 
 if test -n "$ARFLAGS" ; then
@@ -4040,7 +4059,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:4062: 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 +4093,7 @@ else
 	ECHO_CC=''
 
 fi;
-echo "$as_me:4077: result: $enableval" >&5
+echo "$as_me:4096: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 # special case for WWW/*
@@ -4084,7 +4103,7 @@ else
 	DONT_ECHO_CC=''
 fi
 
-echo "$as_me:4087: checking if you want to check memory-leaks" >&5
+echo "$as_me:4106: 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 +4120,7 @@ else
 	with_leak_checks=no
 
 fi;
-echo "$as_me:4104: result: $with_leak_checks" >&5
+echo "$as_me:4123: result: $with_leak_checks" >&5
 echo "${ECHO_T}$with_leak_checks" >&6
 test "$with_leak_checks" = "yes" &&
 cat >>confdefs.h <<\EOF
@@ -4111,7 +4130,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:4133: 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 +4147,7 @@ else
 	with_debug=no
 
 fi;
-echo "$as_me:4131: result: $with_debug" >&5
+echo "$as_me:4150: result: $with_debug" >&5
 echo "${ECHO_T}$with_debug" >&6
 if test "$with_debug" = "yes" ; then
 	case "$host_os" in
@@ -4153,7 +4172,7 @@ else
 	esac
 fi
 
-echo "$as_me:4156: checking if you want to enable lynx trace code *recommended* " >&5
+echo "$as_me:4175: 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 +4189,14 @@ else
 	with_trace=yes
 
 fi;
-echo "$as_me:4173: result: $with_trace" >&5
+echo "$as_me:4192: 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:4199: 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 +4213,7 @@ else
 	with_vertrace=no
 
 fi;
-echo "$as_me:4197: result: $with_vertrace" >&5
+echo "$as_me:4216: result: $with_vertrace" >&5
 echo "${ECHO_T}$with_vertrace" >&6
 test "$with_vertrace" = yes &&
 cat >>confdefs.h <<\EOF
@@ -4203,7 +4222,7 @@ EOF
 
 if test -n "$with_screen" && test "x$with_screen" = "xpdcurses"
 then
-	echo "$as_me:4206: checking for X" >&5
+	echo "$as_me:4225: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -4307,17 +4326,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 4329 "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:4333: \"$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:4339: \$? = $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 +4369,7 @@ if test "$ac_x_libraries" = no; then
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 4353 "configure"
+#line 4372 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -4362,16 +4381,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:4384: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4368: \$? = $ac_status" >&5
+  echo "$as_me:4387: \$? = $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:4390: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4374: \$? = $ac_status" >&5
+  echo "$as_me:4393: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -4409,7 +4428,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:4412: result: $have_x" >&5
+  echo "$as_me:4431: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -4419,7 +4438,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:4441: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -4446,11 +4465,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:4468: 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 4472 "configure"
 #include "confdefs.h"
 
 int
@@ -4462,16 +4481,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:4484: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4468: \$? = $ac_status" >&5
+  echo "$as_me:4487: \$? = $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:4490: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4474: \$? = $ac_status" >&5
+  echo "$as_me:4493: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_nospace=yes
 else
@@ -4481,13 +4500,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:4503: 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 4509 "configure"
 #include "confdefs.h"
 
 int
@@ -4499,16 +4518,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:4521: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4505: \$? = $ac_status" >&5
+  echo "$as_me:4524: \$? = $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:4527: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4511: \$? = $ac_status" >&5
+  echo "$as_me:4530: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_R_space=yes
 else
@@ -4518,11 +4537,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:4540: 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:4544: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -4542,7 +4561,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 4564 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4561,22 +4580,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:4583: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4567: \$? = $ac_status" >&5
+  echo "$as_me:4586: \$? = $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:4589: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4573: \$? = $ac_status" >&5
+  echo "$as_me:4592: \$? = $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:4598: 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 +4603,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 4587 "configure"
+#line 4606 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4603,16 +4622,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:4625: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4609: \$? = $ac_status" >&5
+  echo "$as_me:4628: \$? = $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:4631: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4615: \$? = $ac_status" >&5
+  echo "$as_me:4634: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -4623,14 +4642,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:4645: 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:4652: 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 +4657,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 4641 "configure"
+#line 4660 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4657,16 +4676,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:4679: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4663: \$? = $ac_status" >&5
+  echo "$as_me:4682: \$? = $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:4685: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4669: \$? = $ac_status" >&5
+  echo "$as_me:4688: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -4677,7 +4696,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:4699: 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 +4715,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:4718: 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 4724 "configure"
 #include "confdefs.h"
 #define gethostbyname autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -4733,16 +4752,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:4755: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4739: \$? = $ac_status" >&5
+  echo "$as_me:4758: \$? = $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:4761: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4745: \$? = $ac_status" >&5
+  echo "$as_me:4764: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -4752,11 +4771,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:4774: 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:4778: 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 +4783,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 4767 "configure"
+#line 4786 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4783,16 +4802,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:4805: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4789: \$? = $ac_status" >&5
+  echo "$as_me:4808: \$? = $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:4811: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4795: \$? = $ac_status" >&5
+  echo "$as_me:4814: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -4803,14 +4822,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:4825: 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:4832: 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 +4837,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 4821 "configure"
+#line 4840 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4837,16 +4856,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:4859: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4843: \$? = $ac_status" >&5
+  echo "$as_me:4862: \$? = $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:4865: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4849: \$? = $ac_status" >&5
+  echo "$as_me:4868: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -4857,7 +4876,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:4879: 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 +4892,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:4895: 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 4901 "configure"
 #include "confdefs.h"
 #define connect autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -4910,16 +4929,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:4932: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4916: \$? = $ac_status" >&5
+  echo "$as_me:4935: \$? = $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:4938: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4922: \$? = $ac_status" >&5
+  echo "$as_me:4941: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_connect=yes
 else
@@ -4929,11 +4948,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:4951: 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:4955: 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 +4960,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 4944 "configure"
+#line 4963 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4960,16 +4979,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:4982: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4966: \$? = $ac_status" >&5
+  echo "$as_me:4985: \$? = $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:4988: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4972: \$? = $ac_status" >&5
+  echo "$as_me:4991: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -4980,7 +4999,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:5002: 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 +5008,13 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:4992: checking for remove" >&5
+    echo "$as_me:5011: 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 5017 "configure"
 #include "confdefs.h"
 #define remove autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -5026,16 +5045,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:5048: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5032: \$? = $ac_status" >&5
+  echo "$as_me:5051: \$? = $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:5054: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5038: \$? = $ac_status" >&5
+  echo "$as_me:5057: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_remove=yes
 else
@@ -5045,11 +5064,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:5067: 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:5071: 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 +5076,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 5060 "configure"
+#line 5079 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -5076,16 +5095,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:5098: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5082: \$? = $ac_status" >&5
+  echo "$as_me:5101: \$? = $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:5104: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5088: \$? = $ac_status" >&5
+  echo "$as_me:5107: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -5096,7 +5115,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:5118: 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 +5124,13 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:5108: checking for shmat" >&5
+    echo "$as_me:5127: 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 5133 "configure"
 #include "confdefs.h"
 #define shmat autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -5142,16 +5161,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:5164: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5148: \$? = $ac_status" >&5
+  echo "$as_me:5167: \$? = $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:5170: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5154: \$? = $ac_status" >&5
+  echo "$as_me:5173: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -5161,11 +5180,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:5183: 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:5187: 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 +5192,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 5176 "configure"
+#line 5195 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -5192,16 +5211,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:5214: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5198: \$? = $ac_status" >&5
+  echo "$as_me:5217: \$? = $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:5220: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5204: \$? = $ac_status" >&5
+  echo "$as_me:5223: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -5212,7 +5231,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:5234: 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 +5249,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:5252: 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 +5257,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 5241 "configure"
+#line 5260 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -5257,16 +5276,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:5279: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5263: \$? = $ac_status" >&5
+  echo "$as_me:5282: \$? = $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:5285: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5269: \$? = $ac_status" >&5
+  echo "$as_me:5288: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -5277,7 +5296,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:5299: 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 +5308,7 @@ fi
 
 fi
 
-echo "$as_me:5292: checking if you want to use C11 _Noreturn feature" >&5
+echo "$as_me:5311: 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 +5325,17 @@ else
 	enable_stdnoreturn=no
 
 fi;
-echo "$as_me:5309: result: $enable_stdnoreturn" >&5
+echo "$as_me:5328: 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:5332: 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 5338 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -5332,16 +5351,16 @@ if (feof(stdin)) giveup()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5335: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5354: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5338: \$? = $ac_status" >&5
+  echo "$as_me:5357: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5341: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5360: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5344: \$? = $ac_status" >&5
+  echo "$as_me:5363: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_c11_noreturn=yes
 else
@@ -5352,7 +5371,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:5355: result: $cf_cv_c11_noreturn" >&5
+echo "$as_me:5374: result: $cf_cv_c11_noreturn" >&5
 echo "${ECHO_T}$cf_cv_c11_noreturn" >&6
 else
 	cf_cv_c11_noreturn=no,
@@ -5408,16 +5427,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CFLAGS: $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:5411: testing repairing CFLAGS: $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:5430: testing repairing CFLAGS: $CFLAGS ..." 1>&5
 
 			CFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CFLAGS" 1>&6
 
-echo "${as_me:-configure}:5416: testing ... fixed $CFLAGS ..." 1>&5
+echo "${as_me:-configure}:5435: testing ... fixed $CFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:5420: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:5439: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -5456,16 +5475,16 @@ then
 		then
 			test -n "$verbose" && echo "	repairing CPPFLAGS: $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:5459: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:5478: testing repairing CPPFLAGS: $CPPFLAGS ..." 1>&5
 
 			CPPFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:5464: testing ... fixed $CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:5483: testing ... fixed $CPPFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:5468: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:5487: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
@@ -5504,23 +5523,23 @@ then
 		then
 			test -n "$verbose" && echo "	repairing LDFLAGS: $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:5507: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:5526: testing repairing LDFLAGS: $LDFLAGS ..." 1>&5
 
 			LDFLAGS="$cf_temp_flags"
 			test -n "$verbose" && echo "	... fixed $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:5512: testing ... fixed $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:5531: testing ... fixed $LDFLAGS ..." 1>&5
 
 			test -n "$verbose" && echo "	... extra $EXTRA_CFLAGS" 1>&6
 
-echo "${as_me:-configure}:5516: testing ... extra $EXTRA_CFLAGS ..." 1>&5
+echo "${as_me:-configure}:5535: testing ... extra $EXTRA_CFLAGS ..." 1>&5
 
 		fi
 		;;
 	esac
 fi
 
-echo "$as_me:5523: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:5542: 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.
@@ -5537,7 +5556,7 @@ else
 	enable_warnings=no
 
 fi;
-echo "$as_me:5540: result: $enable_warnings" >&5
+echo "$as_me:5559: result: $enable_warnings" >&5
 echo "${ECHO_T}$enable_warnings" >&6
 if test "$enable_warnings" = "yes"
 then
@@ -5560,10 +5579,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:5563: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:5582: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > "conftest.$ac_ext" <<EOF
-#line 5566 "${as_me:-configure}"
+#line 5585 "${as_me:-configure}"
 #include <stdio.h>
 #include "confdefs.h"
 #include "conftest.h"
@@ -5613,12 +5632,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:5616: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:5635: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5619: \$? = $ac_status" >&5
+  echo "$as_me:5638: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:5621: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:5640: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case "$cf_attribute" in
@@ -5696,7 +5715,7 @@ do
 done
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 5699 "configure"
+#line 5718 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -5711,26 +5730,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:5733: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5717: \$? = $ac_status" >&5
+  echo "$as_me:5736: \$? = $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:5739: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5723: \$? = $ac_status" >&5
+  echo "$as_me:5742: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-echo "$as_me:5726: checking for X11/Xt const-feature" >&5
+echo "$as_me:5745: 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 5752 "configure"
 #include "confdefs.h"
 
 #undef  _CONST_X_STRING
@@ -5748,16 +5767,16 @@ String foo = malloc(1); *foo = 0
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:5751: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5770: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5754: \$? = $ac_status" >&5
+  echo "$as_me:5773: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:5757: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5776: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5760: \$? = $ac_status" >&5
+  echo "$as_me:5779: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			cf_cv_const_x_string=no
@@ -5772,7 +5791,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:5775: result: $cf_cv_const_x_string" >&5
+echo "$as_me:5794: result: $cf_cv_const_x_string" >&5
 echo "${ECHO_T}$cf_cv_const_x_string" >&6
 
 LIBS="$cf_save_LIBS_CF_CONST_X_STRING"
@@ -5801,7 +5820,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
  fi
 cat > "conftest.$ac_ext" <<EOF
-#line 5804 "${as_me:-configure}"
+#line 5823 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 if test "$INTEL_COMPILER" = yes
@@ -5817,7 +5836,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:5820: checking for $CC warning options..." >&5
+	{ echo "$as_me:5839: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall"
@@ -5833,12 +5852,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:5836: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:5855: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5839: \$? = $ac_status" >&5
+  echo "$as_me:5858: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:5841: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:5860: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -5846,7 +5865,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 	CFLAGS="$cf_save_CFLAGS"
 elif test "$GCC" = yes && test "$GCC_VERSION" != "unknown"
 then
-	{ echo "$as_me:5849: checking for $CC warning options..." >&5
+	{ echo "$as_me:5868: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	cf_warn_CONST=""
@@ -5869,12 +5888,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:5872: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:5891: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5875: \$? = $ac_status" >&5
+  echo "$as_me:5894: \$? = $ac_status" >&5
   (exit "$ac_status"); }; then
-			test -n "$verbose" && echo "$as_me:5877: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:5896: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case "$cf_opt" in
 			(Winline)
@@ -5882,7 +5901,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}:5885: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:5904: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -5892,7 +5911,7 @@ echo "${as_me:-configure}:5885: 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}:5895: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:5914: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -5909,7 +5928,7 @@ fi
 
 fi
 
-echo "$as_me:5912: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:5931: 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.
@@ -5931,7 +5950,7 @@ EOF
 else
   with_dbmalloc=
 fi;
-echo "$as_me:5934: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:5953: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -6045,23 +6064,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:6048: checking for dbmalloc.h" >&5
+	echo "$as_me:6067: 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 6054 "configure"
+#line 6073 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:6058: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:6077: \"$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:6064: \$? = $ac_status" >&5
+  echo "$as_me:6083: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6080,11 +6099,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:6083: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:6102: 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:6087: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:6106: 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
@@ -6092,7 +6111,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6095 "configure"
+#line 6114 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6111,16 +6130,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6114: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6133: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6117: \$? = $ac_status" >&5
+  echo "$as_me:6136: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6120: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6139: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6123: \$? = $ac_status" >&5
+  echo "$as_me:6142: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -6131,7 +6150,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6134: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:6153: 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
@@ -6146,7 +6165,7 @@ fi
 
 fi
 
-echo "$as_me:6149: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:6168: 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.
@@ -6168,7 +6187,7 @@ EOF
 else
   with_dmalloc=
 fi;
-echo "$as_me:6171: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:6190: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case ".$with_cflags" in
@@ -6282,23 +6301,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:6285: checking for dmalloc.h" >&5
+	echo "$as_me:6304: 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 6291 "configure"
+#line 6310 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:6295: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:6314: \"$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:6301: \$? = $ac_status" >&5
+  echo "$as_me:6320: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6317,11 +6336,11 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:6320: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:6339: 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:6324: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:6343: 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
@@ -6329,7 +6348,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6332 "configure"
+#line 6351 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6348,16 +6367,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6351: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6370: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6354: \$? = $ac_status" >&5
+  echo "$as_me:6373: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6357: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6376: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6360: \$? = $ac_status" >&5
+  echo "$as_me:6379: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -6368,7 +6387,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6371: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:6390: 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
@@ -6408,7 +6427,7 @@ case "$host_os" in
 	# contributed by Alex Matulich (matuli_a@marlin.navsea.navy.mil) also
 	# references -lmalloc and -lbsd.
 
-echo "$as_me:6411: checking for strcmp in -lc_s" >&5
+echo "$as_me:6430: 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
@@ -6416,7 +6435,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc_s  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 6419 "configure"
+#line 6438 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6435,16 +6454,16 @@ strcmp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:6438: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6457: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6441: \$? = $ac_status" >&5
+  echo "$as_me:6460: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:6444: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6463: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6447: \$? = $ac_status" >&5
+  echo "$as_me:6466: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_c_s_strcmp=yes
 else
@@ -6455,7 +6474,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6458: result: $ac_cv_lib_c_s_strcmp" >&5
+echo "$as_me:6477: 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
@@ -6635,14 +6654,14 @@ fi
 	# SCO's cc (which is reported to have broken const/volatile).
 	case "$CC" in
 	(cc|*/cc)
-		{ echo "$as_me:6638: WARNING: You should consider using gcc or rcc if available" >&5
+		{ echo "$as_me:6657: 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:6645: checking for $ac_word" >&5
+echo "$as_me:6664: 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
@@ -6657,7 +6676,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:6660: found $ac_dir/$ac_word" >&5
+echo "$as_me:6679: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -6665,10 +6684,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:6668: result: $CC" >&5
+  echo "$as_me:6687: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:6671: result: no" >&5
+  echo "$as_me:6690: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -6691,23 +6710,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:6694: checking for $ac_header" >&5
+echo "$as_me:6713: 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 6700 "configure"
+#line 6719 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:6704: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:6723: \"$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:6710: \$? = $ac_status" >&5
+  echo "$as_me:6729: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6726,7 +6745,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:6729: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:6748: 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
@@ -6754,23 +6773,23 @@ done
 for ac_header in cursesX.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:6757: checking for $ac_header" >&5
+echo "$as_me:6776: 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 6763 "configure"
+#line 6782 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:6767: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:6786: \"$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:6773: \$? = $ac_status" >&5
+  echo "$as_me:6792: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6789,7 +6808,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:6792: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:6811: 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
@@ -6816,13 +6835,13 @@ esac
 # This should have been defined by AC_PROG_CC
 : "${CC:=cc}"
 
-echo "$as_me:6819: checking \$CFLAGS variable" >&5
+echo "$as_me:6838: checking \$CFLAGS variable" >&5
 echo $ECHO_N "checking \$CFLAGS variable... $ECHO_C" >&6
 case "x$CFLAGS" in
 (*-[IUD]*)
-	echo "$as_me:6823: result: broken" >&5
+	echo "$as_me:6842: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:6825: WARNING: your environment uses the CFLAGS variable to hold CPPFLAGS options" >&5
+	{ echo "$as_me:6844: 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=
@@ -6930,18 +6949,18 @@ fi
 	done
 	;;
 (*)
-	echo "$as_me:6933: result: ok" >&5
+	echo "$as_me:6952: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
 
-echo "$as_me:6938: checking \$CC variable" >&5
+echo "$as_me:6957: checking \$CC variable" >&5
 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
 case "$CC" in
 (*[\ \	]-*)
-	echo "$as_me:6942: result: broken" >&5
+	echo "$as_me:6961: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:6944: WARNING: your environment uses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
+	{ echo "$as_me:6963: 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/[ ]*[ ]-[^ ].*//'`
@@ -7058,24 +7077,24 @@ fi
 	done
 	test -n "$verbose" && echo "	resulting CC: '$CC'" 1>&6
 
-echo "${as_me:-configure}:7061: testing resulting CC: '$CC' ..." 1>&5
+echo "${as_me:-configure}:7080: testing resulting CC: '$CC' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CFLAGS: '$CFLAGS'" 1>&6
 
-echo "${as_me:-configure}:7065: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+echo "${as_me:-configure}:7084: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
 
 	test -n "$verbose" && echo "	resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
 
-echo "${as_me:-configure}:7069: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+echo "${as_me:-configure}:7088: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
 
 	;;
 (*)
-	echo "$as_me:7073: result: ok" >&5
+	echo "$as_me:7092: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
 
-echo "$as_me:7078: checking for ${CC:-cc} option to accept ANSI C" >&5
+echo "$as_me:7097: 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
@@ -7199,7 +7218,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 7202 "configure"
+#line 7221 "configure"
 #include "confdefs.h"
 
 #ifndef CC_HAS_PROTOS
@@ -7220,16 +7239,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7223: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7242: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7226: \$? = $ac_status" >&5
+  echo "$as_me:7245: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7229: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7248: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7232: \$? = $ac_status" >&5
+  echo "$as_me:7251: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ansi_cc="$cf_arg"; break
 else
@@ -7242,7 +7261,7 @@ CFLAGS="$cf_save_CFLAGS"
 CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi
-echo "$as_me:7245: result: $cf_cv_ansi_cc" >&5
+echo "$as_me:7264: result: $cf_cv_ansi_cc" >&5
 echo "${ECHO_T}$cf_cv_ansi_cc" >&6
 
 if test "$cf_cv_ansi_cc" != "no"; then
@@ -7356,7 +7375,7 @@ fi
 fi
 
 if test "$cf_cv_ansi_cc" = "no"; then
-	{ { echo "$as_me:7359: error: Your compiler does not appear to recognize prototypes.
+	{ { echo "$as_me:7378: 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
@@ -7376,7 +7395,7 @@ if test "${enable_largefile+set}" = set; then
 fi;
 if test "$enable_largefile" != no; then
 
-  echo "$as_me:7379: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:7398: 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
@@ -7388,7 +7407,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 7391 "configure"
+#line 7410 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -7408,16 +7427,16 @@ main (void)
 }
 _ACEOF
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7411: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7430: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7414: \$? = $ac_status" >&5
+  echo "$as_me:7433: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7417: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7436: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7420: \$? = $ac_status" >&5
+  echo "$as_me:7439: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -7427,16 +7446,16 @@ fi
 rm -f "conftest.$ac_objext"
      	 CC="$CC -n32"
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7430: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7449: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7433: \$? = $ac_status" >&5
+  echo "$as_me:7452: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7436: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7455: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7439: \$? = $ac_status" >&5
+  echo "$as_me:7458: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else
@@ -7450,13 +7469,13 @@ rm -f "conftest.$ac_objext"
        rm -f "conftest.$ac_ext"
     fi
 fi
-echo "$as_me:7453: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:7472: 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:7459: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:7478: 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
@@ -7464,7 +7483,7 @@ else
   while :; do
   ac_cv_sys_file_offset_bits=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 7467 "configure"
+#line 7486 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -7484,16 +7503,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7487: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7506: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7490: \$? = $ac_status" >&5
+  echo "$as_me:7509: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7493: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7512: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7496: \$? = $ac_status" >&5
+  echo "$as_me:7515: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -7502,7 +7521,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 7505 "configure"
+#line 7524 "configure"
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
@@ -7523,16 +7542,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7526: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7545: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7529: \$? = $ac_status" >&5
+  echo "$as_me:7548: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7532: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7551: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7535: \$? = $ac_status" >&5
+  echo "$as_me:7554: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_file_offset_bits=64; break
 else
@@ -7543,7 +7562,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:7546: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:7565: 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
 
@@ -7553,7 +7572,7 @@ EOF
 
 fi
 rm -rf conftest*
-  echo "$as_me:7556: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:7575: 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
@@ -7561,7 +7580,7 @@ else
   while :; do
   ac_cv_sys_large_files=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 7564 "configure"
+#line 7583 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -7581,16 +7600,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7584: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7603: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7587: \$? = $ac_status" >&5
+  echo "$as_me:7606: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7590: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7609: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7593: \$? = $ac_status" >&5
+  echo "$as_me:7612: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -7599,7 +7618,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 7602 "configure"
+#line 7621 "configure"
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
@@ -7620,16 +7639,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7623: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7642: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7626: \$? = $ac_status" >&5
+  echo "$as_me:7645: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7629: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7648: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7632: \$? = $ac_status" >&5
+  echo "$as_me:7651: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_large_files=1; break
 else
@@ -7640,7 +7659,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:7643: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:7662: 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
 
@@ -7653,7 +7672,7 @@ rm -rf conftest*
 fi
 
 	if test "$enable_largefile" != no ; then
-	echo "$as_me:7656: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+	echo "$as_me:7675: 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
@@ -7661,7 +7680,7 @@ else
   while :; do
   ac_cv_sys_largefile_source=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 7664 "configure"
+#line 7683 "configure"
 #include "confdefs.h"
 #include <stdio.h>
     #include <sys/types.h>
@@ -7676,16 +7695,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7679: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7698: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7682: \$? = $ac_status" >&5
+  echo "$as_me:7701: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7685: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7704: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7688: \$? = $ac_status" >&5
+  echo "$as_me:7707: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -7694,7 +7713,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 7697 "configure"
+#line 7716 "configure"
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
@@ -7710,16 +7729,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7713: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7732: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7716: \$? = $ac_status" >&5
+  echo "$as_me:7735: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7719: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7738: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7722: \$? = $ac_status" >&5
+  echo "$as_me:7741: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_source=1; break
 else
@@ -7730,7 +7749,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:7733: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:7752: 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
 
@@ -7744,13 +7763,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:7747: checking for fseeko" >&5
+echo "$as_me:7766: 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 7753 "configure"
+#line 7772 "configure"
 #include "confdefs.h"
 #include <stdio.h>
                              #include <sys/types.h>
@@ -7764,16 +7783,16 @@ int (*my_fseeko)(FILE *, off_t, int) = fseeko;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:7767: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7786: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7770: \$? = $ac_status" >&5
+  echo "$as_me:7789: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:7773: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7792: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7776: \$? = $ac_status" >&5
+  echo "$as_me:7795: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fseeko=yes
 else
@@ -7783,7 +7802,7 @@ ac_cv_func_fseeko=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:7786: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:7805: result: $ac_cv_func_fseeko" >&5
 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
 if test $ac_cv_func_fseeko = yes; then
 
@@ -7822,14 +7841,14 @@ fi
 
 	fi
 
-	echo "$as_me:7825: checking whether to use struct dirent64" >&5
+	echo "$as_me:7844: 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 7832 "configure"
+#line 7851 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types"
@@ -7856,16 +7875,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7859: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7878: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7862: \$? = $ac_status" >&5
+  echo "$as_me:7881: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7865: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7884: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7868: \$? = $ac_status" >&5
+  echo "$as_me:7887: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_struct_dirent64=yes
 else
@@ -7876,7 +7895,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:7879: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:7898: result: $cf_cv_struct_dirent64" >&5
 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
 	test "$cf_cv_struct_dirent64" = yes &&
 cat >>confdefs.h <<\EOF
@@ -7888,20 +7907,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:7891: checking for PATH separator" >&5
+	echo "$as_me:7910: 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:7898: result: $PATH_SEPARATOR" >&5
+	echo "$as_me:7917: 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:7904: checking for $ac_word" >&5
+echo "$as_me:7923: 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
@@ -7928,17 +7947,17 @@ esac
 fi
 MSGINIT="$ac_cv_path_MSGINIT"
 if test "$MSGINIT" != ":"; then
-  echo "$as_me:7931: result: $MSGINIT" >&5
+  echo "$as_me:7950: result: $MSGINIT" >&5
 echo "${ECHO_T}$MSGINIT" >&6
 else
-  echo "$as_me:7934: result: no" >&5
+  echo "$as_me:7953: 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}:7941: testing adding en.po ..." 1>&5
+echo "${as_me:-configure}:7960: testing adding en.po ..." 1>&5
 
 		ALL_LINGUAS="$ALL_LINGUAS en"
 	fi
@@ -7947,7 +7966,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:7950: checking for $ac_word" >&5
+echo "$as_me:7969: 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
@@ -7962,7 +7981,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:7965: found $ac_dir/$ac_word" >&5
+echo "$as_me:7984: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -7970,10 +7989,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:7973: result: $RANLIB" >&5
+  echo "$as_me:7992: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:7976: result: no" >&5
+  echo "$as_me:7995: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -7982,7 +8001,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:7985: checking for $ac_word" >&5
+echo "$as_me:8004: 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
@@ -7997,7 +8016,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:8000: found $ac_dir/$ac_word" >&5
+echo "$as_me:8019: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -8006,10 +8025,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:8009: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:8028: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:8012: result: no" >&5
+  echo "$as_me:8031: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8018,13 +8037,13 @@ else
   RANLIB="$ac_cv_prog_RANLIB"
 fi
 
-echo "$as_me:8021: checking for ANSI C header files" >&5
+echo "$as_me:8040: 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 8027 "configure"
+#line 8046 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -8032,13 +8051,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:8035: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:8054: \"$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:8041: \$? = $ac_status" >&5
+  echo "$as_me:8060: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8060,7 +8079,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 8063 "configure"
+#line 8082 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -8078,7 +8097,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 8081 "configure"
+#line 8100 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -8099,7 +8118,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 8102 "configure"
+#line 8121 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -8125,15 +8144,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:8128: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8147: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8131: \$? = $ac_status" >&5
+  echo "$as_me:8150: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:8133: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8152: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8136: \$? = $ac_status" >&5
+  echo "$as_me:8155: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -8146,7 +8165,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 fi
 fi
-echo "$as_me:8149: result: $ac_cv_header_stdc" >&5
+echo "$as_me:8168: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -8156,7 +8175,7 @@ EOF
 
 fi
 
-echo "$as_me:8159: checking for inline" >&5
+echo "$as_me:8178: 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
@@ -8164,7 +8183,7 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 8167 "configure"
+#line 8186 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo (void) {return 0; }
@@ -8173,16 +8192,16 @@ $ac_kw int foo (void) {return 0; }
 
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8176: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8195: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8179: \$? = $ac_status" >&5
+  echo "$as_me:8198: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8182: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8201: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8185: \$? = $ac_status" >&5
+  echo "$as_me:8204: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
@@ -8193,7 +8212,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:8196: result: $ac_cv_c_inline" >&5
+echo "$as_me:8215: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -8214,28 +8233,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:8217: checking for $ac_header" >&5
+echo "$as_me:8236: 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 8223 "configure"
+#line 8242 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8229: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8248: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8232: \$? = $ac_status" >&5
+  echo "$as_me:8251: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8235: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8254: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8238: \$? = $ac_status" >&5
+  echo "$as_me:8257: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -8245,7 +8264,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:8248: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:8267: 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
@@ -8255,13 +8274,13 @@ EOF
 fi
 done
 
-echo "$as_me:8258: checking for off_t" >&5
+echo "$as_me:8277: 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 8264 "configure"
+#line 8283 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -8276,16 +8295,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8279: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8298: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8282: \$? = $ac_status" >&5
+  echo "$as_me:8301: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8285: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8304: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8288: \$? = $ac_status" >&5
+  echo "$as_me:8307: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -8295,7 +8314,7 @@ ac_cv_type_off_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:8298: result: $ac_cv_type_off_t" >&5
+echo "$as_me:8317: 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
   :
@@ -8307,13 +8326,13 @@ EOF
 
 fi
 
-echo "$as_me:8310: checking for size_t" >&5
+echo "$as_me:8329: 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 8316 "configure"
+#line 8335 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -8328,16 +8347,16 @@ if (sizeof (size_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8331: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8350: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8334: \$? = $ac_status" >&5
+  echo "$as_me:8353: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8337: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8356: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8340: \$? = $ac_status" >&5
+  echo "$as_me:8359: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_size_t=yes
 else
@@ -8347,7 +8366,7 @@ ac_cv_type_size_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:8350: result: $ac_cv_type_size_t" >&5
+echo "$as_me:8369: 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
   :
@@ -8361,13 +8380,13 @@ fi
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo "$as_me:8364: checking for working alloca.h" >&5
+echo "$as_me:8383: 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 8370 "configure"
+#line 8389 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int
@@ -8379,16 +8398,16 @@ char *p = (char *) alloca (2 * sizeof (int));
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8382: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8401: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8385: \$? = $ac_status" >&5
+  echo "$as_me:8404: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8388: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8407: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8391: \$? = $ac_status" >&5
+  echo "$as_me:8410: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_working_alloca_h=yes
 else
@@ -8398,7 +8417,7 @@ ac_cv_working_alloca_h=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:8401: result: $ac_cv_working_alloca_h" >&5
+echo "$as_me:8420: 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
 
@@ -8408,13 +8427,13 @@ EOF
 
 fi
 
-echo "$as_me:8411: checking for alloca" >&5
+echo "$as_me:8430: 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 8417 "configure"
+#line 8436 "configure"
 #include "confdefs.h"
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -8446,16 +8465,16 @@ char *p = (char *) alloca (1);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8449: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8468: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8452: \$? = $ac_status" >&5
+  echo "$as_me:8471: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8455: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8474: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8458: \$? = $ac_status" >&5
+  echo "$as_me:8477: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_alloca_works=yes
 else
@@ -8465,7 +8484,7 @@ ac_cv_func_alloca_works=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:8468: result: $ac_cv_func_alloca_works" >&5
+echo "$as_me:8487: 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
@@ -8486,13 +8505,13 @@ cat >>confdefs.h <<\EOF
 #define C_ALLOCA 1
 EOF
 
-echo "$as_me:8489: checking whether \`alloca.c' needs Cray hooks" >&5
+echo "$as_me:8508: 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 8495 "configure"
+#line 8514 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -8510,18 +8529,18 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:8513: result: $ac_cv_os_cray" >&5
+echo "$as_me:8532: 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:8518: checking for $ac_func" >&5
+echo "$as_me:8537: 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 8524 "configure"
+#line 8543 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -8552,16 +8571,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8555: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8574: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8558: \$? = $ac_status" >&5
+  echo "$as_me:8577: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8561: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8580: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8564: \$? = $ac_status" >&5
+  echo "$as_me:8583: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -8571,7 +8590,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:8574: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:8593: 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
 
@@ -8585,7 +8604,7 @@ fi
   done
 fi
 
-echo "$as_me:8588: checking stack direction for C alloca" >&5
+echo "$as_me:8607: 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
@@ -8594,7 +8613,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 8597 "configure"
+#line 8616 "configure"
 #include "confdefs.h"
 int
 find_stack_direction (void)
@@ -8617,15 +8636,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:8620: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8639: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8623: \$? = $ac_status" >&5
+  echo "$as_me:8642: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:8625: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8644: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8628: \$? = $ac_status" >&5
+  echo "$as_me:8647: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_stack_direction=1
 else
@@ -8637,7 +8656,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:8640: result: $ac_cv_c_stack_direction" >&5
+echo "$as_me:8659: result: $ac_cv_c_stack_direction" >&5
 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
 cat >>confdefs.h <<EOF
@@ -8649,23 +8668,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:8652: checking for $ac_header" >&5
+echo "$as_me:8671: 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 8658 "configure"
+#line 8677 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8662: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:8681: \"$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:8668: \$? = $ac_status" >&5
+  echo "$as_me:8687: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8684,7 +8703,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:8687: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:8706: 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
@@ -8697,13 +8716,13 @@ done
 for ac_func in getpagesize
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:8700: checking for $ac_func" >&5
+echo "$as_me:8719: 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 8706 "configure"
+#line 8725 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -8734,16 +8753,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:8737: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8756: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8740: \$? = $ac_status" >&5
+  echo "$as_me:8759: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:8743: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8762: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8746: \$? = $ac_status" >&5
+  echo "$as_me:8765: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -8753,7 +8772,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:8756: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:8775: 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
@@ -8763,7 +8782,7 @@ EOF
 fi
 done
 
-echo "$as_me:8766: checking for working mmap" >&5
+echo "$as_me:8785: 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
@@ -8772,7 +8791,7 @@ else
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 8775 "configure"
+#line 8794 "configure"
 #include "confdefs.h"
 $ac_includes_default
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -8899,15 +8918,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:8902: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8921: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8905: \$? = $ac_status" >&5
+  echo "$as_me:8924: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:8907: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8926: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8910: \$? = $ac_status" >&5
+  echo "$as_me:8929: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -8919,7 +8938,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:8922: result: $ac_cv_func_mmap_fixed_mapped" >&5
+echo "$as_me:8941: 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
 
@@ -8930,13 +8949,13 @@ EOF
 fi
 rm -f conftest.mmap
 
-echo "$as_me:8933: checking whether we are using the GNU C Library 2.1 or newer" >&5
+echo "$as_me:8952: 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 8939 "configure"
+#line 8958 "configure"
 #include "confdefs.h"
 
 #include <features.h>
@@ -8956,7 +8975,7 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:8959: result: $ac_cv_gnu_library_2_1" >&5
+echo "$as_me:8978: 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"
@@ -8969,7 +8988,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:8972: error: CF_BUNDLED_INTL used without setting PACKAGE variable" >&5
+	{ { echo "$as_me:8991: 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
@@ -8986,23 +9005,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:8989: checking for $ac_header" >&5
+echo "$as_me:9008: 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 8995 "configure"
+#line 9014 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8999: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:9018: \"$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:9005: \$? = $ac_status" >&5
+  echo "$as_me:9024: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9021,7 +9040,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:9024: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:9043: 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
@@ -9036,13 +9055,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:9039: checking for $ac_func" >&5
+echo "$as_me:9058: 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 9045 "configure"
+#line 9064 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -9073,16 +9092,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9076: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9095: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9079: \$? = $ac_status" >&5
+  echo "$as_me:9098: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9082: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9101: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9085: \$? = $ac_status" >&5
+  echo "$as_me:9104: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -9092,7 +9111,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:9095: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:9114: 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
@@ -9143,7 +9162,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 9146 "configure"
+#line 9165 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9155,16 +9174,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9158: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9177: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9161: \$? = $ac_status" >&5
+  echo "$as_me:9180: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9164: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9183: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9167: \$? = $ac_status" >&5
+  echo "$as_me:9186: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -9181,7 +9200,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}:9184: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9203: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -9227,7 +9246,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 9230 "configure"
+#line 9249 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9239,16 +9258,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9242: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9261: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9245: \$? = $ac_status" >&5
+  echo "$as_me:9264: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9248: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9267: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9251: \$? = $ac_status" >&5
+  echo "$as_me:9270: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -9265,7 +9284,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}:9268: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9287: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -9283,7 +9302,7 @@ echo "${as_me:-configure}:9268: testing adding $cf_add_incdir to include-path ..
 fi
 
 	else
-{ { echo "$as_me:9286: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:9305: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -9308,7 +9327,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}:9311: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:9330: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -9337,7 +9356,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}:9340: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:9359: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -9346,7 +9365,7 @@ echo "${as_me:-configure}:9340: testing adding $cf_add_libdir to library-path ..
 fi
 
 	else
-{ { echo "$as_me:9349: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:9368: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -9357,7 +9376,7 @@ esac
 
 fi;
 
-  echo "$as_me:9360: checking for iconv" >&5
+  echo "$as_me:9379: 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
@@ -9368,12 +9387,12 @@ else
 cf_cv_header_path_iconv=
 cf_cv_library_path_iconv=
 
-echo "${as_me:-configure}:9371: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:9390: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9376 "configure"
+#line 9395 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -9392,16 +9411,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9395: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9414: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9398: \$? = $ac_status" >&5
+  echo "$as_me:9417: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9401: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9420: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9404: \$? = $ac_status" >&5
+  echo "$as_me:9423: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -9415,7 +9434,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-liconv  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9418 "configure"
+#line 9437 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -9434,16 +9453,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9437: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9456: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9440: \$? = $ac_status" >&5
+  echo "$as_me:9459: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9443: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9462: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9446: \$? = $ac_status" >&5
+  echo "$as_me:9465: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -9460,9 +9479,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for iconv library" 1>&6
 
-echo "${as_me:-configure}:9463: testing find linkage for iconv library ..." 1>&5
+echo "${as_me:-configure}:9482: testing find linkage for iconv library ..." 1>&5
 
-echo "${as_me:-configure}:9465: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:9484: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -9553,7 +9572,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}:9556: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:9575: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -9561,7 +9580,7 @@ echo "${as_me:-configure}:9556: testing ... testing $cf_cv_header_path_iconv ...
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_iconv"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 9564 "configure"
+#line 9583 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -9580,21 +9599,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9583: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9602: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9586: \$? = $ac_status" >&5
+  echo "$as_me:9605: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9589: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9608: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9592: \$? = $ac_status" >&5
+  echo "$as_me:9611: \$? = $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}:9597: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:9616: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
 
 				cf_cv_find_linkage_iconv=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -9612,7 +9631,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_iconv" = maybe ; then
 
-echo "${as_me:-configure}:9615: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:9634: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -9687,13 +9706,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}:9690: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:9709: 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 9696 "configure"
+#line 9715 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -9712,21 +9731,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9715: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9734: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9718: \$? = $ac_status" >&5
+  echo "$as_me:9737: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9721: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9740: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9724: \$? = $ac_status" >&5
+  echo "$as_me:9743: \$? = $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}:9729: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:9748: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
 
 					cf_cv_find_linkage_iconv=yes
 					cf_cv_library_file_iconv="-liconv"
@@ -9766,7 +9785,7 @@ am_cv_func_iconv="no, consider installing GNU libiconv"
 fi
 
 fi
-echo "$as_me:9769: result: $am_cv_func_iconv" >&5
+echo "$as_me:9788: result: $am_cv_func_iconv" >&5
 echo "${ECHO_T}$am_cv_func_iconv" >&6
 
   if test "$am_cv_func_iconv" = yes; then
@@ -9775,14 +9794,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_ICONV 1
 EOF
 
-    echo "$as_me:9778: checking if the declaration of iconv() needs const." >&5
+    echo "$as_me:9797: 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 9785 "configure"
+#line 9804 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -9807,16 +9826,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9810: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9829: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9813: \$? = $ac_status" >&5
+  echo "$as_me:9832: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9816: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9835: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9819: \$? = $ac_status" >&5
+  echo "$as_me:9838: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   am_cv_proto_iconv_const=no
 else
@@ -9826,7 +9845,7 @@ am_cv_proto_iconv_const=yes
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:9829: result: $am_cv_proto_iconv_const" >&5
+echo "$as_me:9848: 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
@@ -9871,7 +9890,7 @@ if test -n "$cf_cv_header_path_iconv" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 9874 "configure"
+#line 9893 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9883,16 +9902,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9886: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9905: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9889: \$? = $ac_status" >&5
+  echo "$as_me:9908: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9892: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9911: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9895: \$? = $ac_status" >&5
+  echo "$as_me:9914: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -9909,7 +9928,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}:9912: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:9931: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -9948,7 +9967,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}:9951: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:9970: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -9959,13 +9978,13 @@ fi
     fi
   fi
 
-echo "$as_me:9962: checking for nl_langinfo and CODESET" >&5
+echo "$as_me:9981: 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 9968 "configure"
+#line 9987 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -9979,16 +9998,16 @@ char* cs = nl_langinfo(CODESET); (void)cs
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9982: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10001: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9985: \$? = $ac_status" >&5
+  echo "$as_me:10004: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9988: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10007: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9991: \$? = $ac_status" >&5
+  echo "$as_me:10010: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   am_cv_langinfo_codeset=yes
 else
@@ -9999,7 +10018,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:10002: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:10021: result: $am_cv_langinfo_codeset" >&5
 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
 	if test "$am_cv_langinfo_codeset" = yes; then
 
@@ -10010,13 +10029,13 @@ EOF
 	fi
 
    if test "$ac_cv_header_locale_h" = yes; then
-	echo "$as_me:10013: checking for LC_MESSAGES" >&5
+	echo "$as_me:10032: 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 10019 "configure"
+#line 10038 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int
@@ -10028,16 +10047,16 @@ return LC_MESSAGES
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10031: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10050: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10034: \$? = $ac_status" >&5
+  echo "$as_me:10053: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10037: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10056: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10040: \$? = $ac_status" >&5
+  echo "$as_me:10059: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   am_cv_val_LC_MESSAGES=yes
 else
@@ -10047,7 +10066,7 @@ am_cv_val_LC_MESSAGES=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:10050: result: $am_cv_val_LC_MESSAGES" >&5
+echo "$as_me:10069: 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
 
@@ -10057,7 +10076,7 @@ EOF
 
 	fi
 fi
-   echo "$as_me:10060: checking whether NLS is requested" >&5
+   echo "$as_me:10079: 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.
@@ -10067,7 +10086,7 @@ if test "${enable_nls+set}" = set; then
 else
   USE_NLS=no
 fi;
-  echo "$as_me:10070: result: $USE_NLS" >&5
+  echo "$as_me:10089: result: $USE_NLS" >&5
 echo "${ECHO_T}$USE_NLS" >&6
 
   BUILD_INCLUDED_LIBINTL=no
@@ -10081,7 +10100,7 @@ cat >>confdefs.h <<\EOF
 #define ENABLE_NLS 1
 EOF
 
-    echo "$as_me:10084: checking whether included gettext is requested" >&5
+    echo "$as_me:10103: 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.
@@ -10091,13 +10110,13 @@ if test "${with_included_gettext+set}" = set; then
 else
   nls_cv_force_use_gnu_gettext=no
 fi;
-    echo "$as_me:10094: result: $nls_cv_force_use_gnu_gettext" >&5
+    echo "$as_me:10113: 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:10100: checking for $ac_word" >&5
+echo "$as_me:10119: 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
@@ -10124,16 +10143,16 @@ esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test "$MSGFMT" != ":"; then
-  echo "$as_me:10127: result: $MSGFMT" >&5
+  echo "$as_me:10146: result: $MSGFMT" >&5
 echo "${ECHO_T}$MSGFMT" >&6
 else
-  echo "$as_me:10130: result: no" >&5
+  echo "$as_me:10149: 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:10136: checking for $ac_word" >&5
+echo "$as_me:10155: 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
@@ -10150,7 +10169,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:10153: found $ac_dir/$ac_word" >&5
+   echo "$as_me:10172: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -10162,17 +10181,17 @@ fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 
 if test -n "$GMSGFMT"; then
-  echo "$as_me:10165: result: $GMSGFMT" >&5
+  echo "$as_me:10184: result: $GMSGFMT" >&5
 echo "${ECHO_T}$GMSGFMT" >&6
 else
-  echo "$as_me:10168: result: no" >&5
+  echo "$as_me:10187: 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:10175: checking for $ac_word" >&5
+echo "$as_me:10194: 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
@@ -10199,10 +10218,10 @@ esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test "$XGETTEXT" != ":"; then
-  echo "$as_me:10202: result: $XGETTEXT" >&5
+  echo "$as_me:10221: result: $XGETTEXT" >&5
 echo "${ECHO_T}$XGETTEXT" >&6
 else
-  echo "$as_me:10205: result: no" >&5
+  echo "$as_me:10224: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -10340,12 +10359,12 @@ fi
 cf_cv_header_path_intl=
 cf_cv_library_path_intl=
 
-echo "${as_me:-configure}:10343: testing Starting FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me:-configure}:10362: testing Starting FIND_LINKAGE(intl,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10348 "configure"
+#line 10367 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -10367,16 +10386,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10370: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10389: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10373: \$? = $ac_status" >&5
+  echo "$as_me:10392: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10376: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10395: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10379: \$? = $ac_status" >&5
+  echo "$as_me:10398: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_intl=yes
@@ -10390,7 +10409,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lintl  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10393 "configure"
+#line 10412 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -10412,16 +10431,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10415: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10434: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10418: \$? = $ac_status" >&5
+  echo "$as_me:10437: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10421: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10440: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10424: \$? = $ac_status" >&5
+  echo "$as_me:10443: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_intl=yes
@@ -10438,9 +10457,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for intl library" 1>&6
 
-echo "${as_me:-configure}:10441: testing find linkage for intl library ..." 1>&5
+echo "${as_me:-configure}:10460: testing find linkage for intl library ..." 1>&5
 
-echo "${as_me:-configure}:10443: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me:-configure}:10462: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -10531,7 +10550,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}:10534: testing ... testing $cf_cv_header_path_intl ..." 1>&5
+echo "${as_me:-configure}:10553: testing ... testing $cf_cv_header_path_intl ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -10539,7 +10558,7 @@ echo "${as_me:-configure}:10534: testing ... testing $cf_cv_header_path_intl ...
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_intl"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 10542 "configure"
+#line 10561 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -10561,21 +10580,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10564: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10583: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10567: \$? = $ac_status" >&5
+  echo "$as_me:10586: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10570: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10589: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10573: \$? = $ac_status" >&5
+  echo "$as_me:10592: \$? = $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}:10578: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5
+echo "${as_me:-configure}:10597: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5
 
 				cf_cv_find_linkage_intl=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -10593,7 +10612,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_intl" = maybe ; then
 
-echo "${as_me:-configure}:10596: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me:-configure}:10615: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -10668,13 +10687,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}:10671: testing ... testing $cf_cv_library_path_intl ..." 1>&5
+echo "${as_me:-configure}:10690: 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 10677 "configure"
+#line 10696 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -10696,21 +10715,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10699: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10718: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10702: \$? = $ac_status" >&5
+  echo "$as_me:10721: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10705: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10724: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10708: \$? = $ac_status" >&5
+  echo "$as_me:10727: \$? = $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}:10713: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5
+echo "${as_me:-configure}:10732: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5
 
 					cf_cv_find_linkage_intl=yes
 					cf_cv_library_file_intl="-lintl"
@@ -10749,9 +10768,9 @@ else
 cf_cv_func_gettext=no
 fi
 
-      echo "$as_me:10752: checking for libintl.h and gettext()" >&5
+      echo "$as_me:10771: checking for libintl.h and gettext()" >&5
 echo $ECHO_N "checking for libintl.h and gettext()... $ECHO_C" >&6
-      echo "$as_me:10754: result: $cf_cv_func_gettext" >&5
+      echo "$as_me:10773: result: $cf_cv_func_gettext" >&5
 echo "${ECHO_T}$cf_cv_func_gettext" >&6
 
       LIBS="$cf_save_LIBS_1"
@@ -10796,7 +10815,7 @@ if test -n "$cf_cv_header_path_intl" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 10799 "configure"
+#line 10818 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10808,16 +10827,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10811: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10830: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10814: \$? = $ac_status" >&5
+  echo "$as_me:10833: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10817: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10836: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10820: \$? = $ac_status" >&5
+  echo "$as_me:10839: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -10834,7 +10853,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}:10837: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:10856: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -10873,7 +10892,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}:10876: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:10895: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				INTLLIBS="-L$cf_add_libdir $INTLLIBS"
 			fi
@@ -10889,13 +10908,13 @@ fi
 for ac_func in dcgettext
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10892: checking for $ac_func" >&5
+echo "$as_me:10911: 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 10898 "configure"
+#line 10917 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -10926,16 +10945,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10929: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10948: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10932: \$? = $ac_status" >&5
+  echo "$as_me:10951: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10935: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10954: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10938: \$? = $ac_status" >&5
+  echo "$as_me:10957: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10945,7 +10964,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:10948: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:10967: 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
@@ -10960,7 +10979,7 @@ done
           CATOBJEXT=.gmo
         fi
       elif test -z "$MSGFMT" || test -z "$XGETTEXT" ; then
-        { echo "$as_me:10963: WARNING: disabling NLS feature" >&5
+        { echo "$as_me:10982: 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
@@ -10996,7 +11015,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:10999: WARNING: no NLS library is packaged with this application" >&5
+        { echo "$as_me:11018: 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
@@ -11005,7 +11024,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:11008: WARNING: found msgfmt program is not GNU msgfmt" >&5
+        { echo "$as_me:11027: WARNING: found msgfmt program is not GNU msgfmt" >&5
 echo "$as_me: WARNING: found msgfmt program is not GNU msgfmt" >&2;}
       fi
     fi
@@ -11014,7 +11033,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:11017: WARNING: found xgettext program is not GNU xgettext" >&5
+        { echo "$as_me:11036: WARNING: found xgettext program is not GNU xgettext" >&5
 echo "$as_me: WARNING: found xgettext program is not GNU xgettext" >&2;}
       fi
     fi
@@ -11032,7 +11051,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:11035: checking for $ac_word" >&5
+echo "$as_me:11054: 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
@@ -11047,7 +11066,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:11050: found $ac_dir/$ac_word" >&5
+echo "$as_me:11069: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -11055,10 +11074,10 @@ fi
 fi
 INTL_YACC=$ac_cv_prog_INTL_YACC
 if test -n "$INTL_YACC"; then
-  echo "$as_me:11058: result: $INTL_YACC" >&5
+  echo "$as_me:11077: result: $INTL_YACC" >&5
 echo "${ECHO_T}$INTL_YACC" >&6
 else
-  echo "$as_me:11061: result: no" >&5
+  echo "$as_me:11080: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -11068,7 +11087,7 @@ done
       if test -z "$INTL_YACC"; then
         ac_verc_fail=yes
       else
-                echo "$as_me:11071: checking version of $INTL_YACC" >&5
+                echo "$as_me:11090: 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
@@ -11079,7 +11098,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:11082: result: $ac_prog_version" >&5
+      echo "$as_me:11101: result: $ac_prog_version" >&5
 echo "${ECHO_T}$ac_prog_version" >&6
       fi
       if test "$ac_verc_fail" = yes; then
@@ -11106,7 +11125,7 @@ echo "${ECHO_T}$ac_prog_version" >&6
      if test "x$ALL_LINGUAS" = "x"; then
        LINGUAS=
      else
-       echo "$as_me:11109: checking for catalogs to be installed" >&5
+       echo "$as_me:11128: 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
@@ -11126,7 +11145,7 @@ echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
          fi
        done
        LINGUAS=$NEW_LINGUAS
-       echo "$as_me:11129: result: $LINGUAS" >&5
+       echo "$as_me:11148: result: $LINGUAS" >&5
 echo "${ECHO_T}$LINGUAS" >&6
      fi
 
@@ -11162,7 +11181,7 @@ cf_makefile=makefile
 use_our_messages=no
 if test "$USE_NLS" = yes ; then
 if test -d "$srcdir/po" ; then
-echo "$as_me:11165: checking if we should use included message-library" >&5
+echo "$as_me:11184: 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.
@@ -11173,7 +11192,7 @@ else
   use_our_messages=yes
 fi;
 fi
-echo "$as_me:11176: result: $use_our_messages" >&5
+echo "$as_me:11195: result: $use_our_messages" >&5
 echo "${ECHO_T}$use_our_messages" >&6
 fi
 
@@ -11215,23 +11234,23 @@ else
 for ac_header in libintl.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:11218: checking for $ac_header" >&5
+echo "$as_me:11237: 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 11224 "configure"
+#line 11243 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:11228: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:11247: \"$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:11234: \$? = $ac_status" >&5
+  echo "$as_me:11253: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -11250,7 +11269,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:11253: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:11272: 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
@@ -11339,7 +11358,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:11342: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:11361: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -11348,7 +11367,7 @@ esac
 fi
 eval NLS_DATADIR="$withval"
 
-echo "$as_me:11351: checking if you want full utility pathnames" >&5
+echo "$as_me:11370: 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.
@@ -11365,14 +11384,14 @@ else
 	with_full_paths=yes
 
 fi;
-echo "$as_me:11368: result: $with_full_paths" >&5
+echo "$as_me:11387: 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:11375: checking for system mailer" >&5
+echo "$as_me:11394: 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
@@ -11392,14 +11411,14 @@ else
 
 fi
 
-echo "$as_me:11395: result: $cf_cv_SYSTEM_MAIL" >&5
+echo "$as_me:11414: 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:11402: checking system mail flags" >&5
+echo "$as_me:11421: 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
@@ -11415,7 +11434,7 @@ else
 
 fi
 
-echo "$as_me:11418: result: $cf_cv_system_mail_flags" >&5
+echo "$as_me:11437: result: $cf_cv_system_mail_flags" >&5
 echo "${ECHO_T}$cf_cv_system_mail_flags" >&6
 
 cat >>confdefs.h <<EOF
@@ -11428,14 +11447,14 @@ if test "$with_full_paths" = no ; then
 fi
 fi
 
-echo "$as_me:11431: checking if the POSIX test-macros are already defined" >&5
+echo "$as_me:11450: 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 11438 "configure"
+#line 11457 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11454,16 +11473,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11457: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11476: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11460: \$? = $ac_status" >&5
+  echo "$as_me:11479: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11463: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11482: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11466: \$? = $ac_status" >&5
+  echo "$as_me:11485: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_visible=no
 else
@@ -11474,7 +11493,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11477: result: $cf_cv_posix_visible" >&5
+echo "$as_me:11496: result: $cf_cv_posix_visible" >&5
 echo "${ECHO_T}$cf_cv_posix_visible" >&6
 
 if test "$cf_cv_posix_visible" = no; then
@@ -11516,14 +11535,14 @@ case "$host_os" in
 
 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
 
-echo "$as_me:11519: checking if this is the GNU C library" >&5
+echo "$as_me:11538: 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 11526 "configure"
+#line 11545 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11542,16 +11561,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11545: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11564: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11548: \$? = $ac_status" >&5
+  echo "$as_me:11567: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11551: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11570: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11554: \$? = $ac_status" >&5
+  echo "$as_me:11573: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library=yes
 else
@@ -11562,7 +11581,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11565: result: $cf_cv_gnu_library" >&5
+echo "$as_me:11584: result: $cf_cv_gnu_library" >&5
 echo "${ECHO_T}$cf_cv_gnu_library" >&6
 
 if test x$cf_cv_gnu_library = xyes; then
@@ -11570,7 +11589,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:11573: checking if _DEFAULT_SOURCE can be used as a basis" >&5
+	echo "$as_me:11592: 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
@@ -11582,7 +11601,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 11585 "configure"
+#line 11604 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11601,16 +11620,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11604: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11623: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11607: \$? = $ac_status" >&5
+  echo "$as_me:11626: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11610: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11629: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11613: \$? = $ac_status" >&5
+  echo "$as_me:11632: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library_219=yes
 else
@@ -11622,12 +11641,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save"
 
 fi
-echo "$as_me:11625: result: $cf_cv_gnu_library_219" >&5
+echo "$as_me:11644: 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:11630: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
+		echo "$as_me:11649: 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
@@ -11732,7 +11751,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 11735 "configure"
+#line 11754 "configure"
 #include "confdefs.h"
 
 				#include <limits.h>
@@ -11752,16 +11771,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11755: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11774: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11758: \$? = $ac_status" >&5
+  echo "$as_me:11777: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11761: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11780: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11764: \$? = $ac_status" >&5
+  echo "$as_me:11783: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_dftsrc_219=yes
 else
@@ -11772,7 +11791,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11775: result: $cf_cv_gnu_dftsrc_219" >&5
+echo "$as_me:11794: 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
@@ -11781,14 +11800,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
 
 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
 
-		echo "$as_me:11784: checking if we must define _GNU_SOURCE" >&5
+		echo "$as_me:11803: 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 11791 "configure"
+#line 11810 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11803,16 +11822,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11806: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11825: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11809: \$? = $ac_status" >&5
+  echo "$as_me:11828: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11812: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11831: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11815: \$? = $ac_status" >&5
+  echo "$as_me:11834: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -11919,7 +11938,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11922 "configure"
+#line 11941 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11934,16 +11953,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11937: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11956: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11940: \$? = $ac_status" >&5
+  echo "$as_me:11959: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11943: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11962: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11946: \$? = $ac_status" >&5
+  echo "$as_me:11965: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -11958,12 +11977,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11961: result: $cf_cv_gnu_source" >&5
+echo "$as_me:11980: 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:11966: checking if we should also define _DEFAULT_SOURCE" >&5
+		echo "$as_me:11985: 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
@@ -11973,7 +11992,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 11976 "configure"
+#line 11995 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -11988,16 +12007,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11991: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12010: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11994: \$? = $ac_status" >&5
+  echo "$as_me:12013: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11997: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12016: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12000: \$? = $ac_status" >&5
+  echo "$as_me:12019: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_default_source=no
 else
@@ -12008,7 +12027,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12011: result: $cf_cv_default_source" >&5
+echo "$as_me:12030: result: $cf_cv_default_source" >&5
 echo "${ECHO_T}$cf_cv_default_source" >&6
 			if test "$cf_cv_default_source" = yes
 			then
@@ -12045,16 +12064,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:12048: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:12067: 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}:12054: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:12073: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 12057 "configure"
+#line 12076 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -12069,16 +12088,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12072: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12091: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12075: \$? = $ac_status" >&5
+  echo "$as_me:12094: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12078: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12097: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12081: \$? = $ac_status" >&5
+  echo "$as_me:12100: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -12099,7 +12118,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 12102 "configure"
+#line 12121 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -12114,16 +12133,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12117: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12136: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12120: \$? = $ac_status" >&5
+  echo "$as_me:12139: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12123: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12142: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12126: \$? = $ac_status" >&5
+  echo "$as_me:12145: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -12134,7 +12153,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:12137: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:12156: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -12142,10 +12161,10 @@ echo "${as_me:-configure}:12137: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:12145: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:12164: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12148 "configure"
+#line 12167 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -12160,16 +12179,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12163: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12182: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12166: \$? = $ac_status" >&5
+  echo "$as_me:12185: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12169: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12188: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12172: \$? = $ac_status" >&5
+  echo "$as_me:12191: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -12185,7 +12204,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12188: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:12207: 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
@@ -12302,7 +12321,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:12305: WARNING: this system does not provide usable locale support" >&5
+	{ echo "$as_me:12324: 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
@@ -12334,14 +12353,14 @@ echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	;;
 (*)
 
-echo "$as_me:12337: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:12356: 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 12344 "configure"
+#line 12363 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12359,16 +12378,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12362: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12381: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12365: \$? = $ac_status" >&5
+  echo "$as_me:12384: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12368: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12387: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12371: \$? = $ac_status" >&5
+  echo "$as_me:12390: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -12380,7 +12399,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12383 "configure"
+#line 12402 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12398,16 +12417,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12401: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12420: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12404: \$? = $ac_status" >&5
+  echo "$as_me:12423: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12407: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12426: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12410: \$? = $ac_status" >&5
+  echo "$as_me:12429: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -12422,7 +12441,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12425: result: $cf_cv_xopen_source" >&5
+echo "$as_me:12444: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -12582,16 +12601,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:12585: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:12604: 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}:12591: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:12610: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 12594 "configure"
+#line 12613 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -12606,16 +12625,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12609: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12628: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12612: \$? = $ac_status" >&5
+  echo "$as_me:12631: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12615: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12634: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12618: \$? = $ac_status" >&5
+  echo "$as_me:12637: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -12636,7 +12655,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 12639 "configure"
+#line 12658 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -12651,16 +12670,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12654: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12673: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12657: \$? = $ac_status" >&5
+  echo "$as_me:12676: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12660: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12679: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12663: \$? = $ac_status" >&5
+  echo "$as_me:12682: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -12671,7 +12690,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:12674: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:12693: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -12679,10 +12698,10 @@ echo "${as_me:-configure}:12674: testing ifdef from value $cf_POSIX_C_SOURCE ...
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:12682: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:12701: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12685 "configure"
+#line 12704 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -12697,16 +12716,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12700: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12719: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12703: \$? = $ac_status" >&5
+  echo "$as_me:12722: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12706: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12725: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12709: \$? = $ac_status" >&5
+  echo "$as_me:12728: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -12722,7 +12741,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12725: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:12744: 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
@@ -12835,10 +12854,10 @@ fi # cf_cv_posix_visible
 	if test "$cf_cv_xopen_source" = no ; then
 		test -n "$verbose" && echo "	checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE" 1>&6
 
-echo "${as_me:-configure}:12838: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+echo "${as_me:-configure}:12857: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 12841 "configure"
+#line 12860 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -12856,23 +12875,23 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12859: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12878: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12862: \$? = $ac_status" >&5
+  echo "$as_me:12881: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12865: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12884: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12868: \$? = $ac_status" >&5
+  echo "$as_me:12887: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-			{ echo "$as_me:12875: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+			{ echo "$as_me:12894: 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
@@ -12895,7 +12914,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}:12898: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+echo "${as_me:-configure}:12917: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
 
 	CFLAGS="$cf_old_cflag"
 done
@@ -12907,7 +12926,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}:12910: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:12929: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
 
 	CPPFLAGS="$cf_old_cflag"
 done
@@ -12995,7 +13014,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}:12998: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:13017: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -13005,7 +13024,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}:13008: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:13027: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -13015,7 +13034,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}:13018: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:13037: 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"
@@ -13027,10 +13046,10 @@ done
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-	echo "$as_me:13030: checking if _XOPEN_SOURCE really is set" >&5
+	echo "$as_me:13049: 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 13033 "configure"
+#line 13052 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -13045,16 +13064,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13048: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13067: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13051: \$? = $ac_status" >&5
+  echo "$as_me:13070: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13054: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13073: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13057: \$? = $ac_status" >&5
+  echo "$as_me:13076: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else
@@ -13063,12 +13082,12 @@ cat "conftest.$ac_ext" >&5
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:13066: result: $cf_XOPEN_SOURCE_set" >&5
+	echo "$as_me:13085: 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 13071 "configure"
+#line 13090 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -13083,16 +13102,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13086: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13105: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13089: \$? = $ac_status" >&5
+  echo "$as_me:13108: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13092: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13111: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13095: \$? = $ac_status" >&5
+  echo "$as_me:13114: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set_ok=yes
 else
@@ -13103,19 +13122,19 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_XOPEN_SOURCE_set_ok" = no
 		then
-			{ echo "$as_me:13106: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+			{ echo "$as_me:13125: WARNING: _XOPEN_SOURCE is lower than requested" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
 		fi
 	else
 
-echo "$as_me:13111: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:13130: 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 13118 "configure"
+#line 13137 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -13133,16 +13152,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13136: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13155: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13139: \$? = $ac_status" >&5
+  echo "$as_me:13158: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13142: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13161: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13145: \$? = $ac_status" >&5
+  echo "$as_me:13164: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -13154,7 +13173,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13157 "configure"
+#line 13176 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -13172,16 +13191,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13175: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13194: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13178: \$? = $ac_status" >&5
+  echo "$as_me:13197: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13181: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13200: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13184: \$? = $ac_status" >&5
+  echo "$as_me:13203: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -13196,7 +13215,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:13199: result: $cf_cv_xopen_source" >&5
+echo "$as_me:13218: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -13343,14 +13362,14 @@ fi
 fi
 fi # cf_cv_posix_visible
 
-echo "$as_me:13346: checking if SIGWINCH is defined" >&5
+echo "$as_me:13365: 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 13353 "configure"
+#line 13372 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -13365,23 +13384,23 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13368: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13387: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13371: \$? = $ac_status" >&5
+  echo "$as_me:13390: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13374: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13393: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13377: \$? = $ac_status" >&5
+  echo "$as_me:13396: \$? = $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 13384 "configure"
+#line 13403 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -13399,16 +13418,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13402: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13421: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13405: \$? = $ac_status" >&5
+  echo "$as_me:13424: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13408: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13427: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13411: \$? = $ac_status" >&5
+  echo "$as_me:13430: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_define_sigwinch=maybe
 else
@@ -13422,11 +13441,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:13425: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:13444: 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:13429: checking for actual SIGWINCH definition" >&5
+echo "$as_me:13448: 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
@@ -13437,7 +13456,7 @@ cf_sigwinch=32
 while test "$cf_sigwinch" != 1
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 13440 "configure"
+#line 13459 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -13459,16 +13478,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13462: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13481: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13465: \$? = $ac_status" >&5
+  echo "$as_me:13484: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13468: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13487: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13471: \$? = $ac_status" >&5
+  echo "$as_me:13490: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fixup_sigwinch=$cf_sigwinch
 	 break
@@ -13482,7 +13501,7 @@ cf_sigwinch="`expr "$cf_sigwinch" - 1`"
 done
 
 fi
-echo "$as_me:13485: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:13504: result: $cf_cv_fixup_sigwinch" >&5
 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
 
 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
@@ -13494,7 +13513,7 @@ if test -n "$TRY_CFLAGS" ; then
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:13497: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:13516: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -13579,7 +13598,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}:13582: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:13601: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -13589,7 +13608,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}:13592: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:13611: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -13599,7 +13618,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}:13602: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:13621: 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"
@@ -13608,7 +13627,7 @@ fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13611 "configure"
+#line 13630 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13620,16 +13639,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13623: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13642: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13626: \$? = $ac_status" >&5
+  echo "$as_me:13645: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13629: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13648: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13632: \$? = $ac_status" >&5
+  echo "$as_me:13651: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -13637,12 +13656,12 @@ else
 cat "conftest.$ac_ext" >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:13640: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:13659: 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}:13645: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:13664: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_cflags"
@@ -13654,7 +13673,7 @@ fi
 
 ### Look for network libraries first, since some functions (such as gethostname)
 ### are used in a lot of places.
-echo "$as_me:13657: checking if you want NSS compatible SSL libraries" >&5
+echo "$as_me:13676: 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
@@ -13669,10 +13688,10 @@ else
 fi;
 
 fi
-echo "$as_me:13672: result: $cf_cv_use_libnss_compat" >&5
+echo "$as_me:13691: result: $cf_cv_use_libnss_compat" >&5
 echo "${ECHO_T}$cf_cv_use_libnss_compat" >&6
 
-echo "$as_me:13675: checking if you want ssl library" >&5
+echo "$as_me:13694: 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
@@ -13687,10 +13706,10 @@ else
 fi;
 
 fi
-echo "$as_me:13690: result: $cf_cv_use_libssl" >&5
+echo "$as_me:13709: result: $cf_cv_use_libssl" >&5
 echo "${ECHO_T}$cf_cv_use_libssl" >&6
 
-echo "$as_me:13693: checking if you want gnutls support" >&5
+echo "$as_me:13712: 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
@@ -13705,11 +13724,11 @@ else
 fi;
 
 fi
-echo "$as_me:13708: result: $cf_cv_use_libgnutls" >&5
+echo "$as_me:13727: 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:13712: checking if you want gnutls-openssl compat" >&5
+echo "$as_me:13731: 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
@@ -13724,10 +13743,10 @@ else
 fi;
 
 fi
-echo "$as_me:13727: result: $cf_cv_gnutls_compat" >&5
+echo "$as_me:13746: result: $cf_cv_gnutls_compat" >&5
 echo "${ECHO_T}$cf_cv_gnutls_compat" >&6
 
-echo "$as_me:13730: checking if you want socks library" >&5
+echo "$as_me:13749: 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
@@ -13742,10 +13761,10 @@ else
 fi;
 
 fi
-echo "$as_me:13745: result: $cf_cv_use_libsocks" >&5
+echo "$as_me:13764: result: $cf_cv_use_libsocks" >&5
 echo "${ECHO_T}$cf_cv_use_libsocks" >&6
 
-echo "$as_me:13748: checking if you want socks5 library" >&5
+echo "$as_me:13767: 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
@@ -13760,7 +13779,7 @@ else
 fi;
 
 fi
-echo "$as_me:13763: result: $cf_cv_use_libsocks5" >&5
+echo "$as_me:13782: result: $cf_cv_use_libsocks5" >&5
 echo "${ECHO_T}$cf_cv_use_libsocks5" >&6
 
 if test "x$cf_cv_use_libsocks" != xno ; then
@@ -13802,7 +13821,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 13805 "configure"
+#line 13824 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13814,16 +13833,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13817: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13836: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13820: \$? = $ac_status" >&5
+  echo "$as_me:13839: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13823: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13842: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13826: \$? = $ac_status" >&5
+  echo "$as_me:13845: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -13840,7 +13859,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}:13843: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:13862: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -13886,7 +13905,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 13889 "configure"
+#line 13908 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13898,16 +13917,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13901: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13920: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13904: \$? = $ac_status" >&5
+  echo "$as_me:13923: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13907: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13926: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13910: \$? = $ac_status" >&5
+  echo "$as_me:13929: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -13924,7 +13943,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}:13927: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:13946: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -13942,7 +13961,7 @@ echo "${as_me:-configure}:13927: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:13945: error: cannot find socks library under $cf_cv_use_libsocks" >&5
+{ { echo "$as_me:13964: 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
@@ -13967,7 +13986,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}:13970: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:13989: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -13996,7 +14015,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}:13999: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:14018: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -14005,7 +14024,7 @@ echo "${as_me:-configure}:13999: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:14008: error: cannot find socks library under $cf_cv_use_libsocks" >&5
+{ { echo "$as_me:14027: 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
@@ -14019,12 +14038,12 @@ esac
 cf_cv_header_path_socks=
 cf_cv_library_path_socks=
 
-echo "${as_me:-configure}:14022: testing Starting FIND_LINKAGE(socks,) ..." 1>&5
+echo "${as_me:-configure}:14041: testing Starting FIND_LINKAGE(socks,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14027 "configure"
+#line 14046 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14040,16 +14059,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14043: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14062: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14046: \$? = $ac_status" >&5
+  echo "$as_me:14065: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14049: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14068: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14052: \$? = $ac_status" >&5
+  echo "$as_me:14071: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_socks=yes
@@ -14063,7 +14082,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lsocks  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14066 "configure"
+#line 14085 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14079,16 +14098,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14082: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14101: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14085: \$? = $ac_status" >&5
+  echo "$as_me:14104: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14088: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14107: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14091: \$? = $ac_status" >&5
+  echo "$as_me:14110: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_socks=yes
@@ -14105,9 +14124,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for socks library" 1>&6
 
-echo "${as_me:-configure}:14108: testing find linkage for socks library ..." 1>&5
+echo "${as_me:-configure}:14127: testing find linkage for socks library ..." 1>&5
 
-echo "${as_me:-configure}:14110: testing Searching for headers in FIND_LINKAGE(socks,) ..." 1>&5
+echo "${as_me:-configure}:14129: testing Searching for headers in FIND_LINKAGE(socks,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -14198,7 +14217,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}:14201: testing ... testing $cf_cv_header_path_socks ..." 1>&5
+echo "${as_me:-configure}:14220: testing ... testing $cf_cv_header_path_socks ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -14206,7 +14225,7 @@ echo "${as_me:-configure}:14201: testing ... testing $cf_cv_header_path_socks ..
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_socks"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 14209 "configure"
+#line 14228 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14222,21 +14241,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14225: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14244: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14228: \$? = $ac_status" >&5
+  echo "$as_me:14247: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14231: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14250: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14234: \$? = $ac_status" >&5
+  echo "$as_me:14253: \$? = $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}:14239: testing ... found socks headers in $cf_cv_header_path_socks ..." 1>&5
+echo "${as_me:-configure}:14258: testing ... found socks headers in $cf_cv_header_path_socks ..." 1>&5
 
 				cf_cv_find_linkage_socks=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -14254,7 +14273,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_socks" = maybe ; then
 
-echo "${as_me:-configure}:14257: testing Searching for socks library in FIND_LINKAGE(socks,) ..." 1>&5
+echo "${as_me:-configure}:14276: testing Searching for socks library in FIND_LINKAGE(socks,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -14329,13 +14348,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}:14332: testing ... testing $cf_cv_library_path_socks ..." 1>&5
+echo "${as_me:-configure}:14351: 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 14338 "configure"
+#line 14357 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14351,21 +14370,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14354: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14373: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14357: \$? = $ac_status" >&5
+  echo "$as_me:14376: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14360: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14379: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14363: \$? = $ac_status" >&5
+  echo "$as_me:14382: \$? = $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}:14368: testing ... found socks library in $cf_cv_library_path_socks ..." 1>&5
+echo "${as_me:-configure}:14387: testing ... found socks library in $cf_cv_library_path_socks ..." 1>&5
 
 					cf_cv_find_linkage_socks=yes
 					cf_cv_library_file_socks="-lsocks"
@@ -14427,7 +14446,7 @@ if test -n "$cf_cv_header_path_socks" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 14430 "configure"
+#line 14449 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14439,16 +14458,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14442: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14461: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14445: \$? = $ac_status" >&5
+  echo "$as_me:14464: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14448: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14467: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14451: \$? = $ac_status" >&5
+  echo "$as_me:14470: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -14465,7 +14484,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}:14468: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:14487: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -14501,7 +14520,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}:14504: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:14523: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -14526,7 +14545,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:14529: WARNING: Cannot find socks library" >&5
+{ echo "$as_me:14548: WARNING: Cannot find socks library" >&5
 echo "$as_me: WARNING: Cannot find socks library" >&2;}
 fi
 
@@ -14569,7 +14588,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
   else
-    { { echo "$as_me:14572: error: cannot link with socks library" >&5
+    { { echo "$as_me:14591: error: cannot link with socks library" >&5
 echo "$as_me: error: cannot link with socks library" >&2;}
    { (exit 1); exit 1; }; }
   fi
@@ -14613,7 +14632,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 14616 "configure"
+#line 14635 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14625,16 +14644,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14628: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14647: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14631: \$? = $ac_status" >&5
+  echo "$as_me:14650: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14634: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14653: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14637: \$? = $ac_status" >&5
+  echo "$as_me:14656: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -14651,7 +14670,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}:14654: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:14673: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -14697,7 +14716,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 14700 "configure"
+#line 14719 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14709,16 +14728,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14712: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14731: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14715: \$? = $ac_status" >&5
+  echo "$as_me:14734: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14718: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14737: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14721: \$? = $ac_status" >&5
+  echo "$as_me:14740: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -14735,7 +14754,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}:14738: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:14757: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -14753,7 +14772,7 @@ echo "${as_me:-configure}:14738: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:14756: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5
+{ { echo "$as_me:14775: 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
@@ -14778,7 +14797,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}:14781: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:14800: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -14807,7 +14826,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}:14810: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:14829: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -14816,7 +14835,7 @@ echo "${as_me:-configure}:14810: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:14819: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5
+{ { echo "$as_me:14838: 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
@@ -14849,11 +14868,11 @@ cat >>confdefs.h <<\EOF
 #define SOCKS 1
 EOF
 
-echo "$as_me:14852: checking if the socks library uses socks4 prefix" >&5
+echo "$as_me:14871: 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 14856 "configure"
+#line 14875 "configure"
 #include "confdefs.h"
 
 #include <socks.h>
@@ -14867,16 +14886,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14870: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14889: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14873: \$? = $ac_status" >&5
+  echo "$as_me:14892: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14876: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14895: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14879: \$? = $ac_status" >&5
+  echo "$as_me:14898: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 cat >>confdefs.h <<\EOF
@@ -14888,7 +14907,7 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14891 "configure"
+#line 14910 "configure"
 #include "confdefs.h"
 #include <socks.h>
 int
@@ -14900,29 +14919,29 @@ SOCKSinit((char *)0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14903: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14922: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14906: \$? = $ac_status" >&5
+  echo "$as_me:14925: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14909: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14928: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14912: \$? = $ac_status" >&5
+  echo "$as_me:14931: \$? = $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:14918: error: Cannot link with socks5 library" >&5
+{ { echo "$as_me:14937: 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:14925: result: $cf_use_socks4" >&5
+echo "$as_me:14944: result: $cf_use_socks4" >&5
 echo "${ECHO_T}$cf_use_socks4" >&6
 
 if test "$cf_use_socks4" = "yes" ; then
@@ -14977,10 +14996,10 @@ EOF
 
 fi
 
-echo "$as_me:14980: checking if socks5p.h is available" >&5
+echo "$as_me:14999: 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 14983 "configure"
+#line 15002 "configure"
 #include "confdefs.h"
 
 #define INCLUDE_PROTOTYPES
@@ -14995,16 +15014,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14998: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15017: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15001: \$? = $ac_status" >&5
+  echo "$as_me:15020: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15004: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15023: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15007: \$? = $ac_status" >&5
+  echo "$as_me:15026: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_use_socks5p_h=yes
 else
@@ -15013,7 +15032,7 @@ cat "conftest.$ac_ext" >&5
 cf_use_socks5p_h=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:15016: result: $cf_use_socks5p_h" >&5
+echo "$as_me:15035: result: $cf_use_socks5p_h" >&5
 echo "${ECHO_T}$cf_use_socks5p_h" >&6
 
 test "$cf_use_socks5p_h" = yes &&
@@ -15025,14 +15044,14 @@ else
 
 cf_test_netlibs=no
 
-echo "$as_me:15028: checking for network libraries" >&5
+echo "$as_me:15047: 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:15035: result: working..." >&5
+echo "$as_me:15054: result: working..." >&5
 echo "${ECHO_T}working..." >&6
 
 cf_cv_netlibs=""
@@ -15044,23 +15063,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:15047: checking for $ac_header" >&5
+echo "$as_me:15066: 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 15053 "configure"
+#line 15072 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:15057: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:15076: \"$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:15063: \$? = $ac_status" >&5
+  echo "$as_me:15082: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -15079,7 +15098,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:15082: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:15101: 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
@@ -15114,7 +15133,7 @@ done
 LIBS="$cf_add_libs"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 15117 "configure"
+#line 15136 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_WINDOWS_H
@@ -15141,22 +15160,22 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15144: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15163: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15147: \$? = $ac_status" >&5
+  echo "$as_me:15166: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15150: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15169: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15153: \$? = $ac_status" >&5
+  echo "$as_me:15172: \$? = $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:15159: error: Cannot link against winsock library" >&5
+{ { echo "$as_me:15178: error: Cannot link against winsock library" >&5
 echo "$as_me: error: Cannot link against winsock library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -15169,13 +15188,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:15172: checking for $ac_func" >&5
+echo "$as_me:15191: 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 15178 "configure"
+#line 15197 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15206,16 +15225,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15209: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15228: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15212: \$? = $ac_status" >&5
+  echo "$as_me:15231: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15215: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15234: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15218: \$? = $ac_status" >&5
+  echo "$as_me:15237: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -15225,7 +15244,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15228: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:15247: 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
@@ -15234,7 +15253,7 @@ EOF
 
 else
 
-echo "$as_me:15237: checking for gethostname in -lnsl" >&5
+echo "$as_me:15256: 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
@@ -15242,7 +15261,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15245 "configure"
+#line 15264 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15261,16 +15280,16 @@ gethostname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15264: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15283: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15267: \$? = $ac_status" >&5
+  echo "$as_me:15286: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15270: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15289: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15273: \$? = $ac_status" >&5
+  echo "$as_me:15292: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_nsl_gethostname=yes
 else
@@ -15281,7 +15300,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15284: result: $ac_cv_lib_nsl_gethostname" >&5
+echo "$as_me:15303: 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
 
@@ -15298,7 +15317,7 @@ else
 	ac_cv_func_gethostname=unknown
 	unset ac_cv_func_gethostname 2>/dev/null
 
-echo "$as_me:15301: checking for gethostname in -lsocket" >&5
+echo "$as_me:15320: 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
@@ -15306,7 +15325,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $cf_cv_netlibs $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15309 "configure"
+#line 15328 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15325,16 +15344,16 @@ gethostname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15328: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15347: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15331: \$? = $ac_status" >&5
+  echo "$as_me:15350: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15334: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15353: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15337: \$? = $ac_status" >&5
+  echo "$as_me:15356: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_socket_gethostname=yes
 else
@@ -15345,7 +15364,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15348: result: $ac_cv_lib_socket_gethostname" >&5
+echo "$as_me:15367: 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
 
@@ -15369,7 +15388,7 @@ fi
 fi
 done
 
-	echo "$as_me:15372: checking for main in -linet" >&5
+	echo "$as_me:15391: 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
@@ -15377,7 +15396,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-linet  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15380 "configure"
+#line 15399 "configure"
 #include "confdefs.h"
 
 int
@@ -15389,16 +15408,16 @@ main ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15392: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15411: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15395: \$? = $ac_status" >&5
+  echo "$as_me:15414: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15398: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15417: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15401: \$? = $ac_status" >&5
+  echo "$as_me:15420: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_inet_main=yes
 else
@@ -15409,7 +15428,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15412: result: $ac_cv_lib_inet_main" >&5
+echo "$as_me:15431: 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"
@@ -15420,13 +15439,13 @@ fi
 for ac_func in socket
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:15423: checking for $ac_func" >&5
+echo "$as_me:15442: 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 15429 "configure"
+#line 15448 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15457,16 +15476,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15460: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15479: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15463: \$? = $ac_status" >&5
+  echo "$as_me:15482: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15466: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15485: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15469: \$? = $ac_status" >&5
+  echo "$as_me:15488: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -15476,7 +15495,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15479: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:15498: 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
@@ -15485,7 +15504,7 @@ EOF
 
 else
 
-echo "$as_me:15488: checking for socket in -lsocket" >&5
+echo "$as_me:15507: 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
@@ -15493,7 +15512,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $cf_cv_netlibs $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15496 "configure"
+#line 15515 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15512,16 +15531,16 @@ socket ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15515: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15534: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15518: \$? = $ac_status" >&5
+  echo "$as_me:15537: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15521: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15540: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15524: \$? = $ac_status" >&5
+  echo "$as_me:15543: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_socket_socket=yes
 else
@@ -15532,7 +15551,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15535: result: $ac_cv_lib_socket_socket" >&5
+echo "$as_me:15554: 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
 
@@ -15549,7 +15568,7 @@ else
 	ac_cv_func_socket=unknown
 	unset ac_cv_func_socket 2>/dev/null
 
-echo "$as_me:15552: checking for socket in -lbsd" >&5
+echo "$as_me:15571: 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
@@ -15557,7 +15576,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd $cf_cv_netlibs $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15560 "configure"
+#line 15579 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15576,16 +15595,16 @@ socket ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15579: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15598: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15582: \$? = $ac_status" >&5
+  echo "$as_me:15601: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15585: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15604: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15588: \$? = $ac_status" >&5
+  echo "$as_me:15607: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_socket=yes
 else
@@ -15596,7 +15615,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15599: result: $ac_cv_lib_bsd_socket" >&5
+echo "$as_me:15618: 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
 
@@ -15625,13 +15644,13 @@ done
 for ac_func in gethostbyname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:15628: checking for $ac_func" >&5
+echo "$as_me:15647: 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 15634 "configure"
+#line 15653 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15662,16 +15681,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15665: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15684: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15668: \$? = $ac_status" >&5
+  echo "$as_me:15687: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15671: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15690: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15674: \$? = $ac_status" >&5
+  echo "$as_me:15693: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -15681,7 +15700,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15684: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:15703: 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
@@ -15690,7 +15709,7 @@ EOF
 
 else
 
-echo "$as_me:15693: checking for gethostbyname in -lnsl" >&5
+echo "$as_me:15712: 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
@@ -15698,7 +15717,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15701 "configure"
+#line 15720 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15717,16 +15736,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15720: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15739: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15723: \$? = $ac_status" >&5
+  echo "$as_me:15742: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15726: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15745: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15729: \$? = $ac_status" >&5
+  echo "$as_me:15748: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -15737,7 +15756,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15740: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:15759: 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
 
@@ -15762,13 +15781,13 @@ done
 for ac_func in inet_ntoa
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:15765: checking for $ac_func" >&5
+echo "$as_me:15784: 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 15771 "configure"
+#line 15790 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15799,16 +15818,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15802: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15821: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15805: \$? = $ac_status" >&5
+  echo "$as_me:15824: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15808: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15827: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15811: \$? = $ac_status" >&5
+  echo "$as_me:15830: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -15818,7 +15837,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15821: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:15840: 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
@@ -15827,7 +15846,7 @@ EOF
 
 else
 
-echo "$as_me:15830: checking for inet_ntoa in -lnsl" >&5
+echo "$as_me:15849: 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
@@ -15835,7 +15854,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15838 "configure"
+#line 15857 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15854,16 +15873,16 @@ inet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15857: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15876: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15860: \$? = $ac_status" >&5
+  echo "$as_me:15879: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15863: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15882: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15866: \$? = $ac_status" >&5
+  echo "$as_me:15885: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_nsl_inet_ntoa=yes
 else
@@ -15874,7 +15893,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15877: result: $ac_cv_lib_nsl_inet_ntoa" >&5
+echo "$as_me:15896: 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
 
@@ -15899,13 +15918,13 @@ done
 for ac_func in gethostbyname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:15902: checking for $ac_func" >&5
+echo "$as_me:15921: 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 15908 "configure"
+#line 15927 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15936,16 +15955,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15939: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15958: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15942: \$? = $ac_status" >&5
+  echo "$as_me:15961: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15945: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15964: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15948: \$? = $ac_status" >&5
+  echo "$as_me:15967: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -15955,7 +15974,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15958: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:15977: 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
@@ -15964,7 +15983,7 @@ EOF
 
 else
 
-echo "$as_me:15967: checking for gethostbyname in -lnetwork" >&5
+echo "$as_me:15986: 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
@@ -15972,7 +15991,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnetwork $cf_cv_netlibs $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15975 "configure"
+#line 15994 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15991,16 +16010,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15994: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16013: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15997: \$? = $ac_status" >&5
+  echo "$as_me:16016: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16000: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16019: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16003: \$? = $ac_status" >&5
+  echo "$as_me:16022: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_network_gethostbyname=yes
 else
@@ -16011,7 +16030,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16014: result: $ac_cv_lib_network_gethostbyname" >&5
+echo "$as_me:16033: 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
 
@@ -16036,13 +16055,13 @@ done
 for ac_func in strcasecmp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:16039: checking for $ac_func" >&5
+echo "$as_me:16058: 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 16045 "configure"
+#line 16064 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -16073,16 +16092,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16076: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16095: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16079: \$? = $ac_status" >&5
+  echo "$as_me:16098: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16082: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16101: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16085: \$? = $ac_status" >&5
+  echo "$as_me:16104: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -16092,7 +16111,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16095: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:16114: 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
@@ -16101,7 +16120,7 @@ EOF
 
 else
 
-echo "$as_me:16104: checking for strcasecmp in -lresolv" >&5
+echo "$as_me:16123: 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
@@ -16109,7 +16128,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv $cf_cv_netlibs $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16112 "configure"
+#line 16131 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16128,16 +16147,16 @@ strcasecmp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16131: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16150: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16134: \$? = $ac_status" >&5
+  echo "$as_me:16153: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16137: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16156: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16140: \$? = $ac_status" >&5
+  echo "$as_me:16159: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_resolv_strcasecmp=yes
 else
@@ -16148,7 +16167,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16151: result: $ac_cv_lib_resolv_strcasecmp" >&5
+echo "$as_me:16170: 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
 
@@ -16205,14 +16224,14 @@ test "$cf_test_netlibs" = no && echo "$cf_cv_netlibs" >&6
 
 fi
 
-echo "$as_me:16208: checking for inet_aton function" >&5
+echo "$as_me:16227: 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 16215 "configure"
+#line 16234 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -16248,16 +16267,16 @@ inet_aton(0, (struct in_addr *)0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16251: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16270: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16254: \$? = $ac_status" >&5
+  echo "$as_me:16273: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16257: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16276: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16260: \$? = $ac_status" >&5
+  echo "$as_me:16279: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_inet_aton=yes
 else
@@ -16267,7 +16286,7 @@ cf_cv_have_inet_aton=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16270: result: $cf_cv_have_inet_aton" >&5
+echo "$as_me:16289: 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
 
@@ -16276,14 +16295,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-    echo "$as_me:16279: checking for inet_addr function" >&5
+    echo "$as_me:16298: 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 16286 "configure"
+#line 16305 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -16319,16 +16338,16 @@ inet_addr(0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16322: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16341: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16325: \$? = $ac_status" >&5
+  echo "$as_me:16344: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16328: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16347: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16331: \$? = $ac_status" >&5
+  echo "$as_me:16350: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_inet_addr=yes
 else
@@ -16338,10 +16357,10 @@ cf_cv_have_inet_addr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:16341: result: $cf_cv_have_inet_addr" >&5
+echo "$as_me:16360: 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:16344: checking for library with inet_addr" >&5
+	echo "$as_me:16363: 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
@@ -16352,7 +16371,7 @@ else
 	    do
 		LIBS="$cf_save_LIBS $cf_inetlib"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 16355 "configure"
+#line 16374 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -16368,16 +16387,16 @@ inet_addr(0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16371: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16390: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16374: \$? = $ac_status" >&5
+  echo "$as_me:16393: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16377: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16396: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16380: \$? = $ac_status" >&5
+  echo "$as_me:16399: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_lib_inet_addr=$cf_inetlib
 else
@@ -16391,7 +16410,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	    done
 
 fi
-echo "$as_me:16394: result: $cf_cv_lib_inet_addr" >&5
+echo "$as_me:16413: 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
 
@@ -16412,13 +16431,13 @@ done
 LIBS="$cf_add_libs"
 
 	else
-	    { echo "$as_me:16415: WARNING: Unable to find library for inet_addr function" >&5
+	    { echo "$as_me:16434: 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:16421: checking if you want to use pkg-config" >&5
+echo "$as_me:16440: 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.
@@ -16428,7 +16447,7 @@ if test "${with_pkg_config+set}" = set; then
 else
   cf_pkg_config=yes
 fi;
-echo "$as_me:16431: result: $cf_pkg_config" >&5
+echo "$as_me:16450: result: $cf_pkg_config" >&5
 echo "${ECHO_T}$cf_pkg_config" >&6
 
 case "$cf_pkg_config" in
@@ -16440,7 +16459,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:16443: checking for $ac_word" >&5
+echo "$as_me:16462: 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
@@ -16457,7 +16476,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:16460: found $ac_dir/$ac_word" >&5
+   echo "$as_me:16479: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -16468,10 +16487,10 @@ fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:16471: result: $PKG_CONFIG" >&5
+  echo "$as_me:16490: result: $PKG_CONFIG" >&5
 echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  echo "$as_me:16474: result: no" >&5
+  echo "$as_me:16493: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -16480,7 +16499,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:16483: checking for $ac_word" >&5
+echo "$as_me:16502: 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
@@ -16497,7 +16516,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:16500: found $ac_dir/$ac_word" >&5
+   echo "$as_me:16519: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -16509,10 +16528,10 @@ fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 
 if test -n "$ac_pt_PKG_CONFIG"; then
-  echo "$as_me:16512: result: $ac_pt_PKG_CONFIG" >&5
+  echo "$as_me:16531: result: $ac_pt_PKG_CONFIG" >&5
 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
 else
-  echo "$as_me:16515: result: no" >&5
+  echo "$as_me:16534: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -16555,14 +16574,14 @@ case ".$PKG_CONFIG" in
 	PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:16558: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+	{ { echo "$as_me:16577: 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:16565: WARNING: pkg-config is not installed" >&5
+	{ echo "$as_me:16584: WARNING: pkg-config is not installed" >&5
 echo "$as_me: WARNING: pkg-config is not installed" >&2;}
 fi
 
@@ -16610,7 +16629,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 16613 "configure"
+#line 16632 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -16622,16 +16641,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16625: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16644: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16628: \$? = $ac_status" >&5
+  echo "$as_me:16647: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16631: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16650: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16634: \$? = $ac_status" >&5
+  echo "$as_me:16653: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -16648,7 +16667,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}:16651: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:16670: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -16694,7 +16713,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 16697 "configure"
+#line 16716 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -16706,16 +16725,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16709: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16728: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16712: \$? = $ac_status" >&5
+  echo "$as_me:16731: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16715: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16734: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16718: \$? = $ac_status" >&5
+  echo "$as_me:16737: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -16732,7 +16751,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}:16735: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:16754: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -16750,7 +16769,7 @@ echo "${as_me:-configure}:16735: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:16753: error: cannot find ssl library under $cf_cv_use_libssl" >&5
+{ { echo "$as_me:16772: 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
@@ -16775,7 +16794,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}:16778: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:16797: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -16804,7 +16823,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}:16807: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:16826: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -16813,7 +16832,7 @@ echo "${as_me:-configure}:16807: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:16816: error: cannot find ssl library under $cf_cv_use_libssl" >&5
+{ { echo "$as_me:16835: 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
@@ -16830,15 +16849,15 @@ esac
 			cf_cv_pkg_ssl=
 			for cf_try_package in openssl libssl
 			do
-				echo "$as_me:16833: checking pkg-config for $cf_try_package" >&5
+				echo "$as_me:16852: 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:16837: result: yes" >&5
+					echo "$as_me:16856: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 					break
 				else
-					echo "$as_me:16841: result: no" >&5
+					echo "$as_me:16860: result: no" >&5
 echo "${ECHO_T}no" >&6
 				fi
 			done
@@ -16982,7 +17001,7 @@ fi
 					esac
 					test -n "$verbose" && echo "	adding $cf_libs_ssl to LIBS" 1>&6
 
-echo "${as_me:-configure}:16985: testing adding $cf_libs_ssl to LIBS ..." 1>&5
+echo "${as_me:-configure}:17004: testing adding $cf_libs_ssl to LIBS ..." 1>&5
 
 cf_add_libs="$LIBS"
 # reverse order
@@ -17018,7 +17037,7 @@ LIBS="$cf_add_libs"
 			(*-ldl)
 				;;
 			(*)
-				echo "$as_me:17021: checking for dlsym in -ldl" >&5
+				echo "$as_me:17040: 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
@@ -17026,7 +17045,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17029 "configure"
+#line 17048 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17045,16 +17064,16 @@ dlsym ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17048: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17067: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17051: \$? = $ac_status" >&5
+  echo "$as_me:17070: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17054: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17073: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17057: \$? = $ac_status" >&5
+  echo "$as_me:17076: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dl_dlsym=yes
 else
@@ -17065,7 +17084,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17068: result: $ac_cv_lib_dl_dlsym" >&5
+echo "$as_me:17087: 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"
@@ -17081,12 +17100,12 @@ fi
 cf_cv_header_path_ssl=
 cf_cv_library_path_ssl=
 
-echo "${as_me:-configure}:17084: testing Starting FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me:-configure}:17103: testing Starting FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17089 "configure"
+#line 17108 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17115,16 +17134,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17118: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17137: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17121: \$? = $ac_status" >&5
+  echo "$as_me:17140: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17124: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17143: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17127: \$? = $ac_status" >&5
+  echo "$as_me:17146: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_ssl=yes
@@ -17138,7 +17157,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lssl $cf_extra_ssl_libs $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17141 "configure"
+#line 17160 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17167,16 +17186,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17170: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17189: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17173: \$? = $ac_status" >&5
+  echo "$as_me:17192: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17176: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17195: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17179: \$? = $ac_status" >&5
+  echo "$as_me:17198: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_ssl=yes
@@ -17193,9 +17212,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for ssl library" 1>&6
 
-echo "${as_me:-configure}:17196: testing find linkage for ssl library ..." 1>&5
+echo "${as_me:-configure}:17215: testing find linkage for ssl library ..." 1>&5
 
-echo "${as_me:-configure}:17198: testing Searching for headers in FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me:-configure}:17217: testing Searching for headers in FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -17286,7 +17305,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}:17289: testing ... testing $cf_cv_header_path_ssl ..." 1>&5
+echo "${as_me:-configure}:17308: testing ... testing $cf_cv_header_path_ssl ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -17294,7 +17313,7 @@ echo "${as_me:-configure}:17289: testing ... testing $cf_cv_header_path_ssl ..."
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_ssl"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 17297 "configure"
+#line 17316 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17323,21 +17342,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17326: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17345: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17329: \$? = $ac_status" >&5
+  echo "$as_me:17348: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17332: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17351: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17335: \$? = $ac_status" >&5
+  echo "$as_me:17354: \$? = $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}:17340: testing ... found ssl headers in $cf_cv_header_path_ssl ..." 1>&5
+echo "${as_me:-configure}:17359: testing ... found ssl headers in $cf_cv_header_path_ssl ..." 1>&5
 
 				cf_cv_find_linkage_ssl=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -17355,7 +17374,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_ssl" = maybe ; then
 
-echo "${as_me:-configure}:17358: testing Searching for ssl library in FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me:-configure}:17377: testing Searching for ssl library in FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -17363,7 +17382,7 @@ echo "${as_me:-configure}:17358: 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 17366 "configure"
+#line 17385 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17392,21 +17411,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17395: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17414: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17398: \$? = $ac_status" >&5
+  echo "$as_me:17417: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17401: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17420: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17404: \$? = $ac_status" >&5
+  echo "$as_me:17423: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			test -n "$verbose" && echo "	... found ssl library in system" 1>&6
 
-echo "${as_me:-configure}:17409: testing ... found ssl library in system ..." 1>&5
+echo "${as_me:-configure}:17428: testing ... found ssl library in system ..." 1>&5
 
 			cf_cv_find_linkage_ssl=yes
 else
@@ -17487,13 +17506,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}:17490: testing ... testing $cf_cv_library_path_ssl ..." 1>&5
+echo "${as_me:-configure}:17509: 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 17496 "configure"
+#line 17515 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17522,21 +17541,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17525: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17544: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17528: \$? = $ac_status" >&5
+  echo "$as_me:17547: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17531: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17550: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17534: \$? = $ac_status" >&5
+  echo "$as_me:17553: \$? = $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}:17539: testing ... found ssl library in $cf_cv_library_path_ssl ..." 1>&5
+echo "${as_me:-configure}:17558: testing ... found ssl library in $cf_cv_library_path_ssl ..." 1>&5
 
 					cf_cv_find_linkage_ssl=yes
 					cf_cv_library_file_ssl="-lssl"
@@ -17598,7 +17617,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}:17601: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:17620: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -17657,7 +17676,7 @@ if test -n "$cf_cv_header_path_ssl" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 17660 "configure"
+#line 17679 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -17669,16 +17688,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17672: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17691: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17675: \$? = $ac_status" >&5
+  echo "$as_me:17694: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17678: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17697: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17681: \$? = $ac_status" >&5
+  echo "$as_me:17700: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -17695,7 +17714,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}:17698: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:17717: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -17728,7 +17747,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}:17731: testing checking ssl header-path $cf_cv_header_path_ssl ..." 1>&5
+echo "${as_me:-configure}:17750: testing checking ssl header-path $cf_cv_header_path_ssl ..." 1>&5
 
 			case "$cf_cv_header_path_ssl" in
 			(*/openssl)
@@ -17741,10 +17760,10 @@ EOF
 			esac
 		fi
 
-echo "$as_me:17744: checking for X509 support" >&5
+echo "$as_me:17763: checking for X509 support" >&5
 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17747 "configure"
+#line 17766 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17773,16 +17792,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:17776: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17795: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17779: \$? = $ac_status" >&5
+  echo "$as_me:17798: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17782: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17801: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17785: \$? = $ac_status" >&5
+  echo "$as_me:17804: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_x509_support=yes
 else
@@ -17791,7 +17810,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:17794: result: $cf_x509_support" >&5
+echo "$as_me:17813: result: $cf_x509_support" >&5
 echo "${ECHO_T}$cf_x509_support" >&6
 
 if test "$cf_x509_support" = yes ; then
@@ -17846,7 +17865,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 17849 "configure"
+#line 17868 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -17858,16 +17877,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17861: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17880: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17864: \$? = $ac_status" >&5
+  echo "$as_me:17883: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17867: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17886: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17870: \$? = $ac_status" >&5
+  echo "$as_me:17889: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -17884,7 +17903,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}:17887: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:17906: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -17930,7 +17949,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 17933 "configure"
+#line 17952 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -17942,16 +17961,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17945: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17964: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17948: \$? = $ac_status" >&5
+  echo "$as_me:17967: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17951: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17970: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17954: \$? = $ac_status" >&5
+  echo "$as_me:17973: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -17968,7 +17987,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}:17971: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:17990: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -17986,7 +18005,7 @@ echo "${as_me:-configure}:17971: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:17989: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:18008: 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
@@ -18011,7 +18030,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}:18014: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:18033: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -18040,7 +18059,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}:18043: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:18062: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -18049,7 +18068,7 @@ echo "${as_me:-configure}:18043: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:18052: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:18071: 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
@@ -18067,12 +18086,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}:18070: testing checking pkg-config for $cf_pkg_gnutls ..." 1>&5
+echo "${as_me:-configure}:18089: 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}:18075: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:18094: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_cv_have_gnutls=yes
 				cf_cv_pkg_config_ssl=yes
@@ -18204,7 +18223,7 @@ fi
 					esac
 					test -n "$verbose" && echo "	adding $cf_libs_ssl to LIBS" 1>&6
 
-echo "${as_me:-configure}:18207: testing adding $cf_libs_ssl to LIBS ..." 1>&5
+echo "${as_me:-configure}:18226: testing adding $cf_libs_ssl to LIBS ..." 1>&5
 
 cf_add_libs="$LIBS"
 # reverse order
@@ -18226,7 +18245,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}:18229: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:18248: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_pkg_gnutls=none
 			fi
@@ -18246,12 +18265,12 @@ EOF
 cf_cv_header_path_gnutls=
 cf_cv_library_path_gnutls=
 
-echo "${as_me:-configure}:18249: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:18268: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18254 "configure"
+#line 18273 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -18280,16 +18299,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18283: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18302: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18286: \$? = $ac_status" >&5
+  echo "$as_me:18305: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18289: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18308: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18292: \$? = $ac_status" >&5
+  echo "$as_me:18311: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -18303,7 +18322,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lgnutls  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18306 "configure"
+#line 18325 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -18332,16 +18351,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18335: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18354: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18338: \$? = $ac_status" >&5
+  echo "$as_me:18357: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18341: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18360: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18344: \$? = $ac_status" >&5
+  echo "$as_me:18363: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -18358,9 +18377,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for gnutls library" 1>&6
 
-echo "${as_me:-configure}:18361: testing find linkage for gnutls library ..." 1>&5
+echo "${as_me:-configure}:18380: testing find linkage for gnutls library ..." 1>&5
 
-echo "${as_me:-configure}:18363: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:18382: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -18451,7 +18470,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}:18454: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:18473: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -18459,7 +18478,7 @@ echo "${as_me:-configure}:18454: testing ... testing $cf_cv_header_path_gnutls .
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_gnutls"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 18462 "configure"
+#line 18481 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -18488,21 +18507,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18491: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18510: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18494: \$? = $ac_status" >&5
+  echo "$as_me:18513: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18497: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18516: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18500: \$? = $ac_status" >&5
+  echo "$as_me:18519: \$? = $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}:18505: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:18524: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
 
 				cf_cv_find_linkage_gnutls=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -18520,7 +18539,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_gnutls" = maybe ; then
 
-echo "${as_me:-configure}:18523: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:18542: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -18595,13 +18614,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}:18598: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:18617: 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 18604 "configure"
+#line 18623 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -18630,21 +18649,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18633: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18652: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18636: \$? = $ac_status" >&5
+  echo "$as_me:18655: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18639: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18658: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18642: \$? = $ac_status" >&5
+  echo "$as_me:18661: \$? = $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}:18647: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:18666: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
 
 					cf_cv_find_linkage_gnutls=yes
 					cf_cv_library_file_gnutls="-lgnutls"
@@ -18724,7 +18743,7 @@ if test -n "$cf_cv_header_path_gnutls" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 18727 "configure"
+#line 18746 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -18736,16 +18755,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18739: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18758: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18742: \$? = $ac_status" >&5
+  echo "$as_me:18761: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18745: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18764: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18748: \$? = $ac_status" >&5
+  echo "$as_me:18767: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -18762,7 +18781,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}:18765: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:18784: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -18803,7 +18822,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}:18806: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:18825: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -18832,13 +18851,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:18835: checking for $ac_func" >&5
+echo "$as_me:18854: 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 18841 "configure"
+#line 18860 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18869,16 +18888,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18872: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18891: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18875: \$? = $ac_status" >&5
+  echo "$as_me:18894: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18878: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18897: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18881: \$? = $ac_status" >&5
+  echo "$as_me:18900: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -18888,7 +18907,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18891: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:18910: 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
@@ -18898,13 +18917,13 @@ EOF
 fi
 done
 
-		echo "$as_me:18901: checking for gnutls_rnd" >&5
+		echo "$as_me:18920: 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 18907 "configure"
+#line 18926 "configure"
 #include "confdefs.h"
 #define gnutls_rnd autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18935,16 +18954,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18938: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18957: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18941: \$? = $ac_status" >&5
+  echo "$as_me:18960: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18944: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18963: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18947: \$? = $ac_status" >&5
+  echo "$as_me:18966: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gnutls_rnd=yes
 else
@@ -18954,7 +18973,7 @@ ac_cv_func_gnutls_rnd=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18957: result: $ac_cv_func_gnutls_rnd" >&5
+echo "$as_me:18976: 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
 
@@ -18984,10 +19003,10 @@ fi
 
 		EXTRA_OBJS="$EXTRA_OBJS tidy_tls\$o"
 
-echo "$as_me:18987: checking for X509 support" >&5
+echo "$as_me:19006: checking for X509 support" >&5
 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18990 "configure"
+#line 19009 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -19016,16 +19035,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:19019: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19038: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19022: \$? = $ac_status" >&5
+  echo "$as_me:19041: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19025: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19044: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19028: \$? = $ac_status" >&5
+  echo "$as_me:19047: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_x509_support=yes
 else
@@ -19034,7 +19053,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:19037: result: $cf_x509_support" >&5
+echo "$as_me:19056: result: $cf_x509_support" >&5
 echo "${ECHO_T}$cf_x509_support" >&6
 
 if test "$cf_x509_support" = yes ; then
@@ -19088,7 +19107,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 19091 "configure"
+#line 19110 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -19100,16 +19119,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19103: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19122: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19106: \$? = $ac_status" >&5
+  echo "$as_me:19125: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19109: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19128: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19112: \$? = $ac_status" >&5
+  echo "$as_me:19131: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -19126,7 +19145,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}:19129: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:19148: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -19172,7 +19191,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 19175 "configure"
+#line 19194 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -19184,16 +19203,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19187: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19206: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19190: \$? = $ac_status" >&5
+  echo "$as_me:19209: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19193: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19212: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19196: \$? = $ac_status" >&5
+  echo "$as_me:19215: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -19210,7 +19229,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}:19213: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:19232: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -19228,7 +19247,7 @@ echo "${as_me:-configure}:19213: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:19231: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:19250: 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
@@ -19253,7 +19272,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}:19256: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:19275: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -19282,7 +19301,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}:19285: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:19304: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -19291,7 +19310,7 @@ echo "${as_me:-configure}:19285: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:19294: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:19313: 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
@@ -19309,12 +19328,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}:19312: testing checking pkg-config for $cf_pkg_gnutls ..." 1>&5
+echo "${as_me:-configure}:19331: 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}:19317: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:19336: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_cv_have_gnutls=yes
 				cf_cv_pkg_config_ssl=yes
@@ -19446,7 +19465,7 @@ fi
 					esac
 					test -n "$verbose" && echo "	adding $cf_libs_ssl to LIBS" 1>&6
 
-echo "${as_me:-configure}:19449: testing adding $cf_libs_ssl to LIBS ..." 1>&5
+echo "${as_me:-configure}:19468: testing adding $cf_libs_ssl to LIBS ..." 1>&5
 
 cf_add_libs="$LIBS"
 # reverse order
@@ -19468,7 +19487,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}:19471: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:19490: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_pkg_gnutls=none
 			fi
@@ -19488,12 +19507,12 @@ EOF
 cf_cv_header_path_gnutls=
 cf_cv_library_path_gnutls=
 
-echo "${as_me:-configure}:19491: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:19510: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19496 "configure"
+#line 19515 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -19522,16 +19541,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19525: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19544: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19528: \$? = $ac_status" >&5
+  echo "$as_me:19547: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19531: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19550: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19534: \$? = $ac_status" >&5
+  echo "$as_me:19553: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -19545,7 +19564,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lgnutls -lgnutls-openssl $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19548 "configure"
+#line 19567 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -19574,16 +19593,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19577: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19596: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19580: \$? = $ac_status" >&5
+  echo "$as_me:19599: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19583: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19602: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19586: \$? = $ac_status" >&5
+  echo "$as_me:19605: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -19600,9 +19619,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for gnutls library" 1>&6
 
-echo "${as_me:-configure}:19603: testing find linkage for gnutls library ..." 1>&5
+echo "${as_me:-configure}:19622: testing find linkage for gnutls library ..." 1>&5
 
-echo "${as_me:-configure}:19605: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:19624: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -19693,7 +19712,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}:19696: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:19715: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -19701,7 +19720,7 @@ echo "${as_me:-configure}:19696: testing ... testing $cf_cv_header_path_gnutls .
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_gnutls"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 19704 "configure"
+#line 19723 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -19730,21 +19749,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19733: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19752: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19736: \$? = $ac_status" >&5
+  echo "$as_me:19755: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19739: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19758: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19742: \$? = $ac_status" >&5
+  echo "$as_me:19761: \$? = $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}:19747: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:19766: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
 
 				cf_cv_find_linkage_gnutls=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -19762,7 +19781,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_gnutls" = maybe ; then
 
-echo "${as_me:-configure}:19765: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:19784: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -19837,13 +19856,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}:19840: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:19859: 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 19846 "configure"
+#line 19865 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -19872,21 +19891,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19875: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19894: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19878: \$? = $ac_status" >&5
+  echo "$as_me:19897: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19881: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19900: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19884: \$? = $ac_status" >&5
+  echo "$as_me:19903: \$? = $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}:19889: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:19908: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
 
 					cf_cv_find_linkage_gnutls=yes
 					cf_cv_library_file_gnutls="-lgnutls"
@@ -19966,7 +19985,7 @@ if test -n "$cf_cv_header_path_gnutls" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 19969 "configure"
+#line 19988 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -19978,16 +19997,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19981: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20000: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19984: \$? = $ac_status" >&5
+  echo "$as_me:20003: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19987: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20006: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19990: \$? = $ac_status" >&5
+  echo "$as_me:20009: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -20004,7 +20023,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}:20007: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:20026: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -20045,7 +20064,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}:20048: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:20067: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -20074,13 +20093,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:20077: checking for $ac_func" >&5
+echo "$as_me:20096: 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 20083 "configure"
+#line 20102 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20111,16 +20130,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20114: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20133: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20117: \$? = $ac_status" >&5
+  echo "$as_me:20136: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20120: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20139: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20123: \$? = $ac_status" >&5
+  echo "$as_me:20142: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -20130,7 +20149,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20133: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:20152: 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
@@ -20140,13 +20159,13 @@ EOF
 fi
 done
 
-		echo "$as_me:20143: checking for gnutls_rnd" >&5
+		echo "$as_me:20162: 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 20149 "configure"
+#line 20168 "configure"
 #include "confdefs.h"
 #define gnutls_rnd autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20177,16 +20196,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20180: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20199: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20183: \$? = $ac_status" >&5
+  echo "$as_me:20202: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20186: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20205: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20189: \$? = $ac_status" >&5
+  echo "$as_me:20208: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gnutls_rnd=yes
 else
@@ -20196,7 +20215,7 @@ ac_cv_func_gnutls_rnd=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20199: result: $ac_cv_func_gnutls_rnd" >&5
+echo "$as_me:20218: 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
 
@@ -20225,7 +20244,7 @@ LIBS="$cf_add_libs"
 fi
 
 		if test "$cf_pkg_gnutls" = none ; then
-				echo "$as_me:20228: checking for SSL_connect in -lgnutls-openssl" >&5
+				echo "$as_me:20247: 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
@@ -20233,7 +20252,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnutls-openssl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20236 "configure"
+#line 20255 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20252,16 +20271,16 @@ SSL_connect ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20255: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20274: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20258: \$? = $ac_status" >&5
+  echo "$as_me:20277: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20261: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20280: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20264: \$? = $ac_status" >&5
+  echo "$as_me:20283: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gnutls_openssl_SSL_connect=yes
 else
@@ -20272,7 +20291,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20275: result: $ac_cv_lib_gnutls_openssl_SSL_connect" >&5
+echo "$as_me:20294: 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
 
@@ -20293,7 +20312,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-  echo "$as_me:20296: checking for SSL_connect in -lgnutls-extra" >&5
+  echo "$as_me:20315: 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
@@ -20301,7 +20320,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnutls-extra  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20304 "configure"
+#line 20323 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20320,16 +20339,16 @@ SSL_connect ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20323: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20342: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20326: \$? = $ac_status" >&5
+  echo "$as_me:20345: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20329: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20348: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20332: \$? = $ac_status" >&5
+  echo "$as_me:20351: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gnutls_extra_SSL_connect=yes
 else
@@ -20340,7 +20359,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20343: result: $ac_cv_lib_gnutls_extra_SSL_connect" >&5
+echo "$as_me:20362: 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
 
@@ -20361,7 +20380,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-  { { echo "$as_me:20364: error: cannot find gnutls openssl functions" >&5
+  { { echo "$as_me:20383: error: cannot find gnutls openssl functions" >&5
 echo "$as_me: error: cannot find gnutls openssl functions" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -20370,10 +20389,10 @@ fi
 
 			fi
 
-echo "$as_me:20373: checking for X509 support" >&5
+echo "$as_me:20392: checking for X509 support" >&5
 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20376 "configure"
+#line 20395 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -20402,16 +20421,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:20405: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20424: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20408: \$? = $ac_status" >&5
+  echo "$as_me:20427: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20411: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20430: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20414: \$? = $ac_status" >&5
+  echo "$as_me:20433: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_x509_support=yes
 else
@@ -20420,7 +20439,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:20423: result: $cf_x509_support" >&5
+echo "$as_me:20442: result: $cf_x509_support" >&5
 echo "${ECHO_T}$cf_x509_support" >&6
 
 if test "$cf_x509_support" = yes ; then
@@ -20452,7 +20471,7 @@ case "$cf_cv_use_libnss_compat" in
 	;;
 (yes)
 
-echo "$as_me:20455: checking for SSL_get_version in -lnss_compat_ossl" >&5
+echo "$as_me:20474: 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
@@ -20460,7 +20479,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnss_compat_ossl -lnss_compat_ossl $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 20463 "configure"
+#line 20482 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20479,16 +20498,16 @@ SSL_get_version ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20482: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20501: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20485: \$? = $ac_status" >&5
+  echo "$as_me:20504: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20488: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20507: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20491: \$? = $ac_status" >&5
+  echo "$as_me:20510: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_nss_compat_ossl_SSL_get_version=yes
 else
@@ -20499,7 +20518,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20502: result: $ac_cv_lib_nss_compat_ossl_SSL_get_version" >&5
+echo "$as_me:20521: 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
@@ -20514,11 +20533,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}:20517: testing assume it is in $cf_ssl_root ..." 1>&5
+echo "${as_me:-configure}:20536: 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:20521: error: cannot find NSS compliant libraries" >&5
+			{ { echo "$as_me:20540: error: cannot find NSS compliant libraries" >&5
 echo "$as_me: error: cannot find NSS compliant libraries" >&2;}
    { (exit 1); exit 1; }; }
 		fi
@@ -20533,13 +20552,13 @@ fi
 		elif test -d "$cf_cv_use_libnss_compat/../include" ; then
 			cf_ssl_root=$cf_cv_use_libnss_compat/..
 		else
-			{ { echo "$as_me:20536: error: cannot find NSS compliant library under $cf_cv_use_libnss_compat" >&5
+			{ { echo "$as_me:20555: 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:20542: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&5
+		{ echo "$as_me:20561: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&5
 echo "$as_me: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&2;}
 	fi
 	;;
@@ -20668,10 +20687,10 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 if test "$cf_ssl_subincs" = yes ; then
-echo "$as_me:20671: checking for NSS compliant include directory" >&5
+echo "$as_me:20690: 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 20674 "configure"
+#line 20693 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -20685,16 +20704,16 @@ SSL_shutdown((SSL *)0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20688: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20707: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20691: \$? = $ac_status" >&5
+  echo "$as_me:20710: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20694: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20713: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20697: \$? = $ac_status" >&5
+  echo "$as_me:20716: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_ssl_incl=yes
 else
@@ -20703,7 +20722,7 @@ cat "conftest.$ac_ext" >&5
 cf_ssl_incl=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:20706: result: $cf_ssl_incl" >&5
+echo "$as_me:20725: result: $cf_ssl_incl" >&5
 echo "${ECHO_T}$cf_ssl_incl" >&6
 test "$cf_ssl_incl" = yes &&
 cat >>confdefs.h <<\EOF
@@ -20712,10 +20731,10 @@ EOF
 
 fi
 
-echo "$as_me:20715: checking if we can link to NSS compliant library" >&5
+echo "$as_me:20734: 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 20718 "configure"
+#line 20737 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -20734,16 +20753,16 @@ SSL_shutdown((SSL *)0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20737: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20756: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20740: \$? = $ac_status" >&5
+  echo "$as_me:20759: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20743: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20762: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20746: \$? = $ac_status" >&5
+  echo "$as_me:20765: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_ssl_library=yes
 else
@@ -20752,7 +20771,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:20755: result: $cf_ssl_library" >&5
+echo "$as_me:20774: result: $cf_ssl_library" >&5
 echo "${ECHO_T}$cf_ssl_library" >&6
 if test "$cf_ssl_library" = yes ; then
 
@@ -20765,7 +20784,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-	{ { echo "$as_me:20768: error: Cannot link with NSS compliant libraries" >&5
+	{ { echo "$as_me:20787: error: Cannot link with NSS compliant libraries" >&5
 echo "$as_me: error: Cannot link with NSS compliant libraries" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -20773,7 +20792,7 @@ fi
 fi
 
 ### check for ipv6 support
-echo "$as_me:20776: checking whether to enable ipv6" >&5
+echo "$as_me:20795: 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.
@@ -20790,11 +20809,11 @@ EOF
 else
   enableval=no
 fi;
-echo "$as_me:20793: result: $enableval" >&5
+echo "$as_me:20812: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 if test "$enableval" = "yes"; then
 
-echo "$as_me:20797: checking ipv6 stack type" >&5
+echo "$as_me:20816: 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
@@ -20815,7 +20834,7 @@ do
 		;;
 	(inria)
 				cat >"conftest.$ac_ext" <<_ACEOF
-#line 20818 "configure"
+#line 20837 "configure"
 #include "confdefs.h"
 
 #include <netinet/in.h>
@@ -20832,7 +20851,7 @@ rm -rf conftest*
 		;;
 	(kame)
 				cat >"conftest.$ac_ext" <<_ACEOF
-#line 20835 "configure"
+#line 20854 "configure"
 #include "confdefs.h"
 
 #include <netinet/in.h>
@@ -20849,7 +20868,7 @@ rm -rf conftest*
 		;;
 	(linux-glibc)
 				cat >"conftest.$ac_ext" <<_ACEOF
-#line 20852 "configure"
+#line 20871 "configure"
 #include "confdefs.h"
 
 #include <features.h>
@@ -20875,7 +20894,7 @@ rm -rf conftest*
 		;;
 	(toshiba)
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20878 "configure"
+#line 20897 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -20892,7 +20911,7 @@ rm -rf conftest*
 		;;
 	(v6d)
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20895 "configure"
+#line 20914 "configure"
 #include "confdefs.h"
 
 #include </usr/local/v6/include/sys/v6config.h>
@@ -20909,7 +20928,7 @@ rm -rf conftest*
 		;;
 	(zeta)
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20912 "configure"
+#line 20931 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -20931,13 +20950,13 @@ rm -rf conftest*
 done
 
 fi
-echo "$as_me:20934: result: $cf_cv_ipv6type" >&5
+echo "$as_me:20953: result: $cf_cv_ipv6type" >&5
 echo "${ECHO_T}$cf_cv_ipv6type" >&6
 
 cf_ipv6lib=none
 cf_ipv6dir=none
 
-echo "$as_me:20940: checking for IPv6 library if required" >&5
+echo "$as_me:20959: 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)
@@ -20967,13 +20986,13 @@ case "$cf_cv_ipv6type" in
 	cf_ipv6dir=v6
 	;;
 esac
-echo "$as_me:20970: result: $cf_ipv6lib" >&5
+echo "$as_me:20989: result: $cf_ipv6lib" >&5
 echo "${ECHO_T}$cf_ipv6lib" >&6
 
 if test "$cf_ipv6lib" != "none"; then
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20976 "configure"
+#line 20995 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -20989,16 +21008,16 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20992: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21011: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20995: \$? = $ac_status" >&5
+  echo "$as_me:21014: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20998: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21017: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21001: \$? = $ac_status" >&5
+  echo "$as_me:21020: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -21119,7 +21138,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 21122 "configure"
+#line 21141 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -21131,16 +21150,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21134: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21153: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21137: \$? = $ac_status" >&5
+  echo "$as_me:21156: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21140: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21159: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21143: \$? = $ac_status" >&5
+  echo "$as_me:21162: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -21157,7 +21176,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}:21160: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:21179: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -21185,13 +21204,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:21188: checking for getaddrinfo" >&5
+	echo "$as_me:21207: 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 21194 "configure"
+#line 21213 "configure"
 #include "confdefs.h"
 #define getaddrinfo autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21222,16 +21241,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21225: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21244: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21228: \$? = $ac_status" >&5
+  echo "$as_me:21247: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21231: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21250: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21234: \$? = $ac_status" >&5
+  echo "$as_me:21253: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_getaddrinfo=yes
 else
@@ -21241,18 +21260,18 @@ ac_cv_func_getaddrinfo=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21244: result: $ac_cv_func_getaddrinfo" >&5
+echo "$as_me:21263: 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:21251: checking for getaddrinfo in -l$cf_ipv6lib" >&5
+		echo "$as_me:21270: 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 21255 "configure"
+#line 21274 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -21268,25 +21287,25 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21271: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21290: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21274: \$? = $ac_status" >&5
+  echo "$as_me:21293: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21277: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21296: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21280: \$? = $ac_status" >&5
+  echo "$as_me:21299: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:21282: result: yes" >&5
+  echo "$as_me:21301: 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:21289: result: no" >&5
+echo "$as_me:21308: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -21354,11 +21373,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:21357: checking for -l$cf_ipv6lib in $cf_libdir" >&5
+				echo "$as_me:21376: 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 21361 "configure"
+#line 21380 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -21374,25 +21393,25 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21377: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21396: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21380: \$? = $ac_status" >&5
+  echo "$as_me:21399: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21383: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21402: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21386: \$? = $ac_status" >&5
+  echo "$as_me:21405: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:21388: result: yes" >&5
+  echo "$as_me:21407: 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:21395: result: no" >&5
+echo "$as_me:21414: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -21407,7 +21426,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_ipv6lib"\"
 
 	if test "$cf_found_library" = no ; then
-		{ { echo "$as_me:21410: error: No $cf_ipv6lib library found, cannot continue.  You must fetch lib$cf_ipv6lib.a
+		{ { echo "$as_me:21429: 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;}
@@ -21415,7 +21434,7 @@ from an appropriate IPv6 kit and compile beforehand." >&2;}
 	fi
 fi
 
-echo "$as_me:21418: checking working getaddrinfo" >&5
+echo "$as_me:21437: 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
@@ -21425,7 +21444,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_getaddrinfo=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21428 "configure"
+#line 21447 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21505,15 +21524,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21508: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21527: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21511: \$? = $ac_status" >&5
+  echo "$as_me:21530: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21513: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21532: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21516: \$? = $ac_status" >&5
+  echo "$as_me:21535: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_getaddrinfo=yes
 else
@@ -21526,7 +21545,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:21529: result: $cf_cv_getaddrinfo" >&5
+echo "$as_me:21548: result: $cf_cv_getaddrinfo" >&5
 echo "${ECHO_T}$cf_cv_getaddrinfo" >&6
 if test "$cf_cv_getaddrinfo" = yes ; then
 
@@ -21542,12 +21561,12 @@ fi
 
 if test "$cf_cv_getaddrinfo" != "yes"; then
 	if test "$cf_cv_ipv6type" != "linux"; then
-		{ echo "$as_me:21545: WARNING: You must get working getaddrinfo() function,
+		{ echo "$as_me:21564: 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:21550: WARNING: The getaddrinfo() implementation on your system seems be buggy.
+		{ echo "$as_me:21569: 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.
@@ -21558,7 +21577,7 @@ fi
 
 fi
 
-echo "$as_me:21561: checking for screen type" >&5
+echo "$as_me:21580: 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
@@ -21572,7 +21591,7 @@ case "$withval" in
 (curses|ncurses*|pdcurses|slang)
 	cf_cv_screen=$withval
 	;;
-(*)	{ { echo "$as_me:21575: error: Unexpected value $withval" >&5
+(*)	{ { echo "$as_me:21594: error: Unexpected value $withval" >&5
 echo "$as_me: error: Unexpected value $withval" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -21581,13 +21600,13 @@ else
   cf_cv_screen=curses
 fi;
 fi
-echo "$as_me:21584: result: $cf_cv_screen" >&5
+echo "$as_me:21603: result: $cf_cv_screen" >&5
 echo "${ECHO_T}$cf_cv_screen" >&6
 
 case "$cf_cv_screen" in
 (curses|ncurses*)
 
-echo "$as_me:21590: checking for specific curses-directory" >&5
+echo "$as_me:21609: 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.
@@ -21597,7 +21616,7 @@ if test "${with_curses_dir+set}" = set; then
 else
   cf_cv_curses_dir=no
 fi;
-echo "$as_me:21600: result: $cf_cv_curses_dir" >&5
+echo "$as_me:21619: 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"
@@ -21628,7 +21647,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:21631: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:21650: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -21664,7 +21683,7 @@ if test -n "$cf_cv_curses_dir/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 21667 "configure"
+#line 21686 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -21676,16 +21695,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21679: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21698: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21682: \$? = $ac_status" >&5
+  echo "$as_me:21701: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21685: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21704: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21688: \$? = $ac_status" >&5
+  echo "$as_me:21707: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -21702,7 +21721,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}:21705: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:21724: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -21738,7 +21757,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}:21741: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:21760: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -21757,7 +21776,7 @@ dft_color_style=yes
 case "$cf_cv_screen" in
 (curses)
 
-echo "$as_me:21760: checking for extra include directories" >&5
+echo "$as_me:21779: 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
@@ -21783,7 +21802,7 @@ case "$host_os" in
 esac
 
 fi
-echo "$as_me:21786: result: $cf_cv_curses_incdir" >&5
+echo "$as_me:21805: result: $cf_cv_curses_incdir" >&5
 echo "${ECHO_T}$cf_cv_curses_incdir" >&6
 if test "$cf_cv_curses_incdir" != no
 then
@@ -21793,7 +21812,7 @@ then
 
 fi
 
-echo "$as_me:21796: checking if we have identified curses headers" >&5
+echo "$as_me:21815: 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
@@ -21805,7 +21824,7 @@ for cf_header in \
 	curses.h  ncurses/ncurses.h ncurses/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21808 "configure"
+#line 21827 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -21817,16 +21836,16 @@ initscr(); endwin()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21820: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21839: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21823: \$? = $ac_status" >&5
+  echo "$as_me:21842: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21826: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21845: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21829: \$? = $ac_status" >&5
+  echo "$as_me:21848: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -21837,11 +21856,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:21840: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:21859: 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:21844: error: No curses header-files found" >&5
+	{ { echo "$as_me:21863: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -21851,23 +21870,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:21854: checking for $ac_header" >&5
+echo "$as_me:21873: 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 21860 "configure"
+#line 21879 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:21864: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:21883: \"$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:21870: \$? = $ac_status" >&5
+  echo "$as_me:21889: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -21886,7 +21905,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:21889: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:21908: 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
@@ -21896,7 +21915,7 @@ EOF
 fi
 done
 
-echo "$as_me:21899: checking for terminfo header" >&5
+echo "$as_me:21918: 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
@@ -21914,7 +21933,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21917 "configure"
+#line 21936 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -21929,16 +21948,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21932: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21951: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21935: \$? = $ac_status" >&5
+  echo "$as_me:21954: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21938: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21957: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21941: \$? = $ac_status" >&5
+  echo "$as_me:21960: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -21954,7 +21973,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:21957: result: $cf_cv_term_header" >&5
+echo "$as_me:21976: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -21986,7 +22005,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:21989: checking for ncurses version" >&5
+echo "$as_me:22008: 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
@@ -22012,10 +22031,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:22015: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:22034: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:22018: \$? = $ac_status" >&5
+  echo "$as_me:22037: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -22025,7 +22044,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 22028 "configure"
+#line 22047 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22052,15 +22071,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:22055: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22074: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22058: \$? = $ac_status" >&5
+  echo "$as_me:22077: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:22060: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22079: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22063: \$? = $ac_status" >&5
+  echo "$as_me:22082: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -22074,17 +22093,17 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:22077: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:22096: 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:22084: checking if we have identified curses libraries" >&5
+echo "$as_me:22103: 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 22087 "configure"
+#line 22106 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -22096,16 +22115,16 @@ initscr(); endwin()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22099: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22118: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22102: \$? = $ac_status" >&5
+  echo "$as_me:22121: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22105: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22124: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22108: \$? = $ac_status" >&5
+  echo "$as_me:22127: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -22114,13 +22133,13 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-echo "$as_me:22117: result: $cf_result" >&5
+echo "$as_me:22136: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 if test "$cf_result" = no ; then
 case "$host_os" in
 (freebsd*)
-	echo "$as_me:22123: checking for tgoto in -lmytinfo" >&5
+	echo "$as_me:22142: 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
@@ -22128,7 +22147,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22131 "configure"
+#line 22150 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22147,16 +22166,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22150: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22169: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22153: \$? = $ac_status" >&5
+  echo "$as_me:22172: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22156: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22175: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22159: \$? = $ac_status" >&5
+  echo "$as_me:22178: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -22167,7 +22186,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22170: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:22189: 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
 
@@ -22197,7 +22216,7 @@ fi
 	# term.h) for cur_colr
 	if test "x$cf_cv_screen" = "xcurses_colr"
 	then
-		echo "$as_me:22200: checking for initscr in -lcur_colr" >&5
+		echo "$as_me:22219: 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
@@ -22205,7 +22224,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcur_colr  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22208 "configure"
+#line 22227 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22224,16 +22243,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22227: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22246: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22230: \$? = $ac_status" >&5
+  echo "$as_me:22249: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22233: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22252: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22236: \$? = $ac_status" >&5
+  echo "$as_me:22255: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_cur_colr_initscr=yes
 else
@@ -22244,7 +22263,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22247: result: $ac_cv_lib_cur_colr_initscr" >&5
+echo "$as_me:22266: 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
 
@@ -22268,7 +22287,7 @@ LIBS="$cf_add_libs"
 
 else
 
-		echo "$as_me:22271: checking for initscr in -lHcurses" >&5
+		echo "$as_me:22290: 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
@@ -22276,7 +22295,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lHcurses  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22279 "configure"
+#line 22298 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22295,16 +22314,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22298: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22317: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22301: \$? = $ac_status" >&5
+  echo "$as_me:22320: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22304: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22323: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22307: \$? = $ac_status" >&5
+  echo "$as_me:22326: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Hcurses_initscr=yes
 else
@@ -22315,7 +22334,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22318: result: $ac_cv_lib_Hcurses_initscr" >&5
+echo "$as_me:22337: 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
 
@@ -22373,7 +22392,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}:22376: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:22395: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -22402,7 +22421,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}:22405: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:22424: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -22433,7 +22452,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}:22436: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:22455: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -22468,7 +22487,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}:22471: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:22490: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -22512,13 +22531,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:22515: checking for tgoto" >&5
+		echo "$as_me:22534: 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 22521 "configure"
+#line 22540 "configure"
 #include "confdefs.h"
 #define tgoto autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -22549,16 +22568,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22552: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22571: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22555: \$? = $ac_status" >&5
+  echo "$as_me:22574: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22558: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22577: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22561: \$? = $ac_status" >&5
+  echo "$as_me:22580: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_tgoto=yes
 else
@@ -22568,7 +22587,7 @@ ac_cv_func_tgoto=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22571: result: $ac_cv_func_tgoto" >&5
+echo "$as_me:22590: 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
@@ -22577,7 +22596,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:22580: checking for tgoto in -l$cf_term_lib" >&5
+echo "$as_me:22599: 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
@@ -22585,7 +22604,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_term_lib  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22588 "configure"
+#line 22607 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22604,16 +22623,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22607: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22626: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22610: \$? = $ac_status" >&5
+  echo "$as_me:22629: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22613: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22632: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22616: \$? = $ac_status" >&5
+  echo "$as_me:22635: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -22624,7 +22643,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22627: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:22646: 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
 
@@ -22647,10 +22666,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:22650: checking if we can link with $cf_curs_lib library" >&5
+				echo "$as_me:22669: 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 22653 "configure"
+#line 22672 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -22662,16 +22681,16 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22665: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22684: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22668: \$? = $ac_status" >&5
+  echo "$as_me:22687: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22671: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22690: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22674: \$? = $ac_status" >&5
+  echo "$as_me:22693: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -22680,16 +22699,16 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-				echo "$as_me:22683: result: $cf_result" >&5
+				echo "$as_me:22702: 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:22689: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+				echo "$as_me:22708: 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 22692 "configure"
+#line 22711 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -22701,16 +22720,16 @@ initscr(); endwin();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22704: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22723: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22707: \$? = $ac_status" >&5
+  echo "$as_me:22726: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22710: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22729: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22713: \$? = $ac_status" >&5
+  echo "$as_me:22732: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=no
 else
@@ -22719,7 +22738,7 @@ cat "conftest.$ac_ext" >&5
 
 					LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
 					cat >"conftest.$ac_ext" <<_ACEOF
-#line 22722 "configure"
+#line 22741 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -22731,16 +22750,16 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22734: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22753: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22737: \$? = $ac_status" >&5
+  echo "$as_me:22756: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22740: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22759: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22743: \$? = $ac_status" >&5
+  echo "$as_me:22762: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -22752,19 +22771,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:22755: result: $cf_result" >&5
+				echo "$as_me:22774: 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:22761: error: no curses library found" >&5
+	test "$cf_curs_lib" = unknown && { { echo "$as_me:22780: error: no curses library found" >&5
 echo "$as_me: error: no curses library found" >&2;}
    { (exit 1); exit 1; }; }
 fi
 fi
 
-echo "$as_me:22767: checking for curses performance tradeoff" >&5
+echo "$as_me:22786: 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
@@ -22772,7 +22791,7 @@ else
 
     cf_cv_curs_performance=no
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 22775 "configure"
+#line 22794 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -22791,20 +22810,20 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22794: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22813: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22797: \$? = $ac_status" >&5
+  echo "$as_me:22816: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22800: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22819: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22803: \$? = $ac_status" >&5
+  echo "$as_me:22822: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 22807 "configure"
+#line 22826 "configure"
 #include "confdefs.h"
 
 #define CURS_PERFORMANCE
@@ -22824,16 +22843,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22827: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22846: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22830: \$? = $ac_status" >&5
+  echo "$as_me:22849: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22833: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22852: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22836: \$? = $ac_status" >&5
+  echo "$as_me:22855: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curs_performance=yes
 else
@@ -22848,21 +22867,21 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:22851: result: $cf_cv_curs_performance" >&5
+echo "$as_me:22870: 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:22858: checking for curses touchline function" >&5
+echo "$as_me:22877: 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 22865 "configure"
+#line 22884 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -22875,23 +22894,23 @@ touchline(stdscr, 1,2,3);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22878: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22897: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22881: \$? = $ac_status" >&5
+  echo "$as_me:22900: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22884: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22903: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22887: \$? = $ac_status" >&5
+  echo "$as_me:22906: \$? = $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 22894 "configure"
+#line 22913 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -22904,16 +22923,16 @@ touchline(stdscr, 1,2);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22907: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22926: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22910: \$? = $ac_status" >&5
+  echo "$as_me:22929: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22913: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22932: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22916: \$? = $ac_status" >&5
+  echo "$as_me:22935: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curs_touchline=sysv
 else
@@ -22925,7 +22944,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:22928: result: $cf_cv_curs_touchline" >&5
+echo "$as_me:22947: result: $cf_cv_curs_touchline" >&5
 echo "${ECHO_T}$cf_cv_curs_touchline" >&6
 case "$cf_cv_curs_touchline" in
 (bsd)
@@ -22950,23 +22969,23 @@ esac
 for ac_header in wchar.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22953: checking for $ac_header" >&5
+echo "$as_me:22972: 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 22959 "configure"
+#line 22978 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22963: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22982: \"$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:22969: \$? = $ac_status" >&5
+  echo "$as_me:22988: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22985,7 +23004,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:22988: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:23007: 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
@@ -22995,7 +23014,7 @@ EOF
 fi
 done
 
-echo "$as_me:22998: checking for multibyte character support" >&5
+echo "$as_me:23017: 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
@@ -23003,7 +23022,7 @@ else
 
 	cf_save_LIBS="$LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 23006 "configure"
+#line 23025 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -23020,16 +23039,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23023: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23042: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23026: \$? = $ac_status" >&5
+  echo "$as_me:23045: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23029: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23048: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23032: \$? = $ac_status" >&5
+  echo "$as_me:23051: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_utf8_lib=yes
 else
@@ -23041,12 +23060,12 @@ cat "conftest.$ac_ext" >&5
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
-echo "${as_me:-configure}:23044: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:23063: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23049 "configure"
+#line 23068 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -23059,16 +23078,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23062: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23081: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23065: \$? = $ac_status" >&5
+  echo "$as_me:23084: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23068: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23087: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23071: \$? = $ac_status" >&5
+  echo "$as_me:23090: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -23082,7 +23101,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lutf8  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23085 "configure"
+#line 23104 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -23095,16 +23114,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23098: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23117: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23101: \$? = $ac_status" >&5
+  echo "$as_me:23120: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23104: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23123: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23107: \$? = $ac_status" >&5
+  echo "$as_me:23126: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -23121,9 +23140,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
 
-echo "${as_me:-configure}:23124: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:23143: testing find linkage for utf8 library ..." 1>&5
 
-echo "${as_me:-configure}:23126: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:23145: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -23214,7 +23233,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}:23217: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:23236: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -23222,7 +23241,7 @@ echo "${as_me:-configure}:23217: testing ... testing $cf_cv_header_path_utf8 ...
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 23225 "configure"
+#line 23244 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -23235,21 +23254,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23238: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23257: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23241: \$? = $ac_status" >&5
+  echo "$as_me:23260: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23244: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23263: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23247: \$? = $ac_status" >&5
+  echo "$as_me:23266: \$? = $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}:23252: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:23271: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
 
 				cf_cv_find_linkage_utf8=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -23267,7 +23286,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
-echo "${as_me:-configure}:23270: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:23289: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -23342,13 +23361,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}:23345: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:23364: 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 23351 "configure"
+#line 23370 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -23361,21 +23380,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23364: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23383: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23367: \$? = $ac_status" >&5
+  echo "$as_me:23386: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23370: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23389: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23373: \$? = $ac_status" >&5
+  echo "$as_me:23392: \$? = $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}:23378: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:23397: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
 
 					cf_cv_find_linkage_utf8=yes
 					cf_cv_library_file_utf8="-lutf8"
@@ -23417,7 +23436,7 @@ fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:23420: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:23439: 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
@@ -23455,7 +23474,7 @@ if test -n "$cf_cv_header_path_utf8" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 23458 "configure"
+#line 23477 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -23467,16 +23486,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23470: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23489: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23473: \$? = $ac_status" >&5
+  echo "$as_me:23492: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23476: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23495: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23479: \$? = $ac_status" >&5
+  echo "$as_me:23498: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -23493,7 +23512,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}:23496: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:23515: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -23529,7 +23548,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}:23532: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:23551: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -23559,13 +23578,13 @@ cf_ncuconfig_root=$cf_cv_screen
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:23562: checking pkg-config for $cf_ncuconfig_root" >&5
+	echo "$as_me:23581: 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:23565: result: yes" >&5
+		echo "$as_me:23584: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:23568: checking if the $cf_ncuconfig_root package files work" >&5
+		echo "$as_me:23587: 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
 
@@ -23698,7 +23717,7 @@ done
 LIBS="$cf_add_libs"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 23701 "configure"
+#line 23720 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -23710,37 +23729,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23713: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23732: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23716: \$? = $ac_status" >&5
+  echo "$as_me:23735: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23719: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23738: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23722: \$? = $ac_status" >&5
+  echo "$as_me:23741: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23728 "configure"
+#line 23747 "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:23735: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23754: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23738: \$? = $ac_status" >&5
+  echo "$as_me:23757: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23740: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23759: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23743: \$? = $ac_status" >&5
+  echo "$as_me:23762: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_test_ncuconfig=yes
 else
@@ -23914,7 +23933,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 23917 "configure"
+#line 23936 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -23926,37 +23945,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23929: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23948: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23932: \$? = $ac_status" >&5
+  echo "$as_me:23951: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23935: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23954: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23938: \$? = $ac_status" >&5
+  echo "$as_me:23957: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23944 "configure"
+#line 23963 "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:23951: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23970: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23954: \$? = $ac_status" >&5
+  echo "$as_me:23973: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23956: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23975: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23959: \$? = $ac_status" >&5
+  echo "$as_me:23978: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -23973,7 +23992,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:23976: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:23995: 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"
@@ -23989,7 +24008,7 @@ EOF
 
 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
-echo "$as_me:23992: checking for terminfo header" >&5
+echo "$as_me:24011: 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
@@ -24007,7 +24026,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 24010 "configure"
+#line 24029 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -24022,16 +24041,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24025: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24044: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24028: \$? = $ac_status" >&5
+  echo "$as_me:24047: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24031: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24050: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24034: \$? = $ac_status" >&5
+  echo "$as_me:24053: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -24047,7 +24066,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:24050: result: $cf_cv_term_header" >&5
+echo "$as_me:24069: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -24082,7 +24101,7 @@ esac
 		fi
 
 	else
-		echo "$as_me:24085: result: no" >&5
+		echo "$as_me:24104: result: no" >&5
 echo "${ECHO_T}no" >&6
 		NCURSES_CONFIG_PKG=none
 	fi
@@ -24098,7 +24117,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:24101: checking for $ac_word" >&5
+echo "$as_me:24120: 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
@@ -24113,7 +24132,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:24116: found $ac_dir/$ac_word" >&5
+echo "$as_me:24135: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -24121,10 +24140,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:24124: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:24143: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:24127: result: no" >&5
+  echo "$as_me:24146: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -24137,7 +24156,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:24140: checking for $ac_word" >&5
+echo "$as_me:24159: 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
@@ -24152,7 +24171,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:24155: found $ac_dir/$ac_word" >&5
+echo "$as_me:24174: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -24160,10 +24179,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:24163: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:24182: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:24166: result: no" >&5
+  echo "$as_me:24185: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -24320,7 +24339,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:24323: checking if we have identified curses headers" >&5
+echo "$as_me:24342: 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
@@ -24332,7 +24351,7 @@ for cf_header in \
 	curses.h $cf_cv_screen/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 24335 "configure"
+#line 24354 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -24344,16 +24363,16 @@ initscr(); endwin()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24347: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24366: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24350: \$? = $ac_status" >&5
+  echo "$as_me:24369: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24353: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24372: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24356: \$? = $ac_status" >&5
+  echo "$as_me:24375: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -24364,11 +24383,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:24367: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:24386: 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:24371: error: No curses header-files found" >&5
+	{ { echo "$as_me:24390: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -24378,23 +24397,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:24381: checking for $ac_header" >&5
+echo "$as_me:24400: 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 24387 "configure"
+#line 24406 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:24391: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:24410: \"$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:24397: \$? = $ac_status" >&5
+  echo "$as_me:24416: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -24413,7 +24432,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:24416: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:24435: 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
@@ -24469,7 +24488,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 24472 "configure"
+#line 24491 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24481,16 +24500,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24484: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24503: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24487: \$? = $ac_status" >&5
+  echo "$as_me:24506: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24490: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24509: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24493: \$? = $ac_status" >&5
+  echo "$as_me:24512: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -24507,7 +24526,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}:24510: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24529: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24526,7 +24545,7 @@ fi
 
 }
 
-echo "$as_me:24529: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:24548: 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
@@ -24538,7 +24557,7 @@ else
 	do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24541 "configure"
+#line 24560 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -24562,16 +24581,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24565: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24584: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24568: \$? = $ac_status" >&5
+  echo "$as_me:24587: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24571: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24590: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24574: \$? = $ac_status" >&5
+  echo "$as_me:24593: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -24586,14 +24605,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 
 fi
-echo "$as_me:24589: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:24608: 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:24596: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:24615: 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
@@ -24714,7 +24733,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 24717 "configure"
+#line 24736 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24726,16 +24745,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24729: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24748: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24732: \$? = $ac_status" >&5
+  echo "$as_me:24751: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24735: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24754: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24738: \$? = $ac_status" >&5
+  echo "$as_me:24757: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -24752,7 +24771,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}:24755: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24774: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24775,7 +24794,7 @@ fi
 		do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24778 "configure"
+#line 24797 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -24799,16 +24818,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24802: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24821: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24805: \$? = $ac_status" >&5
+  echo "$as_me:24824: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24808: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24827: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24811: \$? = $ac_status" >&5
+  echo "$as_me:24830: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -24829,12 +24848,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:24832: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:24851: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:24837: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:24856: 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%/[^/]*$%%'`
@@ -24870,7 +24889,7 @@ if test -n "$cf_1st_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 24873 "configure"
+#line 24892 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24882,16 +24901,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24885: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24904: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24888: \$? = $ac_status" >&5
+  echo "$as_me:24907: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24891: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24910: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24894: \$? = $ac_status" >&5
+  echo "$as_me:24913: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -24908,7 +24927,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}:24911: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24930: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24956,7 +24975,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:24959: checking for terminfo header" >&5
+echo "$as_me:24978: 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
@@ -24974,7 +24993,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 24977 "configure"
+#line 24996 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -24989,16 +25008,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24992: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25011: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24995: \$? = $ac_status" >&5
+  echo "$as_me:25014: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24998: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25017: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25001: \$? = $ac_status" >&5
+  echo "$as_me:25020: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -25014,7 +25033,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:25017: result: $cf_cv_term_header" >&5
+echo "$as_me:25036: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -25052,7 +25071,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:25055: checking for ncurses version" >&5
+echo "$as_me:25074: 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
@@ -25078,10 +25097,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:25081: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:25100: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:25084: \$? = $ac_status" >&5
+  echo "$as_me:25103: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -25091,7 +25110,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 25094 "configure"
+#line 25113 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -25118,15 +25137,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:25121: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25140: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25124: \$? = $ac_status" >&5
+  echo "$as_me:25143: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:25126: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25145: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25129: \$? = $ac_status" >&5
+  echo "$as_me:25148: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -25140,7 +25159,7 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:25143: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:25162: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -25153,7 +25172,7 @@ cf_nculib_root=$cf_cv_screen
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:25156: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:25175: 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
@@ -25161,7 +25180,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 25164 "configure"
+#line 25183 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -25180,16 +25199,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25183: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25202: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25186: \$? = $ac_status" >&5
+  echo "$as_me:25205: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25189: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25208: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25192: \$? = $ac_status" >&5
+  echo "$as_me:25211: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -25200,10 +25219,10 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:25203: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:25222: 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:25206: checking for initscr in -lgpm" >&5
+  echo "$as_me:25225: 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
@@ -25211,7 +25230,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 25214 "configure"
+#line 25233 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -25230,16 +25249,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25233: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25252: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25236: \$? = $ac_status" >&5
+  echo "$as_me:25255: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25239: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25258: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25242: \$? = $ac_status" >&5
+  echo "$as_me:25261: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -25250,7 +25269,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:25253: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:25272: 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"
@@ -25265,7 +25284,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:25268: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:25287: 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
@@ -25273,7 +25292,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 25276 "configure"
+#line 25295 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -25292,16 +25311,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25295: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25314: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25298: \$? = $ac_status" >&5
+  echo "$as_me:25317: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25301: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25320: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25304: \$? = $ac_status" >&5
+  echo "$as_me:25323: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -25312,7 +25331,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:25315: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:25334: 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"
@@ -25361,13 +25380,13 @@ else
 
 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
 	cf_libdir=""
-	echo "$as_me:25364: checking for initscr" >&5
+	echo "$as_me:25383: 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 25370 "configure"
+#line 25389 "configure"
 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -25398,16 +25417,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25401: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25420: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25404: \$? = $ac_status" >&5
+  echo "$as_me:25423: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25407: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25426: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25410: \$? = $ac_status" >&5
+  echo "$as_me:25429: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -25417,18 +25436,18 @@ ac_cv_func_initscr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:25420: result: $ac_cv_func_initscr" >&5
+echo "$as_me:25439: 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:25427: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:25446: 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 25431 "configure"
+#line 25450 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -25440,25 +25459,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25443: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25462: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25446: \$? = $ac_status" >&5
+  echo "$as_me:25465: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25449: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25468: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25452: \$? = $ac_status" >&5
+  echo "$as_me:25471: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:25454: result: yes" >&5
+  echo "$as_me:25473: 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:25461: result: no" >&5
+echo "$as_me:25480: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -25526,11 +25545,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:25529: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:25548: 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 25533 "configure"
+#line 25552 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -25542,25 +25561,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25545: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25564: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25548: \$? = $ac_status" >&5
+  echo "$as_me:25567: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25551: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25570: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25554: \$? = $ac_status" >&5
+  echo "$as_me:25573: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:25556: result: yes" >&5
+  echo "$as_me:25575: 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:25563: result: no" >&5
+echo "$as_me:25582: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -25575,7 +25594,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:25578: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:25597: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -25583,7 +25602,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:25586: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:25605: 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
@@ -25593,7 +25612,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25596 "configure"
+#line 25615 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -25605,23 +25624,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25608: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25627: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25611: \$? = $ac_status" >&5
+  echo "$as_me:25630: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25614: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25633: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25617: \$? = $ac_status" >&5
+  echo "$as_me:25636: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:25619: result: yes" >&5
+  echo "$as_me:25638: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:25624: result: no" >&5
+echo "$as_me:25643: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -25647,13 +25666,13 @@ cf_ncuconfig_root=$cf_cv_screen
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:25650: checking pkg-config for $cf_ncuconfig_root" >&5
+	echo "$as_me:25669: 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:25653: result: yes" >&5
+		echo "$as_me:25672: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:25656: checking if the $cf_ncuconfig_root package files work" >&5
+		echo "$as_me:25675: 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
 
@@ -25786,7 +25805,7 @@ done
 LIBS="$cf_add_libs"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 25789 "configure"
+#line 25808 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -25798,37 +25817,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25801: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25820: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25804: \$? = $ac_status" >&5
+  echo "$as_me:25823: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25807: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25826: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25810: \$? = $ac_status" >&5
+  echo "$as_me:25829: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 25816 "configure"
+#line 25835 "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:25823: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25842: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25826: \$? = $ac_status" >&5
+  echo "$as_me:25845: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:25828: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25847: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25831: \$? = $ac_status" >&5
+  echo "$as_me:25850: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_test_ncuconfig=yes
 else
@@ -26002,7 +26021,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 26005 "configure"
+#line 26024 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -26014,37 +26033,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:26017: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26036: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26020: \$? = $ac_status" >&5
+  echo "$as_me:26039: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:26023: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26042: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26026: \$? = $ac_status" >&5
+  echo "$as_me:26045: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26032 "configure"
+#line 26051 "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:26039: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26058: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26042: \$? = $ac_status" >&5
+  echo "$as_me:26061: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26044: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26063: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26047: \$? = $ac_status" >&5
+  echo "$as_me:26066: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -26061,7 +26080,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:26064: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:26083: 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"
@@ -26077,7 +26096,7 @@ EOF
 
 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
-echo "$as_me:26080: checking for terminfo header" >&5
+echo "$as_me:26099: 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
@@ -26095,7 +26114,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26098 "configure"
+#line 26117 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -26110,16 +26129,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26113: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26132: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26116: \$? = $ac_status" >&5
+  echo "$as_me:26135: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26119: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26138: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26122: \$? = $ac_status" >&5
+  echo "$as_me:26141: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -26135,7 +26154,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:26138: result: $cf_cv_term_header" >&5
+echo "$as_me:26157: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -26170,7 +26189,7 @@ esac
 		fi
 
 	else
-		echo "$as_me:26173: result: no" >&5
+		echo "$as_me:26192: result: no" >&5
 echo "${ECHO_T}no" >&6
 		NCURSES_CONFIG_PKG=none
 	fi
@@ -26186,7 +26205,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:26189: checking for $ac_word" >&5
+echo "$as_me:26208: 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
@@ -26201,7 +26220,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:26204: found $ac_dir/$ac_word" >&5
+echo "$as_me:26223: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -26209,10 +26228,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:26212: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:26231: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:26215: result: no" >&5
+  echo "$as_me:26234: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -26225,7 +26244,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:26228: checking for $ac_word" >&5
+echo "$as_me:26247: 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
@@ -26240,7 +26259,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:26243: found $ac_dir/$ac_word" >&5
+echo "$as_me:26262: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -26248,10 +26267,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:26251: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:26270: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:26254: result: no" >&5
+  echo "$as_me:26273: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -26408,7 +26427,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:26411: checking if we have identified curses headers" >&5
+echo "$as_me:26430: 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
@@ -26420,7 +26439,7 @@ for cf_header in \
 	curses.h $cf_cv_screen/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26423 "configure"
+#line 26442 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -26432,16 +26451,16 @@ initscr(); endwin()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26435: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26454: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26438: \$? = $ac_status" >&5
+  echo "$as_me:26457: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26441: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26460: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26444: \$? = $ac_status" >&5
+  echo "$as_me:26463: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -26452,11 +26471,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:26455: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:26474: 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:26459: error: No curses header-files found" >&5
+	{ { echo "$as_me:26478: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -26466,23 +26485,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:26469: checking for $ac_header" >&5
+echo "$as_me:26488: 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 26475 "configure"
+#line 26494 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:26479: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:26498: \"$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:26485: \$? = $ac_status" >&5
+  echo "$as_me:26504: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -26501,7 +26520,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:26504: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:26523: 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
@@ -26557,7 +26576,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 26560 "configure"
+#line 26579 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -26569,16 +26588,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26572: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26591: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26575: \$? = $ac_status" >&5
+  echo "$as_me:26594: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26578: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26597: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26581: \$? = $ac_status" >&5
+  echo "$as_me:26600: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -26595,7 +26614,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}:26598: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:26617: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -26614,7 +26633,7 @@ fi
 
 }
 
-echo "$as_me:26617: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:26636: 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
@@ -26626,7 +26645,7 @@ else
 	do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26629 "configure"
+#line 26648 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -26650,16 +26669,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26653: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26672: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26656: \$? = $ac_status" >&5
+  echo "$as_me:26675: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26659: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26678: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26662: \$? = $ac_status" >&5
+  echo "$as_me:26681: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -26674,14 +26693,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 
 fi
-echo "$as_me:26677: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:26696: 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:26684: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:26703: 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
@@ -26802,7 +26821,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 26805 "configure"
+#line 26824 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -26814,16 +26833,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26817: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26836: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26820: \$? = $ac_status" >&5
+  echo "$as_me:26839: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26823: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26842: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26826: \$? = $ac_status" >&5
+  echo "$as_me:26845: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -26840,7 +26859,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}:26843: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:26862: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -26863,7 +26882,7 @@ fi
 		do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26866 "configure"
+#line 26885 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -26887,16 +26906,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26890: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26909: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26893: \$? = $ac_status" >&5
+  echo "$as_me:26912: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26896: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26915: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26899: \$? = $ac_status" >&5
+  echo "$as_me:26918: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -26917,12 +26936,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:26920: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:26939: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:26925: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:26944: 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%/[^/]*$%%'`
@@ -26958,7 +26977,7 @@ if test -n "$cf_1st_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 26961 "configure"
+#line 26980 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -26970,16 +26989,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26973: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26992: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26976: \$? = $ac_status" >&5
+  echo "$as_me:26995: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26979: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26998: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26982: \$? = $ac_status" >&5
+  echo "$as_me:27001: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -26996,7 +27015,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}:26999: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:27018: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -27044,7 +27063,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:27047: checking for terminfo header" >&5
+echo "$as_me:27066: 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
@@ -27062,7 +27081,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 27065 "configure"
+#line 27084 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -27077,16 +27096,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27080: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27099: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27083: \$? = $ac_status" >&5
+  echo "$as_me:27102: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27086: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27105: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27089: \$? = $ac_status" >&5
+  echo "$as_me:27108: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -27102,7 +27121,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:27105: result: $cf_cv_term_header" >&5
+echo "$as_me:27124: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -27140,7 +27159,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:27143: checking for ncurses version" >&5
+echo "$as_me:27162: 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
@@ -27166,10 +27185,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:27169: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:27188: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:27172: \$? = $ac_status" >&5
+  echo "$as_me:27191: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -27179,7 +27198,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27182 "configure"
+#line 27201 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -27206,15 +27225,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:27209: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27228: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27212: \$? = $ac_status" >&5
+  echo "$as_me:27231: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:27214: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27233: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27217: \$? = $ac_status" >&5
+  echo "$as_me:27236: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -27228,7 +27247,7 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:27231: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:27250: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -27241,7 +27260,7 @@ cf_nculib_root=$cf_cv_screen
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:27244: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:27263: 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
@@ -27249,7 +27268,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 27252 "configure"
+#line 27271 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -27268,16 +27287,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:27271: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27290: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27274: \$? = $ac_status" >&5
+  echo "$as_me:27293: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:27277: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27296: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27280: \$? = $ac_status" >&5
+  echo "$as_me:27299: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -27288,10 +27307,10 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:27291: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:27310: 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:27294: checking for initscr in -lgpm" >&5
+  echo "$as_me:27313: 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
@@ -27299,7 +27318,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 27302 "configure"
+#line 27321 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -27318,16 +27337,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:27321: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27340: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27324: \$? = $ac_status" >&5
+  echo "$as_me:27343: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:27327: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27346: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27330: \$? = $ac_status" >&5
+  echo "$as_me:27349: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -27338,7 +27357,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:27341: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:27360: 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"
@@ -27353,7 +27372,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:27356: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:27375: 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
@@ -27361,7 +27380,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 27364 "configure"
+#line 27383 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -27380,16 +27399,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:27383: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27402: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27386: \$? = $ac_status" >&5
+  echo "$as_me:27405: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:27389: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27408: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27392: \$? = $ac_status" >&5
+  echo "$as_me:27411: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -27400,7 +27419,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:27403: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:27422: 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"
@@ -27449,13 +27468,13 @@ else
 
 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
 	cf_libdir=""
-	echo "$as_me:27452: checking for initscr" >&5
+	echo "$as_me:27471: 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 27458 "configure"
+#line 27477 "configure"
 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -27486,16 +27505,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:27489: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27508: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27492: \$? = $ac_status" >&5
+  echo "$as_me:27511: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:27495: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27514: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27498: \$? = $ac_status" >&5
+  echo "$as_me:27517: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -27505,18 +27524,18 @@ ac_cv_func_initscr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:27508: result: $ac_cv_func_initscr" >&5
+echo "$as_me:27527: 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:27515: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:27534: 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 27519 "configure"
+#line 27538 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -27528,25 +27547,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:27531: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27550: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27534: \$? = $ac_status" >&5
+  echo "$as_me:27553: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:27537: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27556: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27540: \$? = $ac_status" >&5
+  echo "$as_me:27559: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:27542: result: yes" >&5
+  echo "$as_me:27561: 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:27549: result: no" >&5
+echo "$as_me:27568: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -27614,11 +27633,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:27617: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:27636: 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 27621 "configure"
+#line 27640 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -27630,25 +27649,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:27633: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27652: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27636: \$? = $ac_status" >&5
+  echo "$as_me:27655: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:27639: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27658: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27642: \$? = $ac_status" >&5
+  echo "$as_me:27661: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:27644: result: yes" >&5
+  echo "$as_me:27663: 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:27651: result: no" >&5
+echo "$as_me:27670: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -27663,7 +27682,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:27666: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:27685: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -27671,7 +27690,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:27674: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:27693: 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
@@ -27681,7 +27700,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 27684 "configure"
+#line 27703 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -27693,23 +27712,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:27696: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27715: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27699: \$? = $ac_status" >&5
+  echo "$as_me:27718: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:27702: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27721: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27705: \$? = $ac_status" >&5
+  echo "$as_me:27724: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:27707: result: yes" >&5
+  echo "$as_me:27726: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:27712: result: no" >&5
+echo "$as_me:27731: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -27741,7 +27760,7 @@ fi
 	;;
 (slang)
 
-echo "$as_me:27744: checking for slang header file" >&5
+echo "$as_me:27763: 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
@@ -27749,7 +27768,7 @@ else
 
 	cf_cv_slang_header=no
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 27752 "configure"
+#line 27771 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -27761,16 +27780,16 @@ printf("%s\\n", SLANG_VERSION_STRING)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27764: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27783: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27767: \$? = $ac_status" >&5
+  echo "$as_me:27786: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27770: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27789: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27773: \$? = $ac_status" >&5
+  echo "$as_me:27792: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_slang_header=predefined
 else
@@ -27875,7 +27894,7 @@ cf_search="$cf_search $cf_header_path_list"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:27878: result: $cf_cv_slang_header" >&5
+echo "$as_me:27897: result: $cf_cv_slang_header" >&5
 echo "${ECHO_T}$cf_cv_slang_header" >&6
 
 if test "x$cf_cv_slang_header" != xno
@@ -27919,7 +27938,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 27922 "configure"
+#line 27941 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -27931,16 +27950,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27934: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27953: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27937: \$? = $ac_status" >&5
+  echo "$as_me:27956: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27940: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27959: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27943: \$? = $ac_status" >&5
+  echo "$as_me:27962: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -27957,7 +27976,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}:27960: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:27979: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -27989,7 +28008,7 @@ else
 
 cf_cv_termlib=none
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 27992 "configure"
+#line 28011 "configure"
 #include "confdefs.h"
 extern char *tgoto(const char*,int,int);
 int
@@ -28001,19 +28020,19 @@ char *x=tgoto("",0,0); (void)x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28004: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28023: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28007: \$? = $ac_status" >&5
+  echo "$as_me:28026: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28010: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28029: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28013: \$? = $ac_status" >&5
+  echo "$as_me:28032: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 28016 "configure"
+#line 28035 "configure"
 #include "confdefs.h"
 extern char *tigetstr(const char *);
 int
@@ -28025,16 +28044,16 @@ char *x=tigetstr(""); (void)x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28028: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28047: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28031: \$? = $ac_status" >&5
+  echo "$as_me:28050: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28034: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28053: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28037: \$? = $ac_status" >&5
+  echo "$as_me:28056: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_termlib=terminfo
 else
@@ -28045,7 +28064,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}:28048: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
+echo "${as_me:-configure}:28067: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
 
 else
   echo "$as_me: failed program was:" >&5
@@ -28060,10 +28079,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:28063: checking for $cf_func in -l$cf_lib" >&5
+			echo "$as_me:28082: 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 28066 "configure"
+#line 28085 "configure"
 #include "confdefs.h"
 extern char *$cf_func(const char *);
 int
@@ -28075,16 +28094,16 @@ char *x = $cf_func(""); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28078: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28097: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28081: \$? = $ac_status" >&5
+  echo "$as_me:28100: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28084: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28103: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28087: \$? = $ac_status" >&5
+  echo "$as_me:28106: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -28093,7 +28112,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-			echo "$as_me:28096: result: $cf_result" >&5
+			echo "$as_me:28115: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				if test "$cf_func" = tigetstr ; then
@@ -28110,7 +28129,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:28113: checking for initscr in -lcurses" >&5
+	echo "$as_me:28132: 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
@@ -28118,7 +28137,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 28121 "configure"
+#line 28140 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -28137,16 +28156,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28140: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28159: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28143: \$? = $ac_status" >&5
+  echo "$as_me:28162: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28146: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28165: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28149: \$? = $ac_status" >&5
+  echo "$as_me:28168: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_curses_initscr=yes
 else
@@ -28157,7 +28176,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:28160: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:28179: 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
 
@@ -28179,7 +28198,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-	echo "$as_me:28182: checking for tgoto in -ltermcap" >&5
+	echo "$as_me:28201: 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
@@ -28187,7 +28206,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 28190 "configure"
+#line 28209 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -28206,16 +28225,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28209: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28228: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28212: \$? = $ac_status" >&5
+  echo "$as_me:28231: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28215: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28234: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28218: \$? = $ac_status" >&5
+  echo "$as_me:28237: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_termcap_tgoto=yes
 else
@@ -28226,7 +28245,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:28229: result: $ac_cv_lib_termcap_tgoto" >&5
+echo "$as_me:28248: 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
 
@@ -28253,20 +28272,20 @@ fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 if test "$cf_cv_termlib" = none; then
-	{ echo "$as_me:28256: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
+	{ echo "$as_me:28275: 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:28263: checking for acos" >&5
+echo "$as_me:28282: 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 28269 "configure"
+#line 28288 "configure"
 #include "confdefs.h"
 #define acos autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -28297,16 +28316,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28300: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28319: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28303: \$? = $ac_status" >&5
+  echo "$as_me:28322: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28306: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28325: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28309: \$? = $ac_status" >&5
+  echo "$as_me:28328: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_acos=yes
 else
@@ -28316,13 +28335,13 @@ ac_cv_func_acos=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:28319: result: $ac_cv_func_acos" >&5
+echo "$as_me:28338: 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:28325: checking for acos in -lm" >&5
+echo "$as_me:28344: 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
@@ -28330,7 +28349,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm $LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 28333 "configure"
+#line 28352 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -28349,16 +28368,16 @@ acos ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28352: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28371: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28355: \$? = $ac_status" >&5
+  echo "$as_me:28374: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28358: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28377: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28361: \$? = $ac_status" >&5
+  echo "$as_me:28380: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_m_acos=yes
 else
@@ -28369,7 +28388,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:28372: result: $ac_cv_lib_m_acos" >&5
+echo "$as_me:28391: 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
 
@@ -28395,13 +28414,13 @@ case "$host_os" in
 
 	eval 'cf_cv_have_lib_'"video"'=no'
 	cf_libdir=""
-	echo "$as_me:28398: checking for v_init" >&5
+	echo "$as_me:28417: 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 28404 "configure"
+#line 28423 "configure"
 #include "confdefs.h"
 #define v_init autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -28432,16 +28451,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28435: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28454: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28438: \$? = $ac_status" >&5
+  echo "$as_me:28457: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28441: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28460: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28444: \$? = $ac_status" >&5
+  echo "$as_me:28463: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_v_init=yes
 else
@@ -28451,18 +28470,18 @@ ac_cv_func_v_init=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:28454: result: $ac_cv_func_v_init" >&5
+echo "$as_me:28473: 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:28461: checking for v_init in -lvideo" >&5
+		echo "$as_me:28480: 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 28465 "configure"
+#line 28484 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -28474,25 +28493,25 @@ v_init()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28477: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28496: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28480: \$? = $ac_status" >&5
+  echo "$as_me:28499: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28483: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28502: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28486: \$? = $ac_status" >&5
+  echo "$as_me:28505: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:28488: result: yes" >&5
+  echo "$as_me:28507: 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:28495: result: no" >&5
+echo "$as_me:28514: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -28560,11 +28579,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:28563: checking for -lvideo in $cf_libdir" >&5
+				echo "$as_me:28582: 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 28567 "configure"
+#line 28586 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -28576,25 +28595,25 @@ v_init()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28579: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28598: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28582: \$? = $ac_status" >&5
+  echo "$as_me:28601: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28585: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28604: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28588: \$? = $ac_status" >&5
+  echo "$as_me:28607: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:28590: result: yes" >&5
+  echo "$as_me:28609: 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:28597: result: no" >&5
+echo "$as_me:28616: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -28609,7 +28628,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"video"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:28612: error: Cannot link video library" >&5
+	{ { echo "$as_me:28631: error: Cannot link video library" >&5
 echo "$as_me: error: Cannot link video library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -28619,13 +28638,13 @@ esac
 
 	eval 'cf_cv_have_lib_'"slang"'=no'
 	cf_libdir=""
-	echo "$as_me:28622: checking for SLtt_get_screen_size" >&5
+	echo "$as_me:28641: 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 28628 "configure"
+#line 28647 "configure"
 #include "confdefs.h"
 #define SLtt_get_screen_size autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -28656,16 +28675,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28659: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28678: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28662: \$? = $ac_status" >&5
+  echo "$as_me:28681: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28665: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28684: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28668: \$? = $ac_status" >&5
+  echo "$as_me:28687: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_SLtt_get_screen_size=yes
 else
@@ -28675,18 +28694,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:28678: result: $ac_cv_func_SLtt_get_screen_size" >&5
+echo "$as_me:28697: 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:28685: checking for SLtt_get_screen_size in -lslang" >&5
+		echo "$as_me:28704: 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 28689 "configure"
+#line 28708 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -28698,25 +28717,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28701: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28720: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28704: \$? = $ac_status" >&5
+  echo "$as_me:28723: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28707: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28726: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28710: \$? = $ac_status" >&5
+  echo "$as_me:28729: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:28712: result: yes" >&5
+  echo "$as_me:28731: 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:28719: result: no" >&5
+echo "$as_me:28738: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -28784,11 +28803,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:28787: checking for -lslang in $cf_libdir" >&5
+				echo "$as_me:28806: 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 28791 "configure"
+#line 28810 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -28800,25 +28819,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28803: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28822: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28806: \$? = $ac_status" >&5
+  echo "$as_me:28825: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28809: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28828: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28812: \$? = $ac_status" >&5
+  echo "$as_me:28831: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:28814: result: yes" >&5
+  echo "$as_me:28833: 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:28821: result: no" >&5
+echo "$as_me:28840: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -28833,13 +28852,13 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"slang"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:28836: error: Cannot link slang library" >&5
+	{ { echo "$as_me:28855: 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:28842: checking if we can link slang without termcap" >&5
+echo "$as_me:28861: 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%^.%%'`
@@ -28848,7 +28867,7 @@ else
 fi
 LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s%$cf_exclude%%" -e 's%^.%%'`
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 28851 "configure"
+#line 28870 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -28860,16 +28879,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28863: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28882: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28866: \$? = $ac_status" >&5
+  echo "$as_me:28885: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28869: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28888: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28872: \$? = $ac_status" >&5
+  echo "$as_me:28891: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -28878,13 +28897,13 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-echo "$as_me:28881: result: $cf_result" >&5
+echo "$as_me:28900: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 test "$cf_result" = no && LIBS="$cf_slang_LIBS3"
 
 else
 
-echo "$as_me:28887: checking for slang2 header file" >&5
+echo "$as_me:28906: 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
@@ -28892,7 +28911,7 @@ else
 
 	cf_cv_slang2_header=no
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 28895 "configure"
+#line 28914 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -28904,16 +28923,16 @@ printf("%s\\n", SLANG_VERSION_STRING)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28907: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28926: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28910: \$? = $ac_status" >&5
+  echo "$as_me:28929: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28913: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28932: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28916: \$? = $ac_status" >&5
+  echo "$as_me:28935: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_slang2_header=predefined
 else
@@ -29018,7 +29037,7 @@ cf_search="$cf_search $cf_header_path_list"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:29021: result: $cf_cv_slang2_header" >&5
+echo "$as_me:29040: result: $cf_cv_slang2_header" >&5
 echo "${ECHO_T}$cf_cv_slang2_header" >&6
 
 if test "x$cf_cv_slang2_header" != xno
@@ -29062,7 +29081,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 29065 "configure"
+#line 29084 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -29074,16 +29093,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:29077: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29096: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29080: \$? = $ac_status" >&5
+  echo "$as_me:29099: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:29083: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29102: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29086: \$? = $ac_status" >&5
+  echo "$as_me:29105: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -29100,7 +29119,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}:29103: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:29122: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -29132,7 +29151,7 @@ else
 
 cf_cv_termlib=none
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 29135 "configure"
+#line 29154 "configure"
 #include "confdefs.h"
 extern char *tgoto(const char*,int,int);
 int
@@ -29144,19 +29163,19 @@ char *x=tgoto("",0,0); (void)x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29147: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29166: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29150: \$? = $ac_status" >&5
+  echo "$as_me:29169: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29153: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29172: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29156: \$? = $ac_status" >&5
+  echo "$as_me:29175: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 29159 "configure"
+#line 29178 "configure"
 #include "confdefs.h"
 extern char *tigetstr(const char *);
 int
@@ -29168,16 +29187,16 @@ char *x=tigetstr(""); (void)x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29171: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29190: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29174: \$? = $ac_status" >&5
+  echo "$as_me:29193: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29177: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29196: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29180: \$? = $ac_status" >&5
+  echo "$as_me:29199: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_termlib=terminfo
 else
@@ -29188,7 +29207,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}:29191: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
+echo "${as_me:-configure}:29210: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
 
 else
   echo "$as_me: failed program was:" >&5
@@ -29203,10 +29222,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:29206: checking for $cf_func in -l$cf_lib" >&5
+			echo "$as_me:29225: 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 29209 "configure"
+#line 29228 "configure"
 #include "confdefs.h"
 extern char *$cf_func(const char *);
 int
@@ -29218,16 +29237,16 @@ char *x = $cf_func(""); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29221: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29240: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29224: \$? = $ac_status" >&5
+  echo "$as_me:29243: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29227: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29246: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29230: \$? = $ac_status" >&5
+  echo "$as_me:29249: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -29236,7 +29255,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-			echo "$as_me:29239: result: $cf_result" >&5
+			echo "$as_me:29258: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				if test "$cf_func" = tigetstr ; then
@@ -29253,7 +29272,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:29256: checking for initscr in -lcurses" >&5
+	echo "$as_me:29275: 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
@@ -29261,7 +29280,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 29264 "configure"
+#line 29283 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -29280,16 +29299,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29283: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29302: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29286: \$? = $ac_status" >&5
+  echo "$as_me:29305: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29289: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29308: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29292: \$? = $ac_status" >&5
+  echo "$as_me:29311: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_curses_initscr=yes
 else
@@ -29300,7 +29319,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:29303: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:29322: 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
 
@@ -29322,7 +29341,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-	echo "$as_me:29325: checking for tgoto in -ltermcap" >&5
+	echo "$as_me:29344: 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
@@ -29330,7 +29349,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 29333 "configure"
+#line 29352 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -29349,16 +29368,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29352: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29371: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29355: \$? = $ac_status" >&5
+  echo "$as_me:29374: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29358: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29377: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29361: \$? = $ac_status" >&5
+  echo "$as_me:29380: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_termcap_tgoto=yes
 else
@@ -29369,7 +29388,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:29372: result: $ac_cv_lib_termcap_tgoto" >&5
+echo "$as_me:29391: 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
 
@@ -29396,20 +29415,20 @@ fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 if test "$cf_cv_termlib" = none; then
-	{ echo "$as_me:29399: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
+	{ echo "$as_me:29418: 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:29406: checking for acos" >&5
+echo "$as_me:29425: 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 29412 "configure"
+#line 29431 "configure"
 #include "confdefs.h"
 #define acos autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -29440,16 +29459,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29443: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29462: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29446: \$? = $ac_status" >&5
+  echo "$as_me:29465: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29449: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29468: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29452: \$? = $ac_status" >&5
+  echo "$as_me:29471: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_acos=yes
 else
@@ -29459,13 +29478,13 @@ ac_cv_func_acos=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:29462: result: $ac_cv_func_acos" >&5
+echo "$as_me:29481: 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:29468: checking for acos in -lm" >&5
+echo "$as_me:29487: 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
@@ -29473,7 +29492,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm $LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 29476 "configure"
+#line 29495 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -29492,16 +29511,16 @@ acos ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29495: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29514: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29498: \$? = $ac_status" >&5
+  echo "$as_me:29517: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29501: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29520: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29504: \$? = $ac_status" >&5
+  echo "$as_me:29523: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_m_acos=yes
 else
@@ -29512,7 +29531,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:29515: result: $ac_cv_lib_m_acos" >&5
+echo "$as_me:29534: 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
 
@@ -29538,13 +29557,13 @@ case "$host_os" in
 
 	eval 'cf_cv_have_lib_'"video"'=no'
 	cf_libdir=""
-	echo "$as_me:29541: checking for v_init" >&5
+	echo "$as_me:29560: 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 29547 "configure"
+#line 29566 "configure"
 #include "confdefs.h"
 #define v_init autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -29575,16 +29594,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29578: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29597: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29581: \$? = $ac_status" >&5
+  echo "$as_me:29600: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29584: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29603: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29587: \$? = $ac_status" >&5
+  echo "$as_me:29606: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_v_init=yes
 else
@@ -29594,18 +29613,18 @@ ac_cv_func_v_init=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:29597: result: $ac_cv_func_v_init" >&5
+echo "$as_me:29616: 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:29604: checking for v_init in -lvideo" >&5
+		echo "$as_me:29623: 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 29608 "configure"
+#line 29627 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -29617,25 +29636,25 @@ v_init()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29620: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29639: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29623: \$? = $ac_status" >&5
+  echo "$as_me:29642: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29626: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29645: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29629: \$? = $ac_status" >&5
+  echo "$as_me:29648: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:29631: result: yes" >&5
+  echo "$as_me:29650: 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:29638: result: no" >&5
+echo "$as_me:29657: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -29703,11 +29722,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:29706: checking for -lvideo in $cf_libdir" >&5
+				echo "$as_me:29725: 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 29710 "configure"
+#line 29729 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -29719,25 +29738,25 @@ v_init()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29722: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29741: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29725: \$? = $ac_status" >&5
+  echo "$as_me:29744: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29728: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29747: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29731: \$? = $ac_status" >&5
+  echo "$as_me:29750: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:29733: result: yes" >&5
+  echo "$as_me:29752: 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:29740: result: no" >&5
+echo "$as_me:29759: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -29752,7 +29771,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"video"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:29755: error: Cannot link video library" >&5
+	{ { echo "$as_me:29774: error: Cannot link video library" >&5
 echo "$as_me: error: Cannot link video library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -29762,13 +29781,13 @@ esac
 
 	eval 'cf_cv_have_lib_'"slang2"'=no'
 	cf_libdir=""
-	echo "$as_me:29765: checking for SLtt_get_screen_size" >&5
+	echo "$as_me:29784: 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 29771 "configure"
+#line 29790 "configure"
 #include "confdefs.h"
 #define SLtt_get_screen_size autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -29799,16 +29818,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29802: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29821: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29805: \$? = $ac_status" >&5
+  echo "$as_me:29824: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29808: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29827: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29811: \$? = $ac_status" >&5
+  echo "$as_me:29830: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_SLtt_get_screen_size=yes
 else
@@ -29818,18 +29837,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:29821: result: $ac_cv_func_SLtt_get_screen_size" >&5
+echo "$as_me:29840: 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:29828: checking for SLtt_get_screen_size in -lslang2" >&5
+		echo "$as_me:29847: 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 29832 "configure"
+#line 29851 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -29841,25 +29860,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29844: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29863: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29847: \$? = $ac_status" >&5
+  echo "$as_me:29866: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29850: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29869: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29853: \$? = $ac_status" >&5
+  echo "$as_me:29872: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:29855: result: yes" >&5
+  echo "$as_me:29874: 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:29862: result: no" >&5
+echo "$as_me:29881: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -29927,11 +29946,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:29930: checking for -lslang2 in $cf_libdir" >&5
+				echo "$as_me:29949: 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 29934 "configure"
+#line 29953 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -29943,25 +29962,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29946: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29965: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29949: \$? = $ac_status" >&5
+  echo "$as_me:29968: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29952: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29971: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29955: \$? = $ac_status" >&5
+  echo "$as_me:29974: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:29957: result: yes" >&5
+  echo "$as_me:29976: 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:29964: result: no" >&5
+echo "$as_me:29983: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -29976,13 +29995,13 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"slang2"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:29979: error: Cannot link slang2 library" >&5
+	{ { echo "$as_me:29998: 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:29985: checking if we can link slang2 without termcap" >&5
+echo "$as_me:30004: 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%^.%%'`
@@ -29991,7 +30010,7 @@ else
 fi
 LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s%$cf_exclude%%" -e 's%^.%%'`
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 29994 "configure"
+#line 30013 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -30003,16 +30022,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:30006: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30025: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30009: \$? = $ac_status" >&5
+  echo "$as_me:30028: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:30012: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30031: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30015: \$? = $ac_status" >&5
+  echo "$as_me:30034: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -30021,12 +30040,12 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-echo "$as_me:30024: result: $cf_result" >&5
+echo "$as_me:30043: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 test "$cf_result" = no && LIBS="$cf_slang_LIBS3"
 
 	else
-		{ { echo "$as_me:30029: error: cannot find slang headers" >&5
+		{ { echo "$as_me:30048: error: cannot find slang headers" >&5
 echo "$as_me: error: cannot find slang headers" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -30034,14 +30053,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:30037: checking if we must define UTF8" >&5
+echo "$as_me:30056: 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 30044 "configure"
+#line 30063 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -30053,16 +30072,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:30056: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30075: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30059: \$? = $ac_status" >&5
+  echo "$as_me:30078: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:30062: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30081: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30065: \$? = $ac_status" >&5
+  echo "$as_me:30084: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_slang_utf8=no
 else
@@ -30070,7 +30089,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 30073 "configure"
+#line 30092 "configure"
 #include "confdefs.h"
 
 #define UTF8
@@ -30084,16 +30103,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:30087: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30106: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30090: \$? = $ac_status" >&5
+  echo "$as_me:30109: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:30093: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30112: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30096: \$? = $ac_status" >&5
+  echo "$as_me:30115: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_slang_utf8=yes
 else
@@ -30106,7 +30125,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:30109: result: $cf_cv_slang_utf8" >&5
+echo "$as_me:30128: result: $cf_cv_slang_utf8" >&5
 echo "${ECHO_T}$cf_cv_slang_utf8" >&6
 
 if test "$cf_cv_slang_utf8" = yes ; then
@@ -30117,14 +30136,14 @@ EOF
 
 fi
 
-echo "$as_me:30120: checking if we must tell slang this is UNIX" >&5
+echo "$as_me:30139: 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 30127 "configure"
+#line 30146 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -30143,16 +30162,16 @@ SLang_TT_Baud_Rate = 1
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:30146: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30165: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30149: \$? = $ac_status" >&5
+  echo "$as_me:30168: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:30152: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30171: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30155: \$? = $ac_status" >&5
+  echo "$as_me:30174: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_slang_unix=yes
 else
@@ -30163,20 +30182,20 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:30166: result: $cf_cv_slang_unix" >&5
+echo "$as_me:30185: 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:30173: checking for SLsmg_Color_Type" >&5
+	echo "$as_me:30192: 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 30179 "configure"
+#line 30198 "configure"
 #include "confdefs.h"
 #include <slang.h>
 
@@ -30192,16 +30211,16 @@ if (sizeof (SLsmg_Color_Type))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:30195: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30214: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30198: \$? = $ac_status" >&5
+  echo "$as_me:30217: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:30201: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30220: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30204: \$? = $ac_status" >&5
+  echo "$as_me:30223: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_SLsmg_Color_Type=yes
 else
@@ -30211,7 +30230,7 @@ ac_cv_type_SLsmg_Color_Type=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:30214: result: $ac_cv_type_SLsmg_Color_Type" >&5
+echo "$as_me:30233: 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
@@ -30227,13 +30246,13 @@ EOF
 
 fi
 
-	echo "$as_me:30230: checking for SLtt_Char_Type" >&5
+	echo "$as_me:30249: 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 30236 "configure"
+#line 30255 "configure"
 #include "confdefs.h"
 #include <slang.h>
 
@@ -30249,16 +30268,16 @@ if (sizeof (SLtt_Char_Type))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:30252: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30271: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30255: \$? = $ac_status" >&5
+  echo "$as_me:30274: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:30258: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30277: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30261: \$? = $ac_status" >&5
+  echo "$as_me:30280: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_SLtt_Char_Type=yes
 else
@@ -30268,7 +30287,7 @@ ac_cv_type_SLtt_Char_Type=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:30271: result: $ac_cv_type_SLtt_Char_Type" >&5
+echo "$as_me:30290: 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
@@ -30291,7 +30310,7 @@ esac
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then
-	echo "$as_me:30294: checking for an rpath option" >&5
+	echo "$as_me:30313: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	case "$cf_cv_system_name" in
 	(irix*)
@@ -30322,12 +30341,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	(*)
 		;;
 	esac
-	echo "$as_me:30325: result: $LD_RPATH_OPT" >&5
+	echo "$as_me:30344: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 	case "x$LD_RPATH_OPT" in
 	(x-R*)
-		echo "$as_me:30330: checking if we need a space after rpath option" >&5
+		echo "$as_me:30349: 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"
 
@@ -30348,7 +30367,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 30351 "configure"
+#line 30370 "configure"
 #include "confdefs.h"
 
 int
@@ -30360,16 +30379,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:30363: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30382: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30366: \$? = $ac_status" >&5
+  echo "$as_me:30385: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:30369: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30388: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30372: \$? = $ac_status" >&5
+  echo "$as_me:30391: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_space=no
 else
@@ -30379,7 +30398,7 @@ cf_rpath_space=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 		LIBS="$cf_save_LIBS"
-		echo "$as_me:30382: result: $cf_rpath_space" >&5
+		echo "$as_me:30401: result: $cf_rpath_space" >&5
 echo "${ECHO_T}$cf_rpath_space" >&6
 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
 		;;
@@ -30390,13 +30409,13 @@ if test -z "$LD_RPATH_OPT"
 then
 	test -n "$verbose" && echo "	will not attempt to use rpath" 1>&6
 
-echo "${as_me:-configure}:30393: testing will not attempt to use rpath ..." 1>&5
+echo "${as_me:-configure}:30412: 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}:30399: testing rpath is disabled ..." 1>&5
+echo "${as_me:-configure}:30418: testing rpath is disabled ..." 1>&5
 
 elif test -z "${LD_RUN_PATH}${LD_LIBRARY_PATH}"
 then
@@ -30407,7 +30426,7 @@ if test "$cross_compiling" = yes; then
   cf_check_run=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 30410 "configure"
+#line 30429 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int main(void) {
@@ -30416,15 +30435,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:30419: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30438: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30422: \$? = $ac_status" >&5
+  echo "$as_me:30441: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:30424: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30443: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30427: \$? = $ac_status" >&5
+  echo "$as_me:30446: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_check_run=yes
 else
@@ -30440,7 +30459,7 @@ fi
 		then
 			test -n "$verbose" && echo "	linkage is broken" 1>&6
 
-echo "${as_me:-configure}:30443: testing linkage is broken ..." 1>&5
+echo "${as_me:-configure}:30462: testing linkage is broken ..." 1>&5
 
 			cf_result=
 			for cf_item in $LIBS
@@ -30472,7 +30491,7 @@ if test "$cross_compiling" = yes; then
   cf_check_run=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 30475 "configure"
+#line 30494 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int main(void) {
@@ -30481,15 +30500,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:30484: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30503: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30487: \$? = $ac_status" >&5
+  echo "$as_me:30506: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:30489: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30508: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30492: \$? = $ac_status" >&5
+  echo "$as_me:30511: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_check_run=yes
 else
@@ -30505,12 +30524,12 @@ fi
 				then
 					test -n "$verbose" && echo "	use rpath for $cf_save_LIBS" 1>&6
 
-echo "${as_me:-configure}:30508: testing use rpath for $cf_save_LIBS ..." 1>&5
+echo "${as_me:-configure}:30527: 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}:30513: testing result is now $LIBS ..." 1>&5
+echo "${as_me:-configure}:30532: testing result is now $LIBS ..." 1>&5
 
 				else
 					LIBS="$cf_save_LIBS"
@@ -30521,20 +30540,20 @@ echo "${as_me:-configure}:30513: testing result is now $LIBS ..." 1>&5
 	(*)
 		test -n "$verbose" && echo "	will not attempt to use rpath" 1>&6
 
-echo "${as_me:-configure}:30524: testing will not attempt to use rpath ..." 1>&5
+echo "${as_me:-configure}:30543: testing will not attempt to use rpath ..." 1>&5
 
 		;;
 	esac
 fi
 
-echo "$as_me:30530: checking for chtype typedef" >&5
+echo "$as_me:30549: 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 30537 "configure"
+#line 30556 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -30546,16 +30565,16 @@ chtype foo; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:30549: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30568: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30552: \$? = $ac_status" >&5
+  echo "$as_me:30571: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:30555: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30574: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30558: \$? = $ac_status" >&5
+  echo "$as_me:30577: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_chtype_decl=yes
 else
@@ -30565,7 +30584,7 @@ cf_cv_chtype_decl=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:30568: result: $cf_cv_chtype_decl" >&5
+echo "$as_me:30587: result: $cf_cv_chtype_decl" >&5
 echo "${ECHO_T}$cf_cv_chtype_decl" >&6
 if test "$cf_cv_chtype_decl" = yes ; then
 
@@ -30573,14 +30592,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_TYPE_CHTYPE 1
 EOF
 
-	echo "$as_me:30576: checking if chtype is scalar or struct" >&5
+	echo "$as_me:30595: 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 30583 "configure"
+#line 30602 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -30592,16 +30611,16 @@ static chtype foo; long x = foo; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:30595: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30614: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30598: \$? = $ac_status" >&5
+  echo "$as_me:30617: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:30601: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30620: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30604: \$? = $ac_status" >&5
+  echo "$as_me:30623: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_chtype_type=scalar
 else
@@ -30611,7 +30630,7 @@ cf_cv_chtype_type=struct
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:30614: result: $cf_cv_chtype_type" >&5
+echo "$as_me:30633: result: $cf_cv_chtype_type" >&5
 echo "${ECHO_T}$cf_cv_chtype_type" >&6
 	if test "$cf_cv_chtype_type" = scalar ; then
 
@@ -30622,7 +30641,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:30625: checking if you want the wide-curses features" >&5
+echo "$as_me:30644: 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.
@@ -30639,10 +30658,10 @@ else
 	use_wide_curses=$cf_wide_curses
 
 fi;
-echo "$as_me:30642: result: $use_wide_curses" >&5
+echo "$as_me:30661: result: $use_wide_curses" >&5
 echo "${ECHO_T}$use_wide_curses" >&6
 
-echo "$as_me:30645: checking if color-style code should be used" >&5
+echo "$as_me:30664: 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.
@@ -30662,7 +30681,7 @@ fi;
 
 case "$use_color_style" in
 (no)
-	echo "$as_me:30665: result: no" >&5
+	echo "$as_me:30684: result: no" >&5
 echo "${ECHO_T}no" >&6
 	INSTALL_LSS=
 	;;
@@ -30672,10 +30691,10 @@ cat >>confdefs.h <<\EOF
 #define USE_COLOR_STYLE 1
 EOF
 
-	echo "$as_me:30675: result: yes" >&5
+	echo "$as_me:30694: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-	echo "$as_me:30678: checking for location of style-sheet file" >&5
+	echo "$as_me:30697: 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.
@@ -30711,7 +30730,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:30714: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:30733: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -30720,7 +30739,7 @@ esac
 fi
 eval LYNX_LSS_FILE="$withval"
 
-	echo "$as_me:30723: result: $LYNX_LSS_FILE" >&5
+	echo "$as_me:30742: result: $LYNX_LSS_FILE" >&5
 echo "${ECHO_T}$LYNX_LSS_FILE" >&6
 
 	test "$LYNX_LSS_FILE" = no && LYNX_LSS_FILE=
@@ -30733,7 +30752,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:30736: checking for the default configuration-file" >&5
+echo "$as_me:30755: 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.
@@ -30769,7 +30788,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:30772: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:30791: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -30778,7 +30797,7 @@ esac
 fi
 eval LYNX_CFG_FILE="$withval"
 
-echo "$as_me:30781: result: $LYNX_CFG_FILE" >&5
+echo "$as_me:30800: result: $LYNX_CFG_FILE" >&5
 echo "${ECHO_T}$LYNX_CFG_FILE" >&6
 
 test "$LYNX_CFG_FILE" = no && LYNX_CFG_FILE=
@@ -30787,7 +30806,7 @@ cat >>confdefs.h <<EOF
 #define LYNX_CFG_FILE "$LYNX_CFG_FILE"
 EOF
 
-echo "$as_me:30790: checking for the default configuration-path" >&5
+echo "$as_me:30809: 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.
@@ -30823,7 +30842,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:30826: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:30845: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -30832,7 +30851,7 @@ esac
 fi
 eval LYNX_CFG_PATH="$withval"
 
-echo "$as_me:30835: result: $LYNX_CFG_PATH" >&5
+echo "$as_me:30854: 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%/[^/]*$%%'`"
@@ -30842,7 +30861,7 @@ cat >>confdefs.h <<EOF
 #define LYNX_CFG_PATH "$LYNX_CFG_PATH"
 EOF
 
-echo "$as_me:30845: checking if htmlized lynx.cfg should be built" >&5
+echo "$as_me:30864: 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.
@@ -30859,7 +30878,7 @@ else
 	use_htmlized_cfg=no
 
 fi;
-echo "$as_me:30862: result: $use_htmlized_cfg" >&5
+echo "$as_me:30881: result: $use_htmlized_cfg" >&5
 echo "${ECHO_T}$use_htmlized_cfg" >&6
 
 LYNXCFG_MAKE=''
@@ -30870,7 +30889,7 @@ else
 	LYNXCFG_NO_MAKE='#'
 fi
 
-echo "$as_me:30873: checking if local doc directory should be linked to help page" >&5
+echo "$as_me:30892: 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.
@@ -30887,7 +30906,7 @@ else
 	use_local_docs=no
 
 fi;
-echo "$as_me:30890: result: $use_local_docs" >&5
+echo "$as_me:30909: result: $use_local_docs" >&5
 echo "${ECHO_T}$use_local_docs" >&6
 
 LYNXDOC_MAKE=''
@@ -30895,7 +30914,7 @@ if test "$use_local_docs" = no ; then
 	LYNXDOC_MAKE='#'
 fi
 
-echo "$as_me:30898: checking for MIME library directory" >&5
+echo "$as_me:30917: 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.
@@ -30931,7 +30950,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:30934: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:30953: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -30940,7 +30959,7 @@ esac
 fi
 eval MIME_LIBDIR="$withval"
 
-echo "$as_me:30943: result: $MIME_LIBDIR" >&5
+echo "$as_me:30962: result: $MIME_LIBDIR" >&5
 echo "${ECHO_T}$MIME_LIBDIR" >&6
 MIME_LIBDIR=`echo "$MIME_LIBDIR" | sed -e 's,/$,,' -e 's,$,/,'`
 
@@ -30948,7 +30967,7 @@ cat >>confdefs.h <<EOF
 #define MIME_LIBDIR "$MIME_LIBDIR"
 EOF
 
-echo "$as_me:30951: checking if locale-charset selection logic should be used" >&5
+echo "$as_me:30970: 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.
@@ -30965,7 +30984,7 @@ else
 	use_locale_charset=yes
 
 fi;
-echo "$as_me:30968: result: $use_locale_charset" >&5
+echo "$as_me:30987: result: $use_locale_charset" >&5
 echo "${ECHO_T}$use_locale_charset" >&6
 test "$use_locale_charset" != no &&
 cat >>confdefs.h <<\EOF
@@ -30974,7 +30993,7 @@ EOF
 
 CHARSET_DEFS=
 
-echo "$as_me:30977: checking if you want only a few charsets" >&5
+echo "$as_me:30996: 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.
@@ -30986,7 +31005,7 @@ else
 fi;
 
 if test -n "$cf_charsets" ; then
-	echo "$as_me:30989: result: yes" >&5
+	echo "$as_me:31008: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 cat >>confdefs.h <<\EOF
@@ -31000,7 +31019,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}:31003: testing using minimal list of charsets: $cf_min_charsets ..." 1>&5
+echo "${as_me:-configure}:31022: 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'`
@@ -31027,28 +31046,28 @@ echo "${as_me:-configure}:31003: testing using minimal list of charsets: $cf_min
 		then
 			test -n "$verbose" && echo "	found $cf_charset" 1>&6
 
-echo "${as_me:-configure}:31030: testing found $cf_charset ..." 1>&5
+echo "${as_me:-configure}:31049: 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}:31036: testing not found $cf_charset ..." 1>&5
+echo "${as_me:-configure}:31055: testing not found $cf_charset ..." 1>&5
 
 		fi
 	done
 else
-	echo "$as_me:31041: result: no" >&5
+	echo "$as_me:31060: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:31045: checking whether exit is declared" >&5
+echo "$as_me:31064: checking whether exit is declared" >&5
 echo $ECHO_N "checking whether exit is declared... $ECHO_C" >&6
 if test "${ac_cv_have_decl_exit+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 31051 "configure"
+#line 31070 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -31063,16 +31082,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:31066: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31085: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31069: \$? = $ac_status" >&5
+  echo "$as_me:31088: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:31072: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31091: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31075: \$? = $ac_status" >&5
+  echo "$as_me:31094: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_have_decl_exit=yes
 else
@@ -31082,16 +31101,16 @@ ac_cv_have_decl_exit=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:31085: result: $ac_cv_have_decl_exit" >&5
+echo "$as_me:31104: result: $ac_cv_have_decl_exit" >&5
 echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
 
-echo "$as_me:31088: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:31107: 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 31094 "configure"
+#line 31113 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -31107,16 +31126,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:31110: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31129: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31113: \$? = $ac_status" >&5
+  echo "$as_me:31132: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:31116: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31135: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31119: \$? = $ac_status" >&5
+  echo "$as_me:31138: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
@@ -31126,7 +31145,7 @@ ac_cv_header_time=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:31129: result: $ac_cv_header_time" >&5
+echo "$as_me:31148: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -31139,13 +31158,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:31142: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:31161: 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 31148 "configure"
+#line 31167 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -31160,16 +31179,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:31163: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31182: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31166: \$? = $ac_status" >&5
+  echo "$as_me:31185: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:31169: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31188: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31172: \$? = $ac_status" >&5
+  echo "$as_me:31191: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -31179,7 +31198,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:31182: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:31201: 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
@@ -31192,7 +31211,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:31195: checking for opendir in -ldir" >&5
+  echo "$as_me:31214: 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
@@ -31200,7 +31219,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 31203 "configure"
+#line 31222 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -31219,16 +31238,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:31222: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31241: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31225: \$? = $ac_status" >&5
+  echo "$as_me:31244: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:31228: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31247: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31231: \$? = $ac_status" >&5
+  echo "$as_me:31250: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -31239,14 +31258,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:31242: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:31261: 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:31249: checking for opendir in -lx" >&5
+  echo "$as_me:31268: 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
@@ -31254,7 +31273,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 31257 "configure"
+#line 31276 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -31273,16 +31292,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:31276: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31295: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31279: \$? = $ac_status" >&5
+  echo "$as_me:31298: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:31282: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31301: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31285: \$? = $ac_status" >&5
+  echo "$as_me:31304: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -31293,7 +31312,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:31296: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:31315: 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"
@@ -31319,23 +31338,23 @@ for ac_header in \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:31322: checking for $ac_header" >&5
+echo "$as_me:31341: 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 31328 "configure"
+#line 31347 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:31332: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:31351: \"$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:31338: \$? = $ac_status" >&5
+  echo "$as_me:31357: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -31354,7 +31373,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:31357: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:31376: 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
@@ -31364,14 +31383,14 @@ EOF
 fi
 done
 
-echo "$as_me:31367: checking termio.h and termios.h" >&5
+echo "$as_me:31386: 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 31374 "configure"
+#line 31393 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -31390,16 +31409,16 @@ putchar (0x0a)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:31393: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31412: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31396: \$? = $ac_status" >&5
+  echo "$as_me:31415: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:31399: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31418: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31402: \$? = $ac_status" >&5
+  echo "$as_me:31421: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_termio_and_termios=yes
 else
@@ -31410,21 +31429,21 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:31413: result: $cf_cv_termio_and_termios" >&5
+echo "$as_me:31432: 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:31420: checking for sigaction and structs" >&5
+echo "$as_me:31439: 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 31427 "configure"
+#line 31446 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -31444,16 +31463,16 @@ struct sigaction act;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:31447: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31466: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31450: \$? = $ac_status" >&5
+  echo "$as_me:31469: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:31453: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31472: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31456: \$? = $ac_status" >&5
+  echo "$as_me:31475: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_sigaction=yes
 else
@@ -31464,7 +31483,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:31467: result: $cf_cv_func_sigaction" >&5
+echo "$as_me:31486: result: $cf_cv_func_sigaction" >&5
 echo "${ECHO_T}$cf_cv_func_sigaction" >&6
 test "$cf_cv_func_sigaction" = yes &&
 cat >>confdefs.h <<\EOF
@@ -31474,23 +31493,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:31477: checking for $ac_header" >&5
+echo "$as_me:31496: 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 31483 "configure"
+#line 31502 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:31487: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:31506: \"$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:31493: \$? = $ac_status" >&5
+  echo "$as_me:31512: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -31509,7 +31528,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:31512: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:31531: 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
@@ -31530,23 +31549,23 @@ else
 for ac_header in wait.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:31533: checking for $ac_header" >&5
+echo "$as_me:31552: 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 31539 "configure"
+#line 31558 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:31543: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:31562: \"$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:31549: \$? = $ac_status" >&5
+  echo "$as_me:31568: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -31565,7 +31584,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:31568: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:31587: 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
@@ -31578,23 +31597,23 @@ done
 for ac_header in waitstatus.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:31581: checking for $ac_header" >&5
+echo "$as_me:31600: 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 31587 "configure"
+#line 31606 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:31591: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:31610: \"$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:31597: \$? = $ac_status" >&5
+  echo "$as_me:31616: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -31613,7 +31632,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:31616: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:31635: 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
@@ -31635,14 +31654,14 @@ cf_wait_headers="$cf_wait_headers
 fi
 fi
 
-echo "$as_me:31638: checking for union wait" >&5
+echo "$as_me:31657: 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 31645 "configure"
+#line 31664 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -31661,16 +31680,16 @@ static int x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:31664: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31683: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31667: \$? = $ac_status" >&5
+  echo "$as_me:31686: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:31670: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31689: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31673: \$? = $ac_status" >&5
+  echo "$as_me:31692: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_type_unionwait=no
 	 echo compiles ok w/o union wait 1>&5
@@ -31680,7 +31699,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 31683 "configure"
+#line 31702 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -31707,16 +31726,16 @@ union wait x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:31710: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31729: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31713: \$? = $ac_status" >&5
+  echo "$as_me:31732: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:31716: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31735: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31719: \$? = $ac_status" >&5
+  echo "$as_me:31738: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_type_unionwait=yes
 	 echo compiles ok with union wait and possibly macros too 1>&5
@@ -31731,7 +31750,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:31734: result: $cf_cv_type_unionwait" >&5
+echo "$as_me:31753: result: $cf_cv_type_unionwait" >&5
 echo "${ECHO_T}$cf_cv_type_unionwait" >&6
 test "$cf_cv_type_unionwait" = yes &&
 cat >>confdefs.h <<\EOF
@@ -31740,14 +31759,14 @@ EOF
 
 if test "$cf_cv_type_unionwait" = yes; then
 
-	echo "$as_me:31743: checking if union wait can be used as wait-arg" >&5
+	echo "$as_me:31762: 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 31750 "configure"
+#line 31769 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -31759,16 +31778,16 @@ union wait x; wait(&x)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:31762: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31781: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31765: \$? = $ac_status" >&5
+  echo "$as_me:31784: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:31768: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31787: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31771: \$? = $ac_status" >&5
+  echo "$as_me:31790: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_arg_union_wait=yes
 else
@@ -31780,21 +31799,21 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-	echo "$as_me:31783: result: $cf_cv_arg_union_wait" >&5
+	echo "$as_me:31802: 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:31790: checking if union wait can be used as waitpid-arg" >&5
+	echo "$as_me:31809: 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 31797 "configure"
+#line 31816 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -31806,16 +31825,16 @@ union wait x; waitpid(0, &x, 0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:31809: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31828: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31812: \$? = $ac_status" >&5
+  echo "$as_me:31831: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:31815: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31834: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31818: \$? = $ac_status" >&5
+  echo "$as_me:31837: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_arg_union_waitpid=yes
 else
@@ -31827,7 +31846,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-	echo "$as_me:31830: result: $cf_cv_arg_union_waitpid" >&5
+	echo "$as_me:31849: 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
@@ -31836,13 +31855,13 @@ EOF
 
 fi
 
-echo "$as_me:31839: checking for uid_t in sys/types.h" >&5
+echo "$as_me:31858: 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 31845 "configure"
+#line 31864 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -31856,7 +31875,7 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:31859: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:31878: 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
 
@@ -31870,7 +31889,7 @@ EOF
 
 fi
 
-echo "$as_me:31873: checking type of array argument to getgroups" >&5
+echo "$as_me:31892: 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
@@ -31879,7 +31898,7 @@ else
   ac_cv_type_getgroups=cross
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 31882 "configure"
+#line 31901 "configure"
 #include "confdefs.h"
 $ac_includes_default
 /* Thanks to Mike Rendell for this test.  */
@@ -31906,15 +31925,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:31909: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31928: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31912: \$? = $ac_status" >&5
+  echo "$as_me:31931: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:31914: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31933: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31917: \$? = $ac_status" >&5
+  echo "$as_me:31936: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_getgroups=gid_t
 else
@@ -31927,7 +31946,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 31930 "configure"
+#line 31949 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 
@@ -31942,20 +31961,20 @@ rm -rf conftest*
 
 fi
 fi
-echo "$as_me:31945: result: $ac_cv_type_getgroups" >&5
+echo "$as_me:31964: 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:31952: checking for off_t" >&5
+echo "$as_me:31971: 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 31958 "configure"
+#line 31977 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -31970,16 +31989,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:31973: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31992: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31976: \$? = $ac_status" >&5
+  echo "$as_me:31995: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:31979: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31998: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31982: \$? = $ac_status" >&5
+  echo "$as_me:32001: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -31989,7 +32008,7 @@ ac_cv_type_off_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:31992: result: $ac_cv_type_off_t" >&5
+echo "$as_me:32011: 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
   :
@@ -32001,13 +32020,13 @@ EOF
 
 fi
 
-echo "$as_me:32004: checking for pid_t" >&5
+echo "$as_me:32023: 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 32010 "configure"
+#line 32029 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32022,16 +32041,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32025: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32044: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32028: \$? = $ac_status" >&5
+  echo "$as_me:32047: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32031: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32050: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32034: \$? = $ac_status" >&5
+  echo "$as_me:32053: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -32041,7 +32060,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:32044: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:32063: 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
   :
@@ -32053,13 +32072,13 @@ EOF
 
 fi
 
-echo "$as_me:32056: checking for uid_t in sys/types.h" >&5
+echo "$as_me:32075: 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 32062 "configure"
+#line 32081 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -32073,7 +32092,7 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:32076: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:32095: 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
 
@@ -32087,13 +32106,13 @@ EOF
 
 fi
 
-echo "$as_me:32090: checking for mode_t" >&5
+echo "$as_me:32109: 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 32096 "configure"
+#line 32115 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32108,16 +32127,16 @@ if (sizeof (mode_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32111: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32130: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32114: \$? = $ac_status" >&5
+  echo "$as_me:32133: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32117: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32136: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32120: \$? = $ac_status" >&5
+  echo "$as_me:32139: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_mode_t=yes
 else
@@ -32127,7 +32146,7 @@ ac_cv_type_mode_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:32130: result: $ac_cv_type_mode_t" >&5
+echo "$as_me:32149: 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
   :
@@ -32139,13 +32158,13 @@ EOF
 
 fi
 
-	echo "$as_me:32142: checking for ssize_t" >&5
+	echo "$as_me:32161: 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 32148 "configure"
+#line 32167 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32160,16 +32179,16 @@ if (sizeof (ssize_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32163: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32182: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32166: \$? = $ac_status" >&5
+  echo "$as_me:32185: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32169: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32188: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32172: \$? = $ac_status" >&5
+  echo "$as_me:32191: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_ssize_t=yes
 else
@@ -32179,7 +32198,7 @@ ac_cv_type_ssize_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:32182: result: $ac_cv_type_ssize_t" >&5
+echo "$as_me:32201: 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
@@ -32195,13 +32214,13 @@ EOF
 
 fi
 
-	echo "$as_me:32198: checking for socklen_t" >&5
+	echo "$as_me:32217: 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 32204 "configure"
+#line 32223 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -32219,16 +32238,16 @@ if (sizeof (socklen_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32222: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32241: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32225: \$? = $ac_status" >&5
+  echo "$as_me:32244: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32228: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32247: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32231: \$? = $ac_status" >&5
+  echo "$as_me:32250: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_socklen_t=yes
 else
@@ -32238,7 +32257,7 @@ ac_cv_type_socklen_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:32241: result: $ac_cv_type_socklen_t" >&5
+echo "$as_me:32260: 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
@@ -32254,7 +32273,7 @@ EOF
 
 fi
 
-echo "$as_me:32257: checking for long long type" >&5
+echo "$as_me:32276: 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
@@ -32285,7 +32304,7 @@ _CFEOF
 	rm -f conftest*
 
 fi
-echo "$as_me:32288: result: $cf_cv_type_long_long" >&5
+echo "$as_me:32307: 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
@@ -32296,14 +32315,14 @@ EOF
 
 fi
 
-echo "$as_me:32299: checking for tm.tm_gmtoff" >&5
+echo "$as_me:32318: 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 32306 "configure"
+#line 32325 "configure"
 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME
@@ -32328,16 +32347,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32331: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32350: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32334: \$? = $ac_status" >&5
+  echo "$as_me:32353: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32337: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32356: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32340: \$? = $ac_status" >&5
+  echo "$as_me:32359: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_tm_gmtoff=yes
 else
@@ -32348,20 +32367,20 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:32351: result: $cf_cv_tm_gmtoff" >&5
+echo "$as_me:32370: 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:32358: checking for int" >&5
+echo "$as_me:32377: 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 32364 "configure"
+#line 32383 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32376,16 +32395,16 @@ if (sizeof (int))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32379: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32398: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32382: \$? = $ac_status" >&5
+  echo "$as_me:32401: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32385: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32404: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32388: \$? = $ac_status" >&5
+  echo "$as_me:32407: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_int=yes
 else
@@ -32395,10 +32414,10 @@ ac_cv_type_int=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:32398: result: $ac_cv_type_int" >&5
+echo "$as_me:32417: result: $ac_cv_type_int" >&5
 echo "${ECHO_T}$ac_cv_type_int" >&6
 
-echo "$as_me:32401: checking size of int" >&5
+echo "$as_me:32420: 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
@@ -32407,7 +32426,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 32410 "configure"
+#line 32429 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32419,21 +32438,21 @@ int _array_ [1 - 2 * !((sizeof (int)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32422: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32441: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32425: \$? = $ac_status" >&5
+  echo "$as_me:32444: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32428: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32447: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32431: \$? = $ac_status" >&5
+  echo "$as_me:32450: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 32436 "configure"
+#line 32455 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32445,16 +32464,16 @@ int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32448: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32467: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32451: \$? = $ac_status" >&5
+  echo "$as_me:32470: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32454: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32473: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32457: \$? = $ac_status" >&5
+  echo "$as_me:32476: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -32470,7 +32489,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 32473 "configure"
+#line 32492 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32482,16 +32501,16 @@ int _array_ [1 - 2 * !((sizeof (int)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32485: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32504: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32488: \$? = $ac_status" >&5
+  echo "$as_me:32507: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32491: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32510: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32494: \$? = $ac_status" >&5
+  echo "$as_me:32513: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -32507,7 +32526,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 32510 "configure"
+#line 32529 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32519,16 +32538,16 @@ int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32522: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32541: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32525: \$? = $ac_status" >&5
+  echo "$as_me:32544: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32528: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32547: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32531: \$? = $ac_status" >&5
+  echo "$as_me:32550: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -32541,12 +32560,12 @@ done
 ac_cv_sizeof_int=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:32544: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:32563: 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 32549 "configure"
+#line 32568 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32562,15 +32581,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:32565: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32584: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32568: \$? = $ac_status" >&5
+  echo "$as_me:32587: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:32570: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32589: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32573: \$? = $ac_status" >&5
+  echo "$as_me:32592: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_int=`cat conftest.val`
 else
@@ -32586,7 +32605,7 @@ else
   ac_cv_sizeof_int=0
 fi
 fi
-echo "$as_me:32589: result: $ac_cv_sizeof_int" >&5
+echo "$as_me:32608: 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
@@ -32595,11 +32614,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:32598: WARNING: using 4 for sizeof int" >&5
+		{ echo "$as_me:32617: 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:32602: WARNING: sizeof int not found, using 4" >&5
+		{ echo "$as_me:32621: 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
@@ -32613,13 +32632,13 @@ cf_cv_type=`echo "sizeof_int" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKL
 	fi
 fi
 
-echo "$as_me:32616: checking for long" >&5
+echo "$as_me:32635: 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 32622 "configure"
+#line 32641 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32634,16 +32653,16 @@ if (sizeof (long))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32637: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32656: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32640: \$? = $ac_status" >&5
+  echo "$as_me:32659: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32643: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32662: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32646: \$? = $ac_status" >&5
+  echo "$as_me:32665: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_long=yes
 else
@@ -32653,10 +32672,10 @@ ac_cv_type_long=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:32656: result: $ac_cv_type_long" >&5
+echo "$as_me:32675: result: $ac_cv_type_long" >&5
 echo "${ECHO_T}$ac_cv_type_long" >&6
 
-echo "$as_me:32659: checking size of long" >&5
+echo "$as_me:32678: 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
@@ -32665,7 +32684,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 32668 "configure"
+#line 32687 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32677,21 +32696,21 @@ int _array_ [1 - 2 * !((sizeof (long)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32680: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32699: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32683: \$? = $ac_status" >&5
+  echo "$as_me:32702: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32686: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32705: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32689: \$? = $ac_status" >&5
+  echo "$as_me:32708: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 32694 "configure"
+#line 32713 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32703,16 +32722,16 @@ int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32706: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32725: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32709: \$? = $ac_status" >&5
+  echo "$as_me:32728: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32712: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32731: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32715: \$? = $ac_status" >&5
+  echo "$as_me:32734: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -32728,7 +32747,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 32731 "configure"
+#line 32750 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32740,16 +32759,16 @@ int _array_ [1 - 2 * !((sizeof (long)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32743: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32762: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32746: \$? = $ac_status" >&5
+  echo "$as_me:32765: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32749: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32768: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32752: \$? = $ac_status" >&5
+  echo "$as_me:32771: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -32765,7 +32784,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 32768 "configure"
+#line 32787 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32777,16 +32796,16 @@ int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32780: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32799: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32783: \$? = $ac_status" >&5
+  echo "$as_me:32802: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32786: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32805: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32789: \$? = $ac_status" >&5
+  echo "$as_me:32808: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -32799,12 +32818,12 @@ done
 ac_cv_sizeof_long=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:32802: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:32821: 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 32807 "configure"
+#line 32826 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32820,15 +32839,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:32823: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32842: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32826: \$? = $ac_status" >&5
+  echo "$as_me:32845: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:32828: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32847: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32831: \$? = $ac_status" >&5
+  echo "$as_me:32850: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_long=`cat conftest.val`
 else
@@ -32844,7 +32863,7 @@ else
   ac_cv_sizeof_long=0
 fi
 fi
-echo "$as_me:32847: result: $ac_cv_sizeof_long" >&5
+echo "$as_me:32866: 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
@@ -32853,11 +32872,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:32856: WARNING: using 4 for sizeof long" >&5
+		{ echo "$as_me:32875: 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:32860: WARNING: sizeof long not found, using 4" >&5
+		{ echo "$as_me:32879: 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
@@ -32871,13 +32890,13 @@ cf_cv_type=`echo "sizeof_long" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJK
 	fi
 fi
 
-echo "$as_me:32874: checking for off_t" >&5
+echo "$as_me:32893: 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 32880 "configure"
+#line 32899 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32892,16 +32911,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32895: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32914: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32898: \$? = $ac_status" >&5
+  echo "$as_me:32917: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32901: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32920: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32904: \$? = $ac_status" >&5
+  echo "$as_me:32923: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -32911,10 +32930,10 @@ ac_cv_type_off_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:32914: result: $ac_cv_type_off_t" >&5
+echo "$as_me:32933: result: $ac_cv_type_off_t" >&5
 echo "${ECHO_T}$ac_cv_type_off_t" >&6
 
-echo "$as_me:32917: checking size of off_t" >&5
+echo "$as_me:32936: 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
@@ -32923,7 +32942,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 32926 "configure"
+#line 32945 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32935,21 +32954,21 @@ int _array_ [1 - 2 * !((sizeof (off_t)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32938: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32957: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32941: \$? = $ac_status" >&5
+  echo "$as_me:32960: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32944: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32963: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32947: \$? = $ac_status" >&5
+  echo "$as_me:32966: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 32952 "configure"
+#line 32971 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32961,16 +32980,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32964: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32983: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32967: \$? = $ac_status" >&5
+  echo "$as_me:32986: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32970: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32989: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32973: \$? = $ac_status" >&5
+  echo "$as_me:32992: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -32986,7 +33005,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 32989 "configure"
+#line 33008 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32998,16 +33017,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:33001: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33020: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33004: \$? = $ac_status" >&5
+  echo "$as_me:33023: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:33007: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33026: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33010: \$? = $ac_status" >&5
+  echo "$as_me:33029: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -33023,7 +33042,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 33026 "configure"
+#line 33045 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33035,16 +33054,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:33038: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33057: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33041: \$? = $ac_status" >&5
+  echo "$as_me:33060: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:33044: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33063: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33047: \$? = $ac_status" >&5
+  echo "$as_me:33066: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -33057,12 +33076,12 @@ done
 ac_cv_sizeof_off_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:33060: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:33079: 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 33065 "configure"
+#line 33084 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33078,15 +33097,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:33081: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33100: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33084: \$? = $ac_status" >&5
+  echo "$as_me:33103: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:33086: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33105: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33089: \$? = $ac_status" >&5
+  echo "$as_me:33108: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_off_t=`cat conftest.val`
 else
@@ -33102,7 +33121,7 @@ else
   ac_cv_sizeof_off_t=0
 fi
 fi
-echo "$as_me:33105: result: $ac_cv_sizeof_off_t" >&5
+echo "$as_me:33124: 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
@@ -33111,11 +33130,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:33114: WARNING: using 4 for sizeof off_t" >&5
+		{ echo "$as_me:33133: 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:33118: WARNING: sizeof off_t not found, using 4" >&5
+		{ echo "$as_me:33137: 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
@@ -33129,13 +33148,13 @@ cf_cv_type=`echo "sizeof_off_t" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJ
 	fi
 fi
 
-echo "$as_me:33132: checking for size_t" >&5
+echo "$as_me:33151: 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 33138 "configure"
+#line 33157 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33150,16 +33169,16 @@ if (sizeof (size_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:33153: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33172: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33156: \$? = $ac_status" >&5
+  echo "$as_me:33175: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:33159: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33178: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33162: \$? = $ac_status" >&5
+  echo "$as_me:33181: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_size_t=yes
 else
@@ -33169,10 +33188,10 @@ ac_cv_type_size_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:33172: result: $ac_cv_type_size_t" >&5
+echo "$as_me:33191: result: $ac_cv_type_size_t" >&5
 echo "${ECHO_T}$ac_cv_type_size_t" >&6
 
-echo "$as_me:33175: checking size of size_t" >&5
+echo "$as_me:33194: 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
@@ -33181,7 +33200,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 33184 "configure"
+#line 33203 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33193,21 +33212,21 @@ int _array_ [1 - 2 * !((sizeof (size_t)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:33196: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33215: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33199: \$? = $ac_status" >&5
+  echo "$as_me:33218: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:33202: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33221: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33205: \$? = $ac_status" >&5
+  echo "$as_me:33224: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 33210 "configure"
+#line 33229 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33219,16 +33238,16 @@ int _array_ [1 - 2 * !((sizeof (size_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:33222: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33241: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33225: \$? = $ac_status" >&5
+  echo "$as_me:33244: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:33228: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33247: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33231: \$? = $ac_status" >&5
+  echo "$as_me:33250: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -33244,7 +33263,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 33247 "configure"
+#line 33266 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33256,16 +33275,16 @@ int _array_ [1 - 2 * !((sizeof (size_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:33259: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33278: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33262: \$? = $ac_status" >&5
+  echo "$as_me:33281: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:33265: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33284: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33268: \$? = $ac_status" >&5
+  echo "$as_me:33287: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -33281,7 +33300,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 33284 "configure"
+#line 33303 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33293,16 +33312,16 @@ int _array_ [1 - 2 * !((sizeof (size_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:33296: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33315: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33299: \$? = $ac_status" >&5
+  echo "$as_me:33318: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:33302: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33321: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33305: \$? = $ac_status" >&5
+  echo "$as_me:33324: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -33315,12 +33334,12 @@ done
 ac_cv_sizeof_size_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:33318: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:33337: 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 33323 "configure"
+#line 33342 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33336,15 +33355,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:33339: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33358: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33342: \$? = $ac_status" >&5
+  echo "$as_me:33361: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:33344: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33363: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33347: \$? = $ac_status" >&5
+  echo "$as_me:33366: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_size_t=`cat conftest.val`
 else
@@ -33360,7 +33379,7 @@ else
   ac_cv_sizeof_size_t=0
 fi
 fi
-echo "$as_me:33363: result: $ac_cv_sizeof_size_t" >&5
+echo "$as_me:33382: 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
@@ -33369,11 +33388,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:33372: WARNING: using 4 for sizeof size_t" >&5
+		{ echo "$as_me:33391: 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:33376: WARNING: sizeof size_t not found, using 4" >&5
+		{ echo "$as_me:33395: 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
@@ -33387,13 +33406,13 @@ cf_cv_type=`echo "sizeof_size_t" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHI
 	fi
 fi
 
-echo "$as_me:33390: checking for time_t" >&5
+echo "$as_me:33409: 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 33396 "configure"
+#line 33415 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33408,16 +33427,16 @@ if (sizeof (time_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:33411: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33430: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33414: \$? = $ac_status" >&5
+  echo "$as_me:33433: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:33417: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33436: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33420: \$? = $ac_status" >&5
+  echo "$as_me:33439: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_time_t=yes
 else
@@ -33427,10 +33446,10 @@ ac_cv_type_time_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:33430: result: $ac_cv_type_time_t" >&5
+echo "$as_me:33449: result: $ac_cv_type_time_t" >&5
 echo "${ECHO_T}$ac_cv_type_time_t" >&6
 
-echo "$as_me:33433: checking size of time_t" >&5
+echo "$as_me:33452: 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
@@ -33439,7 +33458,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 33442 "configure"
+#line 33461 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33451,21 +33470,21 @@ int _array_ [1 - 2 * !((sizeof (time_t)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:33454: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33473: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33457: \$? = $ac_status" >&5
+  echo "$as_me:33476: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:33460: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33479: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33463: \$? = $ac_status" >&5
+  echo "$as_me:33482: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 33468 "configure"
+#line 33487 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33477,16 +33496,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:33480: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33499: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33483: \$? = $ac_status" >&5
+  echo "$as_me:33502: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:33486: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33505: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33489: \$? = $ac_status" >&5
+  echo "$as_me:33508: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -33502,7 +33521,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 33505 "configure"
+#line 33524 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33514,16 +33533,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:33517: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33536: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33520: \$? = $ac_status" >&5
+  echo "$as_me:33539: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:33523: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33542: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33526: \$? = $ac_status" >&5
+  echo "$as_me:33545: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -33539,7 +33558,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 33542 "configure"
+#line 33561 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33551,16 +33570,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:33554: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33573: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33557: \$? = $ac_status" >&5
+  echo "$as_me:33576: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:33560: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33579: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33563: \$? = $ac_status" >&5
+  echo "$as_me:33582: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -33573,12 +33592,12 @@ done
 ac_cv_sizeof_time_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:33576: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:33595: 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 33581 "configure"
+#line 33600 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33594,15 +33613,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:33597: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33616: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33600: \$? = $ac_status" >&5
+  echo "$as_me:33619: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:33602: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33621: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33605: \$? = $ac_status" >&5
+  echo "$as_me:33624: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_time_t=`cat conftest.val`
 else
@@ -33618,7 +33637,7 @@ else
   ac_cv_sizeof_time_t=0
 fi
 fi
-echo "$as_me:33621: result: $ac_cv_sizeof_time_t" >&5
+echo "$as_me:33640: 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
@@ -33627,11 +33646,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:33630: WARNING: using 4 for sizeof time_t" >&5
+		{ echo "$as_me:33649: 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:33634: WARNING: sizeof time_t not found, using 4" >&5
+		{ echo "$as_me:33653: 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
@@ -33645,13 +33664,13 @@ cf_cv_type=`echo "sizeof_time_t" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHI
 	fi
 fi
 
-echo "$as_me:33648: checking for intptr_t" >&5
+echo "$as_me:33667: 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 33654 "configure"
+#line 33673 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33666,16 +33685,16 @@ if (sizeof (intptr_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:33669: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33688: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33672: \$? = $ac_status" >&5
+  echo "$as_me:33691: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:33675: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33694: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33678: \$? = $ac_status" >&5
+  echo "$as_me:33697: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_intptr_t=yes
 else
@@ -33685,7 +33704,7 @@ ac_cv_type_intptr_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:33688: result: $ac_cv_type_intptr_t" >&5
+echo "$as_me:33707: 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
   :
@@ -33699,13 +33718,13 @@ fi
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo "$as_me:33702: checking for working alloca.h" >&5
+echo "$as_me:33721: 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 33708 "configure"
+#line 33727 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int
@@ -33717,16 +33736,16 @@ char *p = (char *) alloca (2 * sizeof (int));
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:33720: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33739: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33723: \$? = $ac_status" >&5
+  echo "$as_me:33742: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:33726: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33745: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33729: \$? = $ac_status" >&5
+  echo "$as_me:33748: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_working_alloca_h=yes
 else
@@ -33736,7 +33755,7 @@ ac_cv_working_alloca_h=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:33739: result: $ac_cv_working_alloca_h" >&5
+echo "$as_me:33758: 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
 
@@ -33746,13 +33765,13 @@ EOF
 
 fi
 
-echo "$as_me:33749: checking for alloca" >&5
+echo "$as_me:33768: 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 33755 "configure"
+#line 33774 "configure"
 #include "confdefs.h"
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -33784,16 +33803,16 @@ char *p = (char *) alloca (1);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:33787: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33806: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33790: \$? = $ac_status" >&5
+  echo "$as_me:33809: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:33793: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33812: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33796: \$? = $ac_status" >&5
+  echo "$as_me:33815: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_alloca_works=yes
 else
@@ -33803,7 +33822,7 @@ ac_cv_func_alloca_works=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:33806: result: $ac_cv_func_alloca_works" >&5
+echo "$as_me:33825: 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
@@ -33824,13 +33843,13 @@ cat >>confdefs.h <<\EOF
 #define C_ALLOCA 1
 EOF
 
-echo "$as_me:33827: checking whether \`alloca.c' needs Cray hooks" >&5
+echo "$as_me:33846: 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 33833 "configure"
+#line 33852 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -33848,18 +33867,18 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:33851: result: $ac_cv_os_cray" >&5
+echo "$as_me:33870: 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:33856: checking for $ac_func" >&5
+echo "$as_me:33875: 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 33862 "configure"
+#line 33881 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -33890,16 +33909,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:33893: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33912: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33896: \$? = $ac_status" >&5
+  echo "$as_me:33915: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:33899: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33918: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33902: \$? = $ac_status" >&5
+  echo "$as_me:33921: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -33909,7 +33928,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:33912: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:33931: 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
 
@@ -33923,7 +33942,7 @@ fi
   done
 fi
 
-echo "$as_me:33926: checking stack direction for C alloca" >&5
+echo "$as_me:33945: 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
@@ -33932,7 +33951,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 33935 "configure"
+#line 33954 "configure"
 #include "confdefs.h"
 int
 find_stack_direction (void)
@@ -33955,15 +33974,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:33958: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33977: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33961: \$? = $ac_status" >&5
+  echo "$as_me:33980: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:33963: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33982: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33966: \$? = $ac_status" >&5
+  echo "$as_me:33985: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_stack_direction=1
 else
@@ -33975,7 +33994,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:33978: result: $ac_cv_c_stack_direction" >&5
+echo "$as_me:33997: result: $ac_cv_c_stack_direction" >&5
 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
 cat >>confdefs.h <<EOF
@@ -33987,23 +34006,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:33990: checking for $ac_header" >&5
+echo "$as_me:34009: 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 33996 "configure"
+#line 34015 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:34000: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:34019: \"$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:34006: \$? = $ac_status" >&5
+  echo "$as_me:34025: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -34022,7 +34041,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:34025: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:34044: 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
@@ -34035,13 +34054,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:34038: checking for $ac_func" >&5
+echo "$as_me:34057: 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 34044 "configure"
+#line 34063 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -34072,16 +34091,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:34075: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34094: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34078: \$? = $ac_status" >&5
+  echo "$as_me:34097: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:34081: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34100: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34084: \$? = $ac_status" >&5
+  echo "$as_me:34103: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -34091,7 +34110,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:34094: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:34113: 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
@@ -34103,7 +34122,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:34106: checking for working fork" >&5
+  echo "$as_me:34125: 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
@@ -34126,15 +34145,15 @@ else
       }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:34129: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34148: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34132: \$? = $ac_status" >&5
+  echo "$as_me:34151: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:34134: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34153: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34137: \$? = $ac_status" >&5
+  echo "$as_me:34156: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -34146,7 +34165,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:34149: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:34168: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -34160,12 +34179,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:34163: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:34182: 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:34168: checking for working vfork" >&5
+  echo "$as_me:34187: 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
@@ -34174,7 +34193,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 34177 "configure"
+#line 34196 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -34267,15 +34286,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:34270: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34289: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34273: \$? = $ac_status" >&5
+  echo "$as_me:34292: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:34275: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34294: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34278: \$? = $ac_status" >&5
+  echo "$as_me:34297: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -34287,13 +34306,13 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:34290: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:34309: 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:34296: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:34315: 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
 
@@ -34318,14 +34337,14 @@ EOF
 
 fi
 
-echo "$as_me:34321: checking if we should use fcntl or ioctl" >&5
+echo "$as_me:34340: 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 34328 "configure"
+#line 34347 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -34342,16 +34361,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:34345: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34364: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34348: \$? = $ac_status" >&5
+  echo "$as_me:34367: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:34351: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34370: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34354: \$? = $ac_status" >&5
+  echo "$as_me:34373: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fionbio=ioctl
 else
@@ -34359,7 +34378,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 34362 "configure"
+#line 34381 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -34381,16 +34400,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:34384: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34403: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34387: \$? = $ac_status" >&5
+  echo "$as_me:34406: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:34390: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34409: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34393: \$? = $ac_status" >&5
+  echo "$as_me:34412: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fionbio=fcntl
 else
@@ -34403,21 +34422,21 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:34406: result: $cf_cv_fionbio" >&5
+echo "$as_me:34425: 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:34413: checking for broken/missing definition of remove" >&5
+echo "$as_me:34432: 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 34420 "configure"
+#line 34439 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -34429,23 +34448,23 @@ remove("dummy")
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:34432: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34451: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34435: \$? = $ac_status" >&5
+  echo "$as_me:34454: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:34438: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34457: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34441: \$? = $ac_status" >&5
+  echo "$as_me:34460: \$? = $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 34448 "configure"
+#line 34467 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 		int __unlink(name) { return unlink(name); }
@@ -34458,16 +34477,16 @@ remove("dummy")
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:34461: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34480: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34464: \$? = $ac_status" >&5
+  echo "$as_me:34483: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:34467: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34486: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34470: \$? = $ac_status" >&5
+  echo "$as_me:34489: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_baddef_remove=yes
 else
@@ -34482,21 +34501,21 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:34485: result: $cf_cv_baddef_remove" >&5
+echo "$as_me:34504: 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:34492: checking for lstat" >&5
+echo "$as_me:34511: 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 34499 "configure"
+#line 34518 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -34508,16 +34527,16 @@ struct stat sb; lstat(".", &sb); (void) sb
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:34511: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34530: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34514: \$? = $ac_status" >&5
+  echo "$as_me:34533: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:34517: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34536: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34520: \$? = $ac_status" >&5
+  echo "$as_me:34539: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_lstat=yes
 else
@@ -34529,7 +34548,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:34532: result: $ac_cv_func_lstat " >&5
+echo "$as_me:34551: result: $ac_cv_func_lstat " >&5
 echo "${ECHO_T}$ac_cv_func_lstat " >&6
 if test "$ac_cv_func_lstat" = yes; then
 
@@ -34539,14 +34558,14 @@ EOF
 
 fi
 
-echo "$as_me:34542: checking for getpwuid" >&5
+echo "$as_me:34561: checking for getpwuid" >&5
 echo $ECHO_N "checking for getpwuid... $ECHO_C" >&6
 if test "${ac_cv_func_getpwuid+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 34549 "configure"
+#line 34568 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -34564,16 +34583,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:34567: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34586: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34570: \$? = $ac_status" >&5
+  echo "$as_me:34589: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:34573: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34592: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34576: \$? = $ac_status" >&5
+  echo "$as_me:34595: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_getpwuid=yes
 else
@@ -34584,7 +34603,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:34587: result: $ac_cv_func_getpwuid" >&5
+echo "$as_me:34606: result: $ac_cv_func_getpwuid" >&5
 echo "${ECHO_T}$ac_cv_func_getpwuid" >&6
 if test "$ac_cv_func_getpwuid" = yes; then
 	ac_cv_header_pwd_h=yes
@@ -34599,14 +34618,14 @@ EOF
 
 fi
 
-echo "$as_me:34602: checking for passwd.pw_gecos" >&5
+echo "$as_me:34621: checking for passwd.pw_gecos" >&5
 echo $ECHO_N "checking for passwd.pw_gecos... $ECHO_C" >&6
 if test "${cf_cv_pw_gecos+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 34609 "configure"
+#line 34628 "configure"
 #include "confdefs.h"
 
 #include <pwd.h>
@@ -34623,16 +34642,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:34626: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34645: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34629: \$? = $ac_status" >&5
+  echo "$as_me:34648: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:34632: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34651: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34635: \$? = $ac_status" >&5
+  echo "$as_me:34654: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_pw_gecos=yes
 else
@@ -34642,20 +34661,20 @@ cf_cv_pw_gecos=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:34645: result: $cf_cv_pw_gecos" >&5
+echo "$as_me:34664: result: $cf_cv_pw_gecos" >&5
 echo "${ECHO_T}$cf_cv_pw_gecos" >&6
 test $cf_cv_pw_gecos = no &&
 cat >>confdefs.h <<\EOF
 #define DONT_HAVE_PW_GECOS 1
 EOF
 
-echo "$as_me:34652: checking for vasprintf" >&5
+echo "$as_me:34671: 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 34658 "configure"
+#line 34677 "configure"
 #include "confdefs.h"
 #define vasprintf autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -34686,16 +34705,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:34689: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34708: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34692: \$? = $ac_status" >&5
+  echo "$as_me:34711: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:34695: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34714: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34698: \$? = $ac_status" >&5
+  echo "$as_me:34717: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_vasprintf=yes
 else
@@ -34705,7 +34724,7 @@ ac_cv_func_vasprintf=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:34708: result: $ac_cv_func_vasprintf" >&5
+echo "$as_me:34727: result: $ac_cv_func_vasprintf" >&5
 echo "${ECHO_T}$ac_cv_func_vasprintf" >&6
 if test "$ac_cv_func_vasprintf" = yes; then
 
@@ -34713,10 +34732,10 @@ cat >>confdefs.h <<\EOF
 #define HAVE_VASPRINTF 1
 EOF
 
-	echo "$as_me:34716: checking if vasprintf requires workaround" >&5
+	echo "$as_me:34735: checking if vasprintf requires workaround" >&5
 echo $ECHO_N "checking if vasprintf requires workaround... $ECHO_C" >&6
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 34719 "configure"
+#line 34738 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -34732,19 +34751,19 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:34735: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34754: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34738: \$? = $ac_status" >&5
+  echo "$as_me:34757: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:34741: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34760: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34744: \$? = $ac_status" >&5
+  echo "$as_me:34763: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-		echo "$as_me:34747: result: no" >&5
+		echo "$as_me:34766: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 else
@@ -34752,7 +34771,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 34755 "configure"
+#line 34774 "configure"
 #include "confdefs.h"
 
 			#ifndef _GNU_SOURCE
@@ -34771,19 +34790,19 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:34774: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34793: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34777: \$? = $ac_status" >&5
+  echo "$as_me:34796: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:34780: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34799: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34783: \$? = $ac_status" >&5
+  echo "$as_me:34802: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-			echo "$as_me:34786: result: yes" >&5
+			echo "$as_me:34805: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
@@ -34793,7 +34812,7 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-			echo "$as_me:34796: result: unknown" >&5
+			echo "$as_me:34815: result: unknown" >&5
 echo "${ECHO_T}unknown" >&6
 
 fi
@@ -34826,13 +34845,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:34829: checking for $ac_func" >&5
+echo "$as_me:34848: 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 34835 "configure"
+#line 34854 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -34863,16 +34882,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:34866: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34885: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34869: \$? = $ac_status" >&5
+  echo "$as_me:34888: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:34872: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34891: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34875: \$? = $ac_status" >&5
+  echo "$as_me:34894: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -34882,7 +34901,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:34885: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:34904: 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
@@ -34896,13 +34915,13 @@ for ac_func in \
 	mkdtemp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:34899: checking for $ac_func" >&5
+echo "$as_me:34918: 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 34905 "configure"
+#line 34924 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -34933,16 +34952,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:34936: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34955: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34939: \$? = $ac_status" >&5
+  echo "$as_me:34958: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:34942: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34961: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34945: \$? = $ac_status" >&5
+  echo "$as_me:34964: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -34952,7 +34971,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:34955: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:34974: 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
@@ -34964,13 +34983,13 @@ else
 for ac_func in mktemp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:34967: checking for $ac_func" >&5
+echo "$as_me:34986: 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 34973 "configure"
+#line 34992 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -35001,16 +35020,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:35004: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35023: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35007: \$? = $ac_status" >&5
+  echo "$as_me:35026: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:35010: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35029: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35013: \$? = $ac_status" >&5
+  echo "$as_me:35032: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -35020,7 +35039,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:35023: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:35042: 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
@@ -35040,13 +35059,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:35043: checking for $ac_func" >&5
+echo "$as_me:35062: 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 35049 "configure"
+#line 35068 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -35077,16 +35096,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:35080: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35099: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35083: \$? = $ac_status" >&5
+  echo "$as_me:35102: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:35086: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35105: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35089: \$? = $ac_status" >&5
+  echo "$as_me:35108: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -35096,7 +35115,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:35099: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:35118: 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
@@ -35111,23 +35130,23 @@ done
 for ac_header in limits.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:35114: checking for $ac_header" >&5
+echo "$as_me:35133: 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 35120 "configure"
+#line 35139 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:35124: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:35143: \"$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:35130: \$? = $ac_status" >&5
+  echo "$as_me:35149: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -35146,7 +35165,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:35149: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:35168: 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
@@ -35156,13 +35175,13 @@ EOF
 fi
 done
 
-echo "$as_me:35159: checking for arc2random" >&5
+echo "$as_me:35178: checking for arc2random" >&5
 echo $ECHO_N "checking for arc2random... $ECHO_C" >&6
 if test "${ac_cv_func_arc2random+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 35165 "configure"
+#line 35184 "configure"
 #include "confdefs.h"
 #define arc2random autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -35193,16 +35212,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:35196: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35215: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35199: \$? = $ac_status" >&5
+  echo "$as_me:35218: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:35202: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35221: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35205: \$? = $ac_status" >&5
+  echo "$as_me:35224: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_arc2random=yes
 else
@@ -35212,12 +35231,12 @@ ac_cv_func_arc2random=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:35215: result: $ac_cv_func_arc2random" >&5
+echo "$as_me:35234: result: $ac_cv_func_arc2random" >&5
 echo "${ECHO_T}$ac_cv_func_arc2random" >&6
 if test "$ac_cv_func_arc2random" = yes; then
   :
 else
-  echo "$as_me:35220: checking for arc4random in -lbsd" >&5
+  echo "$as_me:35239: checking for arc4random in -lbsd" >&5
 echo $ECHO_N "checking for arc4random in -lbsd... $ECHO_C" >&6
 if test "${ac_cv_lib_bsd_arc4random+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -35225,7 +35244,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 35228 "configure"
+#line 35247 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -35244,16 +35263,16 @@ arc4random ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:35247: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35266: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35250: \$? = $ac_status" >&5
+  echo "$as_me:35269: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:35253: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35272: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35256: \$? = $ac_status" >&5
+  echo "$as_me:35275: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_arc4random=yes
 else
@@ -35264,7 +35283,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:35267: result: $ac_cv_lib_bsd_arc4random" >&5
+echo "$as_me:35286: result: $ac_cv_lib_bsd_arc4random" >&5
 echo "${ECHO_T}$ac_cv_lib_bsd_arc4random" >&6
 if test "$ac_cv_lib_bsd_arc4random" = yes; then
 
@@ -35288,7 +35307,7 @@ fi
 
 fi
 
-echo "$as_me:35291: checking for random-integer functions" >&5
+echo "$as_me:35310: 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
@@ -35308,7 +35327,7 @@ do
 	esac
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 35311 "configure"
+#line 35330 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -35325,16 +35344,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:35328: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35347: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35331: \$? = $ac_status" >&5
+  echo "$as_me:35350: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:35334: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35353: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35337: \$? = $ac_status" >&5
+  echo "$as_me:35356: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_srand_func=$cf_func
  break
@@ -35346,10 +35365,10 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:35349: result: $cf_cv_srand_func" >&5
+echo "$as_me:35368: 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:35352: checking for range of random-integers" >&5
+	echo "$as_me:35371: 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
@@ -35370,7 +35389,7 @@ else
 			;;
 		esac
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 35373 "configure"
+#line 35392 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -35387,16 +35406,16 @@ long x = $cf_cv_rand_max; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35390: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35409: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35393: \$? = $ac_status" >&5
+  echo "$as_me:35412: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35396: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35415: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35399: \$? = $ac_status" >&5
+  echo "$as_me:35418: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -35407,15 +35426,15 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:35410: result: $cf_cv_rand_max" >&5
+echo "$as_me:35429: result: $cf_cv_rand_max" >&5
 echo "${ECHO_T}$cf_cv_rand_max" >&6
 
 	case "$cf_cv_srand_func" in
 	(*/arc4random)
-		echo "$as_me:35415: checking if <bsd/stdlib.h> should be included" >&5
+		echo "$as_me:35434: 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 35418 "configure"
+#line 35437 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -35433,23 +35452,23 @@ void *arc4random(int);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35436: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35455: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35439: \$? = $ac_status" >&5
+  echo "$as_me:35458: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35442: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35461: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35445: \$? = $ac_status" >&5
+  echo "$as_me:35464: \$? = $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 35452 "configure"
+#line 35471 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -35466,16 +35485,16 @@ unsigned long x = arc4random(); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35469: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35488: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35472: \$? = $ac_status" >&5
+  echo "$as_me:35491: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35475: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35494: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35478: \$? = $ac_status" >&5
+  echo "$as_me:35497: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_bsd_stdlib_h=yes
 else
@@ -35486,7 +35505,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	    echo "$as_me:35489: result: $cf_bsd_stdlib_h" >&5
+	    echo "$as_me:35508: result: $cf_bsd_stdlib_h" >&5
 echo "${ECHO_T}$cf_bsd_stdlib_h" >&6
 		if test "$cf_bsd_stdlib_h" = yes
 		then
@@ -35496,10 +35515,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 		else
-			echo "$as_me:35499: checking if <bsd/random.h> should be included" >&5
+			echo "$as_me:35518: 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 35502 "configure"
+#line 35521 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -35517,23 +35536,23 @@ void *arc4random(int);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35520: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35539: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35523: \$? = $ac_status" >&5
+  echo "$as_me:35542: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35526: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35545: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35529: \$? = $ac_status" >&5
+  echo "$as_me:35548: \$? = $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 35536 "configure"
+#line 35555 "configure"
 #include "confdefs.h"
 #include <bsd/random.h>
 int
@@ -35545,16 +35564,16 @@ unsigned long x = arc4random(); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35548: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35567: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35551: \$? = $ac_status" >&5
+  echo "$as_me:35570: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35554: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35573: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35557: \$? = $ac_status" >&5
+  echo "$as_me:35576: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_bsd_random_h=yes
 else
@@ -35565,7 +35584,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-			echo "$as_me:35568: result: $cf_bsd_random_h" >&5
+			echo "$as_me:35587: result: $cf_bsd_random_h" >&5
 echo "${ECHO_T}$cf_bsd_random_h" >&6
 			if test "$cf_bsd_random_h" = yes
 			then
@@ -35575,7 +35594,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 			else
-				{ echo "$as_me:35578: WARNING: no header file found for arc4random" >&5
+				{ echo "$as_me:35597: WARNING: no header file found for arc4random" >&5
 echo "$as_me: WARNING: no header file found for arc4random" >&2;}
 			fi
 		fi
@@ -35610,13 +35629,13 @@ fi
 for ac_func in sleep
 do
 
-echo "$as_me:35613: checking for $ac_func declaration" >&5
+echo "$as_me:35632: 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 35619 "configure"
+#line 35638 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -35639,20 +35658,20 @@ extern	int	$ac_func(void);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35642: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35661: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35645: \$? = $ac_status" >&5
+  echo "$as_me:35664: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35648: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35667: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35651: \$? = $ac_status" >&5
+  echo "$as_me:35670: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 35655 "configure"
+#line 35674 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -35673,16 +35692,16 @@ int	(*p)(struct cf_check_funcdecl*) = $ac_func;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35676: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35695: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35679: \$? = $ac_status" >&5
+  echo "$as_me:35698: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35682: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35701: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35685: \$? = $ac_status" >&5
+  echo "$as_me:35704: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -35703,11 +35722,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:35706: result: yes" >&5
+  echo "$as_me:35725: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:35710: result: no" >&5
+  echo "$as_me:35729: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -35722,13 +35741,13 @@ done
 for ac_func in strstr
 do
 
-echo "$as_me:35725: checking for $ac_func declaration" >&5
+echo "$as_me:35744: 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 35731 "configure"
+#line 35750 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -35744,20 +35763,20 @@ extern	int	$ac_func(void);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35747: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35766: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35750: \$? = $ac_status" >&5
+  echo "$as_me:35769: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35753: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35772: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35756: \$? = $ac_status" >&5
+  echo "$as_me:35775: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 35760 "configure"
+#line 35779 "configure"
 #include "confdefs.h"
 #include <string.h>
 int
@@ -35771,16 +35790,16 @@ int	(*p)(struct cf_check_funcdecl*) = $ac_func;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35774: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35793: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35777: \$? = $ac_status" >&5
+  echo "$as_me:35796: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35780: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35799: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35783: \$? = $ac_status" >&5
+  echo "$as_me:35802: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -35801,11 +35820,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:35804: result: yes" >&5
+  echo "$as_me:35823: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:35808: result: no" >&5
+  echo "$as_me:35827: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -35820,13 +35839,13 @@ done
 for ac_func in getgrgid getgrnam
 do
 
-echo "$as_me:35823: checking for $ac_func declaration" >&5
+echo "$as_me:35842: 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 35829 "configure"
+#line 35848 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -35844,20 +35863,20 @@ extern	int	$ac_func(void);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35847: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35866: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35850: \$? = $ac_status" >&5
+  echo "$as_me:35869: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35853: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35872: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35856: \$? = $ac_status" >&5
+  echo "$as_me:35875: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 35860 "configure"
+#line 35879 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -35873,16 +35892,16 @@ int	(*p)(struct cf_check_funcdecl*) = $ac_func;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35876: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35895: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35879: \$? = $ac_status" >&5
+  echo "$as_me:35898: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35882: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35901: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35885: \$? = $ac_status" >&5
+  echo "$as_me:35904: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -35903,11 +35922,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:35906: result: yes" >&5
+  echo "$as_me:35925: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:35910: result: no" >&5
+  echo "$as_me:35929: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -35919,14 +35938,14 @@ EOF
 fi
 done
 
-echo "$as_me:35922: checking if TRUE/FALSE are defined" >&5
+echo "$as_me:35941: 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 35929 "configure"
+#line 35948 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -35940,16 +35959,16 @@ int x = TRUE, y = FALSE; (void)x; (void)y
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35943: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35962: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35946: \$? = $ac_status" >&5
+  echo "$as_me:35965: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35949: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35968: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35952: \$? = $ac_status" >&5
+  echo "$as_me:35971: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_bool_defs=yes
 else
@@ -35960,7 +35979,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:35963: result: $cf_cv_bool_defs" >&5
+echo "$as_me:35982: result: $cf_cv_bool_defs" >&5
 echo "${ECHO_T}$cf_cv_bool_defs" >&6
 if test "$cf_cv_bool_defs" = no ; then
 
@@ -35974,14 +35993,14 @@ EOF
 
 fi
 
-echo "$as_me:35977: checking if external errno is declared" >&5
+echo "$as_me:35996: 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 35984 "configure"
+#line 36003 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -35995,16 +36014,16 @@ int x = (int) errno; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35998: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36017: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36001: \$? = $ac_status" >&5
+  echo "$as_me:36020: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36004: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36023: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36007: \$? = $ac_status" >&5
+  echo "$as_me:36026: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -36015,7 +36034,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:36018: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:36037: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -36030,14 +36049,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:36033: checking if external errno exists" >&5
+echo "$as_me:36052: 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 36040 "configure"
+#line 36059 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -36052,16 +36071,16 @@ errno = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:36055: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36074: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36058: \$? = $ac_status" >&5
+  echo "$as_me:36077: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:36061: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36080: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36064: \$? = $ac_status" >&5
+  echo "$as_me:36083: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_errno=yes
 else
@@ -36072,7 +36091,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:36075: result: $cf_cv_have_errno" >&5
+echo "$as_me:36094: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -36085,7 +36104,7 @@ EOF
 
 fi
 
-echo "$as_me:36088: checking if we can set errno" >&5
+echo "$as_me:36107: 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
@@ -36093,7 +36112,7 @@ else
 
 if test "$cross_compiling" = yes; then
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 36096 "configure"
+#line 36115 "configure"
 #include "confdefs.h"
 #include <errno.h>
 int
@@ -36105,16 +36124,16 @@ errno = 255
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:36108: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36127: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36111: \$? = $ac_status" >&5
+  echo "$as_me:36130: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:36114: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36133: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36117: \$? = $ac_status" >&5
+  echo "$as_me:36136: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_set_errno=maybe
 else
@@ -36125,7 +36144,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 36128 "configure"
+#line 36147 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -36139,15 +36158,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:36142: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36161: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36145: \$? = $ac_status" >&5
+  echo "$as_me:36164: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:36147: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36166: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36150: \$? = $ac_status" >&5
+  echo "$as_me:36169: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_set_errno=yes
 else
@@ -36160,21 +36179,21 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:36163: result: $cf_cv_set_errno" >&5
+echo "$as_me:36182: 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:36170: checking for setlocale()" >&5
+echo "$as_me:36189: 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 36177 "configure"
+#line 36196 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -36188,16 +36207,16 @@ setlocale(LC_ALL, "")
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:36191: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36210: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36194: \$? = $ac_status" >&5
+  echo "$as_me:36213: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:36197: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36216: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36200: \$? = $ac_status" >&5
+  echo "$as_me:36219: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_locale=yes
 else
@@ -36209,7 +36228,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:36212: result: $cf_cv_locale" >&5
+echo "$as_me:36231: result: $cf_cv_locale" >&5
 echo "${ECHO_T}$cf_cv_locale" >&6
 test "$cf_cv_locale" = yes && {
 cat >>confdefs.h <<\EOF
@@ -36217,14 +36236,14 @@ cat >>confdefs.h <<\EOF
 EOF
  }
 
-echo "$as_me:36220: checking if NGROUPS is defined" >&5
+echo "$as_me:36239: 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 36227 "configure"
+#line 36246 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -36243,23 +36262,23 @@ int x = NGROUPS; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36246: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36265: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36249: \$? = $ac_status" >&5
+  echo "$as_me:36268: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36252: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36271: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36255: \$? = $ac_status" >&5
+  echo "$as_me:36274: \$? = $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 36262 "configure"
+#line 36281 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -36278,16 +36297,16 @@ int x = NGROUPS_MAX
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36281: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36300: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36284: \$? = $ac_status" >&5
+  echo "$as_me:36303: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36287: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36306: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36290: \$? = $ac_status" >&5
+  echo "$as_me:36309: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ngroups=NGROUPS_MAX
 else
@@ -36299,7 +36318,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:36302: result: $cf_cv_ngroups" >&5
+echo "$as_me:36321: result: $cf_cv_ngroups" >&5
 echo "${ECHO_T}$cf_cv_ngroups" >&6
 
 fi
@@ -36320,13 +36339,13 @@ fi
 for ac_func in strerror
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:36323: checking for $ac_func" >&5
+echo "$as_me:36342: 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 36329 "configure"
+#line 36348 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -36357,16 +36376,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:36360: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36379: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36363: \$? = $ac_status" >&5
+  echo "$as_me:36382: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:36366: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36385: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36369: \$? = $ac_status" >&5
+  echo "$as_me:36388: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -36376,7 +36395,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:36379: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:36398: 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
@@ -36385,14 +36404,14 @@ EOF
 
 else
 
-echo "$as_me:36388: checking if external sys_nerr is declared" >&5
+echo "$as_me:36407: 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 36395 "configure"
+#line 36414 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -36406,16 +36425,16 @@ int x = (int) sys_nerr; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36409: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36428: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36412: \$? = $ac_status" >&5
+  echo "$as_me:36431: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36415: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36434: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36418: \$? = $ac_status" >&5
+  echo "$as_me:36437: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_sys_nerr=yes
 else
@@ -36426,7 +36445,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:36429: result: $cf_cv_dcl_sys_nerr" >&5
+echo "$as_me:36448: 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
@@ -36441,14 +36460,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:36444: checking if external sys_nerr exists" >&5
+echo "$as_me:36463: 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 36451 "configure"
+#line 36470 "configure"
 #include "confdefs.h"
 
 #undef sys_nerr
@@ -36463,16 +36482,16 @@ sys_nerr = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:36466: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36485: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36469: \$? = $ac_status" >&5
+  echo "$as_me:36488: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:36472: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36491: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36475: \$? = $ac_status" >&5
+  echo "$as_me:36494: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_sys_nerr=yes
 else
@@ -36483,7 +36502,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:36486: result: $cf_cv_have_sys_nerr" >&5
+echo "$as_me:36505: 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
@@ -36496,14 +36515,14 @@ EOF
 
 fi
 
-echo "$as_me:36499: checking if external sys_errlist is declared" >&5
+echo "$as_me:36518: 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 36506 "configure"
+#line 36525 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -36517,16 +36536,16 @@ int x = (int) sys_errlist; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36520: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36539: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36523: \$? = $ac_status" >&5
+  echo "$as_me:36542: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36526: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36545: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36529: \$? = $ac_status" >&5
+  echo "$as_me:36548: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_sys_errlist=yes
 else
@@ -36537,7 +36556,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:36540: result: $cf_cv_dcl_sys_errlist" >&5
+echo "$as_me:36559: 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
@@ -36552,14 +36571,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:36555: checking if external sys_errlist exists" >&5
+echo "$as_me:36574: 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 36562 "configure"
+#line 36581 "configure"
 #include "confdefs.h"
 
 #undef sys_errlist
@@ -36574,16 +36593,16 @@ sys_errlist = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:36577: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36596: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36580: \$? = $ac_status" >&5
+  echo "$as_me:36599: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:36583: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36602: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36586: \$? = $ac_status" >&5
+  echo "$as_me:36605: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_sys_errlist=yes
 else
@@ -36594,7 +36613,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:36597: result: $cf_cv_have_sys_errlist" >&5
+echo "$as_me:36616: 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
@@ -36613,23 +36632,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:36616: checking for $ac_header" >&5
+echo "$as_me:36635: 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 36622 "configure"
+#line 36641 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:36626: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:36645: \"$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:36632: \$? = $ac_status" >&5
+  echo "$as_me:36651: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -36648,7 +36667,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:36651: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:36670: 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
@@ -36658,14 +36677,14 @@ EOF
 fi
 done
 
-echo "$as_me:36661: checking for lastlog path" >&5
+echo "$as_me:36680: 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 36668 "configure"
+#line 36687 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -36685,16 +36704,16 @@ static char path[] = _PATH_LASTLOG; (void)path
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36688: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36707: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36691: \$? = $ac_status" >&5
+  echo "$as_me:36710: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36694: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36713: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36697: \$? = $ac_status" >&5
+  echo "$as_me:36716: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_path_lastlog="_PATH_LASTLOG"
 else
@@ -36709,14 +36728,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:36712: result: $cf_cv_path_lastlog" >&5
+echo "$as_me:36731: 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:36719: checking for utmp implementation" >&5
+echo "$as_me:36738: 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
@@ -36733,7 +36752,7 @@ cf_utmp_includes="
 #endif
 "
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 36736 "configure"
+#line 36755 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -36749,16 +36768,16 @@ struct $cf_header x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36752: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36771: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36755: \$? = $ac_status" >&5
+  echo "$as_me:36774: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36758: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36777: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36761: \$? = $ac_status" >&5
+  echo "$as_me:36780: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -36767,7 +36786,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 36770 "configure"
+#line 36789 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -36783,16 +36802,16 @@ struct $cf_header x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36786: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36805: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36789: \$? = $ac_status" >&5
+  echo "$as_me:36808: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36792: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36811: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36795: \$? = $ac_status" >&5
+  echo "$as_me:36814: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -36807,7 +36826,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:36810: result: $cf_cv_have_utmp" >&5
+echo "$as_me:36829: result: $cf_cv_have_utmp" >&5
 echo "${ECHO_T}$cf_cv_have_utmp" >&6
 
 if test "$cf_cv_have_utmp" != no ; then
@@ -36822,14 +36841,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test "$cf_cv_have_utmp" != no ; then
-echo "$as_me:36825: checking if ${cf_cv_have_utmp}.ut_host is declared" >&5
+echo "$as_me:36844: 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 36832 "configure"
+#line 36851 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -36846,16 +36865,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36849: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36868: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36852: \$? = $ac_status" >&5
+  echo "$as_me:36871: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36855: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36874: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36858: \$? = $ac_status" >&5
+  echo "$as_me:36877: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_host=yes
 else
@@ -36867,7 +36886,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:36870: result: $cf_cv_have_utmp_ut_host" >&5
+echo "$as_me:36889: 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
@@ -36877,14 +36896,14 @@ EOF
 fi
 
 if test "$cf_cv_have_utmp" != no ; then
-echo "$as_me:36880: checking if ${cf_cv_have_utmp}.ut_syslen is declared" >&5
+echo "$as_me:36899: 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 36887 "configure"
+#line 36906 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -36901,16 +36920,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36904: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36923: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36907: \$? = $ac_status" >&5
+  echo "$as_me:36926: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36910: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36929: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36913: \$? = $ac_status" >&5
+  echo "$as_me:36932: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_syslen=yes
 else
@@ -36922,7 +36941,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:36925: result: $cf_cv_have_utmp_ut_syslen" >&5
+echo "$as_me:36944: 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
@@ -36932,7 +36951,7 @@ EOF
 fi
 
 if test "$cf_cv_have_utmp" != no ; then
-echo "$as_me:36935: checking if ${cf_cv_have_utmp}.ut_name is declared" >&5
+echo "$as_me:36954: 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
@@ -36949,7 +36968,7 @@ cf_utmp_includes="
 "
 for cf_header in ut_name ut_user ; do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 36952 "configure"
+#line 36971 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -36965,16 +36984,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36968: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36987: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36971: \$? = $ac_status" >&5
+  echo "$as_me:36990: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36974: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36993: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36977: \$? = $ac_status" >&5
+  echo "$as_me:36996: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_name=$cf_header
 	 break
@@ -36986,12 +37005,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:36989: result: $cf_cv_have_utmp_ut_name" >&5
+echo "$as_me:37008: 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:36994: error: Cannot find declaration for ut.ut_name" >&5
+	{ { echo "$as_me:37013: 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; }; }
 	;;
@@ -37006,7 +37025,7 @@ esac
 fi
 
 if test "$cf_cv_have_utmp" != no ; then
-echo "$as_me:37009: checking for exit-status in $cf_cv_have_utmp" >&5
+echo "$as_me:37028: 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
@@ -37019,7 +37038,7 @@ for cf_result in \
 	ut_exit.ut_exit
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 37022 "configure"
+#line 37041 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -37036,16 +37055,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:37039: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:37058: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:37042: \$? = $ac_status" >&5
+  echo "$as_me:37061: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:37045: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37064: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37048: \$? = $ac_status" >&5
+  echo "$as_me:37067: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_xstatus=$cf_result
 	 break
@@ -37058,7 +37077,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:37061: result: $cf_cv_have_utmp_ut_xstatus" >&5
+echo "$as_me:37080: 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
 
@@ -37074,14 +37093,14 @@ fi
 fi
 
 if test "$cf_cv_have_utmp" != no ; then
-echo "$as_me:37077: checking if ${cf_cv_have_utmp}.ut_xtime is declared" >&5
+echo "$as_me:37096: 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 37084 "configure"
+#line 37103 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -37098,23 +37117,23 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:37101: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:37120: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:37104: \$? = $ac_status" >&5
+  echo "$as_me:37123: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:37107: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37126: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37110: \$? = $ac_status" >&5
+  echo "$as_me:37129: \$? = $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 37117 "configure"
+#line 37136 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -37131,16 +37150,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:37134: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:37153: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:37137: \$? = $ac_status" >&5
+  echo "$as_me:37156: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:37140: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37159: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37143: \$? = $ac_status" >&5
+  echo "$as_me:37162: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_xtime=define
 else
@@ -37154,7 +37173,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:37157: result: $cf_cv_have_utmp_ut_xtime" >&5
+echo "$as_me:37176: 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
 
@@ -37173,14 +37192,14 @@ fi
 fi
 
 if test "$cf_cv_have_utmp" != no ; then
-echo "$as_me:37176: checking if ${cf_cv_have_utmp}.ut_session is declared" >&5
+echo "$as_me:37195: 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 37183 "configure"
+#line 37202 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -37197,16 +37216,16 @@ static struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:37200: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:37219: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:37203: \$? = $ac_status" >&5
+  echo "$as_me:37222: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:37206: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37225: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37209: \$? = $ac_status" >&5
+  echo "$as_me:37228: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_session=yes
 else
@@ -37217,7 +37236,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:37220: result: $cf_cv_have_utmp_ut_session" >&5
+echo "$as_me:37239: 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
 
@@ -37228,7 +37247,7 @@ EOF
 fi
 fi
 
-echo "$as_me:37231: checking if $cf_cv_have_utmp is SYSV flavor" >&5
+echo "$as_me:37250: 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
@@ -37236,7 +37255,7 @@ else
 
 test "$cf_cv_have_utmp" = "utmp" && cf_prefix="ut" || cf_prefix="utx"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 37239 "configure"
+#line 37258 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -37255,16 +37274,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:37258: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37277: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37261: \$? = $ac_status" >&5
+  echo "$as_me:37280: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:37264: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37283: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37267: \$? = $ac_status" >&5
+  echo "$as_me:37286: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sysv_utmp=yes
 else
@@ -37275,7 +37294,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:37278: result: $cf_cv_sysv_utmp" >&5
+echo "$as_me:37297: result: $cf_cv_sysv_utmp" >&5
 echo "${ECHO_T}$cf_cv_sysv_utmp" >&6
 test "$cf_cv_sysv_utmp" = yes &&
 cat >>confdefs.h <<\EOF
@@ -37284,14 +37303,14 @@ EOF
 
 fi
 
-echo "$as_me:37287: checking if external h_errno exists" >&5
+echo "$as_me:37306: 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 37294 "configure"
+#line 37313 "configure"
 #include "confdefs.h"
 
 #undef h_errno
@@ -37306,16 +37325,16 @@ h_errno = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:37309: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37328: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37312: \$? = $ac_status" >&5
+  echo "$as_me:37331: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:37315: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37334: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37318: \$? = $ac_status" >&5
+  echo "$as_me:37337: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_h_errno=yes
 else
@@ -37326,7 +37345,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:37329: result: $cf_cv_have_h_errno" >&5
+echo "$as_me:37348: 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
@@ -37339,7 +37358,7 @@ EOF
 
 fi
 
-echo "$as_me:37342: checking if bibp: URLs should be supported" >&5
+echo "$as_me:37361: 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.
@@ -37356,14 +37375,14 @@ else
 	use_bibp_urls=yes
 
 fi;
-echo "$as_me:37359: result: $use_bibp_urls" >&5
+echo "$as_me:37378: 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:37366: checking if configuration info should be browsable" >&5
+echo "$as_me:37385: 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.
@@ -37380,14 +37399,14 @@ else
 	use_config_info=yes
 
 fi;
-echo "$as_me:37383: result: $use_config_info" >&5
+echo "$as_me:37402: 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:37390: checking if new-style forms-based options screen should be used" >&5
+echo "$as_me:37409: 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.
@@ -37404,14 +37423,14 @@ else
 	use_forms_options=yes
 
 fi;
-echo "$as_me:37407: result: $use_forms_options" >&5
+echo "$as_me:37426: 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:37414: checking if old-style options menu should be used" >&5
+echo "$as_me:37433: 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.
@@ -37428,14 +37447,14 @@ else
 	use_menu_options=yes
 
 fi;
-echo "$as_me:37431: result: $use_menu_options" >&5
+echo "$as_me:37450: 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:37438: checking if sessions code should be used" >&5
+echo "$as_me:37457: 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.
@@ -37452,7 +37471,7 @@ else
 	use_sessions=yes
 
 fi;
-echo "$as_me:37455: result: $use_sessions" >&5
+echo "$as_me:37474: result: $use_sessions" >&5
 echo "${ECHO_T}$use_sessions" >&6
 if test "$use_sessions" != no ; then
 
@@ -37463,7 +37482,7 @@ EOF
 	EXTRA_OBJS="$EXTRA_OBJS LYSession\$o"
 fi
 
-echo "$as_me:37466: checking if session-caching code should be used" >&5
+echo "$as_me:37485: 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.
@@ -37480,7 +37499,7 @@ else
 	use_session_cache=yes
 
 fi;
-echo "$as_me:37483: result: $use_session_cache" >&5
+echo "$as_me:37502: result: $use_session_cache" >&5
 echo "${ECHO_T}$use_session_cache" >&6
 if test "$use_session_cache" != no ; then
 
@@ -37490,7 +37509,7 @@ EOF
 
 fi
 
-echo "$as_me:37493: checking if address-list page should be used" >&5
+echo "$as_me:37512: 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.
@@ -37507,14 +37526,14 @@ else
 	use_addrlist_page=yes
 
 fi;
-echo "$as_me:37510: result: $use_addrlist_page" >&5
+echo "$as_me:37529: 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:37517: checking if support for CJK should be used" >&5
+echo "$as_me:37536: 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.
@@ -37531,7 +37550,7 @@ else
 	use_cjk=yes
 
 fi;
-echo "$as_me:37534: result: $use_cjk" >&5
+echo "$as_me:37553: result: $use_cjk" >&5
 echo "${ECHO_T}$use_cjk" >&6
 test "$use_cjk" != no &&
 cat >>confdefs.h <<\EOF
@@ -37581,7 +37600,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 37584 "configure"
+#line 37603 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -37593,16 +37612,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:37596: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:37615: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:37599: \$? = $ac_status" >&5
+  echo "$as_me:37618: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:37602: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37621: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37605: \$? = $ac_status" >&5
+  echo "$as_me:37624: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -37619,7 +37638,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}:37622: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:37641: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -37665,7 +37684,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 37668 "configure"
+#line 37687 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -37677,16 +37696,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:37680: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:37699: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:37683: \$? = $ac_status" >&5
+  echo "$as_me:37702: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:37686: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37705: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37689: \$? = $ac_status" >&5
+  echo "$as_me:37708: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -37703,7 +37722,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}:37706: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:37725: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -37721,7 +37740,7 @@ echo "${as_me:-configure}:37706: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:37724: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:37743: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -37746,7 +37765,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}:37749: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:37768: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -37775,7 +37794,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}:37778: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:37797: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -37784,7 +37803,7 @@ echo "${as_me:-configure}:37778: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:37787: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:37806: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -37795,7 +37814,7 @@ esac
 
 fi;
 
-  echo "$as_me:37798: checking for iconv" >&5
+  echo "$as_me:37817: 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
@@ -37806,12 +37825,12 @@ else
 cf_cv_header_path_iconv=
 cf_cv_library_path_iconv=
 
-echo "${as_me:-configure}:37809: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:37828: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 37814 "configure"
+#line 37833 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -37830,16 +37849,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:37833: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37852: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37836: \$? = $ac_status" >&5
+  echo "$as_me:37855: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:37839: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37858: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37842: \$? = $ac_status" >&5
+  echo "$as_me:37861: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -37853,7 +37872,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-liconv  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 37856 "configure"
+#line 37875 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -37872,16 +37891,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:37875: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37894: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37878: \$? = $ac_status" >&5
+  echo "$as_me:37897: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:37881: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37900: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37884: \$? = $ac_status" >&5
+  echo "$as_me:37903: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -37898,9 +37917,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for iconv library" 1>&6
 
-echo "${as_me:-configure}:37901: testing find linkage for iconv library ..." 1>&5
+echo "${as_me:-configure}:37920: testing find linkage for iconv library ..." 1>&5
 
-echo "${as_me:-configure}:37903: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:37922: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -37991,7 +38010,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}:37994: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:38013: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -37999,7 +38018,7 @@ echo "${as_me:-configure}:37994: testing ... testing $cf_cv_header_path_iconv ..
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_iconv"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 38002 "configure"
+#line 38021 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -38018,21 +38037,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:38021: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:38040: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:38024: \$? = $ac_status" >&5
+  echo "$as_me:38043: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:38027: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38046: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38030: \$? = $ac_status" >&5
+  echo "$as_me:38049: \$? = $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}:38035: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:38054: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
 
 				cf_cv_find_linkage_iconv=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -38050,7 +38069,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_iconv" = maybe ; then
 
-echo "${as_me:-configure}:38053: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:38072: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -38125,13 +38144,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}:38128: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:38147: 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 38134 "configure"
+#line 38153 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -38150,21 +38169,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:38153: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38172: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38156: \$? = $ac_status" >&5
+  echo "$as_me:38175: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:38159: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38178: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38162: \$? = $ac_status" >&5
+  echo "$as_me:38181: \$? = $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}:38167: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:38186: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
 
 					cf_cv_find_linkage_iconv=yes
 					cf_cv_library_file_iconv="-liconv"
@@ -38204,7 +38223,7 @@ am_cv_func_iconv="no, consider installing GNU libiconv"
 fi
 
 fi
-echo "$as_me:38207: result: $am_cv_func_iconv" >&5
+echo "$as_me:38226: result: $am_cv_func_iconv" >&5
 echo "${ECHO_T}$am_cv_func_iconv" >&6
 
   if test "$am_cv_func_iconv" = yes; then
@@ -38213,14 +38232,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_ICONV 1
 EOF
 
-    echo "$as_me:38216: checking if the declaration of iconv() needs const." >&5
+    echo "$as_me:38235: 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 38223 "configure"
+#line 38242 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -38245,16 +38264,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:38248: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:38267: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:38251: \$? = $ac_status" >&5
+  echo "$as_me:38270: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:38254: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38273: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38257: \$? = $ac_status" >&5
+  echo "$as_me:38276: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   am_cv_proto_iconv_const=no
 else
@@ -38264,7 +38283,7 @@ am_cv_proto_iconv_const=yes
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:38267: result: $am_cv_proto_iconv_const" >&5
+echo "$as_me:38286: 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
@@ -38309,7 +38328,7 @@ if test -n "$cf_cv_header_path_iconv" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 38312 "configure"
+#line 38331 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -38321,16 +38340,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:38324: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:38343: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:38327: \$? = $ac_status" >&5
+  echo "$as_me:38346: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:38330: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38349: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38333: \$? = $ac_status" >&5
+  echo "$as_me:38352: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -38347,7 +38366,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}:38350: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:38369: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -38386,7 +38405,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}:38389: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:38408: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -38400,7 +38419,7 @@ fi
 if test "x$am_cv_func_iconv" = "xyes"
 then
 
-echo "$as_me:38403: checking if experimental support for Chinese UTF-8 should be used" >&5
+echo "$as_me:38422: 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.
@@ -38417,7 +38436,7 @@ else
 	use_cn_utf8=yes
 
 fi;
-echo "$as_me:38420: result: $use_cn_utf8" >&5
+echo "$as_me:38439: result: $use_cn_utf8" >&5
 echo "${ECHO_T}$use_cn_utf8" >&6
 if test "$use_cn_utf8" != no ; then
 
@@ -38428,7 +38447,7 @@ EOF
 	use_cjk_utf8=yes
 fi
 
-echo "$as_me:38431: checking if support for Japanese UTF-8 should be used" >&5
+echo "$as_me:38450: 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.
@@ -38445,7 +38464,7 @@ else
 	use_ja_utf8=yes
 
 fi;
-echo "$as_me:38448: result: $use_ja_utf8" >&5
+echo "$as_me:38467: result: $use_ja_utf8" >&5
 echo "${ECHO_T}$use_ja_utf8" >&6
 if test "$use_ja_utf8" != no ; then
 
@@ -38466,11 +38485,11 @@ fi
 else
 	test -n "$verbose" && echo "	skipping CJK features which depend on iconv" 1>&6
 
-echo "${as_me:-configure}:38469: testing skipping CJK features which depend on iconv ..." 1>&5
+echo "${as_me:-configure}:38488: testing skipping CJK features which depend on iconv ..." 1>&5
 
 fi
 
-echo "$as_me:38473: checking if experimental wcwidth/UTF-8 logic should be used" >&5
+echo "$as_me:38492: 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.
@@ -38487,7 +38506,7 @@ else
 	use_wcwidth=no
 
 fi;
-echo "$as_me:38490: result: $use_wcwidth" >&5
+echo "$as_me:38509: result: $use_wcwidth" >&5
 echo "${ECHO_T}$use_wcwidth" >&6
 test "$use_wcwidth" != no &&
 cat >>confdefs.h <<\EOF
@@ -38502,7 +38521,7 @@ case "$cf_cv_screen" in
 esac
 
 if test "$use_dft_colors" != no ; then
-echo "$as_me:38505: checking if you want to use default-colors" >&5
+echo "$as_me:38524: 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.
@@ -38519,7 +38538,7 @@ else
 	use_dft_colors=no
 
 fi;
-echo "$as_me:38522: result: $use_dft_colors" >&5
+echo "$as_me:38541: result: $use_dft_colors" >&5
 echo "${ECHO_T}$use_dft_colors" >&6
 test "$use_dft_colors" = "yes" &&
 cat >>confdefs.h <<\EOF
@@ -38528,7 +38547,7 @@ EOF
 
 fi
 
-echo "$as_me:38531: checking if experimental keyboard-layout logic should be used" >&5
+echo "$as_me:38550: 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.
@@ -38545,14 +38564,14 @@ else
 	use_kbd_layout=no
 
 fi;
-echo "$as_me:38548: result: $use_kbd_layout" >&5
+echo "$as_me:38567: 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:38555: checking if experimental nested-table logic should be used" >&5
+echo "$as_me:38574: 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.
@@ -38569,14 +38588,14 @@ else
 	use_nested_tables=no
 
 fi;
-echo "$as_me:38572: result: $use_nested_tables" >&5
+echo "$as_me:38591: 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:38579: checking if alternative line-edit bindings should be used" >&5
+echo "$as_me:38598: 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.
@@ -38593,14 +38612,14 @@ else
 	use_alt_bindings=yes
 
 fi;
-echo "$as_me:38596: result: $use_alt_bindings" >&5
+echo "$as_me:38615: 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:38603: checking if ascii case-conversion should be used" >&5
+echo "$as_me:38622: 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.
@@ -38617,14 +38636,14 @@ else
 	use_ascii_ctypes=yes
 
 fi;
-echo "$as_me:38620: result: $use_ascii_ctypes" >&5
+echo "$as_me:38639: 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:38627: checking if you want to use extended HTML DTD logic" >&5
+echo "$as_me:38646: 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.
@@ -38641,14 +38660,14 @@ else
 	use_ext_htmldtd=yes
 
 fi;
-echo "$as_me:38644: result: $use_ext_htmldtd" >&5
+echo "$as_me:38663: 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:38651: checking if file-upload logic should be used" >&5
+echo "$as_me:38670: 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.
@@ -38665,14 +38684,14 @@ else
 	use_file_upload=yes
 
 fi;
-echo "$as_me:38668: result: $use_file_upload" >&5
+echo "$as_me:38687: 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:38675: checking if IDNA support should be used" >&5
+echo "$as_me:38694: 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.
@@ -38689,7 +38708,7 @@ else
 	use_idna=yes
 
 fi;
-echo "$as_me:38692: result: $use_idna" >&5
+echo "$as_me:38711: result: $use_idna" >&5
 echo "${ECHO_T}$use_idna" >&6
 
 if test "$use_idna" = yes ; then
@@ -38731,7 +38750,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 38734 "configure"
+#line 38753 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -38743,16 +38762,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:38746: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:38765: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:38749: \$? = $ac_status" >&5
+  echo "$as_me:38768: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:38752: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38771: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38755: \$? = $ac_status" >&5
+  echo "$as_me:38774: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -38769,7 +38788,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}:38772: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:38791: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -38815,7 +38834,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 38818 "configure"
+#line 38837 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -38827,16 +38846,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:38830: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:38849: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:38833: \$? = $ac_status" >&5
+  echo "$as_me:38852: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:38836: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38855: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38839: \$? = $ac_status" >&5
+  echo "$as_me:38858: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -38853,7 +38872,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}:38856: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:38875: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -38871,7 +38890,7 @@ echo "${as_me:-configure}:38856: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:38874: error: cannot find  under $use_idna" >&5
+{ { echo "$as_me:38893: error: cannot find  under $use_idna" >&5
 echo "$as_me: error: cannot find  under $use_idna" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -38896,7 +38915,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}:38899: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:38918: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -38925,7 +38944,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}:38928: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:38947: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -38934,7 +38953,7 @@ echo "${as_me:-configure}:38928: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:38937: error: cannot find  under $use_idna" >&5
+{ { echo "$as_me:38956: error: cannot find  under $use_idna" >&5
 echo "$as_me: error: cannot find  under $use_idna" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -38948,12 +38967,12 @@ esac
 cf_cv_header_path_idn2=
 cf_cv_library_path_idn2=
 
-echo "${as_me:-configure}:38951: testing Starting FIND_LINKAGE(idn2,) ..." 1>&5
+echo "${as_me:-configure}:38970: testing Starting FIND_LINKAGE(idn2,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 38956 "configure"
+#line 38975 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -38972,16 +38991,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:38975: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38994: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38978: \$? = $ac_status" >&5
+  echo "$as_me:38997: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:38981: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39000: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38984: \$? = $ac_status" >&5
+  echo "$as_me:39003: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_idn2=yes
@@ -38995,7 +39014,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lidn2 $LIBICONV $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 38998 "configure"
+#line 39017 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -39014,16 +39033,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:39017: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39036: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39020: \$? = $ac_status" >&5
+  echo "$as_me:39039: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:39023: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39042: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39026: \$? = $ac_status" >&5
+  echo "$as_me:39045: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_idn2=yes
@@ -39040,9 +39059,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for idn2 library" 1>&6
 
-echo "${as_me:-configure}:39043: testing find linkage for idn2 library ..." 1>&5
+echo "${as_me:-configure}:39062: testing find linkage for idn2 library ..." 1>&5
 
-echo "${as_me:-configure}:39045: testing Searching for headers in FIND_LINKAGE(idn2,) ..." 1>&5
+echo "${as_me:-configure}:39064: testing Searching for headers in FIND_LINKAGE(idn2,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -39133,7 +39152,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}:39136: testing ... testing $cf_cv_header_path_idn2 ..." 1>&5
+echo "${as_me:-configure}:39155: testing ... testing $cf_cv_header_path_idn2 ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -39141,7 +39160,7 @@ echo "${as_me:-configure}:39136: testing ... testing $cf_cv_header_path_idn2 ...
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_idn2"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 39144 "configure"
+#line 39163 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -39160,21 +39179,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:39163: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:39182: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:39166: \$? = $ac_status" >&5
+  echo "$as_me:39185: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:39169: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39188: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39172: \$? = $ac_status" >&5
+  echo "$as_me:39191: \$? = $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}:39177: testing ... found idn2 headers in $cf_cv_header_path_idn2 ..." 1>&5
+echo "${as_me:-configure}:39196: testing ... found idn2 headers in $cf_cv_header_path_idn2 ..." 1>&5
 
 				cf_cv_find_linkage_idn2=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -39192,7 +39211,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_idn2" = maybe ; then
 
-echo "${as_me:-configure}:39195: testing Searching for idn2 library in FIND_LINKAGE(idn2,) ..." 1>&5
+echo "${as_me:-configure}:39214: testing Searching for idn2 library in FIND_LINKAGE(idn2,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -39267,13 +39286,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}:39270: testing ... testing $cf_cv_library_path_idn2 ..." 1>&5
+echo "${as_me:-configure}:39289: 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 39276 "configure"
+#line 39295 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -39292,21 +39311,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:39295: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39314: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39298: \$? = $ac_status" >&5
+  echo "$as_me:39317: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:39301: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39320: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39304: \$? = $ac_status" >&5
+  echo "$as_me:39323: \$? = $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}:39309: testing ... found idn2 library in $cf_cv_library_path_idn2 ..." 1>&5
+echo "${as_me:-configure}:39328: testing ... found idn2 library in $cf_cv_library_path_idn2 ..." 1>&5
 
 					cf_cv_find_linkage_idn2=yes
 					cf_cv_library_file_idn2="-lidn2"
@@ -39368,7 +39387,7 @@ if test -n "$cf_cv_header_path_idn2" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 39371 "configure"
+#line 39390 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -39380,16 +39399,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:39383: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:39402: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:39386: \$? = $ac_status" >&5
+  echo "$as_me:39405: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:39389: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39408: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39392: \$? = $ac_status" >&5
+  echo "$as_me:39411: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -39406,7 +39425,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}:39409: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:39428: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -39442,7 +39461,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}:39445: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:39464: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -39469,14 +39488,14 @@ LIBS="$cf_add_libs"
 else
 test -n "$verbose" && echo "	unsuccessful, will try idn (older)" 1>&6
 
-echo "${as_me:-configure}:39472: testing unsuccessful, will try idn (older) ..." 1>&5
+echo "${as_me:-configure}:39491: 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}:39479: testing found idn2 library ..." 1>&5
+echo "${as_me:-configure}:39498: testing found idn2 library ..." 1>&5
 
 cat >>confdefs.h <<\EOF
 #define USE_IDN2 1
@@ -39489,12 +39508,12 @@ else
 cf_cv_header_path_idn=
 cf_cv_library_path_idn=
 
-echo "${as_me:-configure}:39492: testing Starting FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:39511: testing Starting FIND_LINKAGE(idn,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 39497 "configure"
+#line 39516 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -39513,16 +39532,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:39516: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39535: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39519: \$? = $ac_status" >&5
+  echo "$as_me:39538: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:39522: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39541: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39525: \$? = $ac_status" >&5
+  echo "$as_me:39544: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_idn=yes
@@ -39536,7 +39555,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lidn $LIBICONV $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 39539 "configure"
+#line 39558 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -39555,16 +39574,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:39558: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39577: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39561: \$? = $ac_status" >&5
+  echo "$as_me:39580: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:39564: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39583: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39567: \$? = $ac_status" >&5
+  echo "$as_me:39586: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_idn=yes
@@ -39581,9 +39600,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for idn library" 1>&6
 
-echo "${as_me:-configure}:39584: testing find linkage for idn library ..." 1>&5
+echo "${as_me:-configure}:39603: testing find linkage for idn library ..." 1>&5
 
-echo "${as_me:-configure}:39586: testing Searching for headers in FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:39605: testing Searching for headers in FIND_LINKAGE(idn,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -39674,7 +39693,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}:39677: testing ... testing $cf_cv_header_path_idn ..." 1>&5
+echo "${as_me:-configure}:39696: testing ... testing $cf_cv_header_path_idn ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -39682,7 +39701,7 @@ echo "${as_me:-configure}:39677: testing ... testing $cf_cv_header_path_idn ..."
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_idn"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 39685 "configure"
+#line 39704 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -39701,21 +39720,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:39704: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:39723: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:39707: \$? = $ac_status" >&5
+  echo "$as_me:39726: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:39710: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39729: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39713: \$? = $ac_status" >&5
+  echo "$as_me:39732: \$? = $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}:39718: testing ... found idn headers in $cf_cv_header_path_idn ..." 1>&5
+echo "${as_me:-configure}:39737: testing ... found idn headers in $cf_cv_header_path_idn ..." 1>&5
 
 				cf_cv_find_linkage_idn=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -39733,7 +39752,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_idn" = maybe ; then
 
-echo "${as_me:-configure}:39736: testing Searching for idn library in FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:39755: testing Searching for idn library in FIND_LINKAGE(idn,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -39808,13 +39827,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}:39811: testing ... testing $cf_cv_library_path_idn ..." 1>&5
+echo "${as_me:-configure}:39830: 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 39817 "configure"
+#line 39836 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -39833,21 +39852,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:39836: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39855: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39839: \$? = $ac_status" >&5
+  echo "$as_me:39858: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:39842: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39861: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39845: \$? = $ac_status" >&5
+  echo "$as_me:39864: \$? = $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}:39850: testing ... found idn library in $cf_cv_library_path_idn ..." 1>&5
+echo "${as_me:-configure}:39869: testing ... found idn library in $cf_cv_library_path_idn ..." 1>&5
 
 					cf_cv_find_linkage_idn=yes
 					cf_cv_library_file_idn="-lidn"
@@ -39909,7 +39928,7 @@ if test -n "$cf_cv_header_path_idn" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 39912 "configure"
+#line 39931 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -39921,16 +39940,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:39924: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:39943: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:39927: \$? = $ac_status" >&5
+  echo "$as_me:39946: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:39930: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39949: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39933: \$? = $ac_status" >&5
+  echo "$as_me:39952: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -39947,7 +39966,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}:39950: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:39969: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -39983,7 +40002,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}:39986: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:40005: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -40008,14 +40027,14 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:40011: WARNING: Cannot find idn library" >&5
+{ echo "$as_me:40030: 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}:40018: testing found idn library ..." 1>&5
+echo "${as_me:-configure}:40037: testing found idn library ..." 1>&5
 
 cat >>confdefs.h <<\EOF
 #define USE_IDNA 1
@@ -40026,7 +40045,7 @@ fi
 
 fi
 
-echo "$as_me:40029: checking if element-justification logic should be used" >&5
+echo "$as_me:40048: 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.
@@ -40043,14 +40062,14 @@ else
 	use_justify_elts=yes
 
 fi;
-echo "$as_me:40046: result: $use_justify_elts" >&5
+echo "$as_me:40065: 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:40053: checking if partial-display should be used" >&5
+echo "$as_me:40072: 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.
@@ -40067,14 +40086,14 @@ else
 	use_partial_display=yes
 
 fi;
-echo "$as_me:40070: result: $use_partial_display" >&5
+echo "$as_me:40089: 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:40077: checking if persistent-cookie logic should be used" >&5
+echo "$as_me:40096: 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.
@@ -40091,14 +40110,14 @@ else
 	use_filed_cookies=yes
 
 fi;
-echo "$as_me:40094: result: $use_filed_cookies" >&5
+echo "$as_me:40113: 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:40101: checking if html source should be colorized" >&5
+echo "$as_me:40120: 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.
@@ -40115,14 +40134,14 @@ else
 	use_prettysrc=yes
 
 fi;
-echo "$as_me:40118: result: $use_prettysrc" >&5
+echo "$as_me:40137: 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:40125: checking if progress-bar code should be used" >&5
+echo "$as_me:40144: 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.
@@ -40139,14 +40158,14 @@ else
 	use_progressbar=yes
 
 fi;
-echo "$as_me:40142: result: $use_progressbar" >&5
+echo "$as_me:40161: 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:40149: checking if read-progress message should show ETA" >&5
+echo "$as_me:40168: 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.
@@ -40163,14 +40182,14 @@ else
 	use_read_eta=yes
 
 fi;
-echo "$as_me:40166: result: $use_read_eta" >&5
+echo "$as_me:40185: 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:40173: checking if source caching should be used" >&5
+echo "$as_me:40192: 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.
@@ -40187,14 +40206,14 @@ else
 	use_source_cache=yes
 
 fi;
-echo "$as_me:40190: result: $use_source_cache" >&5
+echo "$as_me:40209: 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:40197: checking if scrollbar code should be used" >&5
+echo "$as_me:40216: 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.
@@ -40211,10 +40230,10 @@ else
 	use_scrollbar=yes
 
 fi;
-echo "$as_me:40214: result: $use_scrollbar" >&5
+echo "$as_me:40233: result: $use_scrollbar" >&5
 echo "${ECHO_T}$use_scrollbar" >&6
 
-echo "$as_me:40217: checking if charset-selection logic should be used" >&5
+echo "$as_me:40236: 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.
@@ -40231,14 +40250,14 @@ else
 	use_charset_choice=no
 
 fi;
-echo "$as_me:40234: result: $use_charset_choice" >&5
+echo "$as_me:40253: 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:40241: checking if you want to use external commands" >&5
+echo "$as_me:40260: 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.
@@ -40255,7 +40274,7 @@ else
 	use_externs=no
 
 fi;
-echo "$as_me:40258: result: $use_externs" >&5
+echo "$as_me:40277: result: $use_externs" >&5
 echo "${ECHO_T}$use_externs" >&6
 if test "$use_externs" != "no" ; then
 
@@ -40266,7 +40285,7 @@ EOF
 	EXTRA_OBJS="$EXTRA_OBJS LYExtern\$o"
 fi
 
-echo "$as_me:40269: checking if you want to use setfont support" >&5
+echo "$as_me:40288: 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.
@@ -40283,7 +40302,7 @@ else
 	use_setfont=no
 
 fi;
-echo "$as_me:40286: result: $use_setfont" >&5
+echo "$as_me:40305: result: $use_setfont" >&5
 echo "${ECHO_T}$use_setfont" >&6
 if test "$use_setfont" = yes ; then
 	case "$host_os" in
@@ -40294,7 +40313,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:40297: checking for $ac_word" >&5
+echo "$as_me:40316: 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
@@ -40311,7 +40330,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:40314: found $ac_dir/$ac_word" >&5
+   echo "$as_me:40333: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -40322,10 +40341,10 @@ fi
 SETFONT=$ac_cv_path_SETFONT
 
 if test -n "$SETFONT"; then
-  echo "$as_me:40325: result: $SETFONT" >&5
+  echo "$as_me:40344: result: $SETFONT" >&5
 echo "${ECHO_T}$SETFONT" >&6
 else
-  echo "$as_me:40328: result: no" >&5
+  echo "$as_me:40347: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -40384,7 +40403,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:40387: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:40406: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define SETFONT_PATH "$cf_path_prog"
@@ -40402,19 +40421,19 @@ fi
 		SETFONT=built-in
 		test -n "$verbose" && echo "	Assume $host_os has font-switching" 1>&6
 
-echo "${as_me:-configure}:40405: testing Assume $host_os has font-switching ..." 1>&5
+echo "${as_me:-configure}:40424: 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}:40412: testing Assume $host_os has no font-switching ..." 1>&5
+echo "${as_me:-configure}:40431: testing Assume $host_os has no font-switching ..." 1>&5
 
 		;;
 	esac
 	if test -z "$SETFONT" ; then
-		{ echo "$as_me:40417: WARNING: Cannot find a font-setting program" >&5
+		{ echo "$as_me:40436: WARNING: Cannot find a font-setting program" >&5
 echo "$as_me: WARNING: Cannot find a font-setting program" >&2;}
 	elif test "$SETFONT" != unknown ; then
 
@@ -40425,7 +40444,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:40428: checking if you want cgi-link support" >&5
+echo "$as_me:40447: 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.
@@ -40442,10 +40461,10 @@ EOF
 else
   enableval=no
 fi;
-echo "$as_me:40445: result: $enableval" >&5
+echo "$as_me:40464: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:40448: checking if you want change-exec support" >&5
+echo "$as_me:40467: 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.
@@ -40462,14 +40481,14 @@ else
 	use_change_exec=no
 
 fi;
-echo "$as_me:40465: result: $use_change_exec" >&5
+echo "$as_me:40484: 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:40472: checking if you want exec-links support" >&5
+echo "$as_me:40491: 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.
@@ -40486,14 +40505,14 @@ else
 	use_exec_links=$enableval
 
 fi;
-echo "$as_me:40489: result: $use_exec_links" >&5
+echo "$as_me:40508: 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:40496: checking if you want exec-scripts support" >&5
+echo "$as_me:40515: 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.
@@ -40510,14 +40529,14 @@ else
 	use_exec_scripts=$enableval
 
 fi;
-echo "$as_me:40513: result: $use_exec_scripts" >&5
+echo "$as_me:40532: 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:40520: checking if you want internal-links feature" >&5
+echo "$as_me:40539: 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.
@@ -40534,14 +40553,14 @@ else
 	use_internal_links=no
 
 fi;
-echo "$as_me:40537: result: $use_internal_links" >&5
+echo "$as_me:40556: 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:40544: checking if you want to fork NSL requests" >&5
+echo "$as_me:40563: 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.
@@ -40558,7 +40577,7 @@ else
 	use_nsl_fork=no
 
 fi;
-echo "$as_me:40561: result: $use_nsl_fork" >&5
+echo "$as_me:40580: result: $use_nsl_fork" >&5
 echo "${ECHO_T}$use_nsl_fork" >&6
 if test "$use_nsl_fork" = yes ; then
 	case "$host_os" in
@@ -40579,7 +40598,7 @@ EOF
 	esac
 fi
 
-echo "$as_me:40582: checking if you want to log URL requests via syslog" >&5
+echo "$as_me:40601: 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.
@@ -40596,14 +40615,14 @@ else
 	use_syslog=no
 
 fi;
-echo "$as_me:40599: result: $use_syslog" >&5
+echo "$as_me:40618: 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:40606: checking if you want to underline links" >&5
+echo "$as_me:40625: 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.
@@ -40620,7 +40639,7 @@ else
 	use_underline=no
 
 fi;
-echo "$as_me:40623: result: $use_underline" >&5
+echo "$as_me:40642: result: $use_underline" >&5
 echo "${ECHO_T}$use_underline" >&6
 test "$use_underline" = yes &&
 cat >>confdefs.h <<\EOF
@@ -40632,7 +40651,7 @@ cat >>confdefs.h <<\EOF
 #define UNDERLINE_LINKS 0
 EOF
 
-echo "$as_me:40635: checking if help files should be gzip'ed" >&5
+echo "$as_me:40654: 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.
@@ -40649,10 +40668,10 @@ else
 	use_gzip_help=no
 
 fi;
-echo "$as_me:40652: result: $use_gzip_help" >&5
+echo "$as_me:40671: result: $use_gzip_help" >&5
 echo "${ECHO_T}$use_gzip_help" >&6
 
-echo "$as_me:40655: checking if you want to use libbz2 for decompression of some bzip2 files" >&5
+echo "$as_me:40674: 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.
@@ -40662,7 +40681,7 @@ if test "${with_bzlib+set}" = set; then
 else
   use_bzlib=yes
 fi;
-echo "$as_me:40665: result: $use_bzlib" >&5
+echo "$as_me:40684: result: $use_bzlib" >&5
 echo "${ECHO_T}$use_bzlib" >&6
 
 if test ".$use_bzlib" != ".no" ; then
@@ -40704,7 +40723,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 40707 "configure"
+#line 40726 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -40716,16 +40735,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:40719: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:40738: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:40722: \$? = $ac_status" >&5
+  echo "$as_me:40741: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:40725: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40744: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40728: \$? = $ac_status" >&5
+  echo "$as_me:40747: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -40742,7 +40761,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}:40745: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:40764: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -40788,7 +40807,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 40791 "configure"
+#line 40810 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -40800,16 +40819,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:40803: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:40822: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:40806: \$? = $ac_status" >&5
+  echo "$as_me:40825: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:40809: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40828: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40812: \$? = $ac_status" >&5
+  echo "$as_me:40831: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -40826,7 +40845,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}:40829: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:40848: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -40844,7 +40863,7 @@ echo "${as_me:-configure}:40829: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:40847: error: cannot find  under $use_bzlib" >&5
+{ { echo "$as_me:40866: error: cannot find  under $use_bzlib" >&5
 echo "$as_me: error: cannot find  under $use_bzlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -40869,7 +40888,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}:40872: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:40891: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -40898,7 +40917,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}:40901: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:40920: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -40907,7 +40926,7 @@ echo "${as_me:-configure}:40901: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:40910: error: cannot find  under $use_bzlib" >&5
+{ { echo "$as_me:40929: error: cannot find  under $use_bzlib" >&5
 echo "$as_me: error: cannot find  under $use_bzlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -40921,12 +40940,12 @@ esac
 cf_cv_header_path_bz2=
 cf_cv_library_path_bz2=
 
-echo "${as_me:-configure}:40924: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:40943: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 40929 "configure"
+#line 40948 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -40943,16 +40962,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:40946: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40965: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40949: \$? = $ac_status" >&5
+  echo "$as_me:40968: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:40952: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40971: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40955: \$? = $ac_status" >&5
+  echo "$as_me:40974: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_bz2=yes
@@ -40966,7 +40985,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lbz2  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 40969 "configure"
+#line 40988 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -40983,16 +41002,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:40986: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41005: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40989: \$? = $ac_status" >&5
+  echo "$as_me:41008: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:40992: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41011: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40995: \$? = $ac_status" >&5
+  echo "$as_me:41014: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_bz2=yes
@@ -41009,9 +41028,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for bz2 library" 1>&6
 
-echo "${as_me:-configure}:41012: testing find linkage for bz2 library ..." 1>&5
+echo "${as_me:-configure}:41031: testing find linkage for bz2 library ..." 1>&5
 
-echo "${as_me:-configure}:41014: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:41033: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -41102,7 +41121,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}:41105: testing ... testing $cf_cv_header_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:41124: testing ... testing $cf_cv_header_path_bz2 ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -41110,7 +41129,7 @@ echo "${as_me:-configure}:41105: testing ... testing $cf_cv_header_path_bz2 ..."
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_bz2"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 41113 "configure"
+#line 41132 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -41127,21 +41146,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:41130: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:41149: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:41133: \$? = $ac_status" >&5
+  echo "$as_me:41152: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:41136: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41155: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41139: \$? = $ac_status" >&5
+  echo "$as_me:41158: \$? = $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}:41144: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:41163: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5
 
 				cf_cv_find_linkage_bz2=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -41159,7 +41178,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_bz2" = maybe ; then
 
-echo "${as_me:-configure}:41162: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:41181: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -41167,7 +41186,7 @@ echo "${as_me:-configure}:41162: testing Searching for bz2 library in FIND_LINKA
 		CPPFLAGS="$cf_test_CPPFLAGS"
 		LIBS="-lbz2  $cf_save_LIBS"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 41170 "configure"
+#line 41189 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -41184,21 +41203,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:41187: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41206: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41190: \$? = $ac_status" >&5
+  echo "$as_me:41209: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:41193: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41212: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41196: \$? = $ac_status" >&5
+  echo "$as_me:41215: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			test -n "$verbose" && echo "	... found bz2 library in system" 1>&6
 
-echo "${as_me:-configure}:41201: testing ... found bz2 library in system ..." 1>&5
+echo "${as_me:-configure}:41220: testing ... found bz2 library in system ..." 1>&5
 
 			cf_cv_find_linkage_bz2=yes
 else
@@ -41279,13 +41298,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}:41282: testing ... testing $cf_cv_library_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:41301: 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 41288 "configure"
+#line 41307 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -41302,21 +41321,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:41305: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41324: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41308: \$? = $ac_status" >&5
+  echo "$as_me:41327: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:41311: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41330: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41314: \$? = $ac_status" >&5
+  echo "$as_me:41333: \$? = $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}:41319: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:41338: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5
 
 					cf_cv_find_linkage_bz2=yes
 					cf_cv_library_file_bz2="-lbz2"
@@ -41378,7 +41397,7 @@ if test -n "$cf_cv_header_path_bz2" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 41381 "configure"
+#line 41400 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -41390,16 +41409,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:41393: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:41412: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:41396: \$? = $ac_status" >&5
+  echo "$as_me:41415: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:41399: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41418: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41402: \$? = $ac_status" >&5
+  echo "$as_me:41421: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -41416,7 +41435,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}:41419: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:41438: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -41452,7 +41471,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}:41455: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:41474: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -41477,7 +41496,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:41480: WARNING: Cannot find bz2 library" >&5
+{ echo "$as_me:41499: WARNING: Cannot find bz2 library" >&5
 echo "$as_me: WARNING: Cannot find bz2 library" >&2;}
 fi
 
@@ -41488,7 +41507,7 @@ EOF
 
 fi
 
-echo "$as_me:41491: checking if you want to use zlib for decompression of some gzip files" >&5
+echo "$as_me:41510: 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.
@@ -41498,7 +41517,7 @@ if test "${with_zlib+set}" = set; then
 else
   use_zlib=yes
 fi;
-echo "$as_me:41501: result: $use_zlib" >&5
+echo "$as_me:41520: result: $use_zlib" >&5
 echo "${ECHO_T}$use_zlib" >&6
 
 if test ".$use_zlib" != ".no" ; then
@@ -41540,7 +41559,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 41543 "configure"
+#line 41562 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -41552,16 +41571,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:41555: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:41574: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:41558: \$? = $ac_status" >&5
+  echo "$as_me:41577: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:41561: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41580: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41564: \$? = $ac_status" >&5
+  echo "$as_me:41583: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -41578,7 +41597,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}:41581: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:41600: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -41624,7 +41643,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 41627 "configure"
+#line 41646 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -41636,16 +41655,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:41639: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:41658: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:41642: \$? = $ac_status" >&5
+  echo "$as_me:41661: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:41645: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41664: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41648: \$? = $ac_status" >&5
+  echo "$as_me:41667: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -41662,7 +41681,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}:41665: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:41684: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -41680,7 +41699,7 @@ echo "${as_me:-configure}:41665: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:41683: error: cannot find  under $use_zlib" >&5
+{ { echo "$as_me:41702: error: cannot find  under $use_zlib" >&5
 echo "$as_me: error: cannot find  under $use_zlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -41705,7 +41724,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}:41708: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:41727: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -41734,7 +41753,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}:41737: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:41756: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -41743,7 +41762,7 @@ echo "${as_me:-configure}:41737: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:41746: error: cannot find  under $use_zlib" >&5
+{ { echo "$as_me:41765: error: cannot find  under $use_zlib" >&5
 echo "$as_me: error: cannot find  under $use_zlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -41757,12 +41776,12 @@ esac
 cf_cv_header_path_z=
 cf_cv_library_path_z=
 
-echo "${as_me:-configure}:41760: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:41779: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 41765 "configure"
+#line 41784 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -41778,16 +41797,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:41781: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41800: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41784: \$? = $ac_status" >&5
+  echo "$as_me:41803: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:41787: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41806: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41790: \$? = $ac_status" >&5
+  echo "$as_me:41809: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_z=yes
@@ -41801,7 +41820,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lz  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 41804 "configure"
+#line 41823 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -41817,16 +41836,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:41820: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41839: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41823: \$? = $ac_status" >&5
+  echo "$as_me:41842: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:41826: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41845: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41829: \$? = $ac_status" >&5
+  echo "$as_me:41848: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_z=yes
@@ -41843,9 +41862,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for z library" 1>&6
 
-echo "${as_me:-configure}:41846: testing find linkage for z library ..." 1>&5
+echo "${as_me:-configure}:41865: testing find linkage for z library ..." 1>&5
 
-echo "${as_me:-configure}:41848: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:41867: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -41936,7 +41955,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}:41939: testing ... testing $cf_cv_header_path_z ..." 1>&5
+echo "${as_me:-configure}:41958: testing ... testing $cf_cv_header_path_z ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -41944,7 +41963,7 @@ echo "${as_me:-configure}:41939: testing ... testing $cf_cv_header_path_z ..." 1
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_z"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 41947 "configure"
+#line 41966 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -41960,21 +41979,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:41963: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:41982: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:41966: \$? = $ac_status" >&5
+  echo "$as_me:41985: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:41969: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41988: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41972: \$? = $ac_status" >&5
+  echo "$as_me:41991: \$? = $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}:41977: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5
+echo "${as_me:-configure}:41996: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5
 
 				cf_cv_find_linkage_z=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -41992,7 +42011,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_z" = maybe ; then
 
-echo "${as_me:-configure}:41995: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:42014: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -42000,7 +42019,7 @@ echo "${as_me:-configure}:41995: testing Searching for z library in FIND_LINKAGE
 		CPPFLAGS="$cf_test_CPPFLAGS"
 		LIBS="-lz  $cf_save_LIBS"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 42003 "configure"
+#line 42022 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -42016,21 +42035,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:42019: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42038: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42022: \$? = $ac_status" >&5
+  echo "$as_me:42041: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:42025: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42044: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42028: \$? = $ac_status" >&5
+  echo "$as_me:42047: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			test -n "$verbose" && echo "	... found z library in system" 1>&6
 
-echo "${as_me:-configure}:42033: testing ... found z library in system ..." 1>&5
+echo "${as_me:-configure}:42052: testing ... found z library in system ..." 1>&5
 
 			cf_cv_find_linkage_z=yes
 else
@@ -42111,13 +42130,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}:42114: testing ... testing $cf_cv_library_path_z ..." 1>&5
+echo "${as_me:-configure}:42133: 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 42120 "configure"
+#line 42139 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -42133,21 +42152,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:42136: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42155: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42139: \$? = $ac_status" >&5
+  echo "$as_me:42158: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:42142: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42161: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42145: \$? = $ac_status" >&5
+  echo "$as_me:42164: \$? = $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}:42150: testing ... found z library in $cf_cv_library_path_z ..." 1>&5
+echo "${as_me:-configure}:42169: testing ... found z library in $cf_cv_library_path_z ..." 1>&5
 
 					cf_cv_find_linkage_z=yes
 					cf_cv_library_file_z="-lz"
@@ -42209,7 +42228,7 @@ if test -n "$cf_cv_header_path_z" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 42212 "configure"
+#line 42231 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -42221,16 +42240,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:42224: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42243: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:42227: \$? = $ac_status" >&5
+  echo "$as_me:42246: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:42230: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42249: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42233: \$? = $ac_status" >&5
+  echo "$as_me:42252: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -42247,7 +42266,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}:42250: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:42269: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -42283,7 +42302,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}:42286: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:42305: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -42308,7 +42327,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:42311: WARNING: Cannot find z library" >&5
+{ echo "$as_me:42330: WARNING: Cannot find z library" >&5
 echo "$as_me: WARNING: Cannot find z library" >&2;}
 fi
 
@@ -42317,13 +42336,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:42320: checking for $ac_func" >&5
+echo "$as_me:42339: 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 42326 "configure"
+#line 42345 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -42354,16 +42373,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:42357: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42376: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42360: \$? = $ac_status" >&5
+  echo "$as_me:42379: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:42363: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42382: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42366: \$? = $ac_status" >&5
+  echo "$as_me:42385: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -42373,7 +42392,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:42376: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:42395: 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
@@ -42390,7 +42409,7 @@ EOF
 
 fi
 
-echo "$as_me:42393: checking if you want to use brotli decompression" >&5
+echo "$as_me:42412: 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.
@@ -42400,7 +42419,7 @@ if test "${with_brotli+set}" = set; then
 else
   use_brotli=yes
 fi;
-echo "$as_me:42403: result: $use_brotli" >&5
+echo "$as_me:42422: result: $use_brotli" >&5
 echo "${ECHO_T}$use_brotli" >&6
 
 if test ".$use_brotli" != ".no" ; then
@@ -42442,7 +42461,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 42445 "configure"
+#line 42464 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -42454,16 +42473,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:42457: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42476: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:42460: \$? = $ac_status" >&5
+  echo "$as_me:42479: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:42463: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42482: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42466: \$? = $ac_status" >&5
+  echo "$as_me:42485: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -42480,7 +42499,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}:42483: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:42502: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -42526,7 +42545,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 42529 "configure"
+#line 42548 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -42538,16 +42557,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:42541: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42560: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:42544: \$? = $ac_status" >&5
+  echo "$as_me:42563: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:42547: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42566: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42550: \$? = $ac_status" >&5
+  echo "$as_me:42569: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -42564,7 +42583,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}:42567: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:42586: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -42582,7 +42601,7 @@ echo "${as_me:-configure}:42567: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:42585: error: cannot find  under $use_brotli" >&5
+{ { echo "$as_me:42604: error: cannot find  under $use_brotli" >&5
 echo "$as_me: error: cannot find  under $use_brotli" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -42607,7 +42626,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}:42610: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:42629: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -42636,7 +42655,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}:42639: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:42658: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -42645,7 +42664,7 @@ echo "${as_me:-configure}:42639: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:42648: error: cannot find  under $use_brotli" >&5
+{ { echo "$as_me:42667: error: cannot find  under $use_brotli" >&5
 echo "$as_me: error: cannot find  under $use_brotli" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -42659,12 +42678,12 @@ esac
 cf_cv_header_path_brotlidec=
 cf_cv_library_path_brotlidec=
 
-echo "${as_me:-configure}:42662: testing Starting FIND_LINKAGE(brotlidec,brotlilib) ..." 1>&5
+echo "${as_me:-configure}:42681: testing Starting FIND_LINKAGE(brotlidec,brotlilib) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 42667 "configure"
+#line 42686 "configure"
 #include "confdefs.h"
 
 #include <brotli/decode.h>
@@ -42687,16 +42706,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:42690: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42709: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42693: \$? = $ac_status" >&5
+  echo "$as_me:42712: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:42696: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42715: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42699: \$? = $ac_status" >&5
+  echo "$as_me:42718: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_brotlidec=yes
@@ -42710,7 +42729,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lbrotlidec  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 42713 "configure"
+#line 42732 "configure"
 #include "confdefs.h"
 
 #include <brotli/decode.h>
@@ -42733,16 +42752,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:42736: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42755: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42739: \$? = $ac_status" >&5
+  echo "$as_me:42758: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:42742: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42761: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42745: \$? = $ac_status" >&5
+  echo "$as_me:42764: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_brotlidec=yes
@@ -42759,9 +42778,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for brotlidec library" 1>&6
 
-echo "${as_me:-configure}:42762: testing find linkage for brotlidec library ..." 1>&5
+echo "${as_me:-configure}:42781: testing find linkage for brotlidec library ..." 1>&5
 
-echo "${as_me:-configure}:42764: testing Searching for headers in FIND_LINKAGE(brotlidec,brotlilib) ..." 1>&5
+echo "${as_me:-configure}:42783: testing Searching for headers in FIND_LINKAGE(brotlidec,brotlilib) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -42852,7 +42871,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}:42855: testing ... testing $cf_cv_header_path_brotlidec ..." 1>&5
+echo "${as_me:-configure}:42874: testing ... testing $cf_cv_header_path_brotlidec ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -42860,7 +42879,7 @@ echo "${as_me:-configure}:42855: testing ... testing $cf_cv_header_path_brotlide
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_brotlidec"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 42863 "configure"
+#line 42882 "configure"
 #include "confdefs.h"
 
 #include <brotli/decode.h>
@@ -42883,21 +42902,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:42886: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42905: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:42889: \$? = $ac_status" >&5
+  echo "$as_me:42908: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:42892: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42911: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42895: \$? = $ac_status" >&5
+  echo "$as_me:42914: \$? = $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}:42900: testing ... found brotlidec headers in $cf_cv_header_path_brotlidec ..." 1>&5
+echo "${as_me:-configure}:42919: testing ... found brotlidec headers in $cf_cv_header_path_brotlidec ..." 1>&5
 
 				cf_cv_find_linkage_brotlidec=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -42915,7 +42934,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_brotlidec" = maybe ; then
 
-echo "${as_me:-configure}:42918: testing Searching for brotlidec library in FIND_LINKAGE(brotlidec,brotlilib) ..." 1>&5
+echo "${as_me:-configure}:42937: testing Searching for brotlidec library in FIND_LINKAGE(brotlidec,brotlilib) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -42923,7 +42942,7 @@ echo "${as_me:-configure}:42918: testing Searching for brotlidec library in FIND
 		CPPFLAGS="$cf_test_CPPFLAGS"
 		LIBS="-lbrotlidec  $cf_save_LIBS"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 42926 "configure"
+#line 42945 "configure"
 #include "confdefs.h"
 
 #include <brotli/decode.h>
@@ -42946,21 +42965,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:42949: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42968: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42952: \$? = $ac_status" >&5
+  echo "$as_me:42971: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:42955: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42974: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42958: \$? = $ac_status" >&5
+  echo "$as_me:42977: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			test -n "$verbose" && echo "	... found brotlidec library in system" 1>&6
 
-echo "${as_me:-configure}:42963: testing ... found brotlidec library in system ..." 1>&5
+echo "${as_me:-configure}:42982: testing ... found brotlidec library in system ..." 1>&5
 
 			cf_cv_find_linkage_brotlidec=yes
 else
@@ -43041,13 +43060,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}:43044: testing ... testing $cf_cv_library_path_brotlidec ..." 1>&5
+echo "${as_me:-configure}:43063: 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 43050 "configure"
+#line 43069 "configure"
 #include "confdefs.h"
 
 #include <brotli/decode.h>
@@ -43070,21 +43089,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:43073: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43092: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43076: \$? = $ac_status" >&5
+  echo "$as_me:43095: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:43079: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43098: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43082: \$? = $ac_status" >&5
+  echo "$as_me:43101: \$? = $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}:43087: testing ... found brotlidec library in $cf_cv_library_path_brotlidec ..." 1>&5
+echo "${as_me:-configure}:43106: testing ... found brotlidec library in $cf_cv_library_path_brotlidec ..." 1>&5
 
 					cf_cv_find_linkage_brotlidec=yes
 					cf_cv_library_file_brotlidec="-lbrotlidec"
@@ -43146,7 +43165,7 @@ if test -n "$cf_cv_header_path_brotlidec" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 43149 "configure"
+#line 43168 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -43158,16 +43177,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:43161: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:43180: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:43164: \$? = $ac_status" >&5
+  echo "$as_me:43183: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:43167: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43186: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43170: \$? = $ac_status" >&5
+  echo "$as_me:43189: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -43184,7 +43203,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}:43187: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:43206: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -43220,7 +43239,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}:43223: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:43242: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -43245,7 +43264,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:43248: WARNING: Cannot find brotlidec library" >&5
+{ echo "$as_me:43267: WARNING: Cannot find brotlidec library" >&5
 echo "$as_me: WARNING: Cannot find brotlidec library" >&2;}
 fi
 
@@ -43256,7 +43275,7 @@ EOF
 
 fi
 
-echo "$as_me:43259: checking if you want to exclude FINGER code" >&5
+echo "$as_me:43278: 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.
@@ -43273,14 +43292,14 @@ else
 	use_finger=no
 
 fi;
-echo "$as_me:43276: result: $use_finger" >&5
+echo "$as_me:43295: 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:43283: checking if you want to exclude GOPHER code" >&5
+echo "$as_me:43302: 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.
@@ -43297,14 +43316,14 @@ else
 	use_gopher=no
 
 fi;
-echo "$as_me:43300: result: $use_gopher" >&5
+echo "$as_me:43319: 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:43307: checking if you want to exclude NEWS code" >&5
+echo "$as_me:43326: 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.
@@ -43321,14 +43340,14 @@ else
 	use_news=no
 
 fi;
-echo "$as_me:43324: result: $use_news" >&5
+echo "$as_me:43343: 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:43331: checking if you want to exclude FTP code" >&5
+echo "$as_me:43350: 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.
@@ -43345,14 +43364,14 @@ else
 	use_ftp=no
 
 fi;
-echo "$as_me:43348: result: $use_ftp" >&5
+echo "$as_me:43367: 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:43355: checking if you want to include WAIS code" >&5
+echo "$as_me:43374: 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.
@@ -43369,13 +43388,13 @@ else
 	use_wais=no
 
 fi;
-echo "$as_me:43372: result: $use_wais" >&5
+echo "$as_me:43391: result: $use_wais" >&5
 echo "${ECHO_T}$use_wais" >&6
 
 MAKE_WAIS="#"
 if test "$use_wais" != "no"
 then
-	echo "$as_me:43378: checking for fs_free in -lwais" >&5
+	echo "$as_me:43397: 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
@@ -43383,7 +43402,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lwais  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 43386 "configure"
+#line 43405 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -43402,16 +43421,16 @@ fs_free ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:43405: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43424: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43408: \$? = $ac_status" >&5
+  echo "$as_me:43427: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:43411: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43430: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43414: \$? = $ac_status" >&5
+  echo "$as_me:43433: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_wais_fs_free=yes
 else
@@ -43422,18 +43441,18 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:43425: result: $ac_cv_lib_wais_fs_free" >&5
+echo "$as_me:43444: 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:43429: checking if -lm needed for math functions" >&5
+echo "$as_me:43448: 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 43436 "configure"
+#line 43455 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -43449,16 +43468,16 @@ double x = rand(); printf("result = %g\\n", sin(x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:43452: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43471: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43455: \$? = $ac_status" >&5
+  echo "$as_me:43474: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:43458: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43477: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43461: \$? = $ac_status" >&5
+  echo "$as_me:43480: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libm=no
 else
@@ -43468,7 +43487,7 @@ cf_cv_need_libm=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:43471: result: $cf_cv_need_libm" >&5
+echo "$as_me:43490: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
 
 if test "$cf_cv_need_libm" = yes
@@ -43476,14 +43495,14 @@ then
 
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lm"
-	echo "$as_me:43479: checking if -lm is available for math functions" >&5
+	echo "$as_me:43498: 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 43486 "configure"
+#line 43505 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -43499,16 +43518,16 @@ double x = rand(); printf("result = %g\\n", sin(x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:43502: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43521: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43505: \$? = $ac_status" >&5
+  echo "$as_me:43524: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:43508: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43527: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43511: \$? = $ac_status" >&5
+  echo "$as_me:43530: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_libm=yes
 else
@@ -43518,7 +43537,7 @@ cf_cv_have_libm=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:43521: result: $cf_cv_have_libm" >&5
+echo "$as_me:43540: result: $cf_cv_have_libm" >&5
 echo "${ECHO_T}$cf_cv_have_libm" >&6
 	LIBS="$cf_save_LIBS"
 
@@ -43574,23 +43593,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:43577: checking for $ac_header" >&5
+echo "$as_me:43596: 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 43583 "configure"
+#line 43602 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:43587: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:43606: \"$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:43593: \$? = $ac_status" >&5
+  echo "$as_me:43612: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -43609,7 +43628,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:43612: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:43631: 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
@@ -43622,7 +43641,7 @@ done
 		MAKE_WAIS=
 
 else
-  { echo "$as_me:43625: WARNING: could not find WAIS library" >&5
+  { echo "$as_me:43644: WARNING: could not find WAIS library" >&5
 echo "$as_me: WARNING: could not find WAIS library" >&2;}
 fi
 
@@ -43630,7 +43649,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:43633: checking if directory-editor code should be used" >&5
+echo "$as_me:43652: 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.
@@ -43647,7 +43666,7 @@ else
 	use_dired=yes
 
 fi;
-echo "$as_me:43650: result: $use_dired" >&5
+echo "$as_me:43669: result: $use_dired" >&5
 echo "${ECHO_T}$use_dired" >&6
 
 if test ".$use_dired" != ".no" ; then
@@ -43657,7 +43676,7 @@ cat >>confdefs.h <<\EOF
 #define DIRED_SUPPORT 1
 EOF
 
-	echo "$as_me:43660: checking if you wish to allow extracting from archives via DirEd" >&5
+	echo "$as_me:43679: 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.
@@ -43674,10 +43693,10 @@ EOF
 else
   enableval=yes
 fi;
-	echo "$as_me:43677: result: $enableval" >&5
+	echo "$as_me:43696: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:43680: checking if DirEd mode should override keys" >&5
+	echo "$as_me:43699: 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.
@@ -43701,10 +43720,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:43704: result: $enableval" >&5
+	echo "$as_me:43723: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:43707: checking if you wish to allow permissions commands via DirEd" >&5
+	echo "$as_me:43726: 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.
@@ -43728,10 +43747,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:43731: result: $enableval" >&5
+	echo "$as_me:43750: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:43734: checking if you wish to allow executable-permission commands via DirEd" >&5
+	echo "$as_me:43753: 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.
@@ -43748,10 +43767,10 @@ EOF
 else
   enableval=yes
 fi;
-	echo "$as_me:43751: result: $enableval" >&5
+	echo "$as_me:43770: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:43754: checking if you wish to allow \"tar\" commands from DirEd" >&5
+	echo "$as_me:43773: 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.
@@ -43775,10 +43794,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:43778: result: $enableval" >&5
+	echo "$as_me:43797: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:43781: checking if you wish to allow \"uudecode\" commands from DirEd" >&5
+	echo "$as_me:43800: 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.
@@ -43802,10 +43821,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:43805: result: $enableval" >&5
+	echo "$as_me:43824: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:43808: checking if you wish to allow \"zip\" and \"unzip\" commands from DirEd" >&5
+	echo "$as_me:43827: 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.
@@ -43829,10 +43848,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:43832: result: $enableval" >&5
+	echo "$as_me:43851: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:43835: checking if you wish to allow \"gzip\" and \"gunzip\" commands from DirEd" >&5
+	echo "$as_me:43854: 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.
@@ -43856,11 +43875,11 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:43859: result: $enableval" >&5
+	echo "$as_me:43878: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 fi
 
-echo "$as_me:43863: checking if you want long-directory listings" >&5
+echo "$as_me:43882: 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.
@@ -43884,10 +43903,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-echo "$as_me:43887: result: $enableval" >&5
+echo "$as_me:43906: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:43890: checking if parent-directory references are permitted" >&5
+echo "$as_me:43909: 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.
@@ -43904,7 +43923,7 @@ EOF
 else
   enableval=yes
 fi;
-echo "$as_me:43907: result: $enableval" >&5
+echo "$as_me:43926: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 test -z "$TELNET" && TELNET="telnet"
@@ -43912,7 +43931,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:43915: checking for $ac_word" >&5
+echo "$as_me:43934: 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
@@ -43929,7 +43948,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:43932: found $ac_dir/$ac_word" >&5
+   echo "$as_me:43951: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -43940,10 +43959,10 @@ fi
 TELNET=$ac_cv_path_TELNET
 
 if test -n "$TELNET"; then
-  echo "$as_me:43943: result: $TELNET" >&5
+  echo "$as_me:43962: result: $TELNET" >&5
 echo "${ECHO_T}$TELNET" >&6
 else
-  echo "$as_me:43946: result: no" >&5
+  echo "$as_me:43965: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44002,7 +44021,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:44005: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:44024: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TELNET_PATH "$cf_path_prog"
@@ -44020,7 +44039,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:44023: checking for $ac_word" >&5
+echo "$as_me:44042: 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
@@ -44037,7 +44056,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:44040: found $ac_dir/$ac_word" >&5
+   echo "$as_me:44059: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -44048,10 +44067,10 @@ fi
 TN3270=$ac_cv_path_TN3270
 
 if test -n "$TN3270"; then
-  echo "$as_me:44051: result: $TN3270" >&5
+  echo "$as_me:44070: result: $TN3270" >&5
 echo "${ECHO_T}$TN3270" >&6
 else
-  echo "$as_me:44054: result: no" >&5
+  echo "$as_me:44073: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44110,7 +44129,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:44113: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:44132: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TN3270_PATH "$cf_path_prog"
@@ -44128,7 +44147,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:44131: checking for $ac_word" >&5
+echo "$as_me:44150: 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
@@ -44145,7 +44164,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:44148: found $ac_dir/$ac_word" >&5
+   echo "$as_me:44167: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -44156,10 +44175,10 @@ fi
 RLOGIN=$ac_cv_path_RLOGIN
 
 if test -n "$RLOGIN"; then
-  echo "$as_me:44159: result: $RLOGIN" >&5
+  echo "$as_me:44178: result: $RLOGIN" >&5
 echo "${ECHO_T}$RLOGIN" >&6
 else
-  echo "$as_me:44162: result: no" >&5
+  echo "$as_me:44181: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44218,7 +44237,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:44221: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:44240: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define RLOGIN_PATH "$cf_path_prog"
@@ -44236,7 +44255,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:44239: checking for $ac_word" >&5
+echo "$as_me:44258: 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
@@ -44253,7 +44272,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:44256: found $ac_dir/$ac_word" >&5
+   echo "$as_me:44275: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -44264,10 +44283,10 @@ fi
 MV=$ac_cv_path_MV
 
 if test -n "$MV"; then
-  echo "$as_me:44267: result: $MV" >&5
+  echo "$as_me:44286: result: $MV" >&5
 echo "${ECHO_T}$MV" >&6
 else
-  echo "$as_me:44270: result: no" >&5
+  echo "$as_me:44289: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44326,7 +44345,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:44329: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:44348: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define MV_PATH "$cf_path_prog"
@@ -44344,7 +44363,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:44347: checking for $ac_word" >&5
+echo "$as_me:44366: 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
@@ -44361,7 +44380,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:44364: found $ac_dir/$ac_word" >&5
+   echo "$as_me:44383: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -44372,10 +44391,10 @@ fi
 GZIP=$ac_cv_path_GZIP
 
 if test -n "$GZIP"; then
-  echo "$as_me:44375: result: $GZIP" >&5
+  echo "$as_me:44394: result: $GZIP" >&5
 echo "${ECHO_T}$GZIP" >&6
 else
-  echo "$as_me:44378: result: no" >&5
+  echo "$as_me:44397: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44434,7 +44453,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:44437: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:44456: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define GZIP_PATH "$cf_path_prog"
@@ -44452,7 +44471,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:44455: checking for $ac_word" >&5
+echo "$as_me:44474: 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
@@ -44469,7 +44488,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:44472: found $ac_dir/$ac_word" >&5
+   echo "$as_me:44491: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -44480,10 +44499,10 @@ fi
 UNCOMPRESS=$ac_cv_path_UNCOMPRESS
 
 if test -n "$UNCOMPRESS"; then
-  echo "$as_me:44483: result: $UNCOMPRESS" >&5
+  echo "$as_me:44502: result: $UNCOMPRESS" >&5
 echo "${ECHO_T}$UNCOMPRESS" >&6
 else
-  echo "$as_me:44486: result: no" >&5
+  echo "$as_me:44505: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44542,7 +44561,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:44545: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:44564: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define UNCOMPRESS_PATH "$cf_path_prog"
@@ -44560,7 +44579,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:44563: checking for $ac_word" >&5
+echo "$as_me:44582: 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
@@ -44577,7 +44596,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:44580: found $ac_dir/$ac_word" >&5
+   echo "$as_me:44599: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -44588,10 +44607,10 @@ fi
 UNZIP=$ac_cv_path_UNZIP
 
 if test -n "$UNZIP"; then
-  echo "$as_me:44591: result: $UNZIP" >&5
+  echo "$as_me:44610: result: $UNZIP" >&5
 echo "${ECHO_T}$UNZIP" >&6
 else
-  echo "$as_me:44594: result: no" >&5
+  echo "$as_me:44613: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44650,7 +44669,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:44653: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:44672: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define UNZIP_PATH "$cf_path_prog"
@@ -44668,7 +44687,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:44671: checking for $ac_word" >&5
+echo "$as_me:44690: 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
@@ -44685,7 +44704,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:44688: found $ac_dir/$ac_word" >&5
+   echo "$as_me:44707: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -44696,10 +44715,10 @@ fi
 BZIP2=$ac_cv_path_BZIP2
 
 if test -n "$BZIP2"; then
-  echo "$as_me:44699: result: $BZIP2" >&5
+  echo "$as_me:44718: result: $BZIP2" >&5
 echo "${ECHO_T}$BZIP2" >&6
 else
-  echo "$as_me:44702: result: no" >&5
+  echo "$as_me:44721: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44758,7 +44777,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:44761: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:44780: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define BZIP2_PATH "$cf_path_prog"
@@ -44776,7 +44795,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:44779: checking for $ac_word" >&5
+echo "$as_me:44798: 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
@@ -44793,7 +44812,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:44796: found $ac_dir/$ac_word" >&5
+   echo "$as_me:44815: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -44804,10 +44823,10 @@ fi
 BROTLI=$ac_cv_path_BROTLI
 
 if test -n "$BROTLI"; then
-  echo "$as_me:44807: result: $BROTLI" >&5
+  echo "$as_me:44826: result: $BROTLI" >&5
 echo "${ECHO_T}$BROTLI" >&6
 else
-  echo "$as_me:44810: result: no" >&5
+  echo "$as_me:44829: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44866,7 +44885,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:44869: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:44888: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define BROTLI_PATH "$cf_path_prog"
@@ -44884,7 +44903,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:44887: checking for $ac_word" >&5
+echo "$as_me:44906: 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
@@ -44901,7 +44920,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:44904: found $ac_dir/$ac_word" >&5
+   echo "$as_me:44923: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -44912,10 +44931,10 @@ fi
 TAR=$ac_cv_path_TAR
 
 if test -n "$TAR"; then
-  echo "$as_me:44915: result: $TAR" >&5
+  echo "$as_me:44934: result: $TAR" >&5
 echo "${ECHO_T}$TAR" >&6
 else
-  echo "$as_me:44918: result: no" >&5
+  echo "$as_me:44937: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44974,7 +44993,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:44977: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:44996: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TAR_PATH "$cf_path_prog"
@@ -45032,7 +45051,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:45035: checking for $ac_word" >&5
+echo "$as_me:45054: 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
@@ -45049,7 +45068,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:45052: found $ac_dir/$ac_word" >&5
+   echo "$as_me:45071: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -45060,10 +45079,10 @@ fi
 COMPRESS=$ac_cv_path_COMPRESS
 
 if test -n "$COMPRESS"; then
-  echo "$as_me:45063: result: $COMPRESS" >&5
+  echo "$as_me:45082: result: $COMPRESS" >&5
 echo "${ECHO_T}$COMPRESS" >&6
 else
-  echo "$as_me:45066: result: no" >&5
+  echo "$as_me:45085: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -45122,7 +45141,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:45125: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:45144: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define COMPRESS_PATH "$cf_path_prog"
@@ -45140,7 +45159,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:45143: checking for $ac_word" >&5
+echo "$as_me:45162: 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
@@ -45157,7 +45176,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:45160: found $ac_dir/$ac_word" >&5
+   echo "$as_me:45179: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -45168,10 +45187,10 @@ fi
 RM=$ac_cv_path_RM
 
 if test -n "$RM"; then
-  echo "$as_me:45171: result: $RM" >&5
+  echo "$as_me:45190: result: $RM" >&5
 echo "${ECHO_T}$RM" >&6
 else
-  echo "$as_me:45174: result: no" >&5
+  echo "$as_me:45193: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -45230,7 +45249,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:45233: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:45252: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define RM_PATH "$cf_path_prog"
@@ -45248,7 +45267,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:45251: checking for $ac_word" >&5
+echo "$as_me:45270: 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
@@ -45265,7 +45284,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:45268: found $ac_dir/$ac_word" >&5
+   echo "$as_me:45287: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -45276,10 +45295,10 @@ fi
 UUDECODE=$ac_cv_path_UUDECODE
 
 if test -n "$UUDECODE"; then
-  echo "$as_me:45279: result: $UUDECODE" >&5
+  echo "$as_me:45298: result: $UUDECODE" >&5
 echo "${ECHO_T}$UUDECODE" >&6
 else
-  echo "$as_me:45282: result: no" >&5
+  echo "$as_me:45301: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -45338,7 +45357,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:45341: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:45360: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define UUDECODE_PATH "$cf_path_prog"
@@ -45356,7 +45375,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:45359: checking for $ac_word" >&5
+echo "$as_me:45378: 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
@@ -45373,7 +45392,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:45376: found $ac_dir/$ac_word" >&5
+   echo "$as_me:45395: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -45384,10 +45403,10 @@ fi
 ZCAT=$ac_cv_path_ZCAT
 
 if test -n "$ZCAT"; then
-  echo "$as_me:45387: result: $ZCAT" >&5
+  echo "$as_me:45406: result: $ZCAT" >&5
 echo "${ECHO_T}$ZCAT" >&6
 else
-  echo "$as_me:45390: result: no" >&5
+  echo "$as_me:45409: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -45446,7 +45465,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:45449: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:45468: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define ZCAT_PATH "$cf_path_prog"
@@ -45464,7 +45483,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:45467: checking for $ac_word" >&5
+echo "$as_me:45486: 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
@@ -45481,7 +45500,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:45484: found $ac_dir/$ac_word" >&5
+   echo "$as_me:45503: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -45492,10 +45511,10 @@ fi
 ZIP=$ac_cv_path_ZIP
 
 if test -n "$ZIP"; then
-  echo "$as_me:45495: result: $ZIP" >&5
+  echo "$as_me:45514: result: $ZIP" >&5
 echo "${ECHO_T}$ZIP" >&6
 else
-  echo "$as_me:45498: result: no" >&5
+  echo "$as_me:45517: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -45554,7 +45573,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:45557: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:45576: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define ZIP_PATH "$cf_path_prog"
@@ -45582,7 +45601,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:45585: checking for $ac_word" >&5
+echo "$as_me:45604: 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
@@ -45599,7 +45618,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:45602: found $ac_dir/$ac_word" >&5
+   echo "$as_me:45621: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -45610,10 +45629,10 @@ fi
 INSTALL=$ac_cv_path_INSTALL
 
 if test -n "$INSTALL"; then
-  echo "$as_me:45613: result: $INSTALL" >&5
+  echo "$as_me:45632: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 else
-  echo "$as_me:45616: result: no" >&5
+  echo "$as_me:45635: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -45672,7 +45691,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:45675: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:45694: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define INSTALL_PATH "$cf_path_prog"
@@ -45702,7 +45721,7 @@ if test "$cf_cv_screen" = pdcurses ; then
 	case "$host_os" in
 	(mingw*)
 
-echo "$as_me:45705: checking for initscr in -lpdcurses" >&5
+echo "$as_me:45724: 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
@@ -45710,7 +45729,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpdcurses  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 45713 "configure"
+#line 45732 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -45729,16 +45748,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:45732: \"$ac_link\"") >&5
+if { (eval echo "$as_me:45751: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:45735: \$? = $ac_status" >&5
+  echo "$as_me:45754: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:45738: \"$ac_try\"") >&5
+  { (eval echo "$as_me:45757: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:45741: \$? = $ac_status" >&5
+  echo "$as_me:45760: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pdcurses_initscr=yes
 else
@@ -45749,7 +45768,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:45752: result: $ac_cv_lib_pdcurses_initscr" >&5
+echo "$as_me:45771: 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
 
@@ -45771,13 +45790,13 @@ LIBS="$cf_add_libs"
 
 	cf_cv_term_header=no
 	cf_cv_unctrl_header=no
-	echo "$as_me:45774: checking for winwstr" >&5
+	echo "$as_me:45793: 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 45780 "configure"
+#line 45799 "configure"
 #include "confdefs.h"
 #define winwstr autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -45808,16 +45827,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:45811: \"$ac_link\"") >&5
+if { (eval echo "$as_me:45830: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:45814: \$? = $ac_status" >&5
+  echo "$as_me:45833: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:45817: \"$ac_try\"") >&5
+  { (eval echo "$as_me:45836: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:45820: \$? = $ac_status" >&5
+  echo "$as_me:45839: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_winwstr=yes
 else
@@ -45827,7 +45846,7 @@ ac_cv_func_winwstr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:45830: result: $ac_cv_func_winwstr" >&5
+echo "$as_me:45849: result: $ac_cv_func_winwstr" >&5
 echo "${ECHO_T}$ac_cv_func_winwstr" >&6
 if test "$ac_cv_func_winwstr" = yes; then
 
@@ -45837,13 +45856,13 @@ EOF
 
 fi
 
-	echo "$as_me:45840: checking for pdcurses_dll_iname" >&5
+	echo "$as_me:45859: 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 45846 "configure"
+#line 45865 "configure"
 #include "confdefs.h"
 #define pdcurses_dll_iname autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -45874,16 +45893,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:45877: \"$ac_link\"") >&5
+if { (eval echo "$as_me:45896: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:45880: \$? = $ac_status" >&5
+  echo "$as_me:45899: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:45883: \"$ac_try\"") >&5
+  { (eval echo "$as_me:45902: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:45886: \$? = $ac_status" >&5
+  echo "$as_me:45905: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_pdcurses_dll_iname=yes
 else
@@ -45893,7 +45912,7 @@ ac_cv_func_pdcurses_dll_iname=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:45896: result: $ac_cv_func_pdcurses_dll_iname" >&5
+echo "$as_me:45915: 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
 
@@ -45910,7 +45929,7 @@ fi
 
 cf_x_athena=${cf_x_athena:-Xaw}
 
-echo "$as_me:45913: checking if you want to link with Xaw 3d library" >&5
+echo "$as_me:45932: 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=
 
@@ -45921,14 +45940,14 @@ if test "${with_Xaw3d+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3d
-	echo "$as_me:45924: result: yes" >&5
+	echo "$as_me:45943: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:45927: result: no" >&5
+	echo "$as_me:45946: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:45931: checking if you want to link with Xaw 3d xft library" >&5
+echo "$as_me:45950: 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=
 
@@ -45939,14 +45958,14 @@ if test "${with_Xaw3dxft+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3dxft
-	echo "$as_me:45942: result: yes" >&5
+	echo "$as_me:45961: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:45945: result: no" >&5
+	echo "$as_me:45964: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:45949: checking if you want to link with neXT Athena library" >&5
+echo "$as_me:45968: 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=
 
@@ -45957,14 +45976,14 @@ if test "${with_neXtaw+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=neXtaw
-	echo "$as_me:45960: result: yes" >&5
+	echo "$as_me:45979: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:45963: result: no" >&5
+	echo "$as_me:45982: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:45967: checking if you want to link with Athena-Plus library" >&5
+echo "$as_me:45986: 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=
 
@@ -45975,10 +45994,10 @@ if test "${with_XawPlus+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=XawPlus
-	echo "$as_me:45978: result: yes" >&5
+	echo "$as_me:45997: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:45981: result: no" >&5
+	echo "$as_me:46000: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -45998,17 +46017,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}:46001: testing found package $cf_athena_pkg ..." 1>&5
+echo "${as_me:-configure}:46020: 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}:46007: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:46026: 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}:46011: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:46030: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -46139,20 +46158,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}:46142: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:46161: testing ..trimmed $LIBS ..." 1>&5
 
 			;;
 		esac
 	done
 
-echo "$as_me:46148: checking for usable $cf_x_athena/Xmu package" >&5
+echo "$as_me:46167: 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 46155 "configure"
+#line 46174 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -46170,16 +46189,16 @@ int check = XmuCompareISOLatin1("big", "small");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:46173: \"$ac_link\"") >&5
+if { (eval echo "$as_me:46192: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:46176: \$? = $ac_status" >&5
+  echo "$as_me:46195: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:46179: \"$ac_try\"") >&5
+  { (eval echo "$as_me:46198: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:46182: \$? = $ac_status" >&5
+  echo "$as_me:46201: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xaw_compat=yes
 else
@@ -46189,7 +46208,7 @@ cf_cv_xaw_compat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:46192: result: $cf_cv_xaw_compat" >&5
+echo "$as_me:46211: result: $cf_cv_xaw_compat" >&5
 echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 
 			if test "$cf_cv_xaw_compat" = no
@@ -46201,7 +46220,7 @@ echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 				(*)
 					test -n "$verbose" && echo "	work around broken package" 1>&6
 
-echo "${as_me:-configure}:46204: testing work around broken package ..." 1>&5
+echo "${as_me:-configure}:46223: testing work around broken package ..." 1>&5
 
 					cf_save_xmu="$LIBS"
 					cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^  *//' -e 's/ .*//'`
@@ -46209,17 +46228,17 @@ echo "${as_me:-configure}:46204: 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}:46212: testing found package xmu ..." 1>&5
+echo "${as_me:-configure}:46231: 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}:46218: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:46237: 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}:46222: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:46241: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -46339,12 +46358,12 @@ LIBS="$cf_add_libs"
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:46342: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:46361: 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}:46347: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:46366: testing ...after  $LIBS ..." 1>&5
 
 else
 	cf_pkgconfig_incs=
@@ -46352,12 +46371,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:46355: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:46374: 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}:46360: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:46379: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -46368,7 +46387,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}:46371: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:46390: testing ..trimmed $LIBS ..." 1>&5
 
 			;;
 		esac
@@ -46393,17 +46412,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}:46396: testing found package Xext ..." 1>&5
+echo "${as_me:-configure}:46415: 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}:46402: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:46421: 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}:46406: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:46425: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -46524,7 +46543,7 @@ else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
 
-	echo "$as_me:46527: checking for XextCreateExtension in -lXext" >&5
+	echo "$as_me:46546: 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
@@ -46532,7 +46551,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 46535 "configure"
+#line 46554 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -46551,16 +46570,16 @@ XextCreateExtension ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:46554: \"$ac_link\"") >&5
+if { (eval echo "$as_me:46573: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:46557: \$? = $ac_status" >&5
+  echo "$as_me:46576: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:46560: \"$ac_try\"") >&5
+  { (eval echo "$as_me:46579: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:46563: \$? = $ac_status" >&5
+  echo "$as_me:46582: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
@@ -46571,7 +46590,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:46574: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:46593: 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
 
@@ -46607,17 +46626,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}:46610: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:46629: 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}:46616: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:46635: 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}:46620: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:46639: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -46737,24 +46756,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:46740: WARNING: unable to find X11 library" >&5
+	{ echo "$as_me:46759: 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}:46747: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:46766: 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}:46753: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:46772: 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}:46757: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:46776: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -46874,24 +46893,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:46877: WARNING: unable to find ICE library" >&5
+	{ echo "$as_me:46896: 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}:46884: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:46903: 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}:46890: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:46909: 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}:46894: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:46913: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -47011,24 +47030,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:47014: WARNING: unable to find SM library" >&5
+	{ echo "$as_me:47033: 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}:47021: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:47040: 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}:47027: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:47046: 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}:47031: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:47050: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -47148,7 +47167,7 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:47151: WARNING: unable to find Xt library" >&5
+	{ echo "$as_me:47170: WARNING: unable to find Xt library" >&5
 echo "$as_me: WARNING: unable to find Xt library" >&2;}
 fi
 
@@ -47161,17 +47180,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}:47164: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:47183: 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}:47170: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:47189: 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}:47174: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:47193: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -47292,14 +47311,14 @@ LIBS="$cf_add_libs"
 		;;
 	(*)
 # we have an "xt" package, but it may omit Xt's dependency on X11
-echo "$as_me:47295: checking for usable X dependency" >&5
+echo "$as_me:47314: 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 47302 "configure"
+#line 47321 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -47319,16 +47338,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:47322: \"$ac_link\"") >&5
+if { (eval echo "$as_me:47341: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:47325: \$? = $ac_status" >&5
+  echo "$as_me:47344: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:47328: \"$ac_try\"") >&5
+  { (eval echo "$as_me:47347: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:47331: \$? = $ac_status" >&5
+  echo "$as_me:47350: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xt_x11_compat=yes
 else
@@ -47338,30 +47357,30 @@ cf_cv_xt_x11_compat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:47341: result: $cf_cv_xt_x11_compat" >&5
+echo "$as_me:47360: 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}:47347: testing work around broken X11 dependency ..." 1>&5
+echo "${as_me:-configure}:47366: 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}:47354: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:47373: 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}:47360: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:47379: 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}:47364: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:47383: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -47484,12 +47503,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:47487: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:47506: 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}:47492: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:47511: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -47497,14 +47516,14 @@ fi
 		;;
 	esac
 
-echo "$as_me:47500: checking for usable X Toolkit package" >&5
+echo "$as_me:47519: 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 47507 "configure"
+#line 47526 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -47520,16 +47539,16 @@ int num = IceConnectionNumber(0); (void) num
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:47523: \"$ac_link\"") >&5
+if { (eval echo "$as_me:47542: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:47526: \$? = $ac_status" >&5
+  echo "$as_me:47545: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:47529: \"$ac_try\"") >&5
+  { (eval echo "$as_me:47548: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:47532: \$? = $ac_status" >&5
+  echo "$as_me:47551: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xt_ice_compat=yes
 else
@@ -47539,7 +47558,7 @@ cf_cv_xt_ice_compat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:47542: result: $cf_cv_xt_ice_compat" >&5
+echo "$as_me:47561: result: $cf_cv_xt_ice_compat" >&5
 echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
 
 	if test "$cf_cv_xt_ice_compat" = no
@@ -47553,22 +47572,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}:47556: testing work around broken ICE dependency ..." 1>&5
+echo "${as_me:-configure}:47575: 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}:47561: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:47580: 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}:47567: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:47586: 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}:47571: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:47590: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -47687,17 +47706,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}:47690: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:47709: 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}:47696: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:47715: 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}:47700: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:47719: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -47826,12 +47845,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:47829: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:47848: 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}:47834: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:47853: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -47851,7 +47870,7 @@ else
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:47854: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:47873: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -47936,7 +47955,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}:47939: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:47958: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -47946,7 +47965,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}:47949: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:47968: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -47956,7 +47975,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}:47959: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:47978: 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"
@@ -47965,7 +47984,7 @@ fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 47968 "configure"
+#line 47987 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -47977,16 +47996,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:47980: \"$ac_link\"") >&5
+if { (eval echo "$as_me:47999: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:47983: \$? = $ac_status" >&5
+  echo "$as_me:48002: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:47986: \"$ac_try\"") >&5
+  { (eval echo "$as_me:48005: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:47989: \$? = $ac_status" >&5
+  echo "$as_me:48008: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -47994,12 +48013,12 @@ else
 cat "conftest.$ac_ext" >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:47997: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:48016: 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}:48002: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:48021: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_cflags"
@@ -48007,13 +48026,13 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
-	echo "$as_me:48010: checking for XOpenDisplay" >&5
+	echo "$as_me:48029: 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 48016 "configure"
+#line 48035 "configure"
 #include "confdefs.h"
 #define XOpenDisplay autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -48044,16 +48063,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:48047: \"$ac_link\"") >&5
+if { (eval echo "$as_me:48066: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:48050: \$? = $ac_status" >&5
+  echo "$as_me:48069: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:48053: \"$ac_try\"") >&5
+  { (eval echo "$as_me:48072: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48056: \$? = $ac_status" >&5
+  echo "$as_me:48075: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_XOpenDisplay=yes
 else
@@ -48063,13 +48082,13 @@ ac_cv_func_XOpenDisplay=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:48066: result: $ac_cv_func_XOpenDisplay" >&5
+echo "$as_me:48085: 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:48072: checking for XOpenDisplay in -lX11" >&5
+	echo "$as_me:48091: 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
@@ -48077,7 +48096,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 48080 "configure"
+#line 48099 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -48096,16 +48115,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:48099: \"$ac_link\"") >&5
+if { (eval echo "$as_me:48118: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:48102: \$? = $ac_status" >&5
+  echo "$as_me:48121: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:48105: \"$ac_try\"") >&5
+  { (eval echo "$as_me:48124: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48108: \$? = $ac_status" >&5
+  echo "$as_me:48127: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -48116,7 +48135,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:48119: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:48138: 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
 
@@ -48140,13 +48159,13 @@ fi
 
 fi
 
-	echo "$as_me:48143: checking for XtAppInitialize" >&5
+	echo "$as_me:48162: 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 48149 "configure"
+#line 48168 "configure"
 #include "confdefs.h"
 #define XtAppInitialize autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -48177,16 +48196,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:48180: \"$ac_link\"") >&5
+if { (eval echo "$as_me:48199: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:48183: \$? = $ac_status" >&5
+  echo "$as_me:48202: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:48186: \"$ac_try\"") >&5
+  { (eval echo "$as_me:48205: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48189: \$? = $ac_status" >&5
+  echo "$as_me:48208: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_XtAppInitialize=yes
 else
@@ -48196,13 +48215,13 @@ ac_cv_func_XtAppInitialize=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:48199: result: $ac_cv_func_XtAppInitialize" >&5
+echo "$as_me:48218: 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:48205: checking for XtAppInitialize in -lXt" >&5
+	echo "$as_me:48224: 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
@@ -48210,7 +48229,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 48213 "configure"
+#line 48232 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -48229,16 +48248,16 @@ XtAppInitialize ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:48232: \"$ac_link\"") >&5
+if { (eval echo "$as_me:48251: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:48235: \$? = $ac_status" >&5
+  echo "$as_me:48254: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:48238: \"$ac_try\"") >&5
+  { (eval echo "$as_me:48257: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48241: \$? = $ac_status" >&5
+  echo "$as_me:48260: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xt_XtAppInitialize=yes
 else
@@ -48249,7 +48268,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:48252: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "$as_me:48271: 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
 
@@ -48266,7 +48285,7 @@ fi
 fi
 
 if test "$cf_have_X_LIBS" = no ; then
-	{ echo "$as_me:48269: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+	{ echo "$as_me:48288: 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
@@ -48307,14 +48326,14 @@ done
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}-I$cf_path/include"
 
-			echo "$as_me:48310: checking for $cf_test in $cf_path" >&5
+			echo "$as_me:48329: 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:48313: checking for $cf_test" >&5
+			echo "$as_me:48332: checking for $cf_test" >&5
 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
 		fi
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 48317 "configure"
+#line 48336 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -48328,16 +48347,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:48331: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:48350: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:48334: \$? = $ac_status" >&5
+  echo "$as_me:48353: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:48337: \"$ac_try\"") >&5
+  { (eval echo "$as_me:48356: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48340: \$? = $ac_status" >&5
+  echo "$as_me:48359: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -48346,7 +48365,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-		echo "$as_me:48349: result: $cf_result" >&5
+		echo "$as_me:48368: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 LIBS="$cf_save_LIBS_CF_X_ATHENA_CPPFLAGS"
@@ -48362,7 +48381,7 @@ CPPFLAGS="$cf_save_CPPFLAGS_CF_X_ATHENA_CPPFLAGS"
 done
 
 if test -z "$cf_x_athena_inc" ; then
-	{ echo "$as_me:48365: WARNING: Unable to find Athena header files" >&5
+	{ echo "$as_me:48384: 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
 
@@ -48427,10 +48446,10 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
-		echo "$as_me:48430: checking for $cf_test in $cf_libs" >&5
+		echo "$as_me:48449: 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 48433 "configure"
+#line 48452 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -48447,16 +48466,16 @@ $cf_test((XtAppContext) 0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:48450: \"$ac_link\"") >&5
+if { (eval echo "$as_me:48469: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:48453: \$? = $ac_status" >&5
+  echo "$as_me:48472: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:48456: \"$ac_try\"") >&5
+  { (eval echo "$as_me:48475: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48459: \$? = $ac_status" >&5
+  echo "$as_me:48478: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -48465,7 +48484,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:48468: result: $cf_result" >&5
+		echo "$as_me:48487: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 LIBS="$cf_save_LIBS_CF_X_ATHENA_LIBS"
@@ -48482,7 +48501,7 @@ CPPFLAGS="$cf_save_CPPFLAGS_CF_X_ATHENA_LIBS"
 done
 
 if test -z "$cf_x_athena_lib" ; then
-	{ { echo "$as_me:48485: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+	{ { echo "$as_me:48504: 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
@@ -48516,7 +48535,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:48519: checking for $ac_word" >&5
+echo "$as_me:48538: 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
@@ -48531,7 +48550,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:48534: found $ac_dir/$ac_word" >&5
+echo "$as_me:48553: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -48539,10 +48558,10 @@ fi
 fi
 XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG
 if test -n "$XCURSES_CONFIG"; then
-  echo "$as_me:48542: result: $XCURSES_CONFIG" >&5
+  echo "$as_me:48561: result: $XCURSES_CONFIG" >&5
 echo "${ECHO_T}$XCURSES_CONFIG" >&6
 else
-  echo "$as_me:48545: result: no" >&5
+  echo "$as_me:48564: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -48555,7 +48574,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:48558: checking for $ac_word" >&5
+echo "$as_me:48577: 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
@@ -48570,7 +48589,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:48573: found $ac_dir/$ac_word" >&5
+echo "$as_me:48592: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -48578,10 +48597,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:48581: result: $ac_ct_XCURSES_CONFIG" >&5
+  echo "$as_me:48600: result: $ac_ct_XCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6
 else
-  echo "$as_me:48584: result: no" >&5
+  echo "$as_me:48603: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -48716,7 +48735,7 @@ LDFLAGS="$LDFLAGS $X_LIBS"
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:48719: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:48738: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -48801,7 +48820,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}:48804: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:48823: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -48811,7 +48830,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}:48814: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:48833: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -48821,7 +48840,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}:48824: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:48843: 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"
@@ -48830,7 +48849,7 @@ fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 48833 "configure"
+#line 48852 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -48842,16 +48861,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:48845: \"$ac_link\"") >&5
+if { (eval echo "$as_me:48864: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:48848: \$? = $ac_status" >&5
+  echo "$as_me:48867: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:48851: \"$ac_try\"") >&5
+  { (eval echo "$as_me:48870: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48854: \$? = $ac_status" >&5
+  echo "$as_me:48873: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -48859,12 +48878,12 @@ else
 cat "conftest.$ac_ext" >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:48862: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:48881: 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}:48867: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:48886: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_cflags"
@@ -48872,7 +48891,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:48875: checking for XOpenDisplay in -lX11" >&5
+echo "$as_me:48894: 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
@@ -48880,7 +48899,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 48883 "configure"
+#line 48902 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -48899,16 +48918,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:48902: \"$ac_link\"") >&5
+if { (eval echo "$as_me:48921: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:48905: \$? = $ac_status" >&5
+  echo "$as_me:48924: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:48908: \"$ac_try\"") >&5
+  { (eval echo "$as_me:48927: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48911: \$? = $ac_status" >&5
+  echo "$as_me:48930: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -48919,7 +48938,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:48922: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:48941: 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
 
@@ -48941,7 +48960,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-echo "$as_me:48944: checking for XCurses library" >&5
+echo "$as_me:48963: 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
@@ -48964,7 +48983,7 @@ done
 LIBS="$cf_add_libs"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 48967 "configure"
+#line 48986 "configure"
 #include "confdefs.h"
 
 #include <xcurses.h>
@@ -48979,16 +48998,16 @@ XCursesExit();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:48982: \"$ac_link\"") >&5
+if { (eval echo "$as_me:49001: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:48985: \$? = $ac_status" >&5
+  echo "$as_me:49004: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:48988: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49007: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48991: \$? = $ac_status" >&5
+  echo "$as_me:49010: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_lib_XCurses=yes
 else
@@ -48999,7 +49018,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:49002: result: $cf_cv_lib_XCurses" >&5
+echo "$as_me:49021: result: $cf_cv_lib_XCurses" >&5
 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
 
 fi
@@ -49014,23 +49033,23 @@ cat >>confdefs.h <<\EOF
 #define XCURSES 1
 EOF
 
-	echo "$as_me:49017: checking for xcurses.h" >&5
+	echo "$as_me:49036: 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 49023 "configure"
+#line 49042 "configure"
 #include "confdefs.h"
 #include <xcurses.h>
 _ACEOF
-if { (eval echo "$as_me:49027: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:49046: \"$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:49033: \$? = $ac_status" >&5
+  echo "$as_me:49052: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -49049,7 +49068,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:49052: result: $ac_cv_header_xcurses_h" >&5
+echo "$as_me:49071: 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
 
@@ -49060,7 +49079,7 @@ EOF
 fi
 
 else
-	{ { echo "$as_me:49063: error: Cannot link with XCurses" >&5
+	{ { echo "$as_me:49082: error: Cannot link with XCurses" >&5
 echo "$as_me: error: Cannot link with XCurses" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -49069,7 +49088,7 @@ fi
 	esac
 else
 
-echo "$as_me:49072: checking if we can include termio.h with curses" >&5
+echo "$as_me:49091: 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
@@ -49079,7 +49098,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 49082 "configure"
+#line 49101 "configure"
 #include "confdefs.h"
 
 #include <LYCurses.h>
@@ -49093,16 +49112,16 @@ putchar(0x0a)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:49096: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:49115: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:49099: \$? = $ac_status" >&5
+  echo "$as_me:49118: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:49102: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49121: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49105: \$? = $ac_status" >&5
+  echo "$as_me:49124: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_termio_and_curses=yes
 else
@@ -49115,7 +49134,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
     rm -f lynx_cfg.h
 
 fi
-echo "$as_me:49118: result: $cf_cv_termio_and_curses" >&5
+echo "$as_me:49137: result: $cf_cv_termio_and_curses" >&5
 echo "${ECHO_T}$cf_cv_termio_and_curses" >&6
 
 test "$cf_cv_termio_and_curses" = yes &&
@@ -49132,23 +49151,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:49135: checking for $ac_header" >&5
+echo "$as_me:49154: 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 49141 "configure"
+#line 49160 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:49145: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:49164: \"$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:49151: \$? = $ac_status" >&5
+  echo "$as_me:49170: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -49167,7 +49186,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:49170: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:49189: 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
@@ -49179,7 +49198,7 @@ done
 
 	fi
 
-echo "$as_me:49182: checking if curses supports alternate-character set" >&5
+echo "$as_me:49201: 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
@@ -49188,7 +49207,7 @@ else
 for mapname in acs_map _acs_map
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 49191 "configure"
+#line 49210 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -49202,16 +49221,16 @@ chtype x = ${mapname}['l']; ${mapname}['m'] = 0; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:49205: \"$ac_link\"") >&5
+if { (eval echo "$as_me:49224: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:49208: \$? = $ac_status" >&5
+  echo "$as_me:49227: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:49211: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49230: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49214: \$? = $ac_status" >&5
+  echo "$as_me:49233: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_alt_char_set=$mapname
 	 break
@@ -49225,21 +49244,21 @@ done
 
 fi
 
-echo "$as_me:49228: result: $cf_cv_alt_char_set" >&5
+echo "$as_me:49247: 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:49235: checking if curses supports fancy attributes" >&5
+echo "$as_me:49254: 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 49242 "configure"
+#line 49261 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -49257,16 +49276,16 @@ attrset(A_UNDERLINE|A_BOLD|A_REVERSE);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:49260: \"$ac_link\"") >&5
+if { (eval echo "$as_me:49279: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:49263: \$? = $ac_status" >&5
+  echo "$as_me:49282: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:49266: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49285: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49269: \$? = $ac_status" >&5
+  echo "$as_me:49288: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fancy_curses=yes
 else
@@ -49278,14 +49297,14 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:49281: result: $cf_cv_fancy_curses" >&5
+echo "$as_me:49300: 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:49288: checking for function curses_version" >&5
+echo "$as_me:49307: 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
@@ -49295,7 +49314,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_curses_version=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 49298 "configure"
+#line 49317 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -49311,15 +49330,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:49314: \"$ac_link\"") >&5
+if { (eval echo "$as_me:49333: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:49317: \$? = $ac_status" >&5
+  echo "$as_me:49336: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:49319: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49338: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49322: \$? = $ac_status" >&5
+  echo "$as_me:49341: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_curses_version=yes
 
@@ -49334,7 +49353,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 rm -f core
 fi
-echo "$as_me:49337: result: $cf_cv_func_curses_version" >&5
+echo "$as_me:49356: 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
@@ -49342,14 +49361,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test "$cf_cv_ncurses_version" != no ; then
-echo "$as_me:49345: checking for obsolete/broken version of ncurses" >&5
+echo "$as_me:49364: 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 49352 "configure"
+#line 49371 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -49368,16 +49387,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:49371: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:49390: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:49374: \$? = $ac_status" >&5
+  echo "$as_me:49393: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:49377: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49396: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49380: \$? = $ac_status" >&5
+  echo "$as_me:49399: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_broken=no
 else
@@ -49389,10 +49408,10 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:49392: result: $cf_cv_ncurses_broken" >&5
+echo "$as_me:49411: 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:49395: WARNING: hmm... you should get an up-to-date version of ncurses" >&5
+	{ echo "$as_me:49414: 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
@@ -49402,14 +49421,14 @@ EOF
 fi
 fi
 
-echo "$as_me:49405: checking if curses supports color attributes" >&5
+echo "$as_me:49424: 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 49412 "configure"
+#line 49431 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -49430,16 +49449,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:49433: \"$ac_link\"") >&5
+if { (eval echo "$as_me:49452: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:49436: \$? = $ac_status" >&5
+  echo "$as_me:49455: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:49439: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49458: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49442: \$? = $ac_status" >&5
+  echo "$as_me:49461: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_color_curses=yes
 else
@@ -49451,7 +49470,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:49454: result: $cf_cv_color_curses" >&5
+echo "$as_me:49473: result: $cf_cv_color_curses" >&5
 echo "${ECHO_T}$cf_cv_color_curses" >&6
 if test "$cf_cv_color_curses" = yes ; then
 
@@ -49475,23 +49494,23 @@ sys/termio.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:49478: checking for $ac_header" >&5
+echo "$as_me:49497: 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 49484 "configure"
+#line 49503 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:49488: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:49507: \"$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:49494: \$? = $ac_status" >&5
+  echo "$as_me:49513: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -49510,7 +49529,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:49513: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:49532: 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
@@ -49527,10 +49546,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	(*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:49530: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:49549: 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 49533 "configure"
+#line 49552 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -49542,16 +49561,16 @@ struct termios foo; int x = (int)(foo.c_iflag = 1); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:49545: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:49564: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:49548: \$? = $ac_status" >&5
+  echo "$as_me:49567: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:49551: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49570: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49554: \$? = $ac_status" >&5
+  echo "$as_me:49573: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=no
 else
@@ -49559,7 +49578,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 49562 "configure"
+#line 49581 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -49573,16 +49592,16 @@ struct termios foo; int x = (int)(foo.c_iflag = 2); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:49576: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:49595: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:49579: \$? = $ac_status" >&5
+  echo "$as_me:49598: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:49582: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49601: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49585: \$? = $ac_status" >&5
+  echo "$as_me:49604: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=unknown
 else
@@ -49598,12 +49617,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:49601: result: $termios_bad" >&5
+	echo "$as_me:49620: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:49606: checking declaration of size-change" >&5
+echo "$as_me:49625: 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
@@ -49624,7 +49643,7 @@ do
 
 	fi
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 49627 "configure"
+#line 49646 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -49674,16 +49693,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:49677: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:49696: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:49680: \$? = $ac_status" >&5
+  echo "$as_me:49699: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:49683: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49702: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49686: \$? = $ac_status" >&5
+  echo "$as_me:49705: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sizechange=yes
 else
@@ -49702,7 +49721,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:49705: result: $cf_cv_sizechange" >&5
+echo "$as_me:49724: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 
@@ -49720,14 +49739,14 @@ EOF
 	esac
 fi
 
-echo "$as_me:49723: checking if ttytype is declared in curses library" >&5
+echo "$as_me:49742: 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 49730 "configure"
+#line 49749 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -49739,16 +49758,16 @@ char *x = &ttytype[1]; *x = 1
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:49742: \"$ac_link\"") >&5
+if { (eval echo "$as_me:49761: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:49745: \$? = $ac_status" >&5
+  echo "$as_me:49764: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:49748: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49767: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49751: \$? = $ac_status" >&5
+  echo "$as_me:49770: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_ttytype=yes
 else
@@ -49760,7 +49779,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:49763: result: $cf_cv_have_ttytype" >&5
+echo "$as_me:49782: result: $cf_cv_have_ttytype" >&5
 echo "${ECHO_T}$cf_cv_have_ttytype" >&6
 test "$cf_cv_have_ttytype" = yes &&
 cat >>confdefs.h <<\EOF
@@ -49769,14 +49788,14 @@ EOF
 
 	if test "$use_wide_curses" = yes ; then
 
-echo "$as_me:49772: checking if curses supports wide characters" >&5
+echo "$as_me:49791: 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 49779 "configure"
+#line 49798 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -49795,16 +49814,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:49798: \"$ac_link\"") >&5
+if { (eval echo "$as_me:49817: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:49801: \$? = $ac_status" >&5
+  echo "$as_me:49820: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:49804: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49823: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49807: \$? = $ac_status" >&5
+  echo "$as_me:49826: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_widec_curses=yes
 else
@@ -49815,7 +49834,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:49818: result: $cf_cv_widec_curses" >&5
+echo "$as_me:49837: result: $cf_cv_widec_curses" >&5
 echo "${ECHO_T}$cf_cv_widec_curses" >&6
 
 if test "$cf_cv_widec_curses" = yes ; then
@@ -49825,14 +49844,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	# This is needed on Tru64 5.0 to declare mbstate_t
-	echo "$as_me:49828: checking if we must include wchar.h to declare mbstate_t" >&5
+	echo "$as_me:49847: 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 49835 "configure"
+#line 49854 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -49846,23 +49865,23 @@ mbstate_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:49849: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:49868: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:49852: \$? = $ac_status" >&5
+  echo "$as_me:49871: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:49855: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49874: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49858: \$? = $ac_status" >&5
+  echo "$as_me:49877: \$? = $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 49865 "configure"
+#line 49884 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -49877,16 +49896,16 @@ mbstate_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:49880: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:49899: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:49883: \$? = $ac_status" >&5
+  echo "$as_me:49902: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:49886: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49905: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49889: \$? = $ac_status" >&5
+  echo "$as_me:49908: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_widec_mbstate=yes
 else
@@ -49898,7 +49917,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:49901: result: $cf_cv_widec_mbstate" >&5
+echo "$as_me:49920: result: $cf_cv_widec_mbstate" >&5
 echo "${ECHO_T}$cf_cv_widec_mbstate" >&6
 
 if test "$cf_cv_widec_mbstate" = yes ; then
@@ -49921,7 +49940,7 @@ fi
 
 	fi
 
-echo "$as_me:49924: checking definition to turn on extended curses functions" >&5
+echo "$as_me:49943: 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
@@ -49929,7 +49948,7 @@ else
 
 cf_cv_need_xopen_extension=unknown
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 49932 "configure"
+#line 49951 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -49962,16 +49981,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:49965: \"$ac_link\"") >&5
+if { (eval echo "$as_me:49984: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:49968: \$? = $ac_status" >&5
+  echo "$as_me:49987: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:49971: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49990: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49974: \$? = $ac_status" >&5
+  echo "$as_me:49993: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_xopen_extension=none
 else
@@ -49981,7 +50000,7 @@ cat "conftest.$ac_ext" >&5
 	for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 49984 "configure"
+#line 50003 "configure"
 #include "confdefs.h"
 
 #define $cf_try_xopen_extension 1
@@ -50007,16 +50026,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:50010: \"$ac_link\"") >&5
+if { (eval echo "$as_me:50029: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:50013: \$? = $ac_status" >&5
+  echo "$as_me:50032: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:50016: \"$ac_try\"") >&5
+  { (eval echo "$as_me:50035: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:50019: \$? = $ac_status" >&5
+  echo "$as_me:50038: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_xopen_extension=$cf_try_xopen_extension; break
 else
@@ -50030,7 +50049,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:50033: result: $cf_cv_need_xopen_extension" >&5
+echo "$as_me:50052: result: $cf_cv_need_xopen_extension" >&5
 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
 
 case "$cf_cv_need_xopen_extension" in
@@ -50042,7 +50061,7 @@ case "$cf_cv_need_xopen_extension" in
 	;;
 esac
 
-echo "$as_me:50045: checking for term.h" >&5
+echo "$as_me:50064: 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
@@ -50063,7 +50082,7 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 50066 "configure"
+#line 50085 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -50077,16 +50096,16 @@ WINDOW *x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:50080: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:50099: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:50083: \$? = $ac_status" >&5
+  echo "$as_me:50102: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:50086: \"$ac_try\"") >&5
+  { (eval echo "$as_me:50105: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:50089: \$? = $ac_status" >&5
+  echo "$as_me:50108: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_term_header=$cf_header
 	 break
@@ -50105,7 +50124,7 @@ case "$cf_cv_term_header" in
 	for cf_header in ncurses/term.h ncursesw/term.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 50108 "configure"
+#line 50127 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -50123,16 +50142,16 @@ WINDOW *x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:50126: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:50145: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:50129: \$? = $ac_status" >&5
+  echo "$as_me:50148: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:50132: \"$ac_try\"") >&5
+  { (eval echo "$as_me:50151: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:50135: \$? = $ac_status" >&5
+  echo "$as_me:50154: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_term_header=$cf_header
 			 break
@@ -50147,7 +50166,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 esac
 
 fi
-echo "$as_me:50150: result: $cf_cv_term_header" >&5
+echo "$as_me:50169: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 case "$cf_cv_term_header" in
@@ -50174,7 +50193,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:50177: checking for unctrl.h" >&5
+echo "$as_me:50196: 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
@@ -50195,7 +50214,7 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 50198 "configure"
+#line 50217 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -50209,16 +50228,16 @@ WINDOW *x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:50212: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:50231: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:50215: \$? = $ac_status" >&5
+  echo "$as_me:50234: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:50218: \"$ac_try\"") >&5
+  { (eval echo "$as_me:50237: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:50221: \$? = $ac_status" >&5
+  echo "$as_me:50240: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_unctrl_header=$cf_header
 	 break
@@ -50231,12 +50250,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:50234: result: $cf_cv_unctrl_header" >&5
+echo "$as_me:50253: result: $cf_cv_unctrl_header" >&5
 echo "${ECHO_T}$cf_cv_unctrl_header" >&6
 
 case "$cf_cv_unctrl_header" in
 (no)
-	{ echo "$as_me:50239: WARNING: unctrl.h header not found" >&5
+	{ echo "$as_me:50258: WARNING: unctrl.h header not found" >&5
 echo "$as_me: WARNING: unctrl.h header not found" >&2;}
 	;;
 esac
@@ -50292,10 +50311,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:50295: checking for ${cf_func}" >&5
+	echo "$as_me:50314: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me:-configure}:50298: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:50317: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -50304,7 +50323,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 50307 "configure"
+#line 50326 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -50337,16 +50356,16 @@ if (foo + 1234L > 5678L)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:50340: \"$ac_link\"") >&5
+if { (eval echo "$as_me:50359: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:50343: \$? = $ac_status" >&5
+  echo "$as_me:50362: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:50346: \"$ac_try\"") >&5
+  { (eval echo "$as_me:50365: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:50349: \$? = $ac_status" >&5
+  echo "$as_me:50368: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -50362,7 +50381,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:50365: result: $cf_result" >&5
+	echo "$as_me:50384: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" != no; then
 		cat >>confdefs.h <<EOF
@@ -50379,13 +50398,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:50382: checking for $ac_func" >&5
+echo "$as_me:50401: 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 50388 "configure"
+#line 50407 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -50416,16 +50435,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:50419: \"$ac_link\"") >&5
+if { (eval echo "$as_me:50438: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:50422: \$? = $ac_status" >&5
+  echo "$as_me:50441: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:50425: \"$ac_try\"") >&5
+  { (eval echo "$as_me:50444: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:50428: \$? = $ac_status" >&5
+  echo "$as_me:50447: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -50435,7 +50454,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:50438: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:50457: 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
@@ -50449,12 +50468,12 @@ fi
 
 if test "$use_color_style" != no ; then
 	if test .$cf_cv_color_curses != .yes ; then
-		{ { echo "$as_me:50452: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:50471: 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:50457: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:50476: error: Configuration does not support color-styles" >&5
 echo "$as_me: error: Configuration does not support color-styles" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -50462,7 +50481,7 @@ fi
 
 if test "$use_scrollbar" != no ; then
 	if test .$cf_cv_fancy_curses != .yes ; then
-		{ echo "$as_me:50465: WARNING: Configuration does not support ACS_xxx definitions" >&5
+		{ echo "$as_me:50484: WARNING: Configuration does not support ACS_xxx definitions" >&5
 echo "$as_me: WARNING: Configuration does not support ACS_xxx definitions" >&2;}
 	else
 
@@ -50475,7 +50494,7 @@ fi
 
 # use rpath for libraries in unusual places
 
-echo "$as_me:50478: checking if rpath-hack should be disabled" >&5
+echo "$as_me:50497: 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.
@@ -50493,22 +50512,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:50496: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:50515: result: $cf_disable_rpath_hack" >&5
 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 
 if test "$enable_rpath_hack" = yes ; then
 
-echo "$as_me:50501: checking for updated LDFLAGS" >&5
+echo "$as_me:50520: 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:50504: result: maybe" >&5
+	echo "$as_me:50523: 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:50511: checking for $ac_word" >&5
+echo "$as_me:50530: 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
@@ -50523,7 +50542,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:50526: found $ac_dir/$ac_word" >&5
+echo "$as_me:50545: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -50531,10 +50550,10 @@ fi
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:50534: result: $cf_ldd_prog" >&5
+  echo "$as_me:50553: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:50537: result: no" >&5
+  echo "$as_me:50556: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -50548,7 +50567,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
 		cf_rpath_oops=
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 50551 "configure"
+#line 50570 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -50560,16 +50579,16 @@ printf("Hello");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:50563: \"$ac_link\"") >&5
+if { (eval echo "$as_me:50582: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:50566: \$? = $ac_status" >&5
+  echo "$as_me:50585: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:50569: \"$ac_try\"") >&5
+  { (eval echo "$as_me:50588: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:50572: \$? = $ac_status" >&5
+  echo "$as_me:50591: \$? = $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`
@@ -50597,7 +50616,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}:50600: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:50619: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
 
 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
 						break
@@ -50609,11 +50628,11 @@ echo "${as_me:-configure}:50600: testing ...adding -L$cf_rpath_dir/lib to LDFLAG
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:50612: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:50631: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:50616: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:50635: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -50650,7 +50669,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:50653: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:50672: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -50663,11 +50682,11 @@ LDFLAGS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:50666: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:50685: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:50670: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:50689: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -50704,7 +50723,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:50707: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:50726: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -50717,14 +50736,14 @@ LIBS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:50720: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:50739: testing ...checked LIBS $LIBS ..." 1>&5
 
 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:50724: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:50743: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 else
-	echo "$as_me:50727: result: no" >&5
+	echo "$as_me:50746: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -50839,7 +50858,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:50842: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:50861: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -50974,7 +50993,7 @@ EOF
 
 cat >>"$CONFIG_STATUS" <<EOF
 ac_cs_version="\\
-config.status
+lynx config.status 2.9.0
 configured by $0, generated by GNU Autoconf 2.52.20231210,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -51020,7 +51039,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:51023: error: ambiguous option: $1
+    { { echo "$as_me:51042: 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;}
@@ -51039,7 +51058,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:51042: error: unrecognized option: $1
+  -*) { { echo "$as_me:51061: 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;}
@@ -51058,7 +51077,7 @@ cat >&5 << _ACEOF
 ## Running config.status.  ##
 ## ----------------------- ##
 
-This file was extended by $as_me 2.52.20231210, executed with
+This file was extended by $as_me (lynx 2.9.0) 2.52.20231210, executed with
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
   CONFIG_LINKS    = $CONFIG_LINKS
@@ -51092,7 +51111,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:51095: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:51114: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -51191,6 +51210,7 @@ s,@target_vendor@,$target_vendor,;t t
 s,@target_os@,$target_os,;t t
 s,@PACKAGE@,$PACKAGE,;t t
 s,@VERSION@,$VERSION,;t t
+s,@NO_DOTS_VERSION@,$NO_DOTS_VERSION,;t t
 s,@DESTDIR@,$DESTDIR,;t t
 s,@CC@,$CC,;t t
 s,@CFLAGS@,$CFLAGS,;t t
@@ -51456,7 +51476,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:51459: creating $ac_file" >&5
+    { echo "$as_me:51479: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -51474,7 +51494,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:51477: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:51497: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -51487,7 +51507,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:51490: error: cannot find input file: $f" >&5
+           { { echo "$as_me:51510: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -51503,7 +51523,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:51506: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:51526: 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;}
@@ -51512,7 +51532,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:51515: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:51535: 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;}
@@ -51557,7 +51577,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:51560: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:51580: 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;}
@@ -51568,7 +51588,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:51571: WARNING: Some variables may not be substituted:
+      { echo "$as_me:51591: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -51617,7 +51637,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:51620: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:51640: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -51628,7 +51648,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:51631: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:51651: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -51641,7 +51661,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:51644: error: cannot find input file: $f" >&5
+           { { echo "$as_me:51664: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -51760,7 +51780,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:51763: $ac_file is unchanged" >&5
+      { echo "$as_me:51783: $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 2b827783..29081036 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $LynxId: configure.in,v 1.349 2024/01/07 15:33:23 tom Exp $
+dnl $LynxId: configure.in,v 1.355 2024/01/14 22:24:38 tom Exp $
 dnl
 dnl Process this file with autoconf to produce a configure script.
 dnl
@@ -27,9 +27,14 @@ dnl ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 dnl OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 dnl ---------------------------------------------------------------------------
 dnl
-dnl ask PRCS to plug-in the project-version for the configure-script.
-dnl $Format: "AC_REVISION($ProjectVersion$)"$
-AC_REVISION(2.9.0dev.13)
+AC_REVISION($Revision: 1.355 $)
+
+AC_PREREQ(2.52.20231210)
+AC_INIT(lynx,2.9.0,lynx-dev@nongnu.org)
+
+AC_CONFIG_SRCDIR(userdefs.h)
+
+echo "Configuring $PACKAGE_NAME version $PACKAGE_VERSION"
 
 # Save the original $CFLAGS so we can distinguish whether the user set those
 # in the environment, or whether autoconf added -O and -g options:
@@ -40,9 +45,6 @@ ORIGINAL_CFLAGS="$CFLAGS"
 # run to the next, as well as with tests that are order-dependent.
 rm -f config.cache
 
-AC_PREREQ(2.25.20210105)
-AC_INIT(userdefs.h)
-
 # autoconf 2.5x defaults to no cache file; we need the cache file's information
 # for building the config page.  But start with it empty to avoid confusion by
 # people who don't do a "make distclean" after applying patches.
@@ -61,14 +63,15 @@ AC_ARG_WITH(system-type,
 
 AC_ARG_PROGRAM
 
-PACKAGE=lynx
-dnl ask PRCS to plug-in the project-version for the packages.
-# $Format: "VERSION=$ProjectVersion$"$
-VERSION=2.9.0dev.13
+PACKAGE=$PACKAGE_NAME
+VERSION=$PACKAGE_VERSION
 
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
 
+NO_DOTS_VERSION=`echo "$PACKAGE_VERSION" | sed -e 's,\.,-,g'`
+AC_SUBST(NO_DOTS_VERSION)
+
 AC_MSG_CHECKING(for DESTDIR)
 CF_WITH_PATH(destdir,
 [  --with-destdir=XXX      set DESTDIR destination for install],
diff --git a/docs/README.metrics b/docs/README.metrics
index bdfdf3f2..87b6536d 100644
--- a/docs/README.metrics
+++ b/docs/README.metrics
@@ -1,4 +1,4 @@
--- $LynxId: README.metrics,v 1.17 2018/07/08 16:43:30 tom Exp $
+-- $LynxId: README.metrics,v 1.18 2024/01/15 01:51:51 tom Exp $
 
 This is a short summary of code metrics showing how lynx has grown from
 release to release.  It also shows how the original codebase has
@@ -47,15 +47,15 @@ scripts.
 Here is a count of contributions (from CHANGES and docs/CHANGES2.8) since the
 start of the 2.8 series:
 
-    0.5 AJL
     3   Al Gilman
     1   Al Walker
+    0.5 Alex J Lyons
     1   Alexei Anatski
     2   Alexey Dobriyan
-    2   Andreas Metzler
+    3   Andreas Metzler
     2   Andrew Belov
     3.5 Andrey A Chernov
-    1   Arkadiusz Miskiewicz
+    1   Arkadiusz
     1   Arnaud Giersch
     2   Atsuhito Kohda
     2   Axel Beckert
@@ -64,6 +64,7 @@ start of the 2.8 series:
     1   Bill Nottingham
     3.5 Bill Schiavo
     2   Binh Do
+    1   Bjarni I Gislason
     1   Brett Lymn
    46.3 Brian J Pardy
     1   Carlton Anderson
@@ -74,6 +75,7 @@ start of the 2.8 series:
     3   Christian Weisgerber
     1   Christoph J Gartmann
     1   Chuck Houpt
+    1   Chuck Martin
     1   Crouton
     1   Dan Jacobson
     1   Daniel Dickman
@@ -88,7 +90,7 @@ start of the 2.8 series:
     1   Elliot Thomas
     2   Emanuele Giaquinta
     1   Eric Brun
-   70   External
+   84   External
     1   Fabian Fingerle
   280.5 Foteos Macrides
     2   Frank Heckenbach
@@ -96,13 +98,14 @@ start of the 2.8 series:
     1   Frederick P Herrmann
     1   Georg Drenkhahn
     1   George Lindholm
-   27   Gisle Vanem
+   29   Gisle Vanem
     1   Glenn Nielsen
     1   Hans Wurst
    28.5 Hataguchi Takeshi
     1   Heikki Kantola
     0.5 Helen Sommer
    23   Henry Nelson
+    1   Hiltjo Posthuma
     1   Hiram Lester Jr
     8.5 Hiroyuki Senshu
     3   Hynek Med
@@ -129,14 +132,14 @@ start of the 2.8 series:
     2   Jonathan Sergent
     1   Josef Sontgen
     2   Julian Coleman
-    2   Kamil Dudka
+    3   Kamil Dudka
     3   Karl Eichwalder
     1   Karl-Andre Skevik
-    4   Kihara Hideto
+    8   Kihara Hideto
    29.3 Kim DeVaughn
   706.3 Klaus Weide
     1   Lalo Martins
-    1   Larry Hynes
+    2   Larry Hynes
     1   Larry Virden
    15.8 Larry W Virden
    11   Laura Eaves
@@ -153,14 +156,18 @@ start of the 2.8 series:
     6.5 Michael Warner
     1   Michel Such
     1   Mike Castle
+    1   Mike Gorse
+    1   Mike Knight
     2   Munechika Sumikawa
     1   Nigel Horne
     0.5 Nikos Chantziaras
+   11   OOPS
     1   OpenBSD CVS
     1   Owen Leibman
     1   Pat Walsh
    13.5 Paul B Mahol
     1   Paul D Smith
+    2   Paul G Fox
    52.5 Paul Gilmartin
     1   Peter Backes
     1   Peter Canning
@@ -169,43 +176,50 @@ start of the 2.8 series:
    14   Philippe De Muyter
     1   Quentin Minster
     5.5 Rado Smiljanic
+    1   Rajeev V Pillai
     2   Ralph Babel
     1   Randall
     1   Reiner Hermann
     1   Risto Widenius
     1   Rob Cameron
+    1   Robert Bell
     1   Ruda Moura
     1   Ryan Nielsen
     2   Scott Bigham
     1   Sergej Kvachonok
     6   Sergey Svishchev
     1   Serhii Hlodin
+    0.5 Shlomi Fish
     2   Simon Kainz
    15   Sinan Kaan Yerli
     7.8 Stefan Caunter
+    1.5 Steffen Nurpmeso
     1   Stepan Kasal
+    1   Sylvain Bertrand
     1   Tadayoshi Okuma
     1   Takao Fujiwara
     1   Taketo Kabe
     1   Thomas Braun
- 2188.3 Thomas E Dickey
+ 2269.8 Thomas E Dickey
     1.5 Thomas Klausner
     1   Thomas Petazzoni
     1   Thomas Viehmann
-   21   Thorsten Glaser
+   21.5 Thorsten Glaser
     1   Tim Chase
     4   Tim Larson
     1   Timur Birsh
     2   Tomas Vanhala
     1.5 Ulf Harnhammar
+    1   Viatrix
     6.5 Victor Schneider
     2   Ville Herva
    86   Vlad Harchev
    37.5 Wayne Buttles
     1   Wesley Morgan
     1   Zdenek Prikryl
+    1   emil@vajn icu
     1.5 nsh@horae.dti.ne.jp
- 4563   Total
+ 4689   Total
 
 -------------------------------------------------------------------------------
 
diff --git a/lynx.cfg b/lynx.cfg
index 8ca0e4f6..c92a39c7 100644
--- a/lynx.cfg
+++ b/lynx.cfg
@@ -1,13 +1,10 @@
-# $LynxId: lynx.cfg,v 1.332 2023/01/24 09:25:46 tom Exp $
+# $LynxId: lynx.cfg,v 1.335 2024/01/15 11:31:00 tom Exp $
 # lynx.cfg file.
 # The default placement for this file is /usr/local/lib/lynx.cfg (Unix)
 #                                     or Lynx_Dir:lynx.cfg (VMS)
 #
-# $Format: "#PRCS LYNX_VERSION \"$ProjectVersion$\""$
-#PRCS LYNX_VERSION "2.9.0dev.13"
-#
-# $Format: "#PRCS LYNX_DATE \"$ProjectDate$\""$
-#PRCS LYNX_DATE "Tue, 24 Jan 2023 04:25:46 -0500"
+# LYNX_VERSION "2.9.0"
+# LYNX_DATE    "15 Jan 2024"
 #
 # Definition pairs (configuration settings) are of the form
 #	VARIABLE:DEFINITION
diff --git a/lynx.hlp b/lynx.hlp
index 3b16496b..7291dfd4 100644
--- a/lynx.hlp
+++ b/lynx.hlp
@@ -19,13 +19,15 @@
 2 Description
        Lynx is a fully-featured World Wide Web (WWW) client for users  running
        cursor-addressable,   character-cell   display   devices  (e.g.,  vt100
-       terminals, vt100 emulators running on Windows 95/NT/XP/7/8 or any POSIX
-       platform,  or  any  other  "curses-oriented" display).  It will display
-       hypertext markup language (HTML) documents containing  links  to  files
-       residing  on  the  local  system,  as  well as files residing on remote
-       systems running Gopher, HTTP, FTP, WAIS,  and  NNTP  servers.   Current
-       versions  of Lynx run on Unix, VMS, Windows 95/NT/XP/7/8, DOS DJGPP and
-       OS/2.
+       terminals, vt100 emulators running on Windows or any POSIX platform, or
+       any other "curses-oriented" display).  It will display hypertext markup
+       language (HTML) documents containing links to  files  residing  on  the
+       local  system,  as  well  as  files  residing on remote systems running
+       Gopher, HTTP, FTP, WAIS, and NNTP servers.
+
+       Lynx has been ported to many systems, including all variants  of  Unix,
+       Windows  (since  Windows  95),  DOS  DJGPP and OS/2, as well as VMS and
+       OS/390.
 
        Lynx can be used to access information on the World  Wide  Web,  or  to
        build  information  systems  intended  primarily for local access.  For
@@ -894,9 +896,9 @@
        *   Type Delete to view history list.
 
 2 Environment
-       In  addition  to various "standard" environment variables such as HOME,
-       PATH, USER, DISPLAY, TMPDIR, etc, Lynx utilizes  several  Lynx-specific
-       environment variables, if they exist.
+       In  addition  to  various  "standard"  environment  variables  such  as
+       DISPLAY, HOME, PATH, SHELL, TMPDIR, USER, etc., Lynx  utilizes  several
+       Lynx-specific environment variables, if they exist.
 
        Others  may  be created or modified by Lynx to pass data to an external
        program, or for other reasons.  These are listed separately below.
@@ -993,21 +995,30 @@
                                finger_proxy
                                ftp_proxy
                                gopher_proxy
-                               https_proxy
                                http_proxy
+                               https_proxy
+                               news_proxy
                                newspost_proxy
                                newsreply_proxy
-                               news_proxy
                                nntp_proxy
                                no_proxy
+                               rlogin_proxy
+                               snews_proxy
                                snewspost_proxy
                                snewsreply_proxy
-                               snews_proxy
+                               telnet_proxy
+                               tn3270_proxy
                                wais_proxy
 
                            See Lynx Users Guide  for  additional  details  and
                            examples.
 
+       RL_CLCOPY_CMD       Pipe  the  contents  of the current link using this
+                           command as the target.
+
+       RL_PASTE_CMD        Open a pipe to read from this command,  pasting  it
+                           into the current editable-field or command-prompt.
+
        SOCKS5_PROXY        Is  inspected  if  -socks5_proxy  has not been used
                            (for the same content).
 
@@ -1097,7 +1108,7 @@
                            values  of  the  LINES  and/or  COLUMNS environment
                            variables may also be changed.
 
-2 Simulated Cgi Support
+   Simulated CGI Support
        If built with the cgi-links option enabled, Lynx allows access to a cgi
        script directly without the need for an http daemon.
 
@@ -1139,7 +1150,7 @@
        The CGI Specification, and other associated  documentation,  should  be
        consulted for general information on CGI script programming.
 
-2 Native Language Support
+   Native Language Support
        If  configured  and  installed  with Native Language Support, Lynx will
        display status and other messages in your local language.  See the file
        ABOUT_NLS  in  the  source distribution, or at your local GNU site, for
@@ -1173,56 +1184,37 @@
                            for message catalogs.
 
 2 Notes
-       This is the manual for Lynx v2.9.0dev.5; development is in progress for
-       2.9.0.
-
+   Mailing Lists
        If you wish to contribute to the further development of Lynx, subscribe
-       to  our mailing list.  Send email to <lynx-dev-request@nongnu.org> with
+       to our mailing list.  Send email to <lynx-dev-request@nongnu.org>  with
        "subscribe lynx-dev" as the only line in the body of your message.
 
-       Send bug reports, comments, suggestions to <lynx-dev@nongnu.org>  after
+       Send  bug reports, comments, suggestions to <lynx-dev@nongnu.org> after
        subscribing.
 
-       Unsubscribe  by  sending  email  to  <lynx-dev-request@nongnu.org> with
-       "unsubscribe lynx-dev" as the only line in the body  of  your  message.
+       Unsubscribe by  sending  email  to  <lynx-dev-request@nongnu.org>  with
+       "unsubscribe  lynx-dev"  as  the only line in the body of your message.
        Do not send the unsubscribe message to the lynx-dev list, itself.
 
-2 See Also
-       catgets(3),  curses(3),  environ(7),  execve(2),  ftp(1), gettext(GNU),
-       localeconv(3),   ncurses(3),   setlocale(3),   slang(?),    termcap(5),
-       terminfo(5), wget(GNU)
-
-       Note that man page availability and section numbering is somewhat platform
-       dependent, and may vary from the above references.
-
-       A section shown as (GNU), is intended to denote that the topic  may  be
-       available via an info page, instead of a man page (i.e., try "info subject",
-       rather than "man subject").
-
-       A section shown as (?) denotes that documentation on the topic  exists,
-       but  is  not part of an established documentation retrieval system (see
-       the distribution files associated with the topic, or contact your  System
-       Administrator for further information).
-
-2 Acknowledgments
-       Lynx  has  incorporated  code  from a variety of sources along the way.
-       The earliest versions of Lynx included code from Earl Fogel of  Comput-
-       ing  Services at the University of Saskatchewan, who implemented HYPER-
-       REZ in the Unix environment.  HYPERREZ was developed by Niel Larson  of
-       Think.com  and  served  as  the  model  for the early versions of Lynx.
-       Those versions also incorporated libraries from the Unix Gopher clients
-       developed  at  the  University  of Minnesota, and the later versions of
-       Lynx rely on the WWW client library code developed by  Tim  Berners-Lee
-       and  the  WWW  community.  Also a special thanks to Foteos Macrides who
-       ported much of Lynx to VMS and did or organized most of its development
-       since  the  departures of Lou Montulli and Garrett Blythe from the Uni-
-       versity of Kansas in the summer of 1994 through the release of  v2.7.2,
-       and  to  everyone  on the net who has contributed to Lynx's development
-       either directly (through patches, comments or bug reports) or indirect-
-       ly (through inspiration and development of other systems).
+   Acknowledgments
+       Lynx has incorporated code from a variety of  sources  along  the  way.
+       The  earliest  versions  of  Lynx  included  code  from  Earl  Fogel of
+       Computing Services at the University of Saskatchewan,  who  implemented
+       HYPERREZ  in  the  Unix  environment.   HYPERREZ  was developed by Niel
+       Larson of Think.com and served as the model for the early  versions  of
+       Lynx.   Those versions also incorporated libraries from the Unix Gopher
+       clients developed  at  the  University  of  Minnesota,  and  the  later
+       versions  of  Lynx rely on the WWW client library code developed by Tim
+       Berners-Lee and the WWW community.  Also a  special  thanks  to  Foteos
+       Macrides  who  ported  much of Lynx to VMS and did or organized most of
+       its development since the departures of Lou Montulli and Garrett Blythe
+       from the University of Kansas in the summer of 1994 through the release
+       of v2.7.2, and to everyone on the net who  has  contributed  to  Lynx's
+       development  either directly (through patches, comments or bug reports)
+       or indirectly (through inspiration and development of other systems).
 
 2 Authors
-       Lou  Montulli,  Garrett  Blythe, Craig Lavender, Michael Grobe, Charles
+       Lou Montulli, Garrett Blythe, Craig Lavender,  Michael  Grobe,  Charles
        Rezac
        Academic Computing Services
        University of Kansas
@@ -1234,3 +1226,7 @@
 
        Thomas E. Dickey
        <dickey@invisible-island.net>
+
+2 See Also
+       catgets(3), curses(3), environ(7), ftp(1), gettext(GNU), localeconv(3),
+       ncurses(3), setlocale(3), termcap(5), terminfo(5)
diff --git a/lynx.man b/lynx.man
index 800e5812..464078d2 100644
--- a/lynx.man
+++ b/lynx.man
@@ -1,6 +1,7 @@
-.\" $LynxId: lynx.man,v 1.142 2023/10/30 22:31:08 tom Exp $
+.\" $LynxId: lynx.man,v 1.147 2024/01/14 20:53:14 tom Exp $
 .\" **************************************************************************
-.\" Escape single quotes in literal strings from groff's Unicode transform.
+.TH LYNX 1 2024-01-14 "Lynx 2.9.0" "Lynx \(en the \fItext\fP web browser"
+.
 .ie \n(.g \{\
 .ds `` \(lq
 .ds '' \(rq
@@ -15,6 +16,12 @@
 .el   .ds '  '
 .\}
 .
+.ie n .ds CW R
+.el   \{
+.ie \n(.g .ds CW CR
+.el       .ds CW CW
+.\}
+.
 .de bP
 .ie n  .IP \(bu 4
 .el    .IP \(bu 2
@@ -25,7 +32,7 @@
 .ie n  .in +4
 .el    .in +2
 .nf
-.ft CR			\" Courier
+.ft \*(CW
 ..
 .de NE
 .fi
@@ -34,7 +41,6 @@
 .el    .in -2
 ..
 .\" **************************************************************************
-.TH LYNX 1 2023-10-30 "Lynx 2.9.0" "Lynx \(en the \fItext\fP web browser"
 .SH NAME
 lynx \-
 a general purpose distributed information browser for the World Wide Web
@@ -61,17 +67,20 @@ Lynx
 is a fully-featured World Wide Web (WWW) client for users
 running cursor-addressable, character-cell display devices
 (e.g., vt100 terminals,
-vt100 emulators running on Windows 95/NT/XP/7/8 or any POSIX platform,
+vt100 emulators running on Windows or any POSIX platform,
 or any other \*(``curses-oriented\*('' display).
 It will display hypertext
 markup language (HTML) documents containing links to
 files residing on the local system, as well as files residing on
 remote systems running Gopher, HTTP, FTP, WAIS, and NNTP servers.
-Current versions of
+.PP
 .I
 Lynx
-run on
-Unix, VMS, Windows 95/NT/XP/7/8, DOS DJGPP and OS/2.
+has been ported to many systems,
+including all variants of Unix,
+Windows (since Windows 95),
+DOS DJGPP and OS/2,
+as well as VMS and OS/390.
 .PP
 .I
 Lynx
@@ -1271,7 +1280,7 @@ above), \fILynx\fR will set or modify its value to the user specified
 terminal type (for the \fILynx\fR execution environment).
 Note: If set/modified by \fILynx\fR, the values of the \fBLINES\fR and/or
 \fBCOLUMNS\fR environment variables may also be changed.
-.SH SIMULATED CGI SUPPORT
+.SS "Simulated CGI Support"
 If built with the \fBcgi-links\fR option enabled, \fILynx\fR allows access
 to a cgi script directly without the need for an http daemon.
 .PP
@@ -1312,7 +1321,7 @@ definition and usage of these variables.
 .PP
 The CGI Specification, and other associated documentation, should be consulted
 for general information on CGI script programming.
-.SH NATIVE LANGUAGE SUPPORT
+.SS "Native Language Support"
 If configured and installed with \fBNative Language Support\fR, \fILynx\fR
 will display status and other messages in your local language.
 See the
@@ -1349,9 +1358,7 @@ Currently, it is hard-coded to a wish list.
 .B NLSPATH
 This variable, if set, is used as the path prefix for message catalogs.
 .SH NOTES
-This is the manual for \fILynx\fP v2.9.0dev.5;
-development is in progress for 2.9.0.
-.PP
+.SS "Mailing Lists"
 If you wish to contribute to the further development
 of \fILynx\fR, subscribe to our mailing list.
 Send email to
@@ -1365,35 +1372,7 @@ after subscribing.
 Unsubscribe by sending email to <lynx\-dev\-request@nongnu.org> with
 \*(``unsubscribe lynx\-dev\*('' as the only line in the body of your message.
 Do not send the unsubscribe message to the lynx\-dev list, itself.
-.SH SEE ALSO
-.hy 0
-\fBcatgets\fR(3),
-\fBcurses\fR(3),
-\fBenviron\fR(7),
-\fBexecve\fR(2),
-\fBftp\fR(1),
-\fBgettext\fR(GNU),
-\fBlocaleconv\fR(3),
-\fBncurses\fR(3),
-\fBsetlocale\fR(3),
-\fBslang\fR(?),
-\fBtermcap\fR(5),
-\fBterminfo\fR(5),
-\fBwget\fR(GNU)
-.hy 1
-.PP
-Note that man page availability and section numbering is somewhat
-platform dependent, and may vary from the above references.
-.PP
-A section shown as (GNU), is intended to denote that the topic
-may be available via an info page, instead of a man page (i.e., try
-\*(``info subject\*('', rather than \*(``man subject\*('').
-.PP
-A section shown as \fB(?)\fP denotes that documentation on the topic exists,
-but is not part of an established documentation retrieval system (see
-the distribution files associated with the topic, or contact your
-System Administrator for further information).
-.SH ACKNOWLEDGMENTS
+.SS Acknowledgments
 \fILynx\fP has incorporated code from a variety of sources along the way.
 The earliest versions of \fILynx\fP included code from Earl Fogel of Computing
 Services at the University of Saskatchewan, who implemented HYPERREZ
@@ -1429,3 +1408,14 @@ Shrewsbury, Massachusetts 01545
 Thomas E.\& Dickey
 .br
 <dickey@invisible\-island.net>
+.SH SEE ALSO
+\fB\%catgets\fR(3),
+\fB\%curses\fR(3),
+\fB\%environ\fR(7),
+\fB\%ftp\fR(1),
+\fB\%gettext\fR(GNU),
+\fB\%localeconv\fR(3),
+\fB\%ncurses\fR(3),
+\fB\%setlocale\fR(3),
+\fB\%termcap\fR(5),
+\fB\%terminfo\fR(5)
diff --git a/lynx_help/Lynx_users_guide.html b/lynx_help/Lynx_users_guide.html
index a5b270f3..6815754e 100644
--- a/lynx_help/Lynx_users_guide.html
+++ b/lynx_help/Lynx_users_guide.html
@@ -1,10 +1,10 @@
-<!-- $LynxId: Lynx_users_guide.html,v 1.157 2023/01/03 00:11:31 Jens.Schleusener Exp $ -->
+<!-- $LynxId: Lynx_users_guide.html,v 1.161 2024/01/15 01:49:05 tom Exp $ -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
 <head>
   <meta name="generator" content=
   "HTML Tidy for HTML5 for Linux version 5.6.0">
-  <title>Lynx Users Guide v2.8.9</title>
+  <title>Lynx Users Guide v2.9.0</title>
   <link rev="made" href="mailto:lynx-dev@nongnu.org">
   <meta http-equiv="Content-Type" content=
   "text/html; charset=us-ascii">
@@ -12,7 +12,7 @@
   "This is the user's guide to Lynx, giving detailed information on how to use the program, and how to change its configuration using the options menu.">
 </head>
 <body>
-  <h1>Lynx Users Guide v2.8.9</h1>
+  <h1>Lynx Users Guide v2.9.0</h1>
 
   <p>Lynx is a fully-featured <em>World Wide Web</em>
   (<em>WWW</em>) client for users running cursor-addressable,
@@ -755,7 +755,7 @@
 
                     <a href="#item-form_based_options" name=
 "example-form_based_options" id=
-"example-form_based_options">Options Menu (Lynx Version 2.9.0dev.7)</a>
+"example-form_based_options">Options Menu (Lynx Version 2.9.0)</a>
 
     Accept Changes - Reset Changes - Left Arrow cancels changes - HELP!
 
@@ -850,7 +850,7 @@
   Send User-Agent header (!)       : <a href=
 "#optinfo-send_user_agent">[X]</a>
   User-Agent header (!)            : <a href=
-"#optinfo-user_agent">Lynx/2.8.9rel.1 libwww-FM/2.14 SSL-MM/1.4.</a>
+"#optinfo-user_agent">Lynx/2.9.0 libwww-FM/2.14 SSL-MM/1.4.</a>
 
   Listing and Accessing Files
   Use Passive FTP (!)              : <a href=
@@ -892,7 +892,7 @@
 
              <a href="#item-key_based_options" name=
 "example-key_based_options" id=
-"example-key_based_options">Options Menu (Lynx Version 2.9.0dev.7)</a>
+"example-key_based_options">Options Menu (Lynx Version 2.9.0)</a>
 
      <a href=
 "#optinfo-editor">(E)</a>ditor                     : emacs
@@ -1826,7 +1826,7 @@
       indicate the User-Agent is displayed here. Changes may be
       disallowed via the <em>-restrictions</em> switch. Otherwise,
       the header can be changed temporarily to a string such as
-      <em>L_y_n_x/2.8.9</em> for access to sites which discriminate
+      <em>L_y_n_x/2.9.0</em> for access to sites which discriminate
       against Lynx based on checks for the presence of "Lynx" in
       the header. If the User-Agent header has been changed, it can
       be restored to the built-in default value by deleting the
@@ -5669,9 +5669,9 @@ lynx -source ./ &gt;foo.html
   Lynx was implemented by Lou Montulli and maintained by Garrett
   Arch Blythe and Craig Lavender.</p>
 
-  <p><em>Foteos Macrides</em> and members of the <a href=
-  "lynx-dev.html">lynx-dev</a> list have developed and supported
-  Lynx since release of v2.3 in May 1994.<br>
+  <p>Members of the <a href="lynx-dev.html">lynx-dev</a> list have
+  developed and supported Lynx since release of v2.3 in May
+  1994.<br>
   The Lynx2-3FM code set was released as v2.4 in June 1995.<br>
   The Lynx2-4FM code set was released as v2.5 in May 1996.<br>
   The Lynx2-5FM code set was released as v2.6 in September
@@ -5697,14 +5697,9 @@ lynx -source ./ &gt;foo.html
   The 2.8.7 development set was released as v2.8.8 in February
   2014.<br>
   The 2.8.8 development set was released as v2.8.9 in July
-  2018.<br></p>
-
-  <p>Since early 1997, the Lynx code has expanded into
-  autoconfigure and PC versions. The branching of the Lynx source
-  base from a single source into two sources (FM/Foteos Macrides
-  and ac/autoconfigure) should be considered a healthy synergism
-  among groups of computer professionals acting in their spare time
-  out of a common goal.</p>
+  2018.<br>
+  The 2.8.9 development set was released as v2.9.0 in January
+  2024.<br></p>
 
   <p>Lynx has incorporated code from a variety of sources along the
   way. The earliest versions of Lynx included code from Earl Fogel
diff --git a/makefile.in b/makefile.in
index f10c9eae..651677e1 100644
--- a/makefile.in
+++ b/makefile.in
@@ -1,4 +1,4 @@
-# $LynxId: makefile.in,v 1.194 2023/01/24 09:25:46 tom Exp $
+# $LynxId: makefile.in,v 1.198 2024/01/15 16:06:06 tom Exp $
 ##makefile for lynx
 
 SHELL		= @CONFIG_SHELL@
@@ -46,12 +46,11 @@ TAR		= @TAR@
 TAR_UP		= $(TAR) @TAR_UP_OPTIONS@ @TAR_PIPE_OPTIONS@
 TAR_DOWN	= $(TAR) @TAR_DOWN_OPTIONS@ @TAR_PIPE_OPTIONS@
 
-# $Format: "LYNX_VERSION	= $ProjectVersion$"$
-LYNX_VERSION	= 2.9.0dev.13
+LYNX_VERSION	= @PACKAGE_VERSION@
 
 ## This is the version which we are developing (or, upon release, make this
 ## the same).  Use no dots in the name, since it must work on VMS and MS-DOS.
-VERSION		= 2-8-9
+PORT_VERSION	= @NO_DOTS_VERSION@
 
 ##this is the name of the directory the lynx source code is in.
 ##(e.g., lynx2-8-9, not the full path)
@@ -312,7 +311,7 @@ install-man : $(MANDIR)
 
 install-doc : $(DOCDIR) $(HELPDIR)
 	@echo "Copying sample files";\
-	$(SHELL) -c 'set -x; \
+	$(SHELL) -c '\
 		( umask 022; \
 		  cd $(srcdir) && \
 		  $(TAR_UP) C[HO]* PROBLEMS README docs samples test ) | \
@@ -322,15 +321,20 @@ install-doc : $(DOCDIR) $(HELPDIR)
 	$(SHELL) -c 'if test "$(COMPRESS_PROG)" != "" ; then \
 		(cd $(DOCDIR) && $(COMPRESS_PROG) -f docs/CHANGES*.[0-9] docs/*.announce ) \
 	fi';\
-	$(SHELL) -c 'set -x; \
+	echo "Copying copyright files";\
+	$(SHELL) -c '\
+		r="`$(SHELL) $(scripts_dir)/relpath.sh "$(docdir)" "$(helpdir)"`"; \
+		echo ".. docdir:   $(docdir)"; \
+		echo ".. helpdir:  $(helpdir)"; \
+		echo ".. relative: $$r"; \
 		for name in COPYING COPYHEADER; do \
-		cd $(HELPDIR) && rm -f $$name ;\
-		r= ;\
-		test "$(LN_S)" = "ln -s" || r=`echo $(helpdir)|sed -e "s%[^/]\+%..%g" -e "s%^.%%"`; \
-		cd $(HELPDIR) && ( $(LN_S) $$r$(docdir)/$$name . || cp $(DOCDIR)/$$name . );\
+		cd $(HELPDIR) && rm -f $$name;\
+		cd $(HELPDIR) && ( $(LN_S) $$r/$$name $$name || cp $(DOCDIR)/$$name . );\
 		done';\
-	$(SHELL) -c 'set -x; \
-		case `id|sed -e "s/(.*//"` in \
+	$(SHELL) -c '\
+		i=`id|sed -e "s/(.*//"`; \
+		echo "Checking owner: $$i"; \
+		case $$i in \
 		uid=0) \
 			chown -R root $(DOCDIR);; \
 		esac'
diff --git a/po/lynx.pot b/po/lynx.pot
index 118c2d34..a59f7475 100644
--- a/po/lynx.pot
+++ b/po/lynx.pot
@@ -1,9 +1,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: lynx 2.9.0dev.8\n"
+"Project-Id-Version: lynx 2.9.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-31 10:04-0400\n"
+"POT-Creation-Date: 2024-01-14 19:36-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2329,7 +2329,7 @@ msgstr ""
 msgid "(No value.)"
 msgstr ""
 
-#: LYMessages.c:742 src/LYOptions.c:2482
+#: LYMessages.c:742 src/LYOptions.c:2485
 msgid "None"
 msgstr ""
 
@@ -2894,7 +2894,7 @@ msgstr ""
 msgid "Loading failed, use a previous copy."
 msgstr ""
 
-#: WWW/Library/Implementation/HTAccess.c:1062 src/GridText.c:8939
+#: WWW/Library/Implementation/HTAccess.c:1062 src/GridText.c:9048
 msgid "Loading incomplete."
 msgstr ""
 
@@ -2919,7 +2919,7 @@ msgstr ""
 #. * hack: if we fail in HTAccess.c
 #. * avoid duplicating URL, oh.
 #.
-#: WWW/Library/Implementation/HTAccess.c:1102 src/LYMainLoop.c:8076
+#: WWW/Library/Implementation/HTAccess.c:1102 src/LYMainLoop.c:8096
 msgid "Can't Access"
 msgstr ""
 
@@ -2957,7 +2957,7 @@ msgstr ""
 msgid "connect for data"
 msgstr ""
 
-#: WWW/Library/Implementation/HTFTP.c:4098
+#: WWW/Library/Implementation/HTFTP.c:4101
 msgid "Receiving FTP file."
 msgstr ""
 
@@ -3101,29 +3101,29 @@ msgstr ""
 msgid "Sorry, could not load requested news."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1339
+#: WWW/Library/Implementation/HTTCP.c:1329
 msgid "Address has invalid port"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1410
+#: WWW/Library/Implementation/HTTCP.c:1400
 msgid "Address length looks invalid"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1868
+#: WWW/Library/Implementation/HTTCP.c:1858
 msgid "SOCKS5: no hostname found."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1874
+#: WWW/Library/Implementation/HTTCP.c:1864
 msgid "SOCKS5: hostname too long."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1892
+#: WWW/Library/Implementation/HTTCP.c:1882
 #, c-format
 msgid "(for %s at %s) SOCKS5"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1919
-#: WWW/Library/Implementation/HTTCP.c:1936
+#: WWW/Library/Implementation/HTTCP.c:1909
+#: WWW/Library/Implementation/HTTCP.c:1926
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr ""
@@ -3132,85 +3132,85 @@ msgstr ""
 #. * but not HTAlert, because typically there will be other
 #. * alerts from the callers.  - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1933
+#: WWW/Library/Implementation/HTTCP.c:1923
 #: WWW/Library/Implementation/HTTelnet.c:115
 #, c-format
 msgid "Invalid hostname %s"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1945
+#: WWW/Library/Implementation/HTTCP.c:1935
 #, c-format
 msgid "Making %s connection to %s"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1955
+#: WWW/Library/Implementation/HTTCP.c:1945
 msgid "socket failed."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1969
+#: WWW/Library/Implementation/HTTCP.c:1959
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:1992
+#: WWW/Library/Implementation/HTTCP.c:1982
 msgid "Could not make connection non-blocking."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:2058
+#: WWW/Library/Implementation/HTTCP.c:2050
 msgid "Connection failed (too many retries)."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:2253
+#: WWW/Library/Implementation/HTTCP.c:2245
 msgid "Could not restore socket to blocking."
 msgstr ""
 
 #. RFC 1928: CONNECT request
-#: WWW/Library/Implementation/HTTCP.c:2285
+#: WWW/Library/Implementation/HTTCP.c:2277
 #, c-format
 msgid "SOCKS5: connecting to %s"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:2314
+#: WWW/Library/Implementation/HTTCP.c:2306
 msgid "SOCKS server failure"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:2317
+#: WWW/Library/Implementation/HTTCP.c:2309
 msgid "connection not allowed by ruleset"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:2320
+#: WWW/Library/Implementation/HTTCP.c:2312
 msgid "network unreachable"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:2323
+#: WWW/Library/Implementation/HTTCP.c:2315
 msgid "host unreachable"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:2326
+#: WWW/Library/Implementation/HTTCP.c:2318
 msgid "connection refused"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:2329
+#: WWW/Library/Implementation/HTTCP.c:2321
 msgid "TTL expired"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:2332
+#: WWW/Library/Implementation/HTTCP.c:2324
 msgid "command not supported"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:2335
+#: WWW/Library/Implementation/HTTCP.c:2327
 msgid "address type not supported"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:2338
+#: WWW/Library/Implementation/HTTCP.c:2330
 msgid "unknown SOCKS error code"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:2383
+#: WWW/Library/Implementation/HTTCP.c:2375
 msgid "unexpected reply\n"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTCP.c:2460
+#: WWW/Library/Implementation/HTTCP.c:2452
 msgid "Socket read failed (too many tries)."
 msgstr ""
 
@@ -3229,95 +3229,95 @@ msgstr ""
 msgid "User/password may be confused with hostname: '%s' (e.g, '%s')"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:733
+#: WWW/Library/Implementation/HTTP.c:736
 #, c-format
 msgid "Certificate issued by: %s"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:922
+#: WWW/Library/Implementation/HTTP.c:942
 msgid "This client does not contain support for HTTPS URLs."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:947
+#: WWW/Library/Implementation/HTTP.c:967
 msgid "Unable to connect to remote host."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:990
+#: WWW/Library/Implementation/HTTP.c:1011
 msgid "Retrying connection without TLS."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:1042
+#: WWW/Library/Implementation/HTTP.c:1063
 msgid "GnuTLS error when trying to verify certificate."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:1055
+#: WWW/Library/Implementation/HTTP.c:1076
 msgid "the certificate has no known issuer"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:1057
+#: WWW/Library/Implementation/HTTP.c:1078
 msgid "no issuer was found"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:1059
+#: WWW/Library/Implementation/HTTP.c:1080
 msgid "issuer is not a CA"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:1061
+#: WWW/Library/Implementation/HTTP.c:1082
 msgid "the certificate has been revoked"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:1063
+#: WWW/Library/Implementation/HTTP.c:1084
 msgid "the certificate is not trusted"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:1138
+#: WWW/Library/Implementation/HTTP.c:1159
 #, c-format
 msgid "Verified connection to %s (cert=%s)"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:1188
-#: WWW/Library/Implementation/HTTP.c:1230
+#: WWW/Library/Implementation/HTTP.c:1209
+#: WWW/Library/Implementation/HTTP.c:1251
 #, c-format
 msgid "Verified connection to %s (subj=%s)"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:1260
+#: WWW/Library/Implementation/HTTP.c:1281
 msgid "Can't find common name in certificate"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:1263
+#: WWW/Library/Implementation/HTTP.c:1284
 #, c-format
 msgid "SSL error:host(%s)!=cert(%s)-Continue?"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:1270
+#: WWW/Library/Implementation/HTTP.c:1291
 msgid "SSL error"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:1278
+#: WWW/Library/Implementation/HTTP.c:1299
 #, c-format
 msgid "UNVERIFIED connection to %s (cert=%s)"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:1287
+#: WWW/Library/Implementation/HTTP.c:1308
 #, c-format
 msgid "Secure %d-bit %s (%s) HTTP connection"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:1757
+#: WWW/Library/Implementation/HTTP.c:1778
 msgid "Sending HTTP request."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:1799
+#: WWW/Library/Implementation/HTTP.c:1820
 msgid "Unexpected network write error; connection aborted."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:1805
+#: WWW/Library/Implementation/HTTP.c:1826
 msgid "HTTP request sent; waiting for response."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:1878
-#: WWW/Library/Implementation/HTTP.c:1888
+#: WWW/Library/Implementation/HTTP.c:1899
+#: WWW/Library/Implementation/HTTP.c:1909
 msgid "Unexpected network read error; connection aborted."
 msgstr ""
 
@@ -3330,7 +3330,7 @@ msgstr ""
 #. * line and possibly other headers, so we'll deal with them by
 #. * showing the full header to the user as text/plain.  - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:2091
+#: WWW/Library/Implementation/HTTP.c:2112
 msgid "Got unexpected Informational Status."
 msgstr ""
 
@@ -3340,7 +3340,7 @@ msgstr ""
 #. * content.  We'll instruct the user to do that, and
 #. * restore the current document.  - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:2125
+#: WWW/Library/Implementation/HTTP.c:2146
 msgid "Request fulfilled.  Reset Content."
 msgstr ""
 
@@ -3350,27 +3350,27 @@ msgstr ""
 #. * status is inappropriate.  We'll deal with it by showing
 #. * the full header to the user as text/plain.  - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:2242
+#: WWW/Library/Implementation/HTTP.c:2264
 msgid "Got unexpected 304 Not Modified status."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:2305
+#: WWW/Library/Implementation/HTTP.c:2327
 msgid "Redirection of POST content requires user approval."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:2320
+#: WWW/Library/Implementation/HTTP.c:2343
 msgid "Have POST content.  Treating Permanent Redirection as Temporary.\n"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:2366
+#: WWW/Library/Implementation/HTTP.c:2389
 msgid "Retrying with access authorization information."
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:2378
+#: WWW/Library/Implementation/HTTP.c:2401
 msgid "Show the 401 message body?"
 msgstr ""
 
-#: WWW/Library/Implementation/HTTP.c:2422
+#: WWW/Library/Implementation/HTTP.c:2445
 msgid "Show the 407 message body?"
 msgstr ""
 
@@ -3378,7 +3378,7 @@ msgstr ""
 #. * Bad or unknown server_status number.  Take a chance and hope
 #. * there is something to display.  - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:2522
+#: WWW/Library/Implementation/HTTP.c:2545
 msgid "Unknown status reply from server!"
 msgstr ""
 
@@ -3556,120 +3556,120 @@ msgstr ""
 msgid "Host"
 msgstr ""
 
-#: src/GridText.c:723
+#: src/GridText.c:726
 msgid "Memory exhausted, display interrupted!"
 msgstr ""
 
-#: src/GridText.c:728
+#: src/GridText.c:731
 msgid "Memory exhausted, will interrupt transfer!"
 msgstr ""
 
-#: src/GridText.c:1719
+#: src/GridText.c:1768
 #, c-format
 msgid " (l%d of %d)"
 msgstr ""
 
-#: src/GridText.c:1728
+#: src/GridText.c:1777
 #, c-format
 msgid " (p%d of %d)"
 msgstr ""
 
-#: src/GridText.c:3720
+#: src/GridText.c:3773
 msgid " *** MEMORY EXHAUSTED ***"
 msgstr ""
 
-#: src/GridText.c:6220
+#: src/GridText.c:6329
 msgid "text entry field"
 msgstr ""
 
-#: src/GridText.c:6223
+#: src/GridText.c:6332
 msgid "password entry field"
 msgstr ""
 
-#: src/GridText.c:6226
+#: src/GridText.c:6335
 msgid "checkbox"
 msgstr ""
 
-#: src/GridText.c:6229
+#: src/GridText.c:6338
 msgid "radio button"
 msgstr ""
 
-#: src/GridText.c:6232
+#: src/GridText.c:6341
 msgid "submit button"
 msgstr ""
 
-#: src/GridText.c:6235
+#: src/GridText.c:6344
 msgid "reset button"
 msgstr ""
 
-#: src/GridText.c:6238
+#: src/GridText.c:6347
 msgid "script button"
 msgstr ""
 
-#: src/GridText.c:6241
+#: src/GridText.c:6350
 msgid "popup menu"
 msgstr ""
 
-#: src/GridText.c:6244
+#: src/GridText.c:6353
 msgid "hidden form field"
 msgstr ""
 
-#: src/GridText.c:6247
+#: src/GridText.c:6356
 msgid "text entry area"
 msgstr ""
 
-#: src/GridText.c:6250
+#: src/GridText.c:6359
 msgid "range entry field"
 msgstr ""
 
-#: src/GridText.c:6253
+#: src/GridText.c:6362
 msgid "file entry field"
 msgstr ""
 
-#: src/GridText.c:6256
+#: src/GridText.c:6365
 msgid "text-submit field"
 msgstr ""
 
-#: src/GridText.c:6259
+#: src/GridText.c:6368
 msgid "image-submit button"
 msgstr ""
 
-#: src/GridText.c:6262
+#: src/GridText.c:6371
 msgid "keygen field"
 msgstr ""
 
-#: src/GridText.c:6265
+#: src/GridText.c:6374
 msgid "unknown form field"
 msgstr ""
 
-#: src/GridText.c:6285 src/GridText.c:6292 src/LYList.c:249
+#: src/GridText.c:6394 src/GridText.c:6401 src/LYList.c:249
 msgid "unknown field or link"
 msgstr ""
 
-#: src/GridText.c:10722
+#: src/GridText.c:10832
 msgid "Can't open file for uploading"
 msgstr ""
 
-#: src/GridText.c:11910
+#: src/GridText.c:12020
 #, c-format
 msgid "Submitting %s"
 msgstr ""
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12980
+#: src/GridText.c:13088
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr ""
 
 #. don't show previous state
-#: src/GridText.c:13139
+#: src/GridText.c:13247
 msgid "Wrap lines to fit displayed area?"
 msgstr ""
 
-#: src/GridText.c:13772
+#: src/GridText.c:13880
 msgid "Very long lines have been truncated!"
 msgstr ""
 
-#: src/HTAlert.c:164 src/LYShowInfo.c:389 src/LYShowInfo.c:393
+#: src/HTAlert.c:164 src/LYShowInfo.c:379 src/LYShowInfo.c:383
 msgid "bytes"
 msgstr ""
 
@@ -3759,35 +3759,35 @@ msgstr ""
 msgid "Y/N/A/V"
 msgstr ""
 
-#: src/HTML.c:5769
+#: src/HTML.c:5775
 msgid "Description:"
 msgstr ""
 
-#: src/HTML.c:5774
+#: src/HTML.c:5780
 msgid "(none)"
 msgstr ""
 
-#: src/HTML.c:5778
+#: src/HTML.c:5784
 msgid "Filepath:"
 msgstr ""
 
-#: src/HTML.c:5784
+#: src/HTML.c:5790
 msgid "(unknown)"
 msgstr ""
 
-#: src/HTML.c:7224
+#: src/HTML.c:7234
 msgid "Document has only hidden links.  Use the 'l'ist command."
 msgstr ""
 
-#: src/HTML.c:7725
+#: src/HTML.c:7735
 msgid "Source cache error - disk full?"
 msgstr ""
 
-#: src/HTML.c:7738
+#: src/HTML.c:7748
 msgid "Source cache error - not enough memory!"
 msgstr ""
 
-#: src/LYBookmark.c:167
+#: src/LYBookmark.c:171
 msgid ""
 "     This file is an HTML representation of the X Mosaic hotlist file.\n"
 "     Outdated or invalid links may be removed by using the\n"
@@ -3795,27 +3795,26 @@ msgid ""
 "     been remapped by you or your system administrator."
 msgstr ""
 
-#: src/LYBookmark.c:380
-#, c-format
+#: src/LYBookmark.c:419
 msgid ""
 "     You can delete links by the 'R' key<br>\n"
 "<ol>\n"
 msgstr ""
 
-#: src/LYBookmark.c:383
+#: src/LYBookmark.c:422
 msgid ""
 "     You can delete links using the remove bookmark command.  It is usually\n"
 "     the 'R' key but may have been remapped by you or your system\n"
 "     administrator."
 msgstr ""
 
-#: src/LYBookmark.c:387
+#: src/LYBookmark.c:426
 msgid ""
 "     This file also may be edited with a standard text editor to delete\n"
 "     outdated or invalid links, or to change their order."
 msgstr ""
 
-#: src/LYBookmark.c:390
+#: src/LYBookmark.c:429
 msgid ""
 "Note: if you edit this file manually\n"
 "      you should not change the format within the lines\n"
@@ -3823,7 +3822,7 @@ msgid ""
 "      Make sure any bookmark link is saved as a single line."
 msgstr ""
 
-#: src/LYBookmark.c:686
+#: src/LYBookmark.c:726
 #, c-format
 msgid "File may be recoverable from %s during this session"
 msgstr ""
@@ -3877,42 +3876,42 @@ msgstr ""
 msgid "cookie_domain_flag_set error, aborting program"
 msgstr ""
 
-#: src/LYCurses.c:1136
+#: src/LYCurses.c:1170
 msgid "Terminal reinitialisation failed - unknown terminal type?"
 msgstr ""
 
-#: src/LYCurses.c:1343
+#: src/LYCurses.c:1378
 msgid "Terminal initialisation failed - unknown terminal type?"
 msgstr ""
 
-#: src/LYCurses.c:1837
+#: src/LYCurses.c:1898
 msgid "Terminal ="
 msgstr ""
 
-#: src/LYCurses.c:1841
+#: src/LYCurses.c:1902
 msgid "You must use a vt100, 200, etc. terminal with this program."
 msgstr ""
 
-#: src/LYCurses.c:1890
+#: src/LYCurses.c:1951
 msgid "Your Terminal type is unknown!"
 msgstr ""
 
-#: src/LYCurses.c:1891
+#: src/LYCurses.c:1952
 msgid "Enter a terminal type:"
 msgstr ""
 
-#: src/LYCurses.c:1905
+#: src/LYCurses.c:1966
 msgid "TERMINAL TYPE IS SET TO"
 msgstr ""
 
-#: src/LYCurses.c:2464
+#: src/LYCurses.c:2520
 #, c-format
 msgid ""
 "\n"
 "A Fatal error has occurred in %s Ver. %s\n"
 msgstr ""
 
-#: src/LYCurses.c:2467
+#: src/LYCurses.c:2523
 #, c-format
 msgid ""
 "\n"
@@ -4237,7 +4236,7 @@ msgstr ""
 msgid "Specify permissions below:"
 msgstr ""
 
-#: src/LYLocal.c:1406 src/LYShowInfo.c:291
+#: src/LYLocal.c:1406 src/LYShowInfo.c:281
 msgid "Owner:"
 msgstr ""
 
@@ -4372,19 +4371,19 @@ msgstr ""
 msgid "No system mailer configured"
 msgstr ""
 
-#: src/LYMain.c:1095
+#: src/LYMain.c:1107
 msgid "No Winsock found, sorry."
 msgstr ""
 
-#: src/LYMain.c:1285
+#: src/LYMain.c:1297
 msgid "You MUST define a valid TMP or TEMP area!"
 msgstr ""
 
-#: src/LYMain.c:1338 src/LYMainLoop.c:5285
+#: src/LYMain.c:1350 src/LYMainLoop.c:5302
 msgid "No such directory"
 msgstr ""
 
-#: src/LYMain.c:1532
+#: src/LYMain.c:1545
 #, c-format
 msgid ""
 "\n"
@@ -4392,7 +4391,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/LYMain.c:1542
+#: src/LYMain.c:1555
 #, c-format
 msgid ""
 "\n"
@@ -4400,179 +4399,179 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/LYMain.c:1698
+#: src/LYMain.c:1711
 #, c-format
 msgid "Ignored %d characters from standard input.\n"
 msgstr ""
 
-#: src/LYMain.c:1700
+#: src/LYMain.c:1713
 #, c-format
 msgid "Use \"-stdin\" or \"-\" to tell how to handle piped input.\n"
 msgstr ""
 
-#: src/LYMain.c:1858
+#: src/LYMain.c:1871
 msgid "Warning:"
 msgstr ""
 
-#: src/LYMain.c:2426
+#: src/LYMain.c:2439
 msgid "persistent cookies state will be changed in next session only."
 msgstr ""
 
-#: src/LYMain.c:2661 src/LYMain.c:2705
+#: src/LYMain.c:2674 src/LYMain.c:2718
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr ""
 
-#: src/LYMain.c:3222
+#: src/LYMain.c:3235
 #, c-format
 msgid "%s Version %s (%s)"
 msgstr ""
 
-#: src/LYMain.c:3263
+#: src/LYMain.c:3276
 #, c-format
 msgid "Built on %s%s.\n"
 msgstr ""
 
-#: src/LYMain.c:3277
+#: src/LYMain.c:3290
 msgid "Copyrights held by the Lynx Developers Group,"
 msgstr ""
 
-#: src/LYMain.c:3278
+#: src/LYMain.c:3291
 msgid "the University of Kansas, CERN, and other contributors."
 msgstr ""
 
-#: src/LYMain.c:3279
+#: src/LYMain.c:3292
 msgid "Distributed under the GNU General Public License (Version 2)."
 msgstr ""
 
-#: src/LYMain.c:3280
+#: src/LYMain.c:3293
 msgid ""
 "See https://lynx.invisible-island.net/ and the online help for more "
 "information."
 msgstr ""
 
-#: src/LYMain.c:4139
+#: src/LYMain.c:4152
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr ""
 
-#: src/LYMain.c:4140
+#: src/LYMain.c:4153
 #, c-format
 msgid "Options are:\n"
 msgstr ""
 
-#: src/LYMain.c:4443
+#: src/LYMain.c:4456
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr ""
 
-#: src/LYMainLoop.c:572
+#: src/LYMainLoop.c:591
 #, c-format
 msgid "Internal error: Invalid mouse link %d!"
 msgstr ""
 
-#: src/LYMainLoop.c:693 src/LYMainLoop.c:5307
+#: src/LYMainLoop.c:712 src/LYMainLoop.c:5324
 msgid "A URL specified by the user"
 msgstr ""
 
-#: src/LYMainLoop.c:1142
+#: src/LYMainLoop.c:1161
 msgid "Enctype multipart/form-data not yet supported!  Cannot submit."
 msgstr ""
 
 #.
 #. * Make a name for this help file.
 #.
-#: src/LYMainLoop.c:3197
+#: src/LYMainLoop.c:3214
 msgid "Help Screen"
 msgstr ""
 
-#: src/LYMainLoop.c:3328
+#: src/LYMainLoop.c:3345
 msgid "System Index"
 msgstr ""
 
-#: src/LYMainLoop.c:3577
+#: src/LYMainLoop.c:3594
 #, c-format
 msgid "Query parameter %d: "
 msgstr ""
 
-#: src/LYMainLoop.c:3806 src/LYMainLoop.c:5583
+#: src/LYMainLoop.c:3823 src/LYMainLoop.c:5600
 msgid "Entry into main screen"
 msgstr ""
 
-#: src/LYMainLoop.c:4064
+#: src/LYMainLoop.c:4085
 msgid "No next document present"
 msgstr ""
 
-#: src/LYMainLoop.c:4359
+#: src/LYMainLoop.c:4378
 msgid "charset for this document specified explicitly, sorry..."
 msgstr ""
 
-#: src/LYMainLoop.c:5265
+#: src/LYMainLoop.c:5282
 msgid "cd to:"
 msgstr ""
 
-#: src/LYMainLoop.c:5288
+#: src/LYMainLoop.c:5305
 msgid "A component of path is not a directory"
 msgstr ""
 
-#: src/LYMainLoop.c:5291
+#: src/LYMainLoop.c:5308
 msgid "failed to change directory"
 msgstr ""
 
-#: src/LYMainLoop.c:6517
+#: src/LYMainLoop.c:6529
 msgid "Reparsing document under current settings..."
 msgstr ""
 
-#: src/LYMainLoop.c:6811
+#: src/LYMainLoop.c:6823
 #, c-format
 msgid "Fatal error - could not open output file %s\n"
 msgstr ""
 
-#: src/LYMainLoop.c:7153
+#: src/LYMainLoop.c:7166
 msgid "TABLE center enable."
 msgstr ""
 
-#: src/LYMainLoop.c:7156
+#: src/LYMainLoop.c:7169
 msgid "TABLE center disable."
 msgstr ""
 
-#: src/LYMainLoop.c:7236
+#: src/LYMainLoop.c:7249
 msgid "Current URL is empty."
 msgstr ""
 
-#: src/LYMainLoop.c:7238 src/LYUtils.c:1909
+#: src/LYMainLoop.c:7251 src/LYUtils.c:1909
 msgid "Copy to clipboard failed."
 msgstr ""
 
-#: src/LYMainLoop.c:7240
+#: src/LYMainLoop.c:7253
 msgid "Document URL put to clipboard."
 msgstr ""
 
-#: src/LYMainLoop.c:7242
+#: src/LYMainLoop.c:7255
 msgid "Link URL put to clipboard."
 msgstr ""
 
-#: src/LYMainLoop.c:7269
+#: src/LYMainLoop.c:7282
 msgid "No URL in the clipboard."
 msgstr ""
 
-#: src/LYMainLoop.c:7962 src/LYMainLoop.c:8133
+#: src/LYMainLoop.c:7975 src/LYMainLoop.c:8153
 msgid "-index-"
 msgstr ""
 
-#: src/LYMainLoop.c:8071
+#: src/LYMainLoop.c:8091
 msgid "lynx: Can't access startfile"
 msgstr ""
 
-#: src/LYMainLoop.c:8083
+#: src/LYMainLoop.c:8103
 msgid "lynx: Start file could not be found or is not text/html or text/plain"
 msgstr ""
 
-#: src/LYMainLoop.c:8084
+#: src/LYMainLoop.c:8104
 msgid "      Exiting..."
 msgstr ""
 
-#: src/LYMainLoop.c:8127
+#: src/LYMainLoop.c:8147
 msgid "-more-"
 msgstr ""
 
@@ -4624,437 +4623,445 @@ msgstr ""
 msgid "Message has no original text!"
 msgstr ""
 
-#: src/LYOptions.c:774
+#: src/LYOptions.c:776
 msgid "review/edit B)ookmarks files"
 msgstr ""
 
-#: src/LYOptions.c:776
+#: src/LYOptions.c:778
 msgid "B)ookmark file: "
 msgstr ""
 
-#: src/LYOptions.c:2131 src/LYOptions.c:2138
+#: src/LYOptions.c:2133 src/LYOptions.c:2140
 msgid "ON"
 msgstr ""
 
 #. verbose_img variable
 #. LYCollapseBRs variable
 #. LYtrimBlankLines variable
-#: src/LYOptions.c:2132 src/LYOptions.c:2137 src/LYOptions.c:2321
-#: src/LYOptions.c:2330 src/LYOptions.c:2339 src/LYOptions.c:2350
+#: src/LYOptions.c:2134 src/LYOptions.c:2139 src/LYOptions.c:2324
+#: src/LYOptions.c:2333 src/LYOptions.c:2342 src/LYOptions.c:2353
 msgid "OFF"
 msgstr ""
 
-#: src/LYOptions.c:2133
+#: src/LYOptions.c:2135
 msgid "NEVER"
 msgstr ""
 
-#: src/LYOptions.c:2134
+#: src/LYOptions.c:2136
 msgid "ALWAYS"
 msgstr ""
 
-#: src/LYOptions.c:2150 src/LYOptions.c:2313
+#: src/LYOptions.c:2152 src/LYOptions.c:2316
 msgid "ignore"
 msgstr ""
 
-#: src/LYOptions.c:2151
+#: src/LYOptions.c:2153
 msgid "ask user"
 msgstr ""
 
-#: src/LYOptions.c:2152
+#: src/LYOptions.c:2154
 msgid "accept all"
 msgstr ""
 
-#: src/LYOptions.c:2164
+#: src/LYOptions.c:2166
 msgid "ALWAYS OFF"
 msgstr ""
 
-#: src/LYOptions.c:2165
+#: src/LYOptions.c:2167
 msgid "FOR LOCAL FILES ONLY"
 msgstr ""
 
-#: src/LYOptions.c:2167
+#: src/LYOptions.c:2169
 msgid "ALWAYS ON"
 msgstr ""
 
-#: src/LYOptions.c:2179
+#: src/LYOptions.c:2181
 msgid "Numbers act as arrows"
 msgstr ""
 
-#: src/LYOptions.c:2181
+#: src/LYOptions.c:2183
 msgid "Links are numbered"
 msgstr ""
 
-#: src/LYOptions.c:2184
+#: src/LYOptions.c:2186
 msgid "Links and form fields are numbered"
 msgstr ""
 
-#: src/LYOptions.c:2187
+#: src/LYOptions.c:2189
 msgid "Form fields are numbered"
 msgstr ""
 
-#: src/LYOptions.c:2202
+#: src/LYOptions.c:2204
 msgid "Case insensitive"
 msgstr ""
 
-#: src/LYOptions.c:2203
+#: src/LYOptions.c:2205
 msgid "Case sensitive"
 msgstr ""
 
-#: src/LYOptions.c:2237
+#: src/LYOptions.c:2239
 msgid "prompt normally"
 msgstr ""
 
-#: src/LYOptions.c:2238
+#: src/LYOptions.c:2240
 msgid "force yes-response"
 msgstr ""
 
-#: src/LYOptions.c:2239
+#: src/LYOptions.c:2241
 msgid "force no-response"
 msgstr ""
 
-#: src/LYOptions.c:2249
+#: src/LYOptions.c:2251
 msgid "RFC 2109"
 msgstr ""
 
-#: src/LYOptions.c:2250
+#: src/LYOptions.c:2252
 msgid "RFC 2965"
 msgstr ""
 
-#: src/LYOptions.c:2251
+#: src/LYOptions.c:2253
 msgid "RFC 6265"
 msgstr ""
 
-#: src/LYOptions.c:2268
+#: src/LYOptions.c:2270
 msgid "Novice"
 msgstr ""
 
-#: src/LYOptions.c:2269
+#: src/LYOptions.c:2271
 msgid "Intermediate"
 msgstr ""
 
-#: src/LYOptions.c:2270
+#: src/LYOptions.c:2272
 msgid "Advanced"
 msgstr ""
 
-#: src/LYOptions.c:2279
+#: src/LYOptions.c:2273
+msgid "Minimal"
+msgstr ""
+
+#: src/LYOptions.c:2282
 msgid "By First Visit"
 msgstr ""
 
-#: src/LYOptions.c:2281
+#: src/LYOptions.c:2284
 msgid "By First Visit Reversed"
 msgstr ""
 
-#: src/LYOptions.c:2282
+#: src/LYOptions.c:2285
 msgid "As Visit Tree"
 msgstr ""
 
-#: src/LYOptions.c:2283
+#: src/LYOptions.c:2286
 msgid "By Last Visit"
 msgstr ""
 
-#: src/LYOptions.c:2285
+#: src/LYOptions.c:2288
 msgid "By Last Visit Reversed"
 msgstr ""
 
 #. Old_DTD variable
-#: src/LYOptions.c:2296
+#: src/LYOptions.c:2299
 msgid "relaxed (TagSoup mode)"
 msgstr ""
 
-#: src/LYOptions.c:2297
+#: src/LYOptions.c:2300
 msgid "strict (SortaSGML mode)"
 msgstr ""
 
-#: src/LYOptions.c:2304
+#: src/LYOptions.c:2307
 msgid "Ignore"
 msgstr ""
 
-#: src/LYOptions.c:2305
+#: src/LYOptions.c:2308
 msgid "Add to trace-file"
 msgstr ""
 
-#: src/LYOptions.c:2306
+#: src/LYOptions.c:2309
 msgid "Add to LYNXMESSAGES"
 msgstr ""
 
-#: src/LYOptions.c:2307
+#: src/LYOptions.c:2310
 msgid "Warn, point to trace-file"
 msgstr ""
 
-#: src/LYOptions.c:2314
+#: src/LYOptions.c:2317
 msgid "as labels"
 msgstr ""
 
-#: src/LYOptions.c:2315
+#: src/LYOptions.c:2318
 msgid "as links"
 msgstr ""
 
-#: src/LYOptions.c:2322
+#: src/LYOptions.c:2325
 msgid "show filename"
 msgstr ""
 
-#: src/LYOptions.c:2331
+#: src/LYOptions.c:2334
 msgid "collapse"
 msgstr ""
 
-#: src/LYOptions.c:2340
+#: src/LYOptions.c:2343
 msgid "trim-lines"
 msgstr ""
 
-#: src/LYOptions.c:2351
+#: src/LYOptions.c:2354
 msgid "STANDARD"
 msgstr ""
 
-#: src/LYOptions.c:2352
+#: src/LYOptions.c:2355
 msgid "ADVANCED"
 msgstr ""
 
-#: src/LYOptions.c:2374
+#: src/LYOptions.c:2377
 msgid "IDNA 2003"
 msgstr ""
 
-#: src/LYOptions.c:2375
+#: src/LYOptions.c:2378
 msgid "IDNA 2008"
 msgstr ""
 
-#: src/LYOptions.c:2376
+#: src/LYOptions.c:2379
 msgid "IDNA TR46"
 msgstr ""
 
-#: src/LYOptions.c:2377
+#: src/LYOptions.c:2380
 msgid "IDNA Compatible"
 msgstr ""
 
-#: src/LYOptions.c:2398
+#: src/LYOptions.c:2401
 msgid "Directories first"
 msgstr ""
 
-#: src/LYOptions.c:2399
+#: src/LYOptions.c:2402
 msgid "Files first"
 msgstr ""
 
-#: src/LYOptions.c:2400
+#: src/LYOptions.c:2403
 msgid "Mixed style"
 msgstr ""
 
-#: src/LYOptions.c:2408 src/LYOptions.c:2428
+#: src/LYOptions.c:2411 src/LYOptions.c:2431
 msgid "By Name"
 msgstr ""
 
-#: src/LYOptions.c:2409 src/LYOptions.c:2429
+#: src/LYOptions.c:2412 src/LYOptions.c:2432
 msgid "By Type"
 msgstr ""
 
-#: src/LYOptions.c:2410 src/LYOptions.c:2430
+#: src/LYOptions.c:2413 src/LYOptions.c:2433
 msgid "By Size"
 msgstr ""
 
-#: src/LYOptions.c:2411 src/LYOptions.c:2431
+#: src/LYOptions.c:2414 src/LYOptions.c:2434
 msgid "By Date"
 msgstr ""
 
-#: src/LYOptions.c:2412
+#: src/LYOptions.c:2415
 msgid "By Mode"
 msgstr ""
 
-#: src/LYOptions.c:2414
+#: src/LYOptions.c:2417
 msgid "By User"
 msgstr ""
 
-#: src/LYOptions.c:2415
+#: src/LYOptions.c:2418
 msgid "By Group"
 msgstr ""
 
-#: src/LYOptions.c:2440
+#: src/LYOptions.c:2443
 msgid "Do not show rate"
 msgstr ""
 
-#: src/LYOptions.c:2441 src/LYOptions.c:2442
+#: src/LYOptions.c:2444 src/LYOptions.c:2445
 #, c-format
 msgid "Show %s/sec rate"
 msgstr ""
 
-#: src/LYOptions.c:2444 src/LYOptions.c:2445
+#: src/LYOptions.c:2447 src/LYOptions.c:2448
 #, c-format
 msgid "Show %s/sec, ETA"
 msgstr ""
 
-#: src/LYOptions.c:2446 src/LYOptions.c:2447
+#: src/LYOptions.c:2449 src/LYOptions.c:2450
 #, c-format
 msgid "Show %s/sec (2-digits), ETA"
 msgstr ""
 
-#: src/LYOptions.c:2450
+#: src/LYOptions.c:2453
 msgid "Show progressbar"
 msgstr ""
 
-#: src/LYOptions.c:2471
+#: src/LYOptions.c:2474
 msgid "Accept lynx's internal types"
 msgstr ""
 
-#: src/LYOptions.c:2472
+#: src/LYOptions.c:2475
 msgid "Also accept lynx.cfg's types"
 msgstr ""
 
-#: src/LYOptions.c:2473
+#: src/LYOptions.c:2476
 msgid "Also accept user's types"
 msgstr ""
 
-#: src/LYOptions.c:2474
+#: src/LYOptions.c:2477
 msgid "Also accept system's types"
 msgstr ""
 
-#: src/LYOptions.c:2475
+#: src/LYOptions.c:2478
 msgid "Accept all types"
 msgstr ""
 
-#: src/LYOptions.c:2484
+#: src/LYOptions.c:2487
 msgid "gzip"
 msgstr ""
 
-#: src/LYOptions.c:2485
+#: src/LYOptions.c:2488
 msgid "deflate"
 msgstr ""
 
-#: src/LYOptions.c:2488
+#: src/LYOptions.c:2491
 msgid "compress"
 msgstr ""
 
-#: src/LYOptions.c:2491
+#: src/LYOptions.c:2494
 msgid "bzip2"
 msgstr ""
 
-#: src/LYOptions.c:2493
+#: src/LYOptions.c:2497
+msgid "brotli"
+msgstr ""
+
+#: src/LYOptions.c:2499
 msgid "All"
 msgstr ""
 
-#: src/LYOptions.c:2503
+#: src/LYOptions.c:2509
 msgid "HTTP 1.0"
 msgstr ""
 
-#: src/LYOptions.c:2504
+#: src/LYOptions.c:2510
 msgid "HTTP 1.1"
 msgstr ""
 
-#: src/LYOptions.c:2863 src/LYOptions.c:2892
+#: src/LYOptions.c:2869 src/LYOptions.c:2898
 #, c-format
 msgid "Use %s to invoke the Options menu!"
 msgstr ""
 
-#: src/LYOptions.c:3789
+#: src/LYOptions.c:3795
 msgid "(options marked with (!) will not be saved)"
 msgstr ""
 
-#: src/LYOptions.c:3797
+#: src/LYOptions.c:3803
 msgid "General Preferences"
 msgstr ""
 
 #. ***************************************************************
 #. User Mode: SELECT
-#: src/LYOptions.c:3801
+#: src/LYOptions.c:3807
 msgid "User mode"
 msgstr ""
 
 #. Editor: INPUT
-#: src/LYOptions.c:3807
+#: src/LYOptions.c:3813
 msgid "Editor"
 msgstr ""
 
 #. Search Type: SELECT
-#: src/LYOptions.c:3812
+#: src/LYOptions.c:3818
 msgid "Type of Search"
 msgstr ""
 
-#: src/LYOptions.c:3817
+#: src/LYOptions.c:3823
 msgid "Security and Privacy"
 msgstr ""
 
 #. ***************************************************************
 #. Cookies: SELECT
-#: src/LYOptions.c:3821
+#: src/LYOptions.c:3827
 msgid "Cookies"
 msgstr ""
 
 #. Cookie Version: SELECT
-#: src/LYOptions.c:3835
+#: src/LYOptions.c:3841
 msgid "Cookie RFC-version"
 msgstr ""
 
 #. Cookie Prompting: SELECT
-#: src/LYOptions.c:3841
+#: src/LYOptions.c:3847
 msgid "Invalid-Cookie Prompting"
 msgstr ""
 
 #. SSL Prompting: SELECT
-#: src/LYOptions.c:3848
+#: src/LYOptions.c:3854
 msgid "SSL Prompting"
 msgstr ""
 
-#: src/LYOptions.c:3853
+#: src/LYOptions.c:3859
 msgid "SSL client certificate file"
 msgstr ""
 
-#: src/LYOptions.c:3857
+#: src/LYOptions.c:3863
 msgid "SSL client key file"
 msgstr ""
 
-#: src/LYOptions.c:3863
+#: src/LYOptions.c:3869
 msgid "Keyboard Input"
 msgstr ""
 
 #. ***************************************************************
 #. Keypad Mode: SELECT
-#: src/LYOptions.c:3867
+#: src/LYOptions.c:3873
 msgid "Keypad mode"
 msgstr ""
 
 #. Emacs keys: ON/OFF
-#: src/LYOptions.c:3873
+#: src/LYOptions.c:3879
 msgid "Emacs keys"
 msgstr ""
 
 #. VI Keys: ON/OFF
-#: src/LYOptions.c:3879
+#: src/LYOptions.c:3885
 msgid "VI keys"
 msgstr ""
 
 #. Line edit style: SELECT
 #. well, at least 2 line edit styles available
-#: src/LYOptions.c:3886
+#: src/LYOptions.c:3892
 msgid "Line edit style"
 msgstr ""
 
 #. Keyboard layout: SELECT
-#: src/LYOptions.c:3898
+#: src/LYOptions.c:3904
 msgid "Keyboard layout"
 msgstr ""
 
 #.
 #. * Display and Character Set
 #.
-#: src/LYOptions.c:3912
+#: src/LYOptions.c:3918
 msgid "Display and Character Set"
 msgstr ""
 
 #. Use locale-based character set: ON/OFF
-#: src/LYOptions.c:3917
+#: src/LYOptions.c:3923
 msgid "Use locale-based character set"
 msgstr ""
 
-#: src/LYOptions.c:3924
+#: src/LYOptions.c:3930
 msgid "Use HTML5 charset replacements"
 msgstr ""
 
 #. Display Character Set: SELECT
-#: src/LYOptions.c:3930
+#: src/LYOptions.c:3936
 msgid "Display character set"
 msgstr ""
 
-#: src/LYOptions.c:3961
+#: src/LYOptions.c:3967
 msgid "Assumed document character set"
 msgstr ""
 
-#: src/LYOptions.c:3977
+#: src/LYOptions.c:3983
 msgid "Internationalized domain names"
 msgstr ""
 
@@ -5063,230 +5070,230 @@ msgstr ""
 #. * we split the header to make it more readable:
 #. * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others.
 #.
-#: src/LYOptions.c:3995
+#: src/LYOptions.c:4001
 msgid "CJK mode"
 msgstr ""
 
-#: src/LYOptions.c:3997
+#: src/LYOptions.c:4003
 msgid "Raw 8-bit"
 msgstr ""
 
 #. X Display: INPUT
-#: src/LYOptions.c:4005
+#: src/LYOptions.c:4011
 msgid "X Display"
 msgstr ""
 
 #.
 #. * Document Appearance
 #.
-#: src/LYOptions.c:4011
+#: src/LYOptions.c:4017
 msgid "Document Appearance"
 msgstr ""
 
-#: src/LYOptions.c:4017
+#: src/LYOptions.c:4023
 msgid "Show color"
 msgstr ""
 
-#: src/LYOptions.c:4043
+#: src/LYOptions.c:4049
 msgid "Color style"
 msgstr ""
 
-#: src/LYOptions.c:4053
+#: src/LYOptions.c:4059
 msgid "Default colors"
 msgstr ""
 
 #. Show cursor: ON/OFF
-#: src/LYOptions.c:4061
+#: src/LYOptions.c:4067
 msgid "Show cursor"
 msgstr ""
 
 #. Underline links: ON/OFF
-#: src/LYOptions.c:4067
+#: src/LYOptions.c:4073
 msgid "Underline links"
 msgstr ""
 
 #. Show scrollbar: ON/OFF
-#: src/LYOptions.c:4074
+#: src/LYOptions.c:4080
 msgid "Show scrollbar"
 msgstr ""
 
 #. Select Popups: ON/OFF
-#: src/LYOptions.c:4081
+#: src/LYOptions.c:4087
 msgid "Popups for select fields"
 msgstr ""
 
 #. HTML error recovery: SELECT
-#: src/LYOptions.c:4087
+#: src/LYOptions.c:4093
 msgid "HTML error recovery"
 msgstr ""
 
 #. Bad HTML messages: SELECT
-#: src/LYOptions.c:4093
+#: src/LYOptions.c:4099
 msgid "Bad HTML messages"
 msgstr ""
 
 #. Show Images: SELECT
-#: src/LYOptions.c:4099
+#: src/LYOptions.c:4105
 msgid "Show images"
 msgstr ""
 
 #. Verbose Images: ON/OFF
-#: src/LYOptions.c:4113
+#: src/LYOptions.c:4119
 msgid "Verbose images"
 msgstr ""
 
 #. Collapse BR Tags: ON/OFF
-#: src/LYOptions.c:4119
+#: src/LYOptions.c:4125
 msgid "Collapse BR tags"
 msgstr ""
 
 #. Trim blank lines: ON/OFF
-#: src/LYOptions.c:4125
+#: src/LYOptions.c:4131
 msgid "Trim blank lines"
 msgstr ""
 
 #.
 #. * Headers Transferred to Remote Servers
 #.
-#: src/LYOptions.c:4133
+#: src/LYOptions.c:4139
 msgid "Headers Transferred to Remote Servers"
 msgstr ""
 
 #. ***************************************************************
 #. Mail Address: INPUT
-#: src/LYOptions.c:4137
+#: src/LYOptions.c:4143
 msgid "Personal mail address"
 msgstr ""
 
-#: src/LYOptions.c:4142
+#: src/LYOptions.c:4148
 msgid "Personal name for mail"
 msgstr ""
 
-#: src/LYOptions.c:4149
+#: src/LYOptions.c:4155
 msgid "Password for anonymous ftp"
 msgstr ""
 
 #. Preferred content type: SELECT
-#: src/LYOptions.c:4155
+#: src/LYOptions.c:4161
 msgid "Preferred content type"
 msgstr ""
 
 #. Preferred media type: SELECT
-#: src/LYOptions.c:4161
+#: src/LYOptions.c:4167
 msgid "Preferred media type"
 msgstr ""
 
 #. Preferred encoding: SELECT
-#: src/LYOptions.c:4167
+#: src/LYOptions.c:4173
 msgid "Preferred encoding"
 msgstr ""
 
 #. Preferred Document Character Set: INPUT
-#: src/LYOptions.c:4173
+#: src/LYOptions.c:4179
 msgid "Preferred document character set"
 msgstr ""
 
 #. Preferred Document Language: INPUT
-#: src/LYOptions.c:4178
+#: src/LYOptions.c:4184
 msgid "Preferred document language"
 msgstr ""
 
 #. HTTP protocol SELECT
-#: src/LYOptions.c:4183
+#: src/LYOptions.c:4189
 msgid "HTTP protocol"
 msgstr ""
 
-#: src/LYOptions.c:4190
+#: src/LYOptions.c:4196
 msgid "Send User-Agent header"
 msgstr ""
 
-#: src/LYOptions.c:4192
+#: src/LYOptions.c:4198
 msgid "User-Agent header"
 msgstr ""
 
 #.
 #. * Listing and Accessing Files
 #.
-#: src/LYOptions.c:4200
+#: src/LYOptions.c:4206
 msgid "Listing and Accessing Files"
 msgstr ""
 
 #. FTP sort: SELECT
-#: src/LYOptions.c:4205
+#: src/LYOptions.c:4211
 msgid "Use Passive FTP"
 msgstr ""
 
 #. FTP sort: SELECT
-#: src/LYOptions.c:4211
+#: src/LYOptions.c:4217
 msgid "FTP sort criteria"
 msgstr ""
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:4219
+#: src/LYOptions.c:4225
 msgid "Local directory sort criteria"
 msgstr ""
 
 #. Local Directory Order: SELECT
-#: src/LYOptions.c:4225
+#: src/LYOptions.c:4231
 msgid "Local directory sort order"
 msgstr ""
 
-#: src/LYOptions.c:4234
+#: src/LYOptions.c:4240
 msgid "Show dot files"
 msgstr ""
 
-#: src/LYOptions.c:4242
+#: src/LYOptions.c:4248
 msgid "Execution links"
 msgstr ""
 
-#: src/LYOptions.c:4260
+#: src/LYOptions.c:4266
 msgid "Pause when showing message"
 msgstr ""
 
 #. Show transfer rate: SELECT
-#: src/LYOptions.c:4267
+#: src/LYOptions.c:4273
 msgid "Show transfer rate"
 msgstr ""
 
 #.
 #. * Special Files and Screens
 #.
-#: src/LYOptions.c:4287
+#: src/LYOptions.c:4293
 msgid "Special Files and Screens"
 msgstr ""
 
-#: src/LYOptions.c:4292
+#: src/LYOptions.c:4298
 msgid "Multi-bookmarks"
 msgstr ""
 
-#: src/LYOptions.c:4300
+#: src/LYOptions.c:4306
 msgid "Review/edit Bookmarks files"
 msgstr ""
 
-#: src/LYOptions.c:4303
+#: src/LYOptions.c:4309
 msgid "Goto multi-bookmark menu"
 msgstr ""
 
-#: src/LYOptions.c:4305
+#: src/LYOptions.c:4311
 msgid "Bookmarks file"
 msgstr ""
 
 #. Auto Session: ON/OFF
-#: src/LYOptions.c:4312
+#: src/LYOptions.c:4318
 msgid "Auto Session"
 msgstr ""
 
 #. Session File Menu: INPUT
-#: src/LYOptions.c:4318
+#: src/LYOptions.c:4324
 msgid "Session file"
 msgstr ""
 
 #. Visited Pages: SELECT
-#: src/LYOptions.c:4324
+#: src/LYOptions.c:4330
 msgid "Visited Pages"
 msgstr ""
 
-#: src/LYOptions.c:4329
+#: src/LYOptions.c:4335
 msgid "View the file "
 msgstr ""
 
@@ -5401,253 +5408,253 @@ msgstr ""
 msgid "(no name)"
 msgstr ""
 
-#: src/LYReadCFG.c:2086
+#: src/LYReadCFG.c:2087
 #, c-format
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
 msgstr ""
 
-#: src/LYReadCFG.c:2088
+#: src/LYReadCFG.c:2089
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr ""
 
-#: src/LYReadCFG.c:2089
+#: src/LYReadCFG.c:2090
 #, c-format
 msgid "included from '%s'.\n"
 msgstr ""
 
-#: src/LYReadCFG.c:2500 src/LYReadCFG.c:2513 src/LYReadCFG.c:2571
+#: src/LYReadCFG.c:2501 src/LYReadCFG.c:2514 src/LYReadCFG.c:2572
 msgid "The following is read from your lynx.cfg file."
 msgstr ""
 
-#: src/LYReadCFG.c:2501 src/LYReadCFG.c:2514
+#: src/LYReadCFG.c:2502 src/LYReadCFG.c:2515
 msgid "Please read the distribution"
 msgstr ""
 
-#: src/LYReadCFG.c:2507 src/LYReadCFG.c:2517
+#: src/LYReadCFG.c:2508 src/LYReadCFG.c:2518
 msgid "for more comments."
 msgstr ""
 
-#: src/LYReadCFG.c:2553
+#: src/LYReadCFG.c:2554
 msgid "RELOAD THE CHANGES"
 msgstr ""
 
-#: src/LYReadCFG.c:2561
+#: src/LYReadCFG.c:2562
 msgid "Your primary configuration"
 msgstr ""
 
-#: src/LYShowInfo.c:116
+#: src/LYShowInfo.c:106
 msgid "URL:"
 msgstr ""
 
-#: src/LYShowInfo.c:200
+#: src/LYShowInfo.c:190
 msgid "Directory that you are currently viewing"
 msgstr ""
 
-#: src/LYShowInfo.c:203
+#: src/LYShowInfo.c:193
 msgid "Name:"
 msgstr ""
 
-#: src/LYShowInfo.c:220
+#: src/LYShowInfo.c:210
 msgid "Directory that you have currently selected"
 msgstr ""
 
-#: src/LYShowInfo.c:222
+#: src/LYShowInfo.c:212
 msgid "File that you have currently selected"
 msgstr ""
 
-#: src/LYShowInfo.c:225
+#: src/LYShowInfo.c:215
 msgid "Symbolic link that you have currently selected"
 msgstr ""
 
-#: src/LYShowInfo.c:228
+#: src/LYShowInfo.c:218
 msgid "Item that you have currently selected"
 msgstr ""
 
-#: src/LYShowInfo.c:230
+#: src/LYShowInfo.c:220
 msgid "Full name:"
 msgstr ""
 
-#: src/LYShowInfo.c:243
+#: src/LYShowInfo.c:233
 msgid "Unable to follow link"
 msgstr ""
 
-#: src/LYShowInfo.c:245
+#: src/LYShowInfo.c:235
 msgid "Points to file:"
 msgstr ""
 
-#: src/LYShowInfo.c:250
+#: src/LYShowInfo.c:240
 msgid "Name of owner:"
 msgstr ""
 
-#: src/LYShowInfo.c:253
+#: src/LYShowInfo.c:243
 msgid "Group name:"
 msgstr ""
 
-#: src/LYShowInfo.c:255
+#: src/LYShowInfo.c:245
 msgid "File size:"
 msgstr ""
 
-#: src/LYShowInfo.c:257
+#: src/LYShowInfo.c:247
 msgid "(bytes)"
 msgstr ""
 
 #.
 #. * Include date and time information.
 #.
-#: src/LYShowInfo.c:262
+#: src/LYShowInfo.c:252
 msgid "Creation date:"
 msgstr ""
 
-#: src/LYShowInfo.c:265
+#: src/LYShowInfo.c:255
 msgid "Last modified:"
 msgstr ""
 
-#: src/LYShowInfo.c:268
+#: src/LYShowInfo.c:258
 msgid "Last accessed:"
 msgstr ""
 
-#: src/LYShowInfo.c:274
+#: src/LYShowInfo.c:264
 msgid "Access Permissions"
 msgstr ""
 
-#: src/LYShowInfo.c:309
+#: src/LYShowInfo.c:299
 msgid "Group:"
 msgstr ""
 
-#: src/LYShowInfo.c:329
+#: src/LYShowInfo.c:319
 msgid "World:"
 msgstr ""
 
-#: src/LYShowInfo.c:336
+#: src/LYShowInfo.c:326
 msgid "File that you are currently viewing"
 msgstr ""
 
-#: src/LYShowInfo.c:344 src/LYShowInfo.c:444
+#: src/LYShowInfo.c:334 src/LYShowInfo.c:434
 msgid "Linkname:"
 msgstr ""
 
-#: src/LYShowInfo.c:350 src/LYShowInfo.c:365
+#: src/LYShowInfo.c:340 src/LYShowInfo.c:355
 msgid "Charset:"
 msgstr ""
 
-#: src/LYShowInfo.c:364
+#: src/LYShowInfo.c:354
 msgid "(assumed)"
 msgstr ""
 
-#: src/LYShowInfo.c:371
+#: src/LYShowInfo.c:361
 msgid "Server:"
 msgstr ""
 
-#: src/LYShowInfo.c:374
+#: src/LYShowInfo.c:364
 msgid "Date:"
 msgstr ""
 
-#: src/LYShowInfo.c:377
+#: src/LYShowInfo.c:367
 msgid "Last Mod:"
 msgstr ""
 
-#: src/LYShowInfo.c:381
+#: src/LYShowInfo.c:371
 msgid "Expires:"
 msgstr ""
 
-#: src/LYShowInfo.c:384
+#: src/LYShowInfo.c:374
 msgid "Cache-Control:"
 msgstr ""
 
-#: src/LYShowInfo.c:387
+#: src/LYShowInfo.c:377
 msgid "Content-Length:"
 msgstr ""
 
-#: src/LYShowInfo.c:391
+#: src/LYShowInfo.c:381
 msgid "Length:"
 msgstr ""
 
-#: src/LYShowInfo.c:396
+#: src/LYShowInfo.c:386
 msgid "Language:"
 msgstr ""
 
-#: src/LYShowInfo.c:402
+#: src/LYShowInfo.c:392
 msgid "Post Data:"
 msgstr ""
 
-#: src/LYShowInfo.c:405
+#: src/LYShowInfo.c:395
 msgid "Post Content Type:"
 msgstr ""
 
-#: src/LYShowInfo.c:408
+#: src/LYShowInfo.c:398
 msgid "Owner(s):"
 msgstr ""
 
-#: src/LYShowInfo.c:413
+#: src/LYShowInfo.c:403
 msgid "size:"
 msgstr ""
 
-#: src/LYShowInfo.c:415
+#: src/LYShowInfo.c:405
 msgid "lines"
 msgstr ""
 
-#: src/LYShowInfo.c:419
+#: src/LYShowInfo.c:409
 msgid "forms mode"
 msgstr ""
 
-#: src/LYShowInfo.c:421
+#: src/LYShowInfo.c:411
 msgid "source"
 msgstr ""
 
-#: src/LYShowInfo.c:422
+#: src/LYShowInfo.c:412
 msgid "normal"
 msgstr ""
 
-#: src/LYShowInfo.c:424
+#: src/LYShowInfo.c:414
 msgid ", safe"
 msgstr ""
 
-#: src/LYShowInfo.c:426
+#: src/LYShowInfo.c:416
 msgid ", via internal link"
 msgstr ""
 
-#: src/LYShowInfo.c:430
+#: src/LYShowInfo.c:420
 msgid ", no-cache"
 msgstr ""
 
-#: src/LYShowInfo.c:432
+#: src/LYShowInfo.c:422
 msgid ", ISMAP script"
 msgstr ""
 
-#: src/LYShowInfo.c:434
+#: src/LYShowInfo.c:424
 msgid ", bookmark file"
 msgstr ""
 
-#: src/LYShowInfo.c:437
+#: src/LYShowInfo.c:427
 msgid "mode:"
 msgstr ""
 
-#: src/LYShowInfo.c:443
+#: src/LYShowInfo.c:433
 msgid "Link that you currently have selected"
 msgstr ""
 
-#: src/LYShowInfo.c:452
+#: src/LYShowInfo.c:442
 msgid "Method:"
 msgstr ""
 
-#: src/LYShowInfo.c:456
+#: src/LYShowInfo.c:446
 msgid "Enctype:"
 msgstr ""
 
-#: src/LYShowInfo.c:462
+#: src/LYShowInfo.c:452
 msgid "Action:"
 msgstr ""
 
-#: src/LYShowInfo.c:468
+#: src/LYShowInfo.c:458
 msgid "(Form field)"
 msgstr ""
 
-#: src/LYShowInfo.c:478
+#: src/LYShowInfo.c:468
 msgid "No Links on the current page"
 msgstr ""
 
-#: src/LYShowInfo.c:483
+#: src/LYShowInfo.c:473
 msgid "Server Headers:"
 msgstr ""
 
@@ -5710,25 +5717,25 @@ msgstr ""
 msgid "Unexpected access protocol for this URL scheme."
 msgstr ""
 
-#: src/LYUtils.c:3571
+#: src/LYUtils.c:3572
 msgid "Too many tempfiles"
 msgstr ""
 
-#: src/LYUtils.c:3871
+#: src/LYUtils.c:3872
 msgid "unknown restriction"
 msgstr ""
 
-#: src/LYUtils.c:3902
+#: src/LYUtils.c:3903
 #, c-format
 msgid "No restrictions set.\n"
 msgstr ""
 
-#: src/LYUtils.c:3905
+#: src/LYUtils.c:3906
 #, c-format
 msgid "Restrictions set:\n"
 msgstr ""
 
-#: src/LYUtils.c:5202
+#: src/LYUtils.c:5203
 msgid "Cannot find HOME directory"
 msgstr ""
 
@@ -5736,7 +5743,7 @@ msgstr ""
 msgid "Normally disabled.  See ENABLE_LYNXRC in lynx.cfg\n"
 msgstr ""
 
-#: src/LYrcFile.c:373
+#: src/LYrcFile.c:378
 msgid ""
 "accept_all_cookies allows the user to tell Lynx to automatically\n"
 "accept all cookies if desired.  The default is \"FALSE\" which will\n"
@@ -5744,7 +5751,7 @@ msgid ""
 "all cookies.\n"
 msgstr ""
 
-#: src/LYrcFile.c:381
+#: src/LYrcFile.c:386
 msgid ""
 "anonftp_password allows the user to tell Lynx to use the personal\n"
 "email address as the password for anonymous ftp.  If no value is given,\n"
@@ -5752,21 +5759,21 @@ msgid ""
 "to a different value if you choose.\n"
 msgstr ""
 
-#: src/LYrcFile.c:390
+#: src/LYrcFile.c:395
 msgid ""
 "bookmark_file specifies the name and location of the default bookmark\n"
 "file into which the user can paste links for easy access at a later\n"
 "date.\n"
 msgstr ""
 
-#: src/LYrcFile.c:395
+#: src/LYrcFile.c:400
 msgid ""
 "If case_sensitive_searching is \"on\" then when the user invokes a search\n"
 "using the 's' or '/' keys, the search performed will be case sensitive\n"
 "instead of case INsensitive.  The default is usually \"off\".\n"
 msgstr ""
 
-#: src/LYrcFile.c:400
+#: src/LYrcFile.c:405
 msgid ""
 "The character_set definition controls the representation of 8 bit\n"
 "characters for your terminal.  If 8 bit characters do not show up\n"
@@ -5775,7 +5782,7 @@ msgid ""
 "Current valid characters sets are:\n"
 msgstr ""
 
-#: src/LYrcFile.c:408
+#: src/LYrcFile.c:413
 msgid ""
 "cookie_accept_domains and cookie_reject_domains are comma-delimited\n"
 "lists of domains from which Lynx should automatically accept or reject\n"
@@ -5784,13 +5791,13 @@ msgid ""
 "settings made here.\n"
 msgstr ""
 
-#: src/LYrcFile.c:416
+#: src/LYrcFile.c:421
 msgid ""
 "cookie_file specifies the file from which to read persistent cookies.\n"
 "The default is ~/"
 msgstr ""
 
-#: src/LYrcFile.c:421
+#: src/LYrcFile.c:426
 msgid ""
 "cookie_loose_invalid_domains, cookie_strict_invalid_domains, and\n"
 "cookie_query_invalid_domains are comma-delimited lists of which domains\n"
@@ -5801,13 +5808,13 @@ msgid ""
 "querying the user for an invalid path or domain.\n"
 msgstr ""
 
-#: src/LYrcFile.c:435
+#: src/LYrcFile.c:440
 msgid ""
 "dir_list_order specifies the directory list order under DIRED_SUPPORT\n"
 "(if implemented).  The default is \"ORDER_BY_NAME\"\n"
 msgstr ""
 
-#: src/LYrcFile.c:440
+#: src/LYrcFile.c:445
 msgid ""
 "dir_list_styles specifies the directory list style under DIRED_SUPPORT\n"
 "(if implemented).  The default is \"MIXED_STYLE\", which sorts both\n"
@@ -5815,7 +5822,7 @@ msgid ""
 "\"DIRECTORIES_FIRST\" lists directories first.\n"
 msgstr ""
 
-#: src/LYrcFile.c:448
+#: src/LYrcFile.c:453
 msgid ""
 "If emacs_keys is to \"on\" then the normal EMACS movement keys:\n"
 "  ^N = down    ^P = up\n"
@@ -5823,7 +5830,7 @@ msgid ""
 "will be enabled.\n"
 msgstr ""
 
-#: src/LYrcFile.c:454
+#: src/LYrcFile.c:459
 msgid ""
 "file_editor specifies the editor to be invoked when editing local files\n"
 "or sending mail.  If no editor is specified, then file editing is disabled\n"
@@ -5831,7 +5838,7 @@ msgid ""
 "will be used for sending mail.\n"
 msgstr ""
 
-#: src/LYrcFile.c:461
+#: src/LYrcFile.c:466
 msgid ""
 "The file_sorting_method specifies which value to sort on when viewing\n"
 "file lists such as FTP directories.  The options are:\n"
@@ -5841,7 +5848,7 @@ msgid ""
 "   BY_DATE     -- sorts on the date of the file\n"
 msgstr ""
 
-#: src/LYrcFile.c:492
+#: src/LYrcFile.c:497
 msgid ""
 "lineedit_mode specifies the key binding used for inputting strings in\n"
 "prompts and forms.  If lineedit_mode is set to \"Default Binding\" then\n"
@@ -5856,7 +5863,7 @@ msgid ""
 "Current lineedit modes are:\n"
 msgstr ""
 
-#: src/LYrcFile.c:510
+#: src/LYrcFile.c:515
 msgid ""
 "The following allow you to define sub-bookmark files and descriptions.\n"
 "The format is multi_bookmark<capital_letter>=<filename>,<description>\n"
@@ -5864,7 +5871,7 @@ msgid ""
 "We start with \"multi_bookmarkB\" since 'A' is the default (see above).\n"
 msgstr ""
 
-#: src/LYrcFile.c:516
+#: src/LYrcFile.c:521
 msgid ""
 "personal_mail_address specifies your personal mail address.  The\n"
 "address will be sent during HTTP file transfers for authorization and\n"
@@ -5875,7 +5882,7 @@ msgid ""
 "your mailed comments.\n"
 msgstr ""
 
-#: src/LYrcFile.c:525
+#: src/LYrcFile.c:530
 msgid ""
 "personal_mail_name specifies your personal name, for mail.  The\n"
 "name is sent for mailed comments.  Lynx will prompt for this,\n"
@@ -5887,7 +5894,7 @@ msgid ""
 "menu, or modify this file directly.\n"
 msgstr ""
 
-#: src/LYrcFile.c:535
+#: src/LYrcFile.c:540
 msgid ""
 "preferred_charset specifies the character set in MIME notation (e.g.,\n"
 "ISO-8859-2, ISO-8859-5) which Lynx will indicate you prefer in requests\n"
@@ -5903,7 +5910,7 @@ msgid ""
 "is also allowed.\n"
 msgstr ""
 
-#: src/LYrcFile.c:553
+#: src/LYrcFile.c:558
 msgid ""
 "preferred_language specifies the language in MIME notation (e.g., en,\n"
 "fr, may be a comma-separated list in decreasing preference)\n"
@@ -5912,7 +5919,7 @@ msgid ""
 "Otherwise, the server will send the file in its default language.\n"
 msgstr ""
 
-#: src/LYrcFile.c:564
+#: src/LYrcFile.c:569
 msgid ""
 "If run_all_execution_links is set \"on\" then all local execution links\n"
 "will be executed when they are selected.\n"
@@ -5925,7 +5932,7 @@ msgid ""
 "          you are viewing trusted source information.\n"
 msgstr ""
 
-#: src/LYrcFile.c:575
+#: src/LYrcFile.c:580
 msgid ""
 "If run_execution_links_on_local_files is set \"on\" then all local\n"
 "execution links that are found in LOCAL files will be executed when they\n"
@@ -5941,7 +5948,7 @@ msgid ""
 "          you are viewing trusted source information.\n"
 msgstr ""
 
-#: src/LYrcFile.c:593
+#: src/LYrcFile.c:598
 msgid ""
 "select_popups specifies whether the OPTIONs in a SELECT block which\n"
 "lacks a MULTIPLE attribute are presented as a vertical list of radio\n"
@@ -5952,7 +5959,7 @@ msgid ""
 "The default can be overridden via the -popup command line toggle.\n"
 msgstr ""
 
-#: src/LYrcFile.c:604
+#: src/LYrcFile.c:609
 msgid ""
 "show_color specifies how to set the color mode at startup.  A value of\n"
 "\"never\" will force color mode off (treat the terminal as monochrome)\n"
@@ -5971,7 +5978,7 @@ msgid ""
 "\"off\" \"show color\" settings will be treated as \"default\".\n"
 msgstr ""
 
-#: src/LYrcFile.c:621
+#: src/LYrcFile.c:626
 msgid ""
 "show_cursor specifies whether to 'hide' the cursor to the right (and\n"
 "bottom, if possible) of the screen, or to place it to the left of the\n"
@@ -5984,7 +5991,7 @@ msgid ""
 "The default can be overridden via the -show_cursor command line toggle.\n"
 msgstr ""
 
-#: src/LYrcFile.c:632
+#: src/LYrcFile.c:637
 msgid ""
 "show_dotfiles specifies that the directory listing should include\n"
 "\"hidden\" (dot) files/directories.  If set \"on\", this will be\n"
@@ -5993,7 +6000,7 @@ msgid ""
 "is disabled, creation of such files via Lynx also is disabled.\n"
 msgstr ""
 
-#: src/LYrcFile.c:643
+#: src/LYrcFile.c:648
 msgid ""
 "If sub_bookmarks is not turned \"off\", and multiple bookmarks have\n"
 "been defined (see below), then all bookmark operations will first\n"
@@ -6006,7 +6013,7 @@ msgid ""
 "presented regardless of user mode.\n"
 msgstr ""
 
-#: src/LYrcFile.c:658
+#: src/LYrcFile.c:663
 msgid ""
 "user_mode specifies the users level of knowledge with Lynx.  The\n"
 "default is \"NOVICE\" which displays two extra lines of help at the\n"
@@ -6016,14 +6023,14 @@ msgid ""
 "bottom of the screen.\n"
 msgstr ""
 
-#: src/LYrcFile.c:667
+#: src/LYrcFile.c:672
 msgid ""
 "If verbose_images is \"on\", lynx will print the name of the image\n"
 "source file in place of [INLINE], [LINK] or [IMAGE]\n"
 "See also VERBOSE_IMAGES in lynx.cfg\n"
 msgstr ""
 
-#: src/LYrcFile.c:672
+#: src/LYrcFile.c:677
 msgid ""
 "If vi_keys is set to \"on\", then the normal VI movement keys:\n"
 "  j = down    k = up\n"
@@ -6033,13 +6040,13 @@ msgid ""
 "and the keymap display, respectively.\n"
 msgstr ""
 
-#: src/LYrcFile.c:680
+#: src/LYrcFile.c:685
 msgid ""
 "The visited_links setting controls how Lynx organizes the information\n"
 "in the Visited Links Page.\n"
 msgstr ""
 
-#: src/LYrcFile.c:924
+#: src/LYrcFile.c:929
 msgid ""
 "If keypad_mode is set to \"NUMBERS_AS_ARROWS\", then the numbers on\n"
 "your keypad when the numlock is on will act as arrow keys:\n"
@@ -6050,13 +6057,13 @@ msgid ""
 "regardless of whether numlock is on.\n"
 msgstr ""
 
-#: src/LYrcFile.c:933
+#: src/LYrcFile.c:938
 msgid ""
 "If keypad_mode is set to \"LINKS_ARE_NUMBERED\", then numbers will\n"
 "appear next to each link and numbers are used to select links.\n"
 msgstr ""
 
-#: src/LYrcFile.c:937
+#: src/LYrcFile.c:942
 msgid ""
 "If keypad_mode is set to \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\", then\n"
 "numbers will appear next to each link and visible form input field.\n"
@@ -6067,33 +6074,33 @@ msgid ""
 "lists and output from the list command also enumerate form inputs.\n"
 msgstr ""
 
-#: src/LYrcFile.c:946
+#: src/LYrcFile.c:951
 msgid ""
 "NOTE: Some fixed format documents may look disfigured when\n"
 "\"LINKS_ARE_NUMBERED\" or \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\" are\n"
 "enabled.\n"
 msgstr ""
 
-#: src/LYrcFile.c:978
+#: src/LYrcFile.c:983
 msgid ""
 "Lynx User Defaults File\n"
 "\n"
 msgstr ""
 
-#: src/LYrcFile.c:987
+#: src/LYrcFile.c:992
 msgid ""
 "This file contains options saved from the Lynx Options Screen (normally\n"
 "with the 'o' key).  To save options with that screen, you must select the\n"
 "checkbox:\n"
 msgstr ""
 
-#: src/LYrcFile.c:994
+#: src/LYrcFile.c:999
 msgid ""
 "You must then save the settings using the link on the line above the\n"
 "checkbox:\n"
 msgstr ""
 
-#: src/LYrcFile.c:1001
+#: src/LYrcFile.c:1006
 msgid ""
 "You may also use the command-line option \"-forms_options\", which displays\n"
 "the simpler Options Menu instead.  Save options with that using the '>' "
@@ -6101,14 +6108,14 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/LYrcFile.c:1008
+#: src/LYrcFile.c:1013
 msgid ""
 "This file contains options saved from the Lynx Options Screen (normally\n"
 "with the '>' key).\n"
 "\n"
 msgstr ""
 
-#: src/LYrcFile.c:1015
+#: src/LYrcFile.c:1020
 msgid ""
 "There is normally no need to edit this file manually, since the defaults\n"
 "here can be controlled from the Options Screen, and the next time options\n"
diff --git a/po/makefile.inn b/po/makefile.inn
index 52b253f2..0b2764d1 100644
--- a/po/makefile.inn
+++ b/po/makefile.inn
@@ -1,4 +1,4 @@
-# $LynxId: makefile.inn,v 1.32 2021/02/28 15:56:25 tom Exp $
+# $LynxId: makefile.inn,v 1.33 2024/01/14 21:39:14 tom Exp $
 #
 # Makefile for program source directory in GNU NLS utilities package.
 # Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
@@ -13,8 +13,8 @@
 SHELL = /bin/sh
 @SET_MAKE@
 
-PACKAGE		= @PACKAGE@
-VERSION		= @VERSION@
+PACKAGE		= @PACKAGE_NAME@
+VERSION		= @PACKAGE_VERSION@
 NLS_TEXTDOMAIN	= @NLS_TEXTDOMAIN@
 
 srcdir		= @srcdir@
diff --git a/scripts/relpath.sh b/scripts/relpath.sh
new file mode 100755
index 00000000..cee5a213
--- /dev/null
+++ b/scripts/relpath.sh
@@ -0,0 +1,43 @@
+#!/bin/sh
+# Given two pathnames, print the first relative to the second.
+#
+# Adapted from
+# https://unix.stackexchange.com/questions/573047/how-to-get-the-relative-path-between-two-directories
+
+usage() {
+	echo "usage: $0 source target" >&2
+	exit 1
+}
+
+check_abs() {
+	case "$1" in
+	/*)
+		;;
+	*)
+		echo "? not an absolute pathname: $1"
+		usage
+		;;
+	esac
+}
+
+[ $# = 2 ] || usage
+check_abs "$1"
+check_abs "$2"
+
+source="$1"
+target="$2"
+prefix=""
+
+source="`echo "$source" | sed -e 's%/$%%'`/"
+target="`echo "$target" | sed -e 's%/$%%'`/"
+remain=`echo "$source" | sed -e 's%^'$target'%%'`
+while [ -n "$target" ] && [ "$source" = "$remain" ]
+do
+	prefix="../$prefix"
+	target=`echo "$target" | sed -e 's%/[^/]*/$%/%'`
+	remain=`echo "$source" | sed -e 's%^'$target'%%'`
+done
+result="${prefix}${remain}"
+[ -n "$result" ] || result="."
+
+echo "$result"
diff --git a/src/GridText.c b/src/GridText.c
index 0543d09e..806a0533 100644
--- a/src/GridText.c
+++ b/src/GridText.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: GridText.c,v 1.346 2023/11/09 09:18:27 tom Exp $
+ * $LynxId: GridText.c,v 1.347 2024/01/15 19:11:55 Gisle.Vanem Exp $
  *
  *		Character grid hypertext object
  *		===============================
@@ -912,7 +912,8 @@ static char *LYGetHiTextStr(TextAnchor *a, int count)
 	result = a->lites.hl_info[count - 1].hl_text;
     else
 	result = a->lites.hl_base.hl_text;
-    result += LYAdjHiTextPos(a, count);
+    if (result)
+	result += LYAdjHiTextPos(a, count);
     return result;
 }
 
diff --git a/src/LYGetFile.c b/src/LYGetFile.c
index 22b43cee..57e7f30e 100644
--- a/src/LYGetFile.c
+++ b/src/LYGetFile.c
@@ -1,4 +1,4 @@
-/* $LynxId: LYGetFile.c,v 1.96 2018/04/01 15:27:18 tom Exp $ */
+/* $LynxId: LYGetFile.c,v 1.97 2024/01/14 20:02:21 Viatrix Exp $ */
 #include <HTUtils.h>
 #include <HTTP.h>
 #include <HTAnchor.h>		/* Anchor class */
@@ -740,6 +740,18 @@ int getfile(DocInfo *doc, int *target)
 			doc->address));
 		FREE(tmp);
 		url_type = HTTP_URL_TYPE;
+	    } else if ((cp = StrChr(doc->address + 9, '/')) != NULL &&
+		       0 == StrNCmp(++cp, "hURL", 4)) {
+		StrAllocCopy(tmp, cp + 4);
+		HTUnEscape(tmp);
+		if (*tmp == ':') {
+		    CTRACE((tfp, "getfile: URL '%s'\n", doc->address));
+		    StrAllocCopy(doc->address, tmp + 1);
+		    FREE(tmp);
+		    CTRACE((tfp, "  changed to '%s'\n", doc->address));
+		    return getfile(doc, target);
+		} else
+		    FREE(tmp);
 	    }
 	}
 
diff --git a/src/LYMainLoop.c b/src/LYMainLoop.c
index 9584a9a5..55be2054 100644
--- a/src/LYMainLoop.c
+++ b/src/LYMainLoop.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYMainLoop.c,v 1.253 2023/10/23 23:36:31 tom Exp $
+ * $LynxId: LYMainLoop.c,v 1.254 2024/01/15 19:10:04 Gisle.Vanem Exp $
  */
 #include <HTUtils.h>
 #include <HTAccess.h>
@@ -6769,7 +6769,7 @@ int mainloop(void)
 	 * If help is not on the screen, then put a message on the screen to
 	 * tell the user other misc info.
 	 */
-	if (!show_help) {
+	if (!show_help && curdoc.link >= 0) {
 	    show_main_statusline(links[curdoc.link],
 				 ((curlink_is_editable &&
 				   textinput_activated)
diff --git a/src/LYShowInfo.c b/src/LYShowInfo.c
index 03387165..129810ce 100644
--- a/src/LYShowInfo.c
+++ b/src/LYShowInfo.c
@@ -1,4 +1,4 @@
-/* $LynxId: LYShowInfo.c,v 1.83 2018/12/27 22:35:44 Chuck.Martin Exp $ */
+/* $LynxId: LYShowInfo.c,v 1.86 2024/01/15 18:16:29 tom Exp $ */
 #include <HTUtils.h>
 #include <HTFile.h>
 #include <HTParse.h>
@@ -33,35 +33,21 @@
 static int label_columns;
 
 /*
- * LYNX_VERSION and LYNX_DATE are automatically generated by PRCS, the tool
- * which we use to archive versions of Lynx.  We use a convention for naming
- * the successive versions:
- *	{release}{status}{patch}
- * where
- *	{release} is the release that we are working on, e.g., 2.8.4
- *	{status} is one of "dev", "pre" or "rel", and
- *	{patch} is a number assigned by PRCS.
+ * LYNX_VERSION and LYNX_DATE are generated by the configure script.
  */
 BOOL LYVersionIsRelease(void)
 {
-    return (BOOL) (strstr(LYNX_VERSION, "rel") != 0);
+    return TRUE;
 }
 
 const char *LYVersionStatus(void)
 {
-    if (LYVersionIsRelease())
-	return REL_VERSION;
-    else if (strstr(LYNX_VERSION, "pre") != 0)
-	return PRE_VERSION;
-    return DEV_VERSION;
+    return REL_VERSION;
 }
 
 const char *LYVersionDate(void)
 {
-    static char temp[LYNX_DATE_LEN + 1];
-
-    LYStrNCpy(temp, &LYNX_DATE[LYNX_DATE_OFF], LYNX_DATE_LEN);
-    return temp;
+    return LYNX_DATE;
 }
 
 static void dt_String(FILE *fp,
diff --git a/src/LYUtils.c b/src/LYUtils.c
index 9b5ac476..e45e641e 100644
--- a/src/LYUtils.c
+++ b/src/LYUtils.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYUtils.c,v 1.308 2023/10/27 21:48:46 tom Exp $
+ * $LynxId: LYUtils.c,v 1.309 2024/01/15 17:10:52 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTTCP.h>
@@ -3125,7 +3125,7 @@ void LYGetScreenSize(int sig GCC_UNUSED)
 	    LYcols = win.ws_col;
 	}
     }
-#else
+#elif !defined(PDCURSES)
 #error inconsistent settings for TIOCGSIZE/TIOCGWINSZ
 #endif /* TIOCGSIZE/TIOCGWINSZ */
 #endif /* HAVE_SIZECHANGE */
diff --git a/src/UCAux.c b/src/UCAux.c
index 44495a61..a10f6249 100644
--- a/src/UCAux.c
+++ b/src/UCAux.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: UCAux.c,v 1.58 2021/07/01 23:34:24 tom Exp $
+ * $LynxId: UCAux.c,v 1.59 2024/01/15 11:24:17 tom Exp $
  */
 #include <HTUtils.h>
 
@@ -669,9 +669,7 @@ dUTF8 HTDecodeUTF8(UTFDecodeState * me, int *c_in_out, UCode_t *result)
 	 * continue a multibyte character...
 	 */
 	if (me->utf_count > 0 && (TOASCII(c) & 0xc0) == 0x80) {
-	    if (me->utf_count <= 0) {
-		me->utf_char = UCS_REPL;
-	    } else if (me->utf_count == 1) {
+	    if (me->utf_count == 1) {
 		int limit = (int) (me->utf_buf_p - me->utf_buf) + 1;
 		int maybe = 0;
 
diff --git a/src/parsdate.c b/src/parsdate.c
index 396f996c..07bbc9dc 100644
--- a/src/parsdate.c
+++ b/src/parsdate.c
@@ -5,7 +5,7 @@
 #define YYBYACC 1
 #define YYMAJOR 2
 #define YYMINOR 0
-#define YYPATCH 20220128
+#define YYPATCH 20240109
 
 #define YYEMPTY        (-1)
 #define yyclearin      (yychar = YYEMPTY)
@@ -25,7 +25,7 @@
 #include <LYLeaks.h>
 
 /*
- *  $LynxId: parsdate.c,v 1.30 2022/03/12 12:54:09 tom Exp $
+ *  $LynxId: parsdate.y,v 1.32 2024/01/15 11:09:08 tom Exp $
  *
  *  This module is adapted and extended from tin, to use for LYmktime().
  *
@@ -2030,7 +2030,7 @@ case 19:
 	    int	i;
 
 	    /* Unix and GMT and numeric timezones -- a little confusing. */
-	    if ((int)yystack.l_mark[0].Number < 0) {
+	    if ((long)yystack.l_mark[0].Number < 0) {
 		/* Don't work with negative modulus. */
 		yystack.l_mark[0].Number = -(int)yystack.l_mark[0].Number;
 		if (yystack.l_mark[0].Number > 9999 || (i = (int) (yystack.l_mark[0].Number % 100)) >= 60) {
diff --git a/src/parsdate.y b/src/parsdate.y
index d6655140..faab5e55 100644
--- a/src/parsdate.y
+++ b/src/parsdate.y
@@ -3,7 +3,7 @@
 #include <LYLeaks.h>
 
 /*
- *  $LynxId: parsdate.y,v 1.31 2021/06/08 23:01:28 tom Exp $
+ *  $LynxId: parsdate.y,v 1.32 2024/01/15 11:09:08 tom Exp $
  *
  *  This module is adapted and extended from tin, to use for LYmktime().
  *
@@ -255,7 +255,7 @@ numzone	: tSNUMBER {
 	    int	i;
 
 	    /* Unix and GMT and numeric timezones -- a little confusing. */
-	    if ((int)$1 < 0) {
+	    if ((long)$1 < 0) {
 		/* Don't work with negative modulus. */
 		$1 = -(int)$1;
 		if ($1 > 9999 || (i = (int) ($1 % 100)) >= 60) {
diff --git a/userdefs.h b/userdefs.h
index a6b9819f..0c50d59f 100644
--- a/userdefs.h
+++ b/userdefs.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: userdefs.h,v 1.370 2024/01/07 11:13:00 tom Exp $
+ * $LynxId: userdefs.h,v 1.373 2024/01/15 11:31:22 tom Exp $
  *
  * Lynx - Hypertext navigation system
  *
@@ -1450,18 +1450,11 @@
  *  		  have a good knowledge of the program
  */
 
-#define LYNX_NAME "Lynx"
-/* The strange-looking comments on the next line tell PRCS to replace
- * the version definition with the Project Version on checkout.  Just
- * ignore it. - kw */
-/* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */
-#define LYNX_VERSION "2.9.0dev.13"
+#define LYNX_NAME     "Lynx"
+#define LYNX_VERSION  "2.9.0"
 #define LYNX_WWW_HOME "https://lynx.invisible-island.net/"
 #define LYNX_WWW_DIST "https://lynx.invisible-island.net/current/"
-/* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */
-#define LYNX_DATE "Tue, 24 Jan 2023 04:25:46 -0500"
-#define LYNX_DATE_OFF 5		/* truncate the automatically-generated date */
-#define LYNX_DATE_LEN 11	/* truncate the automatically-generated date */
+#define LYNX_DATE     "15 Jan 2024"
 
 #ifdef UNICODE
 #define W32_STRING(s) L##s