Adding upstream version 2.9.2.upstream/2.9.2upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

21 files changed, 3931 insertions, 3661 deletions

diff --git a/CHANGES b/CHANGES
index e805dca..0527d6c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,8 +1,20 @@
--- $LynxId: CHANGES,v 1.1185 2024/04/15 20:54:26 tom Exp $
+-- $LynxId: CHANGES,v 1.1198 2024/05/31 22:09:16 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
 
+2024-05-31 (2.9.2)
+* modify makefile.in install-help to only remove files, leaving existing
+  directories and symbolic links -TD
+* in POSIX environments, check paths for external programs to ensure that they
+  are executable, non-empty files -TD
+* adapt special case of gzip decompression in 2.8.9dev.12 to brotli, to handle
+  downloads from websites which support "br" (report by Rajeev V Pillai) -TD
+* updated configure macro CF_ANSI_CC_C, to reset flags on test-failure, to
+  keep options from accumulating. 
+* build-fix for NetBSD and Solaris system curses libraries, removing an ifdef
+  added in 2.9.0dev.11 (report by Nelson Beebe) -TD
+
 2024-04-15 (2.9.1)
 * add samples/mhtml-tool, from
     https://github.com/ThomasDickey/mhtml-tool
diff --git a/INSTALLATION b/INSTALLATION
index 5c89839..68acdbb 100644
--- a/INSTALLATION
+++ b/INSTALLATION
@@ -136,7 +136,7 @@ II. Compile instructions -- UNIX
     have either
     
 	    "ncurses" ("https://invisible-island.net/ncurses") or
-	    "slang"   ("ftp://space.mit.edu/pub/davis/slang").
+	    "slang"   ("https://www.jedsoft.org/slang/").
     
     If you install these libraries in your home directory or a non-default
     location, you may need to set the CPPFLAGS (full path to include files) and
@@ -1503,4 +1503,4 @@ VIII. Acknowledgment
 
 -- 1999/04/24 - H. Nelson <lynx-admin@irm.nara.kindai.ac.jp>
 -- vile:txtmode
--- $LynxId: INSTALLATION,v 1.139 2024/04/09 23:18:16 tom Exp $
+-- $LynxId: INSTALLATION,v 1.140 2024/05/29 22:41:52 tom Exp $
diff --git a/PACKAGE/debian/changelog b/PACKAGE/debian/changelog
index 69e763e..6eb557b 100644
--- a/PACKAGE/debian/changelog
+++ b/PACKAGE/debian/changelog
@@ -1,8 +1,8 @@
-lynx-dev (2.9.1) unstable; urgency=low
+lynx-dev (2.9.2) unstable; urgency=low
 
   * maintenance updates
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Wed, 13 Mar 2024 12:45:26 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Fri, 31 May 2024 18:09:16 -0400
 
 lynx-dev (2.8.8dev.16) unstable; urgency=high
 
diff --git a/PACKAGE/lynx.nsi b/PACKAGE/lynx.nsi
index 90817f6..1bb2f5f 100644
--- a/PACKAGE/lynx.nsi
+++ b/PACKAGE/lynx.nsi
@@ -1,4 +1,4 @@
-; $LynxId: lynx.nsi,v 1.72 2024/04/15 20:53:51 tom Exp $

+; $LynxId: lynx.nsi,v 1.78 2024/05/31 22:09:16 tom Exp $

 ; Script originally generated with the Venis Install Wizard, but customized.

 ; The Inno Setup script is preferred; but this can be built via cross-compiling.

 

@@ -8,7 +8,7 @@
 

 !define VERSION_EPOCH "2"

 !define VERSION_MAJOR "9"

-!define VERSION_MINOR "1"

+!define VERSION_MINOR "2"

 !define VERSION_LEVEL "0"

 !define VERSION_PATCH ""

 

diff --git a/PACKAGE/lynx.spec b/PACKAGE/lynx.spec
index 7f23f19..7d15605 100644
--- a/PACKAGE/lynx.spec
+++ b/PACKAGE/lynx.spec
@@ -1,8 +1,8 @@
-# $LynxId: lynx.spec,v 1.83 2024/04/15 20:53:51 tom Exp $
+# $LynxId: lynx.spec,v 1.91 2024/05/31 22:09:16 tom Exp $
 Summary: A text-based Web browser
 Name: lynx-dev
-Version: 2.9.1
-Release: 0
+Version: 2.9.2
+Release: 1
 License: GPLv2
 Group: Applications/Internet
 Source: https://invisible-island.net/archives/lynx/lynx%{version}.tgz
diff --git a/PACKAGE/version.iss b/PACKAGE/version.iss
index 92b4e90..7d9309e 100644
--- a/PACKAGE/version.iss
+++ b/PACKAGE/version.iss
@@ -1,6 +1,6 @@
 ; version used for Inno Setup files.

 

-#define LYNX_VERSION "2.9.1"

+#define LYNX_VERSION "2.9.2"

 

 #define MyAppProg "Lynx"

 #define MyAppName "Lynx - web browser"

diff --git a/README b/README
index dd14148..79406ff 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
                              Lynx README file
 
-Lynx Version 2.9.0 is the latest release (January 2024).
+Lynx Version 2.9.2 is the latest release (May 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).
 
@@ -12,20 +12,20 @@ at very simple programming.  If you just want something which will work
 by following the links from
         <URL: https://lynx.invisible-island.net/resources.html/> ;
 
-For DOS or Windows, go to
-        <URL: http://www.fdisk.com/doslynx/lynxport.htm>.
-
 WHAT IS LYNX?
 
    Lynx is a fully-featured World Wide Web (WWW) client for users running
    cursor-addressable, character-cell display devices such as vt100 terminals,
-   vt100 emulators running on Windows 95/NT or Macintoshes, or any other
-   character-cell display.  It will display Hypertext Markup Language (HTML)
-   documents containing links to files on the local system, as well as files on
-   remote systems running http, gopher, ftp, wais, nntp, finger, or cso/ph/qi
-   servers, and services accessible via logins to telnet, tn3270 or rlogin
-   accounts.  Current versions of Lynx run on Unix, VMS, Windows95
-   through Windows 8, 386DOS and OS/2 EMX.
+   vt100 emulators or any other character-cell display. 
+
+   Lynx will display Hypertext Markup Language (HTML) documents containing
+   links to files on the local system, as well as files on remote systems
+   running http, gopher, ftp, wais, nntp, finger, or cso/ph/qi servers, and
+   services accessible via logins to telnet, tn3270 or rlogin accounts.
+   
+   Lynx runs on any POSIX platform as well as Windows.
+
+   Older releases also work with VMS, Windows95 (and up), 386DOS and OS/2 EMX.
 
    Lynx can be used to access information on the WWW, or to establish
    information systems intended primarily for local access.  Lynx has been
@@ -105,16 +105,12 @@ INSTALLING THE DOCUMENTATION
 
    where [public_path] is the absolute path to the lynx_help directory.
    Customizing the help menu system is just a matter of editing a set of
-   HTML files.  Additional information about installing and customizing
-   the help file set is available at
-       <URL: http://www.irm.nara.kindai.ac.jp/lynxdev/README.help>.
+   HTML files.
 
 INSTALLING LYNX
 
    To install Lynx, follow the steps in the INSTALLATION file, which is
-   located in the top directory of the source distribution.  Win32 users
-   who need pre-compiled distributions should visit the site
-       <URL: http://www.fdisk.com/doslynx/lynxport.htm>.
+   located in the top directory of the source distribution.
 
 PROBLEMS
 
@@ -146,9 +142,9 @@ LYNX-DEV MAILING LIST
    questions or comments in the archive since more often than not nobody
    will send a carbon copy to you.  View the archives at:
        "lynx-dev Mailing list archives"
-       <URL: http://mail.gnu.org/mailman/listinfo/lynx-dev/>
+       <URL: https://mail.gnu.org/mailman/listinfo/lynx-dev/>
 
 ------------------------------------------------------------------------------
 -- vile:txtmode fc=72 noti
--- $LynxId: README,v 1.37 2024/01/15 01:48:07 tom Exp $
+-- $LynxId: README,v 1.39 2024/05/29 22:33:17 tom Exp $
 ------------------------------------------------------------------------------
diff --git a/WWW/Library/Implementation/HTFile.c b/WWW/Library/Implementation/HTFile.c
index e9a225d..9b6c54f 100644
--- a/WWW/Library/Implementation/HTFile.c
+++ b/WWW/Library/Implementation/HTFile.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTFile.c,v 1.159 2024/04/11 20:19:06 tom Exp $
+ * $LynxId: HTFile.c,v 1.165 2024/05/28 00:35:41 tom Exp $
  *
  *			File Access				HTFile.c
  *			===========
@@ -1384,6 +1384,9 @@ CompressFileType HTEncodingToCompressType(const char *coding)
 
     if (coding == NULL) {
 	result = cftNone;
+    } else if (!strcasecomp(coding, "deflate") ||
+	       !strcasecomp(coding, "x-deflate")) {
+	result = cftDeflate;
     } else if (!strcasecomp(coding, "gzip") ||
 	       !strcasecomp(coding, "x-gzip")) {
 	result = cftGzip;
@@ -1394,12 +1397,9 @@ CompressFileType HTEncodingToCompressType(const char *coding)
 	       !strcasecomp(coding, "x-bzip2")) {
 	result = cftBzip2;
     } else if (!strcasecomp(coding, "br") ||	/* actual */
-	       !strcasecomp(coding, "brotli") ||	/* expected */
-	       !strcasecomp(coding, "x-brotli")) {
+	       !strcasecomp(coding, "x-br") ||
+	       !strcasecomp(coding, "brotli")) {	/* expected */
 	result = cftBrotli;
-    } else if (!strcasecomp(coding, "deflate") ||
-	       !strcasecomp(coding, "x-deflate")) {
-	result = cftDeflate;
     }
     return result;
 }
@@ -1410,6 +1410,9 @@ CompressFileType HTContentTypeToCompressType(const char *ct)
 
     if (ct == NULL) {
 	method = cftNone;
+    } else if (!strncasecomp(ct, "application/deflate", 19) ||
+	       !strncasecomp(ct, "application/x-deflate", 21)) {
+	method = cftGzip;
     } else if (!strncasecomp(ct, "application/gzip", 16) ||
 	       !strncasecomp(ct, "application/x-gzip", 18)) {
 	method = cftGzip;
@@ -1420,14 +1423,49 @@ CompressFileType HTContentTypeToCompressType(const char *ct)
 	       !strncasecomp(ct, "application/x-bzip2", 19)) {
 	method = cftBzip2;
     } else if (!strncasecomp(ct, "application/br", 14) ||
-	       !strncasecomp(ct, "application/brotli", 18) ||
-	       !strncasecomp(ct, "application/x-brotli", 20)) {
+	       !strncasecomp(ct, "application/x-br", 16) ||
+	       !strncasecomp(ct, "application/brotli", 18)) {
 	method = cftBrotli;
     }
     return method;
 }
 
 /*
+ * "Encoding" is jargon for compression-type.  Provide a reverse mapping.
+ */
+BOOL IsCompressionFormat(HTAtom *format, CompressFileType check)
+{
+    BOOL result = FALSE;
+
+    switch (check) {
+    case cftDeflate:
+	result = (format == HTAtom_for("application/deflate") ||
+		  format == HTAtom_for("application/x-deflate"));
+	break;
+    case cftGzip:
+	result = (format == HTAtom_for("application/gzip") ||
+		  format == HTAtom_for("application/x-gzip"));
+	break;
+    case cftCompress:
+	result = (format == HTAtom_for("application/compress") ||
+		  format == HTAtom_for("application/x-compress"));
+	break;
+    case cftBzip2:
+	result = (format == HTAtom_for("application/bzip2") ||
+		  format == HTAtom_for("application/x-bzip2"));
+	break;
+    case cftBrotli:
+	result = (format == HTAtom_for("application/br") ||
+		  format == HTAtom_for("application/x-br") ||
+		  format == HTAtom_for("application/brotli"));
+	break;
+    case cftNone:
+	break;
+    }
+    return result;
+}
+
+/*
  * Check the anchor's content_type and content_encoding elements for a gzip or
  * Unix compressed file -FM, TD
  */
@@ -3210,6 +3248,28 @@ int HTLoadFile(const char *addr,
 
 static const char *program_paths[pp_Last];
 
+#if defined(UNIX) || defined(_WINDOWS)
+#ifndef X_OK
+#define X_OK 0
+#endif
+static int VerifyProgram(const char *path)
+{
+    int result = 0;
+    struct stat info;
+
+    if (stat(path, &info) == 0) {
+	if (S_ISREG(info.st_mode) &&
+	    info.st_size != 0 &&
+	    access(path, X_OK) == 0) {
+	    result = 1;
+	} else {
+	    result = -1;
+	}
+    }
+    return result;
+}
+#endif
+
 /*
  * Given a program number, return its path
  */
@@ -3217,8 +3277,59 @@ const char *HTGetProgramPath(ProgramPaths code)
 {
     const char *result = NULL;
 
-    if (code > ppUnknown && code < pp_Last)
+    if (code > ppUnknown && code < pp_Last) {
 	result = program_paths[code];
+#if defined(UNIX) || defined(_WINDOWS)
+#define VERIFY_FMT "not a program: %s\n"
+#define EXISTS_FMT "no file found: %s\n"
+	if (result != NULL) {
+	    char *path;
+
+	    switch (VerifyProgram(result)) {
+	    case -1:
+		CTRACE((tfp, VERIFY_FMT, result));
+		result = NULL;
+		break;
+	    case 0:
+		if (*result == '/') {
+		    CTRACE((tfp, EXISTS_FMT, result));
+		    result = NULL;
+		} else if ((path = getenv("PATH")) != NULL) {
+		    int check = 0;
+		    char *list = NULL;
+
+		    StrAllocCopy(list, path);
+		    if (list != NULL) {
+			char *item;
+
+			path = list;
+			while ((item = strtok(path, PATH_SEPARATOR)) != NULL) {
+			    path = NULL;
+			    if (*item != '\0') {
+				char *full = NULL;
+
+				HTSprintf0(&full, "%s%s%s",
+					   item, FILE_SEPARATOR, result);
+				check = VerifyProgram(full);
+				free(full);
+				if (check != 0)
+				    break;
+			    }
+			}
+			free(list);
+		    }
+		    if (check <= 0) {
+			CTRACE((tfp, check ? VERIFY_FMT : EXISTS_FMT, result));
+			result = NULL;
+		    }
+		}
+		break;
+	    default:
+		break;
+	    }
+	}
+#endif
+    }
     return result;
 }
 
diff --git a/WWW/Library/Implementation/HTFile.h b/WWW/Library/Implementation/HTFile.h
index 1209090..9340963 100644
--- a/WWW/Library/Implementation/HTFile.h
+++ b/WWW/Library/Implementation/HTFile.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTFile.h,v 1.36 2023/10/24 08:07:39 tom Exp $
+ * $LynxId: HTFile.h,v 1.37 2024/05/27 10:08:57 tom Exp $
  *							File access in libwww
  *				FILE ACCESS
  *
@@ -232,6 +232,10 @@ extern "C" {
  */
     extern CompressFileType HTContentTypeToCompressType(const char *ct);
 /*
+ *  Check if a given content-encoding (format) matches something we support.
+ */
+    extern BOOL IsCompressionFormat(HTAtom *format, CompressFileType check);
+/*
  *  Determine compression type from the content-type and/or content-encoding.
  */
     extern CompressFileType HTContentToCompressType(HTParentAnchor *anchor);
diff --git a/WWW/Library/Implementation/HTTP.c b/WWW/Library/Implementation/HTTP.c
index bbcdf5d..c47d446 100644
--- a/WWW/Library/Implementation/HTTP.c
+++ b/WWW/Library/Implementation/HTTP.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTTP.c,v 1.184 2023/07/23 20:02:58 tom Exp $
+ * $LynxId: HTTP.c,v 1.185 2024/05/29 21:02:14 tom Exp $
  *
  * HyperText Transfer Protocol	- Client implementation		HTTP.c
  * ===========================
@@ -716,11 +716,7 @@ static BOOL acceptEncoding(int code)
 	default:
 	    break;
 	}
-	/*
-	 * FIXME:  if lynx did not rely upon external programs to decompress
-	 * files for external viewers, this check could be relaxed.
-	 */
-	result = (BOOL) (program != 0);
+	result = (BOOL) (program != NULL);
     }
     return result;
 }
diff --git a/aclocal.m4 b/aclocal.m4
index ae08a12..5cfd356 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $LynxId: aclocal.m4,v 1.341 2024/04/09 22:40:58 tom Exp $
+dnl $LynxId: aclocal.m4,v 1.342 2024/05/01 19:00:19 tom Exp $
 dnl Macros for auto-configure script.
 dnl by Thomas E. Dickey <dickey@invisible-island.net>
 dnl and Jim Spath <jspath@mail.bcpl.lib.md.us>
@@ -829,7 +829,7 @@ AC_MSG_RESULT($cf_cv_alt_char_set)
 test "$cf_cv_alt_char_set" != no && AC_DEFINE_UNQUOTED(ALT_CHAR_SET,$cf_cv_alt_char_set,[Define to 1 if if curses supports alternate-character set])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_ANSI_CC_CHECK version: 14 updated: 2024/01/07 06:34:16
+dnl CF_ANSI_CC_CHECK version: 15 updated: 2024/05/01 15:00:19
 dnl ----------------
 dnl This was originally adapted from the macros 'fp_PROG_CC_STDC' and
 dnl 'fp_C_PROTOTYPES' in the sharutils 4.2 distribution.
@@ -856,6 +856,8 @@ for cf_arg in "-DCC_HAS_PROTOS" \
 	"-Aa -D_HPUX_SOURCE" \
 	-Xc
 do
+	CFLAGS="$cf_save_CFLAGS"
+	CPPFLAGS="$cf_save_CPPFLAGS"
 	CF_ADD_CFLAGS($cf_arg)
 	AC_TRY_COMPILE(
 [
diff --git a/configure b/configure
index 54ee528..1f268a4 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
-# From configure.in Revision: 1.366 .
+# From configure.in Revision: 1.370 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by Autoconf 2.52.20231210 for lynx 2.9.0g.
+# Generated by Autoconf 2.52.20231210 for lynx 2.9.1b.
 #
 # Report bugs to <lynx-dev@nongnu.org>.
 #
@@ -191,8 +191,8 @@ mandir='${datarootdir}/man'
 # Identity of this package.
 PACKAGE_NAME='lynx'
 PACKAGE_TARNAME='lynx'
-PACKAGE_VERSION='2.9.1'
-PACKAGE_STRING='lynx 2.9.1'
+PACKAGE_VERSION='2.9.2'
+PACKAGE_STRING='lynx 2.9.2'
 PACKAGE_BUGREPORT='lynx-dev@nongnu.org'
 
 ac_prev=
@@ -625,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 lynx 2.9.0g to adapt to many kinds of systems.
+\`configure' configures lynx 2.9.1b to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -698,7 +698,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case "$ac_init_help" in
-     short | recursive ) echo "Configuration of lynx 2.9.0g:";;
+     short | recursive ) echo "Configuration of lynx 2.9.1b:";;
    esac
   cat <<\EOF
 
@@ -889,7 +889,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if "$ac_init_version"; then
   cat <<\EOF
-lynx configure 2.9.0g
+lynx configure 2.9.1b
 generated by GNU Autoconf 2.52.20231210
 
 Copyright 2003-2022,2023	Thomas E. Dickey
@@ -905,7 +905,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 lynx $as_me 2.9.0g, which was
+It was created by lynx $as_me 2.9.1b, which was
 generated by GNU Autoconf 2.52.20231210.  Invocation command line was
 
   $ $0 $@
@@ -7230,6 +7230,8 @@ for cf_arg in "-DCC_HAS_PROTOS" \
 	"-Aa -D_HPUX_SOURCE" \
 	-Xc
 do
+	CFLAGS="$cf_save_CFLAGS"
+	CPPFLAGS="$cf_save_CPPFLAGS"
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -7330,7 +7332,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 7333 "configure"
+#line 7335 "configure"
 #include "confdefs.h"
 
 #ifndef CC_HAS_PROTOS
@@ -7351,16 +7353,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7354: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7356: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7357: \$? = $ac_status" >&5
+  echo "$as_me:7359: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7360: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7362: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7363: \$? = $ac_status" >&5
+  echo "$as_me:7365: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ansi_cc="$cf_arg"; break
 else
@@ -7373,7 +7375,7 @@ CFLAGS="$cf_save_CFLAGS"
 CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi
-echo "$as_me:7376: result: $cf_cv_ansi_cc" >&5
+echo "$as_me:7378: result: $cf_cv_ansi_cc" >&5
 echo "${ECHO_T}$cf_cv_ansi_cc" >&6
 
 if test "$cf_cv_ansi_cc" != "no"; then
@@ -7487,7 +7489,7 @@ fi
 fi
 
 if test "$cf_cv_ansi_cc" = "no"; then
-	{ { echo "$as_me:7490: error: Your compiler does not appear to recognize prototypes.
+	{ { echo "$as_me:7492: 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
@@ -7500,14 +7502,14 @@ You have the following choices:
    { (exit 1); exit 1; }; }
 fi
 
-echo "$as_me:7503: checking if the POSIX test-macros are already defined" >&5
+echo "$as_me:7505: 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 7510 "configure"
+#line 7512 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7526,16 +7528,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7529: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7531: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7532: \$? = $ac_status" >&5
+  echo "$as_me:7534: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7535: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7537: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7538: \$? = $ac_status" >&5
+  echo "$as_me:7540: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_visible=no
 else
@@ -7546,7 +7548,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:7549: result: $cf_cv_posix_visible" >&5
+echo "$as_me:7551: result: $cf_cv_posix_visible" >&5
 echo "${ECHO_T}$cf_cv_posix_visible" >&6
 
 if test "$cf_cv_posix_visible" = no; then
@@ -7588,14 +7590,14 @@ case "$host_os" in
 
 cf_gnu_xopen_source=$cf_XOPEN_SOURCE
 
-echo "$as_me:7591: checking if this is the GNU C library" >&5
+echo "$as_me:7593: 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 7598 "configure"
+#line 7600 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -7614,16 +7616,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7617: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7619: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7620: \$? = $ac_status" >&5
+  echo "$as_me:7622: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7623: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7625: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7626: \$? = $ac_status" >&5
+  echo "$as_me:7628: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library=yes
 else
@@ -7634,7 +7636,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:7637: result: $cf_cv_gnu_library" >&5
+echo "$as_me:7639: result: $cf_cv_gnu_library" >&5
 echo "${ECHO_T}$cf_cv_gnu_library" >&6
 
 if test x$cf_cv_gnu_library = xyes; then
@@ -7642,7 +7644,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:7645: checking if _DEFAULT_SOURCE can be used as a basis" >&5
+	echo "$as_me:7647: 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
@@ -7654,7 +7656,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_DEFAULT_SOURCE"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 7657 "configure"
+#line 7659 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -7673,16 +7675,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7676: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7678: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7679: \$? = $ac_status" >&5
+  echo "$as_me:7681: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7682: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7684: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7685: \$? = $ac_status" >&5
+  echo "$as_me:7687: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_library_219=yes
 else
@@ -7694,12 +7696,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		CPPFLAGS="$cf_save"
 
 fi
-echo "$as_me:7697: result: $cf_cv_gnu_library_219" >&5
+echo "$as_me:7699: 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:7702: checking if _XOPEN_SOURCE=$cf_gnu_xopen_source works with _DEFAULT_SOURCE" >&5
+		echo "$as_me:7704: 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
@@ -7804,7 +7806,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 7807 "configure"
+#line 7809 "configure"
 #include "confdefs.h"
 
 				#include <limits.h>
@@ -7824,16 +7826,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7827: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7829: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7830: \$? = $ac_status" >&5
+  echo "$as_me:7832: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7833: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7835: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7836: \$? = $ac_status" >&5
+  echo "$as_me:7838: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_dftsrc_219=yes
 else
@@ -7844,7 +7846,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:7847: result: $cf_cv_gnu_dftsrc_219" >&5
+echo "$as_me:7849: 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
@@ -7853,14 +7855,14 @@ echo "${ECHO_T}$cf_cv_gnu_dftsrc_219" >&6
 
 	if test "x$cf_cv_gnu_dftsrc_219" != xyes; then
 
-		echo "$as_me:7856: checking if we must define _GNU_SOURCE" >&5
+		echo "$as_me:7858: 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 7863 "configure"
+#line 7865 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -7875,16 +7877,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:7878: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7880: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7881: \$? = $ac_status" >&5
+  echo "$as_me:7883: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:7884: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7886: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7887: \$? = $ac_status" >&5
+  echo "$as_me:7889: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -7991,7 +7993,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 			 cat >"conftest.$ac_ext" <<_ACEOF
-#line 7994 "configure"
+#line 7996 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -8006,16 +8008,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8009: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8011: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8012: \$? = $ac_status" >&5
+  echo "$as_me:8014: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8015: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8017: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8018: \$? = $ac_status" >&5
+  echo "$as_me:8020: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_gnu_source=no
 else
@@ -8030,12 +8032,12 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:8033: result: $cf_cv_gnu_source" >&5
+echo "$as_me:8035: 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:8038: checking if we should also define _DEFAULT_SOURCE" >&5
+		echo "$as_me:8040: 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
@@ -8045,7 +8047,7 @@ else
 	CPPFLAGS="${CPPFLAGS}-D_GNU_SOURCE"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 8048 "configure"
+#line 8050 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -8060,16 +8062,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8063: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8065: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8066: \$? = $ac_status" >&5
+  echo "$as_me:8068: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8069: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8071: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8072: \$? = $ac_status" >&5
+  echo "$as_me:8074: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_default_source=no
 else
@@ -8080,7 +8082,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:8083: result: $cf_cv_default_source" >&5
+echo "$as_me:8085: result: $cf_cv_default_source" >&5
 echo "${ECHO_T}$cf_cv_default_source" >&6
 			if test "$cf_cv_default_source" = yes
 			then
@@ -8117,16 +8119,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:8120: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:8122: 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}:8126: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:8128: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 8129 "configure"
+#line 8131 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -8141,16 +8143,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8144: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8146: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8147: \$? = $ac_status" >&5
+  echo "$as_me:8149: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8150: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8152: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8153: \$? = $ac_status" >&5
+  echo "$as_me:8155: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -8171,7 +8173,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 8174 "configure"
+#line 8176 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -8186,16 +8188,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8189: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8191: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8192: \$? = $ac_status" >&5
+  echo "$as_me:8194: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8195: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8197: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8198: \$? = $ac_status" >&5
+  echo "$as_me:8200: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -8206,7 +8208,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:8209: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:8211: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -8214,10 +8216,10 @@ echo "${as_me:-configure}:8209: testing ifdef from value $cf_POSIX_C_SOURCE ..."
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:8217: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:8219: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8220 "configure"
+#line 8222 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -8232,16 +8234,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8235: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8237: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8238: \$? = $ac_status" >&5
+  echo "$as_me:8240: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8241: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8243: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8244: \$? = $ac_status" >&5
+  echo "$as_me:8246: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -8257,7 +8259,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:8260: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:8262: 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
@@ -8374,7 +8376,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:8377: WARNING: this system does not provide usable locale support" >&5
+	{ echo "$as_me:8379: 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
@@ -8406,14 +8408,14 @@ echo "$as_me: WARNING: this system does not provide usable locale support" >&2;}
 	;;
 (*)
 
-echo "$as_me:8409: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:8411: 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 8416 "configure"
+#line 8418 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -8431,16 +8433,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8434: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8436: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8437: \$? = $ac_status" >&5
+  echo "$as_me:8439: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8440: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8442: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8443: \$? = $ac_status" >&5
+  echo "$as_me:8445: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -8452,7 +8454,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8455 "configure"
+#line 8457 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -8470,16 +8472,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8473: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8475: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8476: \$? = $ac_status" >&5
+  echo "$as_me:8478: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8479: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8481: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8482: \$? = $ac_status" >&5
+  echo "$as_me:8484: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -8494,7 +8496,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:8497: result: $cf_cv_xopen_source" >&5
+echo "$as_me:8499: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -8654,16 +8656,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:8657: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:8659: 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}:8663: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:8665: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 8666 "configure"
+#line 8668 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -8678,16 +8680,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8681: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8683: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8684: \$? = $ac_status" >&5
+  echo "$as_me:8686: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8687: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8689: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8690: \$? = $ac_status" >&5
+  echo "$as_me:8692: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -8708,7 +8710,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 8711 "configure"
+#line 8713 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -8723,16 +8725,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8726: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8728: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8729: \$? = $ac_status" >&5
+  echo "$as_me:8731: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8732: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8734: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8735: \$? = $ac_status" >&5
+  echo "$as_me:8737: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -8743,7 +8745,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	 fi
 
-echo "${as_me:-configure}:8746: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:8748: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS"
@@ -8751,10 +8753,10 @@ echo "${as_me:-configure}:8746: testing ifdef from value $cf_POSIX_C_SOURCE ..."
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:8754: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:8756: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 8757 "configure"
+#line 8759 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -8769,16 +8771,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8772: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8774: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8775: \$? = $ac_status" >&5
+  echo "$as_me:8777: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8778: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8780: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8781: \$? = $ac_status" >&5
+  echo "$as_me:8783: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -8794,7 +8796,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:8797: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:8799: 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
@@ -8907,10 +8909,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}:8910: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
+echo "${as_me:-configure}:8912: testing checking if _POSIX_C_SOURCE interferes with _XOPEN_SOURCE ..." 1>&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 8913 "configure"
+#line 8915 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -8928,23 +8930,23 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:8931: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8933: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8934: \$? = $ac_status" >&5
+  echo "$as_me:8936: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:8937: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8939: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8940: \$? = $ac_status" >&5
+  echo "$as_me:8942: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-			{ echo "$as_me:8947: WARNING: _POSIX_C_SOURCE definition is not usable" >&5
+			{ echo "$as_me:8949: 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
@@ -8967,7 +8969,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}:8970: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
+echo "${as_me:-configure}:8972: testing removing old option $cf_add_cflags from CFLAGS ..." 1>&5
 
 	CFLAGS="$cf_old_cflag"
 done
@@ -8979,7 +8981,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}:8982: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:8984: testing removing old option $cf_add_cflags from CPPFLAGS ..." 1>&5
 
 	CPPFLAGS="$cf_old_cflag"
 done
@@ -9067,7 +9069,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}:9070: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:9072: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -9077,7 +9079,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}:9080: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:9082: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -9087,7 +9089,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}:9090: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:9092: 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"
@@ -9099,10 +9101,10 @@ done
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-	echo "$as_me:9102: checking if _XOPEN_SOURCE really is set" >&5
+	echo "$as_me:9104: 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 9105 "configure"
+#line 9107 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -9117,16 +9119,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9120: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9122: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9123: \$? = $ac_status" >&5
+  echo "$as_me:9125: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9126: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9128: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9129: \$? = $ac_status" >&5
+  echo "$as_me:9131: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else
@@ -9135,12 +9137,12 @@ cat "conftest.$ac_ext" >&5
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:9138: result: $cf_XOPEN_SOURCE_set" >&5
+	echo "$as_me:9140: 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 9143 "configure"
+#line 9145 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -9155,16 +9157,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9158: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9160: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9161: \$? = $ac_status" >&5
+  echo "$as_me:9163: \$? = $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:9166: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9167: \$? = $ac_status" >&5
+  echo "$as_me:9169: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_XOPEN_SOURCE_set_ok=yes
 else
@@ -9175,19 +9177,19 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 		if test "$cf_XOPEN_SOURCE_set_ok" = no
 		then
-			{ echo "$as_me:9178: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+			{ echo "$as_me:9180: WARNING: _XOPEN_SOURCE is lower than requested" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
 		fi
 	else
 
-echo "$as_me:9183: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:9185: 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 9190 "configure"
+#line 9192 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -9205,16 +9207,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9208: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9210: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9211: \$? = $ac_status" >&5
+  echo "$as_me:9213: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9214: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9216: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9217: \$? = $ac_status" >&5
+  echo "$as_me:9219: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -9226,7 +9228,7 @@ cf_save="$CPPFLAGS"
 	CPPFLAGS="${CPPFLAGS}-D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 
 	 cat >"conftest.$ac_ext" <<_ACEOF
-#line 9229 "configure"
+#line 9231 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -9244,16 +9246,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9247: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9249: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9250: \$? = $ac_status" >&5
+  echo "$as_me:9252: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9253: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9255: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9256: \$? = $ac_status" >&5
+  echo "$as_me:9258: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xopen_source=no
 else
@@ -9268,7 +9270,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:9271: result: $cf_cv_xopen_source" >&5
+echo "$as_me:9273: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -9422,7 +9424,7 @@ if test "${enable_largefile+set}" = set; then
 fi;
 if test "$enable_largefile" != no; then
 
-  echo "$as_me:9425: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:9427: 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
@@ -9434,7 +9436,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 9437 "configure"
+#line 9439 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -9454,16 +9456,16 @@ main (void)
 }
 _ACEOF
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9457: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9459: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9460: \$? = $ac_status" >&5
+  echo "$as_me:9462: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9463: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9465: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9466: \$? = $ac_status" >&5
+  echo "$as_me:9468: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -9473,16 +9475,16 @@ fi
 rm -f "conftest.$ac_objext"
      	 CC="$CC -n32"
      	 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9476: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9478: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9479: \$? = $ac_status" >&5
+  echo "$as_me:9481: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9482: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9484: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9485: \$? = $ac_status" >&5
+  echo "$as_me:9487: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else
@@ -9496,13 +9498,13 @@ rm -f "conftest.$ac_objext"
        rm -f "conftest.$ac_ext"
     fi
 fi
-echo "$as_me:9499: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:9501: 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:9505: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:9507: 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
@@ -9510,7 +9512,7 @@ else
   while :; do
   ac_cv_sys_file_offset_bits=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 9513 "configure"
+#line 9515 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -9530,16 +9532,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9533: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9535: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9536: \$? = $ac_status" >&5
+  echo "$as_me:9538: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9539: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9541: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9542: \$? = $ac_status" >&5
+  echo "$as_me:9544: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -9548,7 +9550,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 9551 "configure"
+#line 9553 "configure"
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
@@ -9569,16 +9571,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9572: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9574: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9575: \$? = $ac_status" >&5
+  echo "$as_me:9577: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9578: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9580: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9581: \$? = $ac_status" >&5
+  echo "$as_me:9583: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_file_offset_bits=64; break
 else
@@ -9589,7 +9591,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:9592: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:9594: 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
 
@@ -9599,7 +9601,7 @@ EOF
 
 fi
 rm -rf conftest*
-  echo "$as_me:9602: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:9604: 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
@@ -9607,7 +9609,7 @@ else
   while :; do
   ac_cv_sys_large_files=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 9610 "configure"
+#line 9612 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -9627,16 +9629,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9630: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9632: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9633: \$? = $ac_status" >&5
+  echo "$as_me:9635: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9636: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9638: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9639: \$? = $ac_status" >&5
+  echo "$as_me:9641: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -9645,7 +9647,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 9648 "configure"
+#line 9650 "configure"
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
@@ -9666,16 +9668,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9669: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9671: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9672: \$? = $ac_status" >&5
+  echo "$as_me:9674: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9675: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9677: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9678: \$? = $ac_status" >&5
+  echo "$as_me:9680: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_large_files=1; break
 else
@@ -9686,7 +9688,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:9689: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:9691: 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
 
@@ -9699,7 +9701,7 @@ rm -rf conftest*
 fi
 
 	if test "$enable_largefile" != no ; then
-	echo "$as_me:9702: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+	echo "$as_me:9704: 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
@@ -9707,7 +9709,7 @@ else
   while :; do
   ac_cv_sys_largefile_source=no
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 9710 "configure"
+#line 9712 "configure"
 #include "confdefs.h"
 #include <stdio.h>
     #include <sys/types.h>
@@ -9722,16 +9724,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9725: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9727: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9728: \$? = $ac_status" >&5
+  echo "$as_me:9730: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9731: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9733: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9734: \$? = $ac_status" >&5
+  echo "$as_me:9736: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   break
 else
@@ -9740,7 +9742,7 @@ cat "conftest.$ac_ext" >&5
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 9743 "configure"
+#line 9745 "configure"
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
@@ -9756,16 +9758,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9759: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9761: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9762: \$? = $ac_status" >&5
+  echo "$as_me:9764: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9765: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9767: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9768: \$? = $ac_status" >&5
+  echo "$as_me:9770: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sys_largefile_source=1; break
 else
@@ -9776,7 +9778,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
   break
 done
 fi
-echo "$as_me:9779: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:9781: 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
 
@@ -9790,13 +9792,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:9793: checking for fseeko" >&5
+echo "$as_me:9795: 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 9799 "configure"
+#line 9801 "configure"
 #include "confdefs.h"
 #include <stdio.h>
                              #include <sys/types.h>
@@ -9810,16 +9812,16 @@ int (*my_fseeko)(FILE *, off_t, int) = fseeko;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:9813: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9815: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9816: \$? = $ac_status" >&5
+  echo "$as_me:9818: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:9819: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9821: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9822: \$? = $ac_status" >&5
+  echo "$as_me:9824: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fseeko=yes
 else
@@ -9829,7 +9831,7 @@ ac_cv_func_fseeko=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:9832: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:9834: result: $ac_cv_func_fseeko" >&5
 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
 if test $ac_cv_func_fseeko = yes; then
 
@@ -9868,14 +9870,14 @@ fi
 
 	fi
 
-	echo "$as_me:9871: checking whether to use struct dirent64" >&5
+	echo "$as_me:9873: 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 9878 "configure"
+#line 9880 "configure"
 #include "confdefs.h"
 
 #pragma GCC diagnostic error "-Wincompatible-pointer-types"
@@ -9902,16 +9904,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:9905: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9907: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9908: \$? = $ac_status" >&5
+  echo "$as_me:9910: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:9911: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9913: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9914: \$? = $ac_status" >&5
+  echo "$as_me:9916: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_struct_dirent64=yes
 else
@@ -9922,7 +9924,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:9925: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:9927: result: $cf_cv_struct_dirent64" >&5
 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
 	test "$cf_cv_struct_dirent64" = yes &&
 cat >>confdefs.h <<\EOF
@@ -9931,13 +9933,13 @@ EOF
 
 	fi
 
-echo "$as_me:9934: checking for ANSI C header files" >&5
+echo "$as_me:9936: 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 9940 "configure"
+#line 9942 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -9945,13 +9947,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:9948: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:9950: \"$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:9954: \$? = $ac_status" >&5
+  echo "$as_me:9956: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9973,7 +9975,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 9976 "configure"
+#line 9978 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -9991,7 +9993,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 9994 "configure"
+#line 9996 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -10012,7 +10014,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 10015 "configure"
+#line 10017 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -10038,15 +10040,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:10041: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10043: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10044: \$? = $ac_status" >&5
+  echo "$as_me:10046: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:10046: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10048: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10049: \$? = $ac_status" >&5
+  echo "$as_me:10051: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -10059,7 +10061,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 fi
 fi
-echo "$as_me:10062: result: $ac_cv_header_stdc" >&5
+echo "$as_me:10064: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -10075,28 +10077,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:10078: checking for $ac_header" >&5
+echo "$as_me:10080: 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 10084 "configure"
+#line 10086 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10090: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10092: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10093: \$? = $ac_status" >&5
+  echo "$as_me:10095: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10096: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10098: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10099: \$? = $ac_status" >&5
+  echo "$as_me:10101: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -10106,7 +10108,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:10109: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:10111: 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
@@ -10116,13 +10118,13 @@ EOF
 fi
 done
 
-echo "$as_me:10119: checking whether exit is declared" >&5
+echo "$as_me:10121: 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 10125 "configure"
+#line 10127 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -10137,16 +10139,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10140: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10142: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10143: \$? = $ac_status" >&5
+  echo "$as_me:10145: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10146: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10148: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10149: \$? = $ac_status" >&5
+  echo "$as_me:10151: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_have_decl_exit=yes
 else
@@ -10156,26 +10158,26 @@ ac_cv_have_decl_exit=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:10159: result: $ac_cv_have_decl_exit" >&5
+echo "$as_me:10161: result: $ac_cv_have_decl_exit" >&5
 echo "${ECHO_T}$ac_cv_have_decl_exit" >&6
 
 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:10165: checking for PATH separator" >&5
+	echo "$as_me:10167: 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:10172: result: $PATH_SEPARATOR" >&5
+	echo "$as_me:10174: 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:10178: checking for $ac_word" >&5
+echo "$as_me:10180: 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
@@ -10202,17 +10204,17 @@ esac
 fi
 MSGINIT="$ac_cv_path_MSGINIT"
 if test "$MSGINIT" != ":"; then
-  echo "$as_me:10205: result: $MSGINIT" >&5
+  echo "$as_me:10207: result: $MSGINIT" >&5
 echo "${ECHO_T}$MSGINIT" >&6
 else
-  echo "$as_me:10208: result: no" >&5
+  echo "$as_me:10210: 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}:10215: testing adding en.po ..." 1>&5
+echo "${as_me:-configure}:10217: testing adding en.po ..." 1>&5
 
 		ALL_LINGUAS="$ALL_LINGUAS en"
 	fi
@@ -10226,7 +10228,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:10229: error: CF_BUNDLED_INTL used without setting PACKAGE variable" >&5
+	{ { echo "$as_me:10231: 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
@@ -10278,7 +10280,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 10281 "configure"
+#line 10283 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10290,16 +10292,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10293: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10295: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10296: \$? = $ac_status" >&5
+  echo "$as_me:10298: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10299: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10301: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10302: \$? = $ac_status" >&5
+  echo "$as_me:10304: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -10316,7 +10318,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}:10319: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:10321: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -10362,7 +10364,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 10365 "configure"
+#line 10367 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10374,16 +10376,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10377: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10379: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10380: \$? = $ac_status" >&5
+  echo "$as_me:10382: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10383: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10385: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10386: \$? = $ac_status" >&5
+  echo "$as_me:10388: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -10400,7 +10402,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}:10403: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:10405: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -10418,7 +10420,7 @@ echo "${as_me:-configure}:10403: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:10421: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:10423: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -10443,7 +10445,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}:10446: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:10448: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -10472,7 +10474,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}:10475: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:10477: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -10481,7 +10483,7 @@ echo "${as_me:-configure}:10475: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:10484: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:10486: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -10489,14 +10491,14 @@ done
 
 	test -n "$verbose" && echo "	setting path value for libiconv to $withval" 1>&6
 
-echo "${as_me:-configure}:10492: testing setting path value for libiconv to $withval ..." 1>&5
+echo "${as_me:-configure}:10494: testing setting path value for libiconv to $withval ..." 1>&5
 
 	;;
 esac
 
 fi;
 
-  echo "$as_me:10499: checking for iconv" >&5
+  echo "$as_me:10501: 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
@@ -10507,12 +10509,12 @@ else
 cf_cv_header_path_iconv=
 cf_cv_library_path_iconv=
 
-echo "${as_me:-configure}:10510: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:10512: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10515 "configure"
+#line 10517 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -10531,16 +10533,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10534: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10536: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10537: \$? = $ac_status" >&5
+  echo "$as_me:10539: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10540: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10542: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10543: \$? = $ac_status" >&5
+  echo "$as_me:10545: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -10554,7 +10556,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-liconv  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 10557 "configure"
+#line 10559 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -10573,16 +10575,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10576: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10578: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10579: \$? = $ac_status" >&5
+  echo "$as_me:10581: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10582: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10584: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10585: \$? = $ac_status" >&5
+  echo "$as_me:10587: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -10599,9 +10601,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for iconv library" 1>&6
 
-echo "${as_me:-configure}:10602: testing find linkage for iconv library ..." 1>&5
+echo "${as_me:-configure}:10604: testing find linkage for iconv library ..." 1>&5
 
-echo "${as_me:-configure}:10604: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:10606: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -10692,7 +10694,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}:10695: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:10697: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -10700,7 +10702,7 @@ echo "${as_me:-configure}:10695: testing ... testing $cf_cv_header_path_iconv ..
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_iconv"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 10703 "configure"
+#line 10705 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -10719,21 +10721,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10722: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10724: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10725: \$? = $ac_status" >&5
+  echo "$as_me:10727: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10728: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10730: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10731: \$? = $ac_status" >&5
+  echo "$as_me:10733: \$? = $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}:10736: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:10738: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
 
 				cf_cv_find_linkage_iconv=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -10751,7 +10753,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_iconv" = maybe ; then
 
-echo "${as_me:-configure}:10754: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:10756: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -10826,13 +10828,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}:10829: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:10831: 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 10835 "configure"
+#line 10837 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -10851,21 +10853,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:10854: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10856: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10857: \$? = $ac_status" >&5
+  echo "$as_me:10859: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:10860: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10862: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10863: \$? = $ac_status" >&5
+  echo "$as_me:10865: \$? = $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}:10868: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:10870: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
 
 					cf_cv_find_linkage_iconv=yes
 					cf_cv_library_file_iconv="-liconv"
@@ -10905,7 +10907,7 @@ am_cv_func_iconv="no, consider installing GNU libiconv"
 fi
 
 fi
-echo "$as_me:10908: result: $am_cv_func_iconv" >&5
+echo "$as_me:10910: result: $am_cv_func_iconv" >&5
 echo "${ECHO_T}$am_cv_func_iconv" >&6
 
   if test "$am_cv_func_iconv" = yes; then
@@ -10914,14 +10916,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_ICONV 1
 EOF
 
-    echo "$as_me:10917: checking if the declaration of iconv() needs const." >&5
+    echo "$as_me:10919: 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 10924 "configure"
+#line 10926 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -10946,16 +10948,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:10949: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10951: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10952: \$? = $ac_status" >&5
+  echo "$as_me:10954: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:10955: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10957: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10958: \$? = $ac_status" >&5
+  echo "$as_me:10960: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   am_cv_proto_iconv_const=no
 else
@@ -10965,7 +10967,7 @@ am_cv_proto_iconv_const=yes
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:10968: result: $am_cv_proto_iconv_const" >&5
+echo "$as_me:10970: 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
@@ -11010,7 +11012,7 @@ if test -n "$cf_cv_header_path_iconv" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 11013 "configure"
+#line 11015 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11022,16 +11024,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11025: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11027: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11028: \$? = $ac_status" >&5
+  echo "$as_me:11030: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11031: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11033: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11034: \$? = $ac_status" >&5
+  echo "$as_me:11036: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11048,7 +11050,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}:11051: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11053: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -11087,7 +11089,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}:11090: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:11092: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -11098,13 +11100,13 @@ fi
     fi
   fi
 
-echo "$as_me:11101: checking for nl_langinfo and CODESET" >&5
+echo "$as_me:11103: 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 11107 "configure"
+#line 11109 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -11118,16 +11120,16 @@ char* cs = nl_langinfo(CODESET); (void)cs
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11121: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11123: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11124: \$? = $ac_status" >&5
+  echo "$as_me:11126: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11127: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11129: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11130: \$? = $ac_status" >&5
+  echo "$as_me:11132: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   am_cv_langinfo_codeset=yes
 else
@@ -11138,7 +11140,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:11141: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:11143: result: $am_cv_langinfo_codeset" >&5
 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
 	if test "$am_cv_langinfo_codeset" = yes; then
 
@@ -11149,13 +11151,13 @@ EOF
 	fi
 
    if test "$ac_cv_header_locale_h" = yes; then
-	echo "$as_me:11152: checking for LC_MESSAGES" >&5
+	echo "$as_me:11154: 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 11158 "configure"
+#line 11160 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int
@@ -11167,16 +11169,16 @@ return LC_MESSAGES
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11170: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11172: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11173: \$? = $ac_status" >&5
+  echo "$as_me:11175: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11176: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11178: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11179: \$? = $ac_status" >&5
+  echo "$as_me:11181: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   am_cv_val_LC_MESSAGES=yes
 else
@@ -11186,7 +11188,7 @@ am_cv_val_LC_MESSAGES=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:11189: result: $am_cv_val_LC_MESSAGES" >&5
+echo "$as_me:11191: 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
 
@@ -11196,7 +11198,7 @@ EOF
 
 	fi
 fi
-   echo "$as_me:11199: checking whether NLS is requested" >&5
+   echo "$as_me:11201: 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.
@@ -11206,7 +11208,7 @@ if test "${enable_nls+set}" = set; then
 else
   USE_NLS=no
 fi;
-  echo "$as_me:11209: result: $USE_NLS" >&5
+  echo "$as_me:11211: result: $USE_NLS" >&5
 echo "${ECHO_T}$USE_NLS" >&6
 
     if test "$USE_NLS" = "yes"; then
@@ -11214,7 +11216,7 @@ echo "${ECHO_T}$USE_NLS" >&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:11217: checking for $ac_word" >&5
+echo "$as_me:11219: 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
@@ -11241,16 +11243,16 @@ esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test "$MSGFMT" != ":"; then
-  echo "$as_me:11244: result: $MSGFMT" >&5
+  echo "$as_me:11246: result: $MSGFMT" >&5
 echo "${ECHO_T}$MSGFMT" >&6
 else
-  echo "$as_me:11247: result: no" >&5
+  echo "$as_me:11249: 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:11253: checking for $ac_word" >&5
+echo "$as_me:11255: 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
@@ -11267,7 +11269,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:11270: found $ac_dir/$ac_word" >&5
+   echo "$as_me:11272: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -11279,17 +11281,17 @@ fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 
 if test -n "$GMSGFMT"; then
-  echo "$as_me:11282: result: $GMSGFMT" >&5
+  echo "$as_me:11284: result: $GMSGFMT" >&5
 echo "${ECHO_T}$GMSGFMT" >&6
 else
-  echo "$as_me:11285: result: no" >&5
+  echo "$as_me:11287: 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:11292: checking for $ac_word" >&5
+echo "$as_me:11294: 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
@@ -11316,10 +11318,10 @@ esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test "$XGETTEXT" != ":"; then
-  echo "$as_me:11319: result: $XGETTEXT" >&5
+  echo "$as_me:11321: result: $XGETTEXT" >&5
 echo "${ECHO_T}$XGETTEXT" >&6
 else
-  echo "$as_me:11322: result: no" >&5
+  echo "$as_me:11324: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -11489,7 +11491,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 11492 "configure"
+#line 11494 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11501,16 +11503,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11504: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11506: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11507: \$? = $ac_status" >&5
+  echo "$as_me:11509: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11510: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11512: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11513: \$? = $ac_status" >&5
+  echo "$as_me:11515: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11527,7 +11529,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}:11530: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11532: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -11573,7 +11575,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 11576 "configure"
+#line 11578 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11585,16 +11587,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11588: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11590: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11591: \$? = $ac_status" >&5
+  echo "$as_me:11593: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11594: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11596: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11597: \$? = $ac_status" >&5
+  echo "$as_me:11599: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -11611,7 +11613,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}:11614: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11616: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -11629,7 +11631,7 @@ echo "${as_me:-configure}:11614: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:11632: error: cannot find libintl under $withval" >&5
+{ { echo "$as_me:11634: error: cannot find libintl under $withval" >&5
 echo "$as_me: error: cannot find libintl under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -11654,7 +11656,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}:11657: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:11659: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -11683,7 +11685,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}:11686: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:11688: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -11692,7 +11694,7 @@ echo "${as_me:-configure}:11686: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:11695: error: cannot find libintl under $withval" >&5
+{ { echo "$as_me:11697: error: cannot find libintl under $withval" >&5
 echo "$as_me: error: cannot find libintl under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -11700,7 +11702,7 @@ done
 
 	test -n "$verbose" && echo "	setting path value for libintl to $withval" 1>&6
 
-echo "${as_me:-configure}:11703: testing setting path value for libintl to $withval ..." 1>&5
+echo "${as_me:-configure}:11705: testing setting path value for libintl to $withval ..." 1>&5
 
 	;;
 esac
@@ -11712,12 +11714,12 @@ fi;
 cf_cv_header_path_intl=
 cf_cv_library_path_intl=
 
-echo "${as_me:-configure}:11715: testing Starting FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me:-configure}:11717: testing Starting FIND_LINKAGE(intl,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11720 "configure"
+#line 11722 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -11739,16 +11741,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11742: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11744: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11745: \$? = $ac_status" >&5
+  echo "$as_me:11747: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11748: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11750: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11751: \$? = $ac_status" >&5
+  echo "$as_me:11753: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_intl=yes
@@ -11762,7 +11764,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lintl  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 11765 "configure"
+#line 11767 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -11784,16 +11786,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:11787: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11789: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11790: \$? = $ac_status" >&5
+  echo "$as_me:11792: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:11793: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11795: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11796: \$? = $ac_status" >&5
+  echo "$as_me:11798: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_intl=yes
@@ -11810,9 +11812,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for intl library" 1>&6
 
-echo "${as_me:-configure}:11813: testing find linkage for intl library ..." 1>&5
+echo "${as_me:-configure}:11815: testing find linkage for intl library ..." 1>&5
 
-echo "${as_me:-configure}:11815: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me:-configure}:11817: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -11903,7 +11905,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}:11906: testing ... testing $cf_cv_header_path_intl ..." 1>&5
+echo "${as_me:-configure}:11908: testing ... testing $cf_cv_header_path_intl ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -11911,7 +11913,7 @@ echo "${as_me:-configure}:11906: testing ... testing $cf_cv_header_path_intl ...
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_intl"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 11914 "configure"
+#line 11916 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -11933,21 +11935,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:11936: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11938: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11939: \$? = $ac_status" >&5
+  echo "$as_me:11941: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:11942: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11944: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11945: \$? = $ac_status" >&5
+  echo "$as_me:11947: \$? = $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}:11950: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5
+echo "${as_me:-configure}:11952: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5
 
 				cf_cv_find_linkage_intl=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -11965,7 +11967,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_intl" = maybe ; then
 
-echo "${as_me:-configure}:11968: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me:-configure}:11970: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -12040,13 +12042,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}:12043: testing ... testing $cf_cv_library_path_intl ..." 1>&5
+echo "${as_me:-configure}:12045: 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 12049 "configure"
+#line 12051 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -12068,21 +12070,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12071: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12073: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12074: \$? = $ac_status" >&5
+  echo "$as_me:12076: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12077: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12079: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12080: \$? = $ac_status" >&5
+  echo "$as_me:12082: \$? = $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}:12085: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5
+echo "${as_me:-configure}:12087: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5
 
 					cf_cv_find_linkage_intl=yes
 					cf_cv_library_file_intl="-lintl"
@@ -12121,9 +12123,9 @@ else
 cf_cv_func_gettext=no
 fi
 
-	echo "$as_me:12124: checking for libintl.h and gettext()" >&5
+	echo "$as_me:12126: checking for libintl.h and gettext()" >&5
 echo $ECHO_N "checking for libintl.h and gettext()... $ECHO_C" >&6
-	echo "$as_me:12126: result: $cf_cv_func_gettext" >&5
+	echo "$as_me:12128: result: $cf_cv_func_gettext" >&5
 echo "${ECHO_T}$cf_cv_func_gettext" >&6
 
 	if test "$cf_cv_func_gettext" = yes ; then
@@ -12163,7 +12165,7 @@ if test -n "$cf_cv_header_path_intl" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 12166 "configure"
+#line 12168 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -12175,16 +12177,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12178: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12180: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12181: \$? = $ac_status" >&5
+  echo "$as_me:12183: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12184: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12186: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12187: \$? = $ac_status" >&5
+  echo "$as_me:12189: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -12201,7 +12203,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}:12204: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:12206: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -12240,7 +12242,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}:12243: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:12245: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				INTLLIBS="-L$cf_add_libdir $INTLLIBS"
 			fi
@@ -12255,13 +12257,13 @@ fi
 for ac_func in dcgettext
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:12258: checking for $ac_func" >&5
+echo "$as_me:12260: 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 12264 "configure"
+#line 12266 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -12292,16 +12294,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12295: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12297: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12298: \$? = $ac_status" >&5
+  echo "$as_me:12300: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12301: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12303: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12304: \$? = $ac_status" >&5
+  echo "$as_me:12306: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -12311,7 +12313,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:12314: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:12316: 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
@@ -12328,7 +12330,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	elif test -z "$MSGFMT" || test -z "$XGETTEXT" ; then
-	  { echo "$as_me:12331: WARNING: disabling NLS feature" >&5
+	  { echo "$as_me:12333: WARNING: disabling NLS feature" >&5
 echo "$as_me: WARNING: disabling NLS feature" >&2;}
 	  ALL_LINGUAS=
 	  CATOBJEXT=.ignored
@@ -12344,7 +12346,7 @@ echo "$as_me: WARNING: disabling NLS feature" >&2;}
       if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then
         : ;
       else
-        { echo "$as_me:12347: WARNING: found msgfmt program is not GNU msgfmt" >&5
+        { echo "$as_me:12349: WARNING: found msgfmt program is not GNU msgfmt" >&5
 echo "$as_me: WARNING: found msgfmt program is not GNU msgfmt" >&2;}
       fi
     fi
@@ -12353,7 +12355,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:12356: WARNING: found xgettext program is not GNU xgettext" >&5
+        { echo "$as_me:12358: WARNING: found xgettext program is not GNU xgettext" >&5
 echo "$as_me: WARNING: found xgettext program is not GNU xgettext" >&2;}
       fi
     fi
@@ -12381,7 +12383,7 @@ echo "$as_me: WARNING: found xgettext program is not GNU xgettext" >&2;}
 	 if test "x$ALL_LINGUAS" = "x"; then
 	   LINGUAS=
 	 else
-	   echo "$as_me:12384: checking for catalogs to be installed" >&5
+	   echo "$as_me:12386: 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
@@ -12401,7 +12403,7 @@ echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
 		 fi
 	   done
 	   LINGUAS=$NEW_LINGUAS
-	   echo "$as_me:12404: result: $LINGUAS" >&5
+	   echo "$as_me:12406: result: $LINGUAS" >&5
 echo "${ECHO_T}$LINGUAS" >&6
 	 fi
 
@@ -12436,7 +12438,7 @@ cf_makefile=makefile
 use_our_messages=no
 if test "$USE_NLS" = yes ; then
 if test -d "$srcdir/po" ; then
-echo "$as_me:12439: checking if we should use included message-library" >&5
+echo "$as_me:12441: 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.
@@ -12447,7 +12449,7 @@ else
   use_our_messages=yes
 fi;
 fi
-echo "$as_me:12450: result: $use_our_messages" >&5
+echo "$as_me:12452: result: $use_our_messages" >&5
 echo "${ECHO_T}$use_our_messages" >&6
 fi
 
@@ -12463,23 +12465,23 @@ if test "$USE_NLS" = yes ; then
 for ac_header in libintl.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:12466: checking for $ac_header" >&5
+echo "$as_me:12468: 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 12472 "configure"
+#line 12474 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:12476: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:12478: \"$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:12482: \$? = $ac_status" >&5
+  echo "$as_me:12484: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12498,7 +12500,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:12501: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:12503: 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
@@ -12543,7 +12545,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:12546: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:12548: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -12552,7 +12554,7 @@ esac
 fi
 eval NLS_DATADIR="$withval"
 
-echo "$as_me:12555: checking if you want full utility pathnames" >&5
+echo "$as_me:12557: 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.
@@ -12569,14 +12571,14 @@ else
 	with_full_paths=yes
 
 fi;
-echo "$as_me:12572: result: $with_full_paths" >&5
+echo "$as_me:12574: 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:12579: checking for system mailer" >&5
+echo "$as_me:12581: 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
@@ -12596,14 +12598,14 @@ else
 
 fi
 
-echo "$as_me:12599: result: $cf_cv_SYSTEM_MAIL" >&5
+echo "$as_me:12601: 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:12606: checking system mail flags" >&5
+echo "$as_me:12608: 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
@@ -12619,7 +12621,7 @@ else
 
 fi
 
-echo "$as_me:12622: result: $cf_cv_system_mail_flags" >&5
+echo "$as_me:12624: result: $cf_cv_system_mail_flags" >&5
 echo "${ECHO_T}$cf_cv_system_mail_flags" >&6
 
 cat >>confdefs.h <<EOF
@@ -12632,14 +12634,14 @@ if test "$with_full_paths" = no ; then
 fi
 fi
 
-echo "$as_me:12635: checking if SIGWINCH is defined" >&5
+echo "$as_me:12637: 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 12642 "configure"
+#line 12644 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -12654,23 +12656,23 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12657: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12659: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12660: \$? = $ac_status" >&5
+  echo "$as_me:12662: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12663: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12665: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12666: \$? = $ac_status" >&5
+  echo "$as_me:12668: \$? = $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 12673 "configure"
+#line 12675 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -12688,16 +12690,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12691: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12693: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12694: \$? = $ac_status" >&5
+  echo "$as_me:12696: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12697: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12699: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12700: \$? = $ac_status" >&5
+  echo "$as_me:12702: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_define_sigwinch=maybe
 else
@@ -12711,11 +12713,11 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:12714: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:12716: 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:12718: checking for actual SIGWINCH definition" >&5
+echo "$as_me:12720: 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
@@ -12726,7 +12728,7 @@ cf_sigwinch=32
 while test "$cf_sigwinch" != 1
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 12729 "configure"
+#line 12731 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -12748,16 +12750,16 @@ int x = SIGWINCH; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:12751: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12753: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12754: \$? = $ac_status" >&5
+  echo "$as_me:12756: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:12757: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12759: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12760: \$? = $ac_status" >&5
+  echo "$as_me:12762: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fixup_sigwinch=$cf_sigwinch
 	 break
@@ -12771,7 +12773,7 @@ cf_sigwinch="`expr "$cf_sigwinch" - 1`"
 done
 
 fi
-echo "$as_me:12774: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:12776: result: $cf_cv_fixup_sigwinch" >&5
 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
 
 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
@@ -12783,7 +12785,7 @@ if test -n "$TRY_CFLAGS" ; then
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:12786: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:12788: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -12868,7 +12870,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}:12871: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:12873: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -12878,7 +12880,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}:12881: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:12883: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -12888,7 +12890,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}:12891: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:12893: 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"
@@ -12897,7 +12899,7 @@ fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 12900 "configure"
+#line 12902 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -12909,16 +12911,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:12912: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12914: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12915: \$? = $ac_status" >&5
+  echo "$as_me:12917: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:12918: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12920: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12921: \$? = $ac_status" >&5
+  echo "$as_me:12923: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -12926,12 +12928,12 @@ else
 cat "conftest.$ac_ext" >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:12929: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:12931: 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}:12934: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:12936: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_cflags"
@@ -12943,7 +12945,7 @@ fi
 
 ### Look for network libraries first, since some functions (such as gethostname)
 ### are used in a lot of places.
-echo "$as_me:12946: checking if you want NSS compatible SSL libraries" >&5
+echo "$as_me:12948: 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
@@ -12958,10 +12960,10 @@ else
 fi;
 
 fi
-echo "$as_me:12961: result: $cf_cv_use_libnss_compat" >&5
+echo "$as_me:12963: result: $cf_cv_use_libnss_compat" >&5
 echo "${ECHO_T}$cf_cv_use_libnss_compat" >&6
 
-echo "$as_me:12964: checking if you want ssl library" >&5
+echo "$as_me:12966: 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
@@ -12976,10 +12978,10 @@ else
 fi;
 
 fi
-echo "$as_me:12979: result: $cf_cv_use_libssl" >&5
+echo "$as_me:12981: result: $cf_cv_use_libssl" >&5
 echo "${ECHO_T}$cf_cv_use_libssl" >&6
 
-echo "$as_me:12982: checking if you want gnutls support" >&5
+echo "$as_me:12984: 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
@@ -12994,11 +12996,11 @@ else
 fi;
 
 fi
-echo "$as_me:12997: result: $cf_cv_use_libgnutls" >&5
+echo "$as_me:12999: 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:13001: checking if you want gnutls-openssl compat" >&5
+echo "$as_me:13003: 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
@@ -13013,10 +13015,10 @@ else
 fi;
 
 fi
-echo "$as_me:13016: result: $cf_cv_gnutls_compat" >&5
+echo "$as_me:13018: result: $cf_cv_gnutls_compat" >&5
 echo "${ECHO_T}$cf_cv_gnutls_compat" >&6
 
-echo "$as_me:13019: checking if you want socks library" >&5
+echo "$as_me:13021: 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
@@ -13031,10 +13033,10 @@ else
 fi;
 
 fi
-echo "$as_me:13034: result: $cf_cv_use_libsocks" >&5
+echo "$as_me:13036: result: $cf_cv_use_libsocks" >&5
 echo "${ECHO_T}$cf_cv_use_libsocks" >&6
 
-echo "$as_me:13037: checking if you want socks5 library" >&5
+echo "$as_me:13039: 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
@@ -13049,7 +13051,7 @@ else
 fi;
 
 fi
-echo "$as_me:13052: result: $cf_cv_use_libsocks5" >&5
+echo "$as_me:13054: result: $cf_cv_use_libsocks5" >&5
 echo "${ECHO_T}$cf_cv_use_libsocks5" >&6
 
 if test "x$cf_cv_use_libsocks" != xno ; then
@@ -13089,7 +13091,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 13092 "configure"
+#line 13094 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13101,16 +13103,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13104: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13106: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13107: \$? = $ac_status" >&5
+  echo "$as_me:13109: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13110: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13112: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13113: \$? = $ac_status" >&5
+  echo "$as_me:13115: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -13127,7 +13129,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}:13130: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:13132: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -13173,7 +13175,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 13176 "configure"
+#line 13178 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13185,16 +13187,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13188: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13190: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13191: \$? = $ac_status" >&5
+  echo "$as_me:13193: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13194: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13196: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13197: \$? = $ac_status" >&5
+  echo "$as_me:13199: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -13211,7 +13213,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}:13214: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:13216: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -13229,7 +13231,7 @@ echo "${as_me:-configure}:13214: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:13232: error: cannot find socks library under $cf_cv_use_libsocks" >&5
+{ { echo "$as_me:13234: 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
@@ -13254,7 +13256,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}:13257: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:13259: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -13283,7 +13285,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}:13286: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:13288: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -13292,7 +13294,7 @@ echo "${as_me:-configure}:13286: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:13295: error: cannot find socks library under $cf_cv_use_libsocks" >&5
+{ { echo "$as_me:13297: 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
@@ -13300,7 +13302,7 @@ done
 
 	test -n "$verbose" && echo "	setting path value for socks library to $cf_cv_use_libsocks" 1>&6
 
-echo "${as_me:-configure}:13303: testing setting path value for socks library to $cf_cv_use_libsocks ..." 1>&5
+echo "${as_me:-configure}:13305: testing setting path value for socks library to $cf_cv_use_libsocks ..." 1>&5
 
 	;;
 esac
@@ -13310,12 +13312,12 @@ esac
 cf_cv_header_path_socks=
 cf_cv_library_path_socks=
 
-echo "${as_me:-configure}:13313: testing Starting FIND_LINKAGE(socks,) ..." 1>&5
+echo "${as_me:-configure}:13315: testing Starting FIND_LINKAGE(socks,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13318 "configure"
+#line 13320 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -13331,16 +13333,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13334: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13336: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13337: \$? = $ac_status" >&5
+  echo "$as_me:13339: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13340: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13342: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13343: \$? = $ac_status" >&5
+  echo "$as_me:13345: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_socks=yes
@@ -13354,7 +13356,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lsocks  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 13357 "configure"
+#line 13359 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -13370,16 +13372,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13373: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13375: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13376: \$? = $ac_status" >&5
+  echo "$as_me:13378: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13379: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13381: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13382: \$? = $ac_status" >&5
+  echo "$as_me:13384: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_socks=yes
@@ -13396,9 +13398,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for socks library" 1>&6
 
-echo "${as_me:-configure}:13399: testing find linkage for socks library ..." 1>&5
+echo "${as_me:-configure}:13401: testing find linkage for socks library ..." 1>&5
 
-echo "${as_me:-configure}:13401: testing Searching for headers in FIND_LINKAGE(socks,) ..." 1>&5
+echo "${as_me:-configure}:13403: testing Searching for headers in FIND_LINKAGE(socks,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -13489,7 +13491,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}:13492: testing ... testing $cf_cv_header_path_socks ..." 1>&5
+echo "${as_me:-configure}:13494: testing ... testing $cf_cv_header_path_socks ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -13497,7 +13499,7 @@ echo "${as_me:-configure}:13492: testing ... testing $cf_cv_header_path_socks ..
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_socks"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 13500 "configure"
+#line 13502 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -13513,21 +13515,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13516: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13518: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13519: \$? = $ac_status" >&5
+  echo "$as_me:13521: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13522: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13524: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13525: \$? = $ac_status" >&5
+  echo "$as_me:13527: \$? = $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}:13530: testing ... found socks headers in $cf_cv_header_path_socks ..." 1>&5
+echo "${as_me:-configure}:13532: testing ... found socks headers in $cf_cv_header_path_socks ..." 1>&5
 
 				cf_cv_find_linkage_socks=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -13545,7 +13547,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_socks" = maybe ; then
 
-echo "${as_me:-configure}:13548: testing Searching for socks library in FIND_LINKAGE(socks,) ..." 1>&5
+echo "${as_me:-configure}:13550: testing Searching for socks library in FIND_LINKAGE(socks,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -13620,13 +13622,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}:13623: testing ... testing $cf_cv_library_path_socks ..." 1>&5
+echo "${as_me:-configure}:13625: 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 13629 "configure"
+#line 13631 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -13642,21 +13644,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:13645: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13647: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13648: \$? = $ac_status" >&5
+  echo "$as_me:13650: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:13651: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13653: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13654: \$? = $ac_status" >&5
+  echo "$as_me:13656: \$? = $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}:13659: testing ... found socks library in $cf_cv_library_path_socks ..." 1>&5
+echo "${as_me:-configure}:13661: testing ... found socks library in $cf_cv_library_path_socks ..." 1>&5
 
 					cf_cv_find_linkage_socks=yes
 					cf_cv_library_file_socks="-lsocks"
@@ -13718,7 +13720,7 @@ if test -n "$cf_cv_header_path_socks" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 13721 "configure"
+#line 13723 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13730,16 +13732,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13733: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13735: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13736: \$? = $ac_status" >&5
+  echo "$as_me:13738: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13739: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13741: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13742: \$? = $ac_status" >&5
+  echo "$as_me:13744: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -13756,7 +13758,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}:13759: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:13761: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -13792,7 +13794,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}:13795: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:13797: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -13817,7 +13819,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:13820: WARNING: Cannot find socks library" >&5
+{ echo "$as_me:13822: WARNING: Cannot find socks library" >&5
 echo "$as_me: WARNING: Cannot find socks library" >&2;}
 fi
 
@@ -13860,7 +13862,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
   else
-    { { echo "$as_me:13863: error: cannot link with socks library" >&5
+    { { echo "$as_me:13865: error: cannot link with socks library" >&5
 echo "$as_me: error: cannot link with socks library" >&2;}
    { (exit 1); exit 1; }; }
   fi
@@ -13902,7 +13904,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 13905 "configure"
+#line 13907 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13914,16 +13916,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:13917: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13919: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13920: \$? = $ac_status" >&5
+  echo "$as_me:13922: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:13923: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13925: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13926: \$? = $ac_status" >&5
+  echo "$as_me:13928: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -13940,7 +13942,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}:13943: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:13945: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -13986,7 +13988,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 13989 "configure"
+#line 13991 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13998,16 +14000,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14001: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14003: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14004: \$? = $ac_status" >&5
+  echo "$as_me:14006: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14007: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14009: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14010: \$? = $ac_status" >&5
+  echo "$as_me:14012: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -14024,7 +14026,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}:14027: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:14029: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -14042,7 +14044,7 @@ echo "${as_me:-configure}:14027: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:14045: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5
+{ { echo "$as_me:14047: 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
@@ -14067,7 +14069,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}:14070: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:14072: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -14096,7 +14098,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}:14099: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:14101: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -14105,7 +14107,7 @@ echo "${as_me:-configure}:14099: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:14108: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5
+{ { echo "$as_me:14110: 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
@@ -14113,7 +14115,7 @@ done
 
 	test -n "$verbose" && echo "	setting path value for socks5 library to $cf_cv_use_libsocks5" 1>&6
 
-echo "${as_me:-configure}:14116: testing setting path value for socks5 library to $cf_cv_use_libsocks5 ..." 1>&5
+echo "${as_me:-configure}:14118: testing setting path value for socks5 library to $cf_cv_use_libsocks5 ..." 1>&5
 
 	;;
 esac
@@ -14142,11 +14144,11 @@ cat >>confdefs.h <<\EOF
 #define SOCKS 1
 EOF
 
-echo "$as_me:14145: checking if the socks library uses socks4 prefix" >&5
+echo "$as_me:14147: 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 14149 "configure"
+#line 14151 "configure"
 #include "confdefs.h"
 
 #include <socks.h>
@@ -14160,16 +14162,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14163: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14165: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14166: \$? = $ac_status" >&5
+  echo "$as_me:14168: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14169: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14171: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14172: \$? = $ac_status" >&5
+  echo "$as_me:14174: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 cat >>confdefs.h <<\EOF
@@ -14181,7 +14183,7 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14184 "configure"
+#line 14186 "configure"
 #include "confdefs.h"
 #include <socks.h>
 int
@@ -14193,29 +14195,29 @@ SOCKSinit((char *)0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14196: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14198: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14199: \$? = $ac_status" >&5
+  echo "$as_me:14201: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14202: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14204: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14205: \$? = $ac_status" >&5
+  echo "$as_me:14207: \$? = $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:14211: error: Cannot link with socks5 library" >&5
+{ { echo "$as_me:14213: 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:14218: result: $cf_use_socks4" >&5
+echo "$as_me:14220: result: $cf_use_socks4" >&5
 echo "${ECHO_T}$cf_use_socks4" >&6
 
 if test "$cf_use_socks4" = "yes" ; then
@@ -14270,10 +14272,10 @@ EOF
 
 fi
 
-echo "$as_me:14273: checking if socks5p.h is available" >&5
+echo "$as_me:14275: 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 14276 "configure"
+#line 14278 "configure"
 #include "confdefs.h"
 
 #define INCLUDE_PROTOTYPES
@@ -14288,16 +14290,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:14291: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14293: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14294: \$? = $ac_status" >&5
+  echo "$as_me:14296: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:14297: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14299: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14300: \$? = $ac_status" >&5
+  echo "$as_me:14302: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_use_socks5p_h=yes
 else
@@ -14306,7 +14308,7 @@ cat "conftest.$ac_ext" >&5
 cf_use_socks5p_h=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:14309: result: $cf_use_socks5p_h" >&5
+echo "$as_me:14311: result: $cf_use_socks5p_h" >&5
 echo "${ECHO_T}$cf_use_socks5p_h" >&6
 
 test "$cf_use_socks5p_h" = yes &&
@@ -14318,14 +14320,14 @@ else
 
 cf_test_netlibs=no
 
-echo "$as_me:14321: checking for network libraries" >&5
+echo "$as_me:14323: 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:14328: result: working..." >&5
+echo "$as_me:14330: result: working..." >&5
 echo "${ECHO_T}working..." >&6
 
 cf_cv_netlibs=""
@@ -14337,23 +14339,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:14340: checking for $ac_header" >&5
+echo "$as_me:14342: 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 14346 "configure"
+#line 14348 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:14350: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:14352: \"$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:14356: \$? = $ac_status" >&5
+  echo "$as_me:14358: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -14372,7 +14374,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:14375: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:14377: 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
@@ -14407,7 +14409,7 @@ done
 LIBS="$cf_add_libs"
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 14410 "configure"
+#line 14412 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_WINDOWS_H
@@ -14434,22 +14436,22 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14437: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14439: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14440: \$? = $ac_status" >&5
+  echo "$as_me:14442: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14443: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14445: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14446: \$? = $ac_status" >&5
+  echo "$as_me:14448: \$? = $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:14452: error: Cannot link against winsock library" >&5
+{ { echo "$as_me:14454: error: Cannot link against winsock library" >&5
 echo "$as_me: error: Cannot link against winsock library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -14462,13 +14464,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:14465: checking for $ac_func" >&5
+echo "$as_me:14467: 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 14471 "configure"
+#line 14473 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -14499,16 +14501,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14502: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14504: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14505: \$? = $ac_status" >&5
+  echo "$as_me:14507: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14508: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14510: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14511: \$? = $ac_status" >&5
+  echo "$as_me:14513: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -14518,7 +14520,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:14521: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:14523: 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
@@ -14527,7 +14529,7 @@ EOF
 
 else
 
-echo "$as_me:14530: checking for gethostname in -lnsl" >&5
+echo "$as_me:14532: 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
@@ -14535,7 +14537,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14538 "configure"
+#line 14540 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14554,16 +14556,16 @@ gethostname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14557: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14559: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14560: \$? = $ac_status" >&5
+  echo "$as_me:14562: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14563: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14565: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14566: \$? = $ac_status" >&5
+  echo "$as_me:14568: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_nsl_gethostname=yes
 else
@@ -14574,7 +14576,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:14577: result: $ac_cv_lib_nsl_gethostname" >&5
+echo "$as_me:14579: 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
 
@@ -14591,7 +14593,7 @@ else
 	ac_cv_func_gethostname=unknown
 	unset ac_cv_func_gethostname 2>/dev/null
 
-echo "$as_me:14594: checking for gethostname in -lsocket" >&5
+echo "$as_me:14596: 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
@@ -14599,7 +14601,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $cf_cv_netlibs $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14602 "configure"
+#line 14604 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14618,16 +14620,16 @@ gethostname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14621: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14623: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14624: \$? = $ac_status" >&5
+  echo "$as_me:14626: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14627: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14629: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14630: \$? = $ac_status" >&5
+  echo "$as_me:14632: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_socket_gethostname=yes
 else
@@ -14638,7 +14640,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:14641: result: $ac_cv_lib_socket_gethostname" >&5
+echo "$as_me:14643: 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
 
@@ -14662,7 +14664,7 @@ fi
 fi
 done
 
-	echo "$as_me:14665: checking for main in -linet" >&5
+	echo "$as_me:14667: 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
@@ -14670,7 +14672,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-linet  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14673 "configure"
+#line 14675 "configure"
 #include "confdefs.h"
 
 int
@@ -14682,16 +14684,16 @@ main ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14685: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14687: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14688: \$? = $ac_status" >&5
+  echo "$as_me:14690: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14691: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14693: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14694: \$? = $ac_status" >&5
+  echo "$as_me:14696: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_inet_main=yes
 else
@@ -14702,7 +14704,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:14705: result: $ac_cv_lib_inet_main" >&5
+echo "$as_me:14707: 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"
@@ -14713,13 +14715,13 @@ fi
 for ac_func in socket
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:14716: checking for $ac_func" >&5
+echo "$as_me:14718: 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 14722 "configure"
+#line 14724 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -14750,16 +14752,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14753: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14755: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14756: \$? = $ac_status" >&5
+  echo "$as_me:14758: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14759: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14761: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14762: \$? = $ac_status" >&5
+  echo "$as_me:14764: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -14769,7 +14771,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:14772: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:14774: 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
@@ -14778,7 +14780,7 @@ EOF
 
 else
 
-echo "$as_me:14781: checking for socket in -lsocket" >&5
+echo "$as_me:14783: 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
@@ -14786,7 +14788,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $cf_cv_netlibs $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14789 "configure"
+#line 14791 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14805,16 +14807,16 @@ socket ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14808: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14810: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14811: \$? = $ac_status" >&5
+  echo "$as_me:14813: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14814: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14816: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14817: \$? = $ac_status" >&5
+  echo "$as_me:14819: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_socket_socket=yes
 else
@@ -14825,7 +14827,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:14828: result: $ac_cv_lib_socket_socket" >&5
+echo "$as_me:14830: 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
 
@@ -14842,7 +14844,7 @@ else
 	ac_cv_func_socket=unknown
 	unset ac_cv_func_socket 2>/dev/null
 
-echo "$as_me:14845: checking for socket in -lbsd" >&5
+echo "$as_me:14847: 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
@@ -14850,7 +14852,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd $cf_cv_netlibs $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14853 "configure"
+#line 14855 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14869,16 +14871,16 @@ socket ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14872: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14874: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14875: \$? = $ac_status" >&5
+  echo "$as_me:14877: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14878: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14880: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14881: \$? = $ac_status" >&5
+  echo "$as_me:14883: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_socket=yes
 else
@@ -14889,7 +14891,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:14892: result: $ac_cv_lib_bsd_socket" >&5
+echo "$as_me:14894: 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
 
@@ -14918,13 +14920,13 @@ done
 for ac_func in gethostbyname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:14921: checking for $ac_func" >&5
+echo "$as_me:14923: 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 14927 "configure"
+#line 14929 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -14955,16 +14957,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:14958: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14960: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14961: \$? = $ac_status" >&5
+  echo "$as_me:14963: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:14964: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14966: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14967: \$? = $ac_status" >&5
+  echo "$as_me:14969: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -14974,7 +14976,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:14977: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:14979: 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
@@ -14983,7 +14985,7 @@ EOF
 
 else
 
-echo "$as_me:14986: checking for gethostbyname in -lnsl" >&5
+echo "$as_me:14988: 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
@@ -14991,7 +14993,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 14994 "configure"
+#line 14996 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15010,16 +15012,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15013: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15015: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15016: \$? = $ac_status" >&5
+  echo "$as_me:15018: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15019: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15021: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15022: \$? = $ac_status" >&5
+  echo "$as_me:15024: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -15030,7 +15032,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15033: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:15035: 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
 
@@ -15055,13 +15057,13 @@ done
 for ac_func in inet_ntoa
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:15058: checking for $ac_func" >&5
+echo "$as_me:15060: 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 15064 "configure"
+#line 15066 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15092,16 +15094,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15095: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15097: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15098: \$? = $ac_status" >&5
+  echo "$as_me:15100: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15101: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15103: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15104: \$? = $ac_status" >&5
+  echo "$as_me:15106: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -15111,7 +15113,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15114: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:15116: 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
@@ -15120,7 +15122,7 @@ EOF
 
 else
 
-echo "$as_me:15123: checking for inet_ntoa in -lnsl" >&5
+echo "$as_me:15125: 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
@@ -15128,7 +15130,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15131 "configure"
+#line 15133 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15147,16 +15149,16 @@ inet_ntoa ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15150: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15152: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15153: \$? = $ac_status" >&5
+  echo "$as_me:15155: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15156: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15158: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15159: \$? = $ac_status" >&5
+  echo "$as_me:15161: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_nsl_inet_ntoa=yes
 else
@@ -15167,7 +15169,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15170: result: $ac_cv_lib_nsl_inet_ntoa" >&5
+echo "$as_me:15172: 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
 
@@ -15192,13 +15194,13 @@ done
 for ac_func in gethostbyname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:15195: checking for $ac_func" >&5
+echo "$as_me:15197: 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 15201 "configure"
+#line 15203 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15229,16 +15231,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15232: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15234: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15235: \$? = $ac_status" >&5
+  echo "$as_me:15237: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15238: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15240: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15241: \$? = $ac_status" >&5
+  echo "$as_me:15243: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -15248,7 +15250,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15251: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:15253: 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
@@ -15257,7 +15259,7 @@ EOF
 
 else
 
-echo "$as_me:15260: checking for gethostbyname in -lnetwork" >&5
+echo "$as_me:15262: 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
@@ -15265,7 +15267,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnetwork $cf_cv_netlibs $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15268 "configure"
+#line 15270 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15284,16 +15286,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15287: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15289: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15290: \$? = $ac_status" >&5
+  echo "$as_me:15292: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15293: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15295: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15296: \$? = $ac_status" >&5
+  echo "$as_me:15298: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_network_gethostbyname=yes
 else
@@ -15304,7 +15306,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15307: result: $ac_cv_lib_network_gethostbyname" >&5
+echo "$as_me:15309: 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
 
@@ -15329,13 +15331,13 @@ done
 for ac_func in strcasecmp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:15332: checking for $ac_func" >&5
+echo "$as_me:15334: 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 15338 "configure"
+#line 15340 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -15366,16 +15368,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15369: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15371: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15372: \$? = $ac_status" >&5
+  echo "$as_me:15374: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15375: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15377: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15378: \$? = $ac_status" >&5
+  echo "$as_me:15380: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -15385,7 +15387,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15388: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:15390: 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
@@ -15394,7 +15396,7 @@ EOF
 
 else
 
-echo "$as_me:15397: checking for strcasecmp in -lresolv" >&5
+echo "$as_me:15399: 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
@@ -15402,7 +15404,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv $cf_cv_netlibs $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 15405 "configure"
+#line 15407 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15421,16 +15423,16 @@ strcasecmp ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15424: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15426: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15427: \$? = $ac_status" >&5
+  echo "$as_me:15429: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15430: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15432: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15433: \$? = $ac_status" >&5
+  echo "$as_me:15435: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_resolv_strcasecmp=yes
 else
@@ -15441,7 +15443,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15444: result: $ac_cv_lib_resolv_strcasecmp" >&5
+echo "$as_me:15446: 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
 
@@ -15498,14 +15500,14 @@ test "$cf_test_netlibs" = no && echo "$cf_cv_netlibs" >&6
 
 fi
 
-echo "$as_me:15501: checking for inet_aton function" >&5
+echo "$as_me:15503: 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 15508 "configure"
+#line 15510 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -15541,16 +15543,16 @@ inet_aton(0, (struct in_addr *)0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15544: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15546: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15547: \$? = $ac_status" >&5
+  echo "$as_me:15549: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15550: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15552: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15553: \$? = $ac_status" >&5
+  echo "$as_me:15555: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_inet_aton=yes
 else
@@ -15560,7 +15562,7 @@ cf_cv_have_inet_aton=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15563: result: $cf_cv_have_inet_aton" >&5
+echo "$as_me:15565: 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
 
@@ -15569,14 +15571,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-    echo "$as_me:15572: checking for inet_addr function" >&5
+    echo "$as_me:15574: 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 15579 "configure"
+#line 15581 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -15612,16 +15614,16 @@ inet_addr(0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15615: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15617: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15618: \$? = $ac_status" >&5
+  echo "$as_me:15620: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15621: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15623: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15624: \$? = $ac_status" >&5
+  echo "$as_me:15626: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_inet_addr=yes
 else
@@ -15631,10 +15633,10 @@ cf_cv_have_inet_addr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:15634: result: $cf_cv_have_inet_addr" >&5
+echo "$as_me:15636: 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:15637: checking for library with inet_addr" >&5
+	echo "$as_me:15639: 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
@@ -15645,7 +15647,7 @@ else
 	    do
 		LIBS="$cf_save_LIBS $cf_inetlib"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 15648 "configure"
+#line 15650 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -15661,16 +15663,16 @@ inet_addr(0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:15664: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15666: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15667: \$? = $ac_status" >&5
+  echo "$as_me:15669: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:15670: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15672: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15673: \$? = $ac_status" >&5
+  echo "$as_me:15675: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_lib_inet_addr=$cf_inetlib
 else
@@ -15684,7 +15686,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 	    done
 
 fi
-echo "$as_me:15687: result: $cf_cv_lib_inet_addr" >&5
+echo "$as_me:15689: 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
 
@@ -15705,13 +15707,13 @@ done
 LIBS="$cf_add_libs"
 
 	else
-	    { echo "$as_me:15708: WARNING: Unable to find library for inet_addr function" >&5
+	    { echo "$as_me:15710: 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:15714: checking if you want to use pkg-config" >&5
+echo "$as_me:15716: 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.
@@ -15721,7 +15723,7 @@ if test "${with_pkg_config+set}" = set; then
 else
   cf_pkg_config=yes
 fi;
-echo "$as_me:15724: result: $cf_pkg_config" >&5
+echo "$as_me:15726: result: $cf_pkg_config" >&5
 echo "${ECHO_T}$cf_pkg_config" >&6
 
 case "$cf_pkg_config" in
@@ -15733,7 +15735,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:15736: checking for $ac_word" >&5
+echo "$as_me:15738: 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
@@ -15750,7 +15752,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:15753: found $ac_dir/$ac_word" >&5
+   echo "$as_me:15755: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -15761,10 +15763,10 @@ fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:15764: result: $PKG_CONFIG" >&5
+  echo "$as_me:15766: result: $PKG_CONFIG" >&5
 echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  echo "$as_me:15767: result: no" >&5
+  echo "$as_me:15769: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -15773,7 +15775,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:15776: checking for $ac_word" >&5
+echo "$as_me:15778: 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
@@ -15790,7 +15792,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:15793: found $ac_dir/$ac_word" >&5
+   echo "$as_me:15795: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -15802,10 +15804,10 @@ fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 
 if test -n "$ac_pt_PKG_CONFIG"; then
-  echo "$as_me:15805: result: $ac_pt_PKG_CONFIG" >&5
+  echo "$as_me:15807: result: $ac_pt_PKG_CONFIG" >&5
 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
 else
-  echo "$as_me:15808: result: no" >&5
+  echo "$as_me:15810: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -15848,14 +15850,14 @@ case ".$PKG_CONFIG" in
 	PKG_CONFIG=`echo "$PKG_CONFIG" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:15851: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+	{ { echo "$as_me:15853: 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:15858: WARNING: pkg-config is not installed" >&5
+	{ echo "$as_me:15860: WARNING: pkg-config is not installed" >&5
 echo "$as_me: WARNING: pkg-config is not installed" >&2;}
 fi
 
@@ -15901,7 +15903,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 15904 "configure"
+#line 15906 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -15913,16 +15915,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:15916: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15918: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15919: \$? = $ac_status" >&5
+  echo "$as_me:15921: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:15922: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15924: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15925: \$? = $ac_status" >&5
+  echo "$as_me:15927: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -15939,7 +15941,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}:15942: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:15944: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -15985,7 +15987,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 15988 "configure"
+#line 15990 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -15997,16 +15999,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16000: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16002: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16003: \$? = $ac_status" >&5
+  echo "$as_me:16005: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16006: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16008: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16009: \$? = $ac_status" >&5
+  echo "$as_me:16011: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -16023,7 +16025,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}:16026: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:16028: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -16041,7 +16043,7 @@ echo "${as_me:-configure}:16026: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:16044: error: cannot find ssl library under $cf_cv_use_libssl" >&5
+{ { echo "$as_me:16046: 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
@@ -16066,7 +16068,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}:16069: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:16071: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -16095,7 +16097,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}:16098: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:16100: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -16104,7 +16106,7 @@ echo "${as_me:-configure}:16098: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:16107: error: cannot find ssl library under $cf_cv_use_libssl" >&5
+{ { echo "$as_me:16109: 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
@@ -16112,7 +16114,7 @@ done
 
 	test -n "$verbose" && echo "	setting path value for ssl library to $cf_cv_use_libssl" 1>&6
 
-echo "${as_me:-configure}:16115: testing setting path value for ssl library to $cf_cv_use_libssl ..." 1>&5
+echo "${as_me:-configure}:16117: testing setting path value for ssl library to $cf_cv_use_libssl ..." 1>&5
 
 	;;
 esac
@@ -16125,15 +16127,15 @@ esac
 			cf_cv_pkg_ssl=
 			for cf_try_package in openssl libssl
 			do
-				echo "$as_me:16128: checking pkg-config for $cf_try_package" >&5
+				echo "$as_me:16130: 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:16132: result: yes" >&5
+					echo "$as_me:16134: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 					break
 				else
-					echo "$as_me:16136: result: no" >&5
+					echo "$as_me:16138: result: no" >&5
 echo "${ECHO_T}no" >&6
 				fi
 			done
@@ -16277,7 +16279,7 @@ fi
 					esac
 					test -n "$verbose" && echo "	adding $cf_libs_ssl to LIBS" 1>&6
 
-echo "${as_me:-configure}:16280: testing adding $cf_libs_ssl to LIBS ..." 1>&5
+echo "${as_me:-configure}:16282: testing adding $cf_libs_ssl to LIBS ..." 1>&5
 
 cf_add_libs="$LIBS"
 # reverse order
@@ -16313,7 +16315,7 @@ LIBS="$cf_add_libs"
 			(*-ldl)
 				;;
 			(*)
-				echo "$as_me:16316: checking for dlsym in -ldl" >&5
+				echo "$as_me:16318: 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
@@ -16321,7 +16323,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16324 "configure"
+#line 16326 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16340,16 +16342,16 @@ dlsym ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16343: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16345: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16346: \$? = $ac_status" >&5
+  echo "$as_me:16348: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16349: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16351: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16352: \$? = $ac_status" >&5
+  echo "$as_me:16354: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dl_dlsym=yes
 else
@@ -16360,7 +16362,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16363: result: $ac_cv_lib_dl_dlsym" >&5
+echo "$as_me:16365: 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"
@@ -16376,12 +16378,12 @@ fi
 cf_cv_header_path_ssl=
 cf_cv_library_path_ssl=
 
-echo "${as_me:-configure}:16379: testing Starting FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me:-configure}:16381: testing Starting FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16384 "configure"
+#line 16386 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16410,16 +16412,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16413: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16415: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16416: \$? = $ac_status" >&5
+  echo "$as_me:16418: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16419: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16421: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16422: \$? = $ac_status" >&5
+  echo "$as_me:16424: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_ssl=yes
@@ -16433,7 +16435,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lssl $cf_extra_ssl_libs $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 16436 "configure"
+#line 16438 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16462,16 +16464,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16465: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16467: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16468: \$? = $ac_status" >&5
+  echo "$as_me:16470: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16471: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16473: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16474: \$? = $ac_status" >&5
+  echo "$as_me:16476: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_ssl=yes
@@ -16488,9 +16490,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for ssl library" 1>&6
 
-echo "${as_me:-configure}:16491: testing find linkage for ssl library ..." 1>&5
+echo "${as_me:-configure}:16493: testing find linkage for ssl library ..." 1>&5
 
-echo "${as_me:-configure}:16493: testing Searching for headers in FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me:-configure}:16495: testing Searching for headers in FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -16581,7 +16583,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}:16584: testing ... testing $cf_cv_header_path_ssl ..." 1>&5
+echo "${as_me:-configure}:16586: testing ... testing $cf_cv_header_path_ssl ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -16589,7 +16591,7 @@ echo "${as_me:-configure}:16584: testing ... testing $cf_cv_header_path_ssl ..."
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_ssl"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 16592 "configure"
+#line 16594 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16618,21 +16620,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16621: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16623: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16624: \$? = $ac_status" >&5
+  echo "$as_me:16626: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16627: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16629: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16630: \$? = $ac_status" >&5
+  echo "$as_me:16632: \$? = $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}:16635: testing ... found ssl headers in $cf_cv_header_path_ssl ..." 1>&5
+echo "${as_me:-configure}:16637: testing ... found ssl headers in $cf_cv_header_path_ssl ..." 1>&5
 
 				cf_cv_find_linkage_ssl=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -16650,7 +16652,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_ssl" = maybe ; then
 
-echo "${as_me:-configure}:16653: testing Searching for ssl library in FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me:-configure}:16655: testing Searching for ssl library in FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -16658,7 +16660,7 @@ echo "${as_me:-configure}:16653: 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 16661 "configure"
+#line 16663 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16687,21 +16689,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16690: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16692: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16693: \$? = $ac_status" >&5
+  echo "$as_me:16695: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16696: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16698: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16699: \$? = $ac_status" >&5
+  echo "$as_me:16701: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			test -n "$verbose" && echo "	... found ssl library in system" 1>&6
 
-echo "${as_me:-configure}:16704: testing ... found ssl library in system ..." 1>&5
+echo "${as_me:-configure}:16706: testing ... found ssl library in system ..." 1>&5
 
 			cf_cv_find_linkage_ssl=yes
 else
@@ -16782,13 +16784,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}:16785: testing ... testing $cf_cv_library_path_ssl ..." 1>&5
+echo "${as_me:-configure}:16787: 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 16791 "configure"
+#line 16793 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16817,21 +16819,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:16820: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16822: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16823: \$? = $ac_status" >&5
+  echo "$as_me:16825: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:16826: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16828: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16829: \$? = $ac_status" >&5
+  echo "$as_me:16831: \$? = $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}:16834: testing ... found ssl library in $cf_cv_library_path_ssl ..." 1>&5
+echo "${as_me:-configure}:16836: testing ... found ssl library in $cf_cv_library_path_ssl ..." 1>&5
 
 					cf_cv_find_linkage_ssl=yes
 					cf_cv_library_file_ssl="-lssl"
@@ -16893,7 +16895,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}:16896: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:16898: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -16952,7 +16954,7 @@ if test -n "$cf_cv_header_path_ssl" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 16955 "configure"
+#line 16957 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -16964,16 +16966,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:16967: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16969: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16970: \$? = $ac_status" >&5
+  echo "$as_me:16972: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:16973: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16975: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16976: \$? = $ac_status" >&5
+  echo "$as_me:16978: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -16990,7 +16992,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}:16993: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:16995: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -17023,7 +17025,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}:17026: testing checking ssl header-path $cf_cv_header_path_ssl ..." 1>&5
+echo "${as_me:-configure}:17028: testing checking ssl header-path $cf_cv_header_path_ssl ..." 1>&5
 
 			case "$cf_cv_header_path_ssl" in
 			(*/openssl)
@@ -17036,10 +17038,10 @@ EOF
 			esac
 		fi
 
-echo "$as_me:17039: checking for X509 support" >&5
+echo "$as_me:17041: checking for X509 support" >&5
 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17042 "configure"
+#line 17044 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17068,16 +17070,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:17071: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17073: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17074: \$? = $ac_status" >&5
+  echo "$as_me:17076: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17077: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17079: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17080: \$? = $ac_status" >&5
+  echo "$as_me:17082: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_x509_support=yes
 else
@@ -17086,7 +17088,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:17089: result: $cf_x509_support" >&5
+echo "$as_me:17091: result: $cf_x509_support" >&5
 echo "${ECHO_T}$cf_x509_support" >&6
 
 if test "$cf_x509_support" = yes ; then
@@ -17139,7 +17141,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 17142 "configure"
+#line 17144 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -17151,16 +17153,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17154: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17156: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17157: \$? = $ac_status" >&5
+  echo "$as_me:17159: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17160: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17162: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17163: \$? = $ac_status" >&5
+  echo "$as_me:17165: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -17177,7 +17179,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}:17180: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:17182: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -17223,7 +17225,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 17226 "configure"
+#line 17228 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -17235,16 +17237,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17238: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17240: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17241: \$? = $ac_status" >&5
+  echo "$as_me:17243: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17244: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17246: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17247: \$? = $ac_status" >&5
+  echo "$as_me:17249: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -17261,7 +17263,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}:17264: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:17266: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -17279,7 +17281,7 @@ echo "${as_me:-configure}:17264: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:17282: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:17284: 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
@@ -17304,7 +17306,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}:17307: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:17309: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -17333,7 +17335,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}:17336: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:17338: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -17342,7 +17344,7 @@ echo "${as_me:-configure}:17336: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:17345: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:17347: 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
@@ -17350,7 +17352,7 @@ done
 
 	test -n "$verbose" && echo "	setting path value for ssl library to $cf_cv_use_libgnutls" 1>&6
 
-echo "${as_me:-configure}:17353: testing setting path value for ssl library to $cf_cv_use_libgnutls ..." 1>&5
+echo "${as_me:-configure}:17355: testing setting path value for ssl library to $cf_cv_use_libgnutls ..." 1>&5
 
 	;;
 esac
@@ -17364,12 +17366,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}:17367: testing checking pkg-config for $cf_pkg_gnutls ..." 1>&5
+echo "${as_me:-configure}:17369: 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}:17372: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:17374: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_cv_have_gnutls=yes
 				cf_cv_pkg_config_ssl=yes
@@ -17501,7 +17503,7 @@ fi
 					esac
 					test -n "$verbose" && echo "	adding $cf_libs_ssl to LIBS" 1>&6
 
-echo "${as_me:-configure}:17504: testing adding $cf_libs_ssl to LIBS ..." 1>&5
+echo "${as_me:-configure}:17506: testing adding $cf_libs_ssl to LIBS ..." 1>&5
 
 cf_add_libs="$LIBS"
 # reverse order
@@ -17523,7 +17525,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}:17526: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:17528: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_pkg_gnutls=none
 			fi
@@ -17543,12 +17545,12 @@ EOF
 cf_cv_header_path_gnutls=
 cf_cv_library_path_gnutls=
 
-echo "${as_me:-configure}:17546: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:17548: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17551 "configure"
+#line 17553 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17577,16 +17579,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17580: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17582: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17583: \$? = $ac_status" >&5
+  echo "$as_me:17585: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17586: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17588: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17589: \$? = $ac_status" >&5
+  echo "$as_me:17591: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -17600,7 +17602,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lgnutls  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 17603 "configure"
+#line 17605 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17629,16 +17631,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17632: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17634: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17635: \$? = $ac_status" >&5
+  echo "$as_me:17637: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17638: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17640: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17641: \$? = $ac_status" >&5
+  echo "$as_me:17643: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -17655,9 +17657,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for gnutls library" 1>&6
 
-echo "${as_me:-configure}:17658: testing find linkage for gnutls library ..." 1>&5
+echo "${as_me:-configure}:17660: testing find linkage for gnutls library ..." 1>&5
 
-echo "${as_me:-configure}:17660: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:17662: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -17748,7 +17750,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}:17751: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:17753: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -17756,7 +17758,7 @@ echo "${as_me:-configure}:17751: testing ... testing $cf_cv_header_path_gnutls .
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_gnutls"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 17759 "configure"
+#line 17761 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17785,21 +17787,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:17788: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17790: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17791: \$? = $ac_status" >&5
+  echo "$as_me:17793: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:17794: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17796: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17797: \$? = $ac_status" >&5
+  echo "$as_me:17799: \$? = $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}:17802: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:17804: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
 
 				cf_cv_find_linkage_gnutls=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -17817,7 +17819,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_gnutls" = maybe ; then
 
-echo "${as_me:-configure}:17820: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:17822: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -17892,13 +17894,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}:17895: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:17897: 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 17901 "configure"
+#line 17903 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17927,21 +17929,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:17930: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17932: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17933: \$? = $ac_status" >&5
+  echo "$as_me:17935: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:17936: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17938: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17939: \$? = $ac_status" >&5
+  echo "$as_me:17941: \$? = $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}:17944: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:17946: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
 
 					cf_cv_find_linkage_gnutls=yes
 					cf_cv_library_file_gnutls="-lgnutls"
@@ -18021,7 +18023,7 @@ if test -n "$cf_cv_header_path_gnutls" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 18024 "configure"
+#line 18026 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -18033,16 +18035,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18036: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18038: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18039: \$? = $ac_status" >&5
+  echo "$as_me:18041: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18042: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18044: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18045: \$? = $ac_status" >&5
+  echo "$as_me:18047: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -18059,7 +18061,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}:18062: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:18064: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -18100,7 +18102,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}:18103: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:18105: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -18129,13 +18131,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:18132: checking for $ac_func" >&5
+echo "$as_me:18134: 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 18138 "configure"
+#line 18140 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18166,16 +18168,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18169: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18171: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18172: \$? = $ac_status" >&5
+  echo "$as_me:18174: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18175: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18177: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18178: \$? = $ac_status" >&5
+  echo "$as_me:18180: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -18185,7 +18187,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18188: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:18190: 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
@@ -18195,13 +18197,13 @@ EOF
 fi
 done
 
-		echo "$as_me:18198: checking for gnutls_rnd" >&5
+		echo "$as_me:18200: 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 18204 "configure"
+#line 18206 "configure"
 #include "confdefs.h"
 #define gnutls_rnd autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -18232,16 +18234,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18235: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18237: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18238: \$? = $ac_status" >&5
+  echo "$as_me:18240: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18241: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18243: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18244: \$? = $ac_status" >&5
+  echo "$as_me:18246: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gnutls_rnd=yes
 else
@@ -18251,7 +18253,7 @@ ac_cv_func_gnutls_rnd=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:18254: result: $ac_cv_func_gnutls_rnd" >&5
+echo "$as_me:18256: 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
 
@@ -18281,10 +18283,10 @@ fi
 
 		EXTRA_OBJS="$EXTRA_OBJS tidy_tls\$o"
 
-echo "$as_me:18284: checking for X509 support" >&5
+echo "$as_me:18286: checking for X509 support" >&5
 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18287 "configure"
+#line 18289 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -18313,16 +18315,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:18316: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18318: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18319: \$? = $ac_status" >&5
+  echo "$as_me:18321: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18322: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18324: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18325: \$? = $ac_status" >&5
+  echo "$as_me:18327: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_x509_support=yes
 else
@@ -18331,7 +18333,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:18334: result: $cf_x509_support" >&5
+echo "$as_me:18336: result: $cf_x509_support" >&5
 echo "${ECHO_T}$cf_x509_support" >&6
 
 if test "$cf_x509_support" = yes ; then
@@ -18383,7 +18385,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 18386 "configure"
+#line 18388 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -18395,16 +18397,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18398: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18400: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18401: \$? = $ac_status" >&5
+  echo "$as_me:18403: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18404: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18406: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18407: \$? = $ac_status" >&5
+  echo "$as_me:18409: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -18421,7 +18423,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}:18424: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:18426: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -18467,7 +18469,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 18470 "configure"
+#line 18472 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -18479,16 +18481,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:18482: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18484: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18485: \$? = $ac_status" >&5
+  echo "$as_me:18487: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:18488: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18490: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18491: \$? = $ac_status" >&5
+  echo "$as_me:18493: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -18505,7 +18507,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}:18508: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:18510: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -18523,7 +18525,7 @@ echo "${as_me:-configure}:18508: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:18526: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:18528: 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
@@ -18548,7 +18550,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}:18551: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:18553: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -18577,7 +18579,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}:18580: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:18582: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -18586,7 +18588,7 @@ echo "${as_me:-configure}:18580: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:18589: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:18591: 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
@@ -18594,7 +18596,7 @@ done
 
 	test -n "$verbose" && echo "	setting path value for ssl library to $cf_cv_use_libgnutls" 1>&6
 
-echo "${as_me:-configure}:18597: testing setting path value for ssl library to $cf_cv_use_libgnutls ..." 1>&5
+echo "${as_me:-configure}:18599: testing setting path value for ssl library to $cf_cv_use_libgnutls ..." 1>&5
 
 	;;
 esac
@@ -18608,12 +18610,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}:18611: testing checking pkg-config for $cf_pkg_gnutls ..." 1>&5
+echo "${as_me:-configure}:18613: 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}:18616: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:18618: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_cv_have_gnutls=yes
 				cf_cv_pkg_config_ssl=yes
@@ -18745,7 +18747,7 @@ fi
 					esac
 					test -n "$verbose" && echo "	adding $cf_libs_ssl to LIBS" 1>&6
 
-echo "${as_me:-configure}:18748: testing adding $cf_libs_ssl to LIBS ..." 1>&5
+echo "${as_me:-configure}:18750: testing adding $cf_libs_ssl to LIBS ..." 1>&5
 
 cf_add_libs="$LIBS"
 # reverse order
@@ -18767,7 +18769,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}:18770: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:18772: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_pkg_gnutls=none
 			fi
@@ -18787,12 +18789,12 @@ EOF
 cf_cv_header_path_gnutls=
 cf_cv_library_path_gnutls=
 
-echo "${as_me:-configure}:18790: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:18792: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18795 "configure"
+#line 18797 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -18821,16 +18823,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18824: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18826: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18827: \$? = $ac_status" >&5
+  echo "$as_me:18829: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18830: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18832: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18833: \$? = $ac_status" >&5
+  echo "$as_me:18835: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -18844,7 +18846,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lgnutls -lgnutls-openssl $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 18847 "configure"
+#line 18849 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -18873,16 +18875,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:18876: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18878: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18879: \$? = $ac_status" >&5
+  echo "$as_me:18881: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:18882: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18884: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18885: \$? = $ac_status" >&5
+  echo "$as_me:18887: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -18899,9 +18901,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for gnutls library" 1>&6
 
-echo "${as_me:-configure}:18902: testing find linkage for gnutls library ..." 1>&5
+echo "${as_me:-configure}:18904: testing find linkage for gnutls library ..." 1>&5
 
-echo "${as_me:-configure}:18904: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:18906: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -18992,7 +18994,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}:18995: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:18997: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -19000,7 +19002,7 @@ echo "${as_me:-configure}:18995: testing ... testing $cf_cv_header_path_gnutls .
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_gnutls"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 19003 "configure"
+#line 19005 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -19029,21 +19031,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19032: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19034: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19035: \$? = $ac_status" >&5
+  echo "$as_me:19037: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19038: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19040: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19041: \$? = $ac_status" >&5
+  echo "$as_me:19043: \$? = $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}:19046: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:19048: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
 
 				cf_cv_find_linkage_gnutls=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -19061,7 +19063,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_gnutls" = maybe ; then
 
-echo "${as_me:-configure}:19064: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:19066: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -19136,13 +19138,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}:19139: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:19141: 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 19145 "configure"
+#line 19147 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -19171,21 +19173,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19174: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19176: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19177: \$? = $ac_status" >&5
+  echo "$as_me:19179: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19180: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19182: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19183: \$? = $ac_status" >&5
+  echo "$as_me:19185: \$? = $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}:19188: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:19190: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
 
 					cf_cv_find_linkage_gnutls=yes
 					cf_cv_library_file_gnutls="-lgnutls"
@@ -19265,7 +19267,7 @@ if test -n "$cf_cv_header_path_gnutls" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 19268 "configure"
+#line 19270 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -19277,16 +19279,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19280: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19282: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19283: \$? = $ac_status" >&5
+  echo "$as_me:19285: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19286: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19288: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19289: \$? = $ac_status" >&5
+  echo "$as_me:19291: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -19303,7 +19305,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}:19306: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:19308: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -19344,7 +19346,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}:19347: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:19349: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -19373,13 +19375,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:19376: checking for $ac_func" >&5
+echo "$as_me:19378: 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 19382 "configure"
+#line 19384 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -19410,16 +19412,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19413: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19415: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19416: \$? = $ac_status" >&5
+  echo "$as_me:19418: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19419: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19421: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19422: \$? = $ac_status" >&5
+  echo "$as_me:19424: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -19429,7 +19431,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19432: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:19434: 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
@@ -19439,13 +19441,13 @@ EOF
 fi
 done
 
-		echo "$as_me:19442: checking for gnutls_rnd" >&5
+		echo "$as_me:19444: 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 19448 "configure"
+#line 19450 "configure"
 #include "confdefs.h"
 #define gnutls_rnd autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -19476,16 +19478,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19479: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19481: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19482: \$? = $ac_status" >&5
+  echo "$as_me:19484: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19485: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19487: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19488: \$? = $ac_status" >&5
+  echo "$as_me:19490: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_gnutls_rnd=yes
 else
@@ -19495,7 +19497,7 @@ ac_cv_func_gnutls_rnd=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:19498: result: $ac_cv_func_gnutls_rnd" >&5
+echo "$as_me:19500: 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
 
@@ -19524,7 +19526,7 @@ LIBS="$cf_add_libs"
 fi
 
 		if test "$cf_pkg_gnutls" = none ; then
-				echo "$as_me:19527: checking for SSL_connect in -lgnutls-openssl" >&5
+				echo "$as_me:19529: 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
@@ -19532,7 +19534,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnutls-openssl  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19535 "configure"
+#line 19537 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19551,16 +19553,16 @@ SSL_connect ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19554: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19556: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19557: \$? = $ac_status" >&5
+  echo "$as_me:19559: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19560: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19562: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19563: \$? = $ac_status" >&5
+  echo "$as_me:19565: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gnutls_openssl_SSL_connect=yes
 else
@@ -19571,7 +19573,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19574: result: $ac_cv_lib_gnutls_openssl_SSL_connect" >&5
+echo "$as_me:19576: 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
 
@@ -19592,7 +19594,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-  echo "$as_me:19595: checking for SSL_connect in -lgnutls-extra" >&5
+  echo "$as_me:19597: 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
@@ -19600,7 +19602,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnutls-extra  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19603 "configure"
+#line 19605 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19619,16 +19621,16 @@ SSL_connect ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19622: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19624: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19625: \$? = $ac_status" >&5
+  echo "$as_me:19627: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19628: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19630: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19631: \$? = $ac_status" >&5
+  echo "$as_me:19633: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gnutls_extra_SSL_connect=yes
 else
@@ -19639,7 +19641,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19642: result: $ac_cv_lib_gnutls_extra_SSL_connect" >&5
+echo "$as_me:19644: 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
 
@@ -19660,7 +19662,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-  { { echo "$as_me:19663: error: cannot find gnutls openssl functions" >&5
+  { { echo "$as_me:19665: error: cannot find gnutls openssl functions" >&5
 echo "$as_me: error: cannot find gnutls openssl functions" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -19669,10 +19671,10 @@ fi
 
 			fi
 
-echo "$as_me:19672: checking for X509 support" >&5
+echo "$as_me:19674: checking for X509 support" >&5
 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19675 "configure"
+#line 19677 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -19701,16 +19703,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:19704: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19706: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19707: \$? = $ac_status" >&5
+  echo "$as_me:19709: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19710: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19712: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19713: \$? = $ac_status" >&5
+  echo "$as_me:19715: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_x509_support=yes
 else
@@ -19719,7 +19721,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:19722: result: $cf_x509_support" >&5
+echo "$as_me:19724: result: $cf_x509_support" >&5
 echo "${ECHO_T}$cf_x509_support" >&6
 
 if test "$cf_x509_support" = yes ; then
@@ -19751,7 +19753,7 @@ case "$cf_cv_use_libnss_compat" in
 	;;
 (yes)
 
-echo "$as_me:19754: checking for SSL_get_version in -lnss_compat_ossl" >&5
+echo "$as_me:19756: 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
@@ -19759,7 +19761,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnss_compat_ossl -lnss_compat_ossl $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 19762 "configure"
+#line 19764 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19778,16 +19780,16 @@ SSL_get_version ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:19781: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19783: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19784: \$? = $ac_status" >&5
+  echo "$as_me:19786: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:19787: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19789: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19790: \$? = $ac_status" >&5
+  echo "$as_me:19792: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_nss_compat_ossl_SSL_get_version=yes
 else
@@ -19798,7 +19800,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19801: result: $ac_cv_lib_nss_compat_ossl_SSL_get_version" >&5
+echo "$as_me:19803: 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
@@ -19813,11 +19815,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}:19816: testing assume it is in $cf_ssl_root ..." 1>&5
+echo "${as_me:-configure}:19818: 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:19820: error: cannot find NSS compliant libraries" >&5
+			{ { echo "$as_me:19822: error: cannot find NSS compliant libraries" >&5
 echo "$as_me: error: cannot find NSS compliant libraries" >&2;}
    { (exit 1); exit 1; }; }
 		fi
@@ -19832,13 +19834,13 @@ fi
 		elif test -d "$cf_cv_use_libnss_compat/../include" ; then
 			cf_ssl_root=$cf_cv_use_libnss_compat/..
 		else
-			{ { echo "$as_me:19835: error: cannot find NSS compliant library under $cf_cv_use_libnss_compat" >&5
+			{ { echo "$as_me:19837: 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:19841: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&5
+		{ echo "$as_me:19843: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&5
 echo "$as_me: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&2;}
 	fi
 	;;
@@ -19967,10 +19969,10 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 if test "$cf_ssl_subincs" = yes ; then
-echo "$as_me:19970: checking for NSS compliant include directory" >&5
+echo "$as_me:19972: 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 19973 "configure"
+#line 19975 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -19984,16 +19986,16 @@ SSL_shutdown((SSL *)0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:19987: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19989: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19990: \$? = $ac_status" >&5
+  echo "$as_me:19992: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:19993: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19995: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19996: \$? = $ac_status" >&5
+  echo "$as_me:19998: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_ssl_incl=yes
 else
@@ -20002,7 +20004,7 @@ cat "conftest.$ac_ext" >&5
 cf_ssl_incl=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:20005: result: $cf_ssl_incl" >&5
+echo "$as_me:20007: result: $cf_ssl_incl" >&5
 echo "${ECHO_T}$cf_ssl_incl" >&6
 test "$cf_ssl_incl" = yes &&
 cat >>confdefs.h <<\EOF
@@ -20011,10 +20013,10 @@ EOF
 
 fi
 
-echo "$as_me:20014: checking if we can link to NSS compliant library" >&5
+echo "$as_me:20016: 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 20017 "configure"
+#line 20019 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -20033,16 +20035,16 @@ SSL_shutdown((SSL *)0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20036: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20038: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20039: \$? = $ac_status" >&5
+  echo "$as_me:20041: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20042: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20044: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20045: \$? = $ac_status" >&5
+  echo "$as_me:20047: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_ssl_library=yes
 else
@@ -20051,7 +20053,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:20054: result: $cf_ssl_library" >&5
+echo "$as_me:20056: result: $cf_ssl_library" >&5
 echo "${ECHO_T}$cf_ssl_library" >&6
 if test "$cf_ssl_library" = yes ; then
 
@@ -20064,7 +20066,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-	{ { echo "$as_me:20067: error: Cannot link with NSS compliant libraries" >&5
+	{ { echo "$as_me:20069: error: Cannot link with NSS compliant libraries" >&5
 echo "$as_me: error: Cannot link with NSS compliant libraries" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -20072,7 +20074,7 @@ fi
 fi
 
 ### check for ipv6 support
-echo "$as_me:20075: checking whether to enable ipv6" >&5
+echo "$as_me:20077: 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.
@@ -20089,11 +20091,11 @@ EOF
 else
   enableval=no
 fi;
-echo "$as_me:20092: result: $enableval" >&5
+echo "$as_me:20094: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 if test "$enableval" = "yes"; then
 
-echo "$as_me:20096: checking ipv6 stack type" >&5
+echo "$as_me:20098: 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
@@ -20114,7 +20116,7 @@ do
 		;;
 	(inria)
 				cat >"conftest.$ac_ext" <<_ACEOF
-#line 20117 "configure"
+#line 20119 "configure"
 #include "confdefs.h"
 
 #include <netinet/in.h>
@@ -20131,7 +20133,7 @@ rm -rf conftest*
 		;;
 	(kame)
 				cat >"conftest.$ac_ext" <<_ACEOF
-#line 20134 "configure"
+#line 20136 "configure"
 #include "confdefs.h"
 
 #include <netinet/in.h>
@@ -20148,7 +20150,7 @@ rm -rf conftest*
 		;;
 	(linux-glibc)
 				cat >"conftest.$ac_ext" <<_ACEOF
-#line 20151 "configure"
+#line 20153 "configure"
 #include "confdefs.h"
 
 #include <features.h>
@@ -20174,7 +20176,7 @@ rm -rf conftest*
 		;;
 	(toshiba)
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20177 "configure"
+#line 20179 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -20191,7 +20193,7 @@ rm -rf conftest*
 		;;
 	(v6d)
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20194 "configure"
+#line 20196 "configure"
 #include "confdefs.h"
 
 #include </usr/local/v6/include/sys/v6config.h>
@@ -20208,7 +20210,7 @@ rm -rf conftest*
 		;;
 	(zeta)
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 20211 "configure"
+#line 20213 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -20230,13 +20232,13 @@ rm -rf conftest*
 done
 
 fi
-echo "$as_me:20233: result: $cf_cv_ipv6type" >&5
+echo "$as_me:20235: result: $cf_cv_ipv6type" >&5
 echo "${ECHO_T}$cf_cv_ipv6type" >&6
 
 cf_ipv6lib=none
 cf_ipv6dir=none
 
-echo "$as_me:20239: checking for IPv6 library if required" >&5
+echo "$as_me:20241: 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)
@@ -20266,13 +20268,13 @@ case "$cf_cv_ipv6type" in
 	cf_ipv6dir=v6
 	;;
 esac
-echo "$as_me:20269: result: $cf_ipv6lib" >&5
+echo "$as_me:20271: result: $cf_ipv6lib" >&5
 echo "${ECHO_T}$cf_ipv6lib" >&6
 
 if test "$cf_ipv6lib" != "none"; then
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 20275 "configure"
+#line 20277 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -20288,16 +20290,16 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20291: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20293: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20294: \$? = $ac_status" >&5
+  echo "$as_me:20296: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20297: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20299: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20300: \$? = $ac_status" >&5
+  echo "$as_me:20302: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -20418,7 +20420,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 20421 "configure"
+#line 20423 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -20430,16 +20432,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20433: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20435: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20436: \$? = $ac_status" >&5
+  echo "$as_me:20438: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20439: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20441: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20442: \$? = $ac_status" >&5
+  echo "$as_me:20444: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -20456,7 +20458,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}:20459: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:20461: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -20484,13 +20486,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:20487: checking for getaddrinfo" >&5
+	echo "$as_me:20489: 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 20493 "configure"
+#line 20495 "configure"
 #include "confdefs.h"
 #define getaddrinfo autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -20521,16 +20523,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20524: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20526: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20527: \$? = $ac_status" >&5
+  echo "$as_me:20529: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20530: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20532: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20533: \$? = $ac_status" >&5
+  echo "$as_me:20535: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_getaddrinfo=yes
 else
@@ -20540,18 +20542,18 @@ ac_cv_func_getaddrinfo=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:20543: result: $ac_cv_func_getaddrinfo" >&5
+echo "$as_me:20545: 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:20550: checking for getaddrinfo in -l$cf_ipv6lib" >&5
+		echo "$as_me:20552: 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 20554 "configure"
+#line 20556 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -20567,25 +20569,25 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20570: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20572: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20573: \$? = $ac_status" >&5
+  echo "$as_me:20575: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20576: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20578: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20579: \$? = $ac_status" >&5
+  echo "$as_me:20581: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:20581: result: yes" >&5
+  echo "$as_me:20583: 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:20588: result: no" >&5
+echo "$as_me:20590: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -20653,11 +20655,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:20656: checking for -l$cf_ipv6lib in $cf_libdir" >&5
+				echo "$as_me:20658: 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 20660 "configure"
+#line 20662 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -20673,25 +20675,25 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:20676: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20678: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20679: \$? = $ac_status" >&5
+  echo "$as_me:20681: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:20682: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20684: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20685: \$? = $ac_status" >&5
+  echo "$as_me:20687: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:20687: result: yes" >&5
+  echo "$as_me:20689: 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:20694: result: no" >&5
+echo "$as_me:20696: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -20706,7 +20708,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_ipv6lib"\"
 
 	if test "$cf_found_library" = no ; then
-		{ { echo "$as_me:20709: error: No $cf_ipv6lib library found, cannot continue.  You must fetch lib$cf_ipv6lib.a
+		{ { echo "$as_me:20711: 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;}
@@ -20714,7 +20716,7 @@ from an appropriate IPv6 kit and compile beforehand." >&2;}
 	fi
 fi
 
-echo "$as_me:20717: checking working getaddrinfo" >&5
+echo "$as_me:20719: 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
@@ -20724,7 +20726,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_getaddrinfo=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 20727 "configure"
+#line 20729 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -20804,15 +20806,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:20807: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20809: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20810: \$? = $ac_status" >&5
+  echo "$as_me:20812: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:20812: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20814: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20815: \$? = $ac_status" >&5
+  echo "$as_me:20817: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_getaddrinfo=yes
 else
@@ -20825,7 +20827,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:20828: result: $cf_cv_getaddrinfo" >&5
+echo "$as_me:20830: result: $cf_cv_getaddrinfo" >&5
 echo "${ECHO_T}$cf_cv_getaddrinfo" >&6
 if test "$cf_cv_getaddrinfo" = yes ; then
 
@@ -20841,12 +20843,12 @@ fi
 
 if test "$cf_cv_getaddrinfo" != "yes"; then
 	if test "$cf_cv_ipv6type" != "linux"; then
-		{ echo "$as_me:20844: WARNING: You must get working getaddrinfo() function,
+		{ echo "$as_me:20846: 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:20849: WARNING: The getaddrinfo() implementation on your system seems be buggy.
+		{ echo "$as_me:20851: 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.
@@ -20857,7 +20859,7 @@ fi
 
 fi
 
-echo "$as_me:20860: checking for screen type" >&5
+echo "$as_me:20862: 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
@@ -20871,7 +20873,7 @@ case "$withval" in
 (curses|ncurses*|pdcurses|slang)
 	cf_cv_screen=$withval
 	;;
-(*)	{ { echo "$as_me:20874: error: Unexpected value $withval" >&5
+(*)	{ { echo "$as_me:20876: error: Unexpected value $withval" >&5
 echo "$as_me: error: Unexpected value $withval" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -20880,13 +20882,13 @@ else
   cf_cv_screen=curses
 fi;
 fi
-echo "$as_me:20883: result: $cf_cv_screen" >&5
+echo "$as_me:20885: result: $cf_cv_screen" >&5
 echo "${ECHO_T}$cf_cv_screen" >&6
 
 case "$cf_cv_screen" in
 (curses|ncurses*)
 
-echo "$as_me:20889: checking for specific curses-directory" >&5
+echo "$as_me:20891: 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.
@@ -20896,7 +20898,7 @@ if test "${with_curses_dir+set}" = set; then
 else
   cf_cv_curses_dir=no
 fi;
-echo "$as_me:20899: result: $cf_cv_curses_dir" >&5
+echo "$as_me:20901: 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"
@@ -20927,7 +20929,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:20930: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:20932: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -20963,7 +20965,7 @@ if test -n "$cf_cv_curses_dir/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 20966 "configure"
+#line 20968 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -20975,16 +20977,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:20978: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20980: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20981: \$? = $ac_status" >&5
+  echo "$as_me:20983: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:20984: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20986: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20987: \$? = $ac_status" >&5
+  echo "$as_me:20989: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -21001,7 +21003,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}:21004: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:21006: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -21037,7 +21039,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}:21040: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:21042: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -21056,7 +21058,7 @@ dft_color_style=yes
 case "$cf_cv_screen" in
 (curses)
 
-echo "$as_me:21059: checking for extra include directories" >&5
+echo "$as_me:21061: 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
@@ -21082,7 +21084,7 @@ case "$host_os" in
 esac
 
 fi
-echo "$as_me:21085: result: $cf_cv_curses_incdir" >&5
+echo "$as_me:21087: result: $cf_cv_curses_incdir" >&5
 echo "${ECHO_T}$cf_cv_curses_incdir" >&6
 if test "$cf_cv_curses_incdir" != no
 then
@@ -21092,7 +21094,7 @@ then
 
 fi
 
-echo "$as_me:21095: checking if we have identified curses headers" >&5
+echo "$as_me:21097: 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
@@ -21104,7 +21106,7 @@ for cf_header in \
 	curses.h  ncurses/ncurses.h ncurses/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21107 "configure"
+#line 21109 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -21116,16 +21118,16 @@ initscr(); endwin()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21119: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21121: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21122: \$? = $ac_status" >&5
+  echo "$as_me:21124: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21125: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21127: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21128: \$? = $ac_status" >&5
+  echo "$as_me:21130: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -21136,11 +21138,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:21139: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:21141: 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:21143: error: No curses header-files found" >&5
+	{ { echo "$as_me:21145: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -21150,23 +21152,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:21153: checking for $ac_header" >&5
+echo "$as_me:21155: 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 21159 "configure"
+#line 21161 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:21163: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:21165: \"$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:21169: \$? = $ac_status" >&5
+  echo "$as_me:21171: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -21185,7 +21187,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:21188: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:21190: 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
@@ -21195,7 +21197,7 @@ EOF
 fi
 done
 
-echo "$as_me:21198: checking for terminfo header" >&5
+echo "$as_me:21200: 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
@@ -21213,7 +21215,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21216 "configure"
+#line 21218 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -21228,16 +21230,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:21231: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21233: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21234: \$? = $ac_status" >&5
+  echo "$as_me:21236: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:21237: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21239: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21240: \$? = $ac_status" >&5
+  echo "$as_me:21242: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -21253,7 +21255,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:21256: result: $cf_cv_term_header" >&5
+echo "$as_me:21258: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -21285,7 +21287,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:21288: checking for ncurses version" >&5
+echo "$as_me:21290: 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
@@ -21311,10 +21313,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:21314: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:21316: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:21317: \$? = $ac_status" >&5
+  echo "$as_me:21319: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -21324,7 +21326,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 21327 "configure"
+#line 21329 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -21351,15 +21353,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:21354: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21356: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21357: \$? = $ac_status" >&5
+  echo "$as_me:21359: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:21359: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21361: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21362: \$? = $ac_status" >&5
+  echo "$as_me:21364: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -21373,17 +21375,17 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:21376: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:21378: 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:21383: checking if we have identified curses libraries" >&5
+echo "$as_me:21385: 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 21386 "configure"
+#line 21388 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -21395,16 +21397,16 @@ initscr(); endwin()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21398: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21400: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21401: \$? = $ac_status" >&5
+  echo "$as_me:21403: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21404: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21406: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21407: \$? = $ac_status" >&5
+  echo "$as_me:21409: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -21413,13 +21415,13 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-echo "$as_me:21416: result: $cf_result" >&5
+echo "$as_me:21418: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 if test "$cf_result" = no ; then
 case "$host_os" in
 (freebsd*)
-	echo "$as_me:21422: checking for tgoto in -lmytinfo" >&5
+	echo "$as_me:21424: 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
@@ -21427,7 +21429,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21430 "configure"
+#line 21432 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21446,16 +21448,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21449: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21451: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21452: \$? = $ac_status" >&5
+  echo "$as_me:21454: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21455: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21457: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21458: \$? = $ac_status" >&5
+  echo "$as_me:21460: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -21466,7 +21468,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21469: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:21471: 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
 
@@ -21496,7 +21498,7 @@ fi
 	# term.h) for cur_colr
 	if test "x$cf_cv_screen" = "xcurses_colr"
 	then
-		echo "$as_me:21499: checking for initscr in -lcur_colr" >&5
+		echo "$as_me:21501: 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
@@ -21504,7 +21506,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcur_colr  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21507 "configure"
+#line 21509 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21523,16 +21525,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21526: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21528: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21529: \$? = $ac_status" >&5
+  echo "$as_me:21531: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21532: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21534: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21535: \$? = $ac_status" >&5
+  echo "$as_me:21537: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_cur_colr_initscr=yes
 else
@@ -21543,7 +21545,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21546: result: $ac_cv_lib_cur_colr_initscr" >&5
+echo "$as_me:21548: 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
 
@@ -21567,7 +21569,7 @@ LIBS="$cf_add_libs"
 
 else
 
-		echo "$as_me:21570: checking for initscr in -lHcurses" >&5
+		echo "$as_me:21572: 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
@@ -21575,7 +21577,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lHcurses  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21578 "configure"
+#line 21580 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21594,16 +21596,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21597: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21599: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21600: \$? = $ac_status" >&5
+  echo "$as_me:21602: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21603: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21605: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21606: \$? = $ac_status" >&5
+  echo "$as_me:21608: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Hcurses_initscr=yes
 else
@@ -21614,7 +21616,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21617: result: $ac_cv_lib_Hcurses_initscr" >&5
+echo "$as_me:21619: 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
 
@@ -21672,7 +21674,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}:21675: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:21677: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -21701,7 +21703,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}:21704: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:21706: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -21732,7 +21734,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}:21735: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:21737: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -21767,7 +21769,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}:21770: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:21772: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -21811,13 +21813,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:21814: checking for tgoto" >&5
+		echo "$as_me:21816: 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 21820 "configure"
+#line 21822 "configure"
 #include "confdefs.h"
 #define tgoto autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -21848,16 +21850,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21851: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21853: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21854: \$? = $ac_status" >&5
+  echo "$as_me:21856: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21857: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21859: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21860: \$? = $ac_status" >&5
+  echo "$as_me:21862: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_tgoto=yes
 else
@@ -21867,7 +21869,7 @@ ac_cv_func_tgoto=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:21870: result: $ac_cv_func_tgoto" >&5
+echo "$as_me:21872: 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
@@ -21876,7 +21878,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:21879: checking for tgoto in -l$cf_term_lib" >&5
+echo "$as_me:21881: 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
@@ -21884,7 +21886,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_term_lib  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 21887 "configure"
+#line 21889 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21903,16 +21905,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21906: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21908: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21909: \$? = $ac_status" >&5
+  echo "$as_me:21911: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21912: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21914: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21915: \$? = $ac_status" >&5
+  echo "$as_me:21917: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -21923,7 +21925,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21926: result: `eval echo '${'"$as_ac_Lib"'}'`" >&5
+echo "$as_me:21928: 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
 
@@ -21946,10 +21948,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:21949: checking if we can link with $cf_curs_lib library" >&5
+				echo "$as_me:21951: 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 21952 "configure"
+#line 21954 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -21961,16 +21963,16 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:21964: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21966: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21967: \$? = $ac_status" >&5
+  echo "$as_me:21969: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:21970: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21972: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21973: \$? = $ac_status" >&5
+  echo "$as_me:21975: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -21979,16 +21981,16 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-				echo "$as_me:21982: result: $cf_result" >&5
+				echo "$as_me:21984: 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:21988: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+				echo "$as_me:21990: 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 21991 "configure"
+#line 21993 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -22000,16 +22002,16 @@ initscr(); endwin();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22003: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22005: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22006: \$? = $ac_status" >&5
+  echo "$as_me:22008: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22009: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22011: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22012: \$? = $ac_status" >&5
+  echo "$as_me:22014: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=no
 else
@@ -22018,7 +22020,7 @@ cat "conftest.$ac_ext" >&5
 
 					LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
 					cat >"conftest.$ac_ext" <<_ACEOF
-#line 22021 "configure"
+#line 22023 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -22030,16 +22032,16 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22033: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22035: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22036: \$? = $ac_status" >&5
+  echo "$as_me:22038: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22039: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22041: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22042: \$? = $ac_status" >&5
+  echo "$as_me:22044: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -22051,19 +22053,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:22054: result: $cf_result" >&5
+				echo "$as_me:22056: 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:22060: error: no curses library found" >&5
+	test "$cf_curs_lib" = unknown && { { echo "$as_me:22062: error: no curses library found" >&5
 echo "$as_me: error: no curses library found" >&2;}
    { (exit 1); exit 1; }; }
 fi
 fi
 
-echo "$as_me:22066: checking for curses performance tradeoff" >&5
+echo "$as_me:22068: 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
@@ -22071,7 +22073,7 @@ else
 
     cf_cv_curs_performance=no
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 22074 "configure"
+#line 22076 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -22090,20 +22092,20 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22093: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22095: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22096: \$? = $ac_status" >&5
+  echo "$as_me:22098: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22099: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22101: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22102: \$? = $ac_status" >&5
+  echo "$as_me:22104: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 22106 "configure"
+#line 22108 "configure"
 #include "confdefs.h"
 
 #define CURS_PERFORMANCE
@@ -22123,16 +22125,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22126: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22128: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22129: \$? = $ac_status" >&5
+  echo "$as_me:22131: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22132: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22134: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22135: \$? = $ac_status" >&5
+  echo "$as_me:22137: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curs_performance=yes
 else
@@ -22147,21 +22149,21 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:22150: result: $cf_cv_curs_performance" >&5
+echo "$as_me:22152: 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:22157: checking for curses touchline function" >&5
+echo "$as_me:22159: 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 22164 "configure"
+#line 22166 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -22174,23 +22176,23 @@ touchline(stdscr, 1,2,3);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22177: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22179: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22180: \$? = $ac_status" >&5
+  echo "$as_me:22182: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22183: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22185: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22186: \$? = $ac_status" >&5
+  echo "$as_me:22188: \$? = $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 22193 "configure"
+#line 22195 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -22203,16 +22205,16 @@ touchline(stdscr, 1,2);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22206: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22208: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22209: \$? = $ac_status" >&5
+  echo "$as_me:22211: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22212: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22214: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22215: \$? = $ac_status" >&5
+  echo "$as_me:22217: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_curs_touchline=sysv
 else
@@ -22224,7 +22226,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:22227: result: $cf_cv_curs_touchline" >&5
+echo "$as_me:22229: result: $cf_cv_curs_touchline" >&5
 echo "${ECHO_T}$cf_cv_curs_touchline" >&6
 case "$cf_cv_curs_touchline" in
 (bsd)
@@ -22249,23 +22251,23 @@ esac
 for ac_header in wchar.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22252: checking for $ac_header" >&5
+echo "$as_me:22254: 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 22258 "configure"
+#line 22260 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22262: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:22264: \"$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:22268: \$? = $ac_status" >&5
+  echo "$as_me:22270: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22284,7 +22286,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:22287: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:22289: 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
@@ -22294,7 +22296,7 @@ EOF
 fi
 done
 
-echo "$as_me:22297: checking for multibyte character support" >&5
+echo "$as_me:22299: 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
@@ -22302,7 +22304,7 @@ else
 
 	cf_save_LIBS="$LIBS"
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 22305 "configure"
+#line 22307 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -22319,16 +22321,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22322: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22324: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22325: \$? = $ac_status" >&5
+  echo "$as_me:22327: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22328: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22330: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22331: \$? = $ac_status" >&5
+  echo "$as_me:22333: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_utf8_lib=yes
 else
@@ -22340,12 +22342,12 @@ cat "conftest.$ac_ext" >&5
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
-echo "${as_me:-configure}:22343: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:22345: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22348 "configure"
+#line 22350 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -22358,16 +22360,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22361: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22363: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22364: \$? = $ac_status" >&5
+  echo "$as_me:22366: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22367: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22369: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22370: \$? = $ac_status" >&5
+  echo "$as_me:22372: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -22381,7 +22383,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lutf8  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 22384 "configure"
+#line 22386 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -22394,16 +22396,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22397: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22399: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22400: \$? = $ac_status" >&5
+  echo "$as_me:22402: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22403: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22405: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22406: \$? = $ac_status" >&5
+  echo "$as_me:22408: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -22420,9 +22422,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
 
-echo "${as_me:-configure}:22423: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:22425: testing find linkage for utf8 library ..." 1>&5
 
-echo "${as_me:-configure}:22425: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:22427: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -22513,7 +22515,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}:22516: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:22518: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -22521,7 +22523,7 @@ echo "${as_me:-configure}:22516: testing ... testing $cf_cv_header_path_utf8 ...
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_utf8"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 22524 "configure"
+#line 22526 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -22534,21 +22536,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22537: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22539: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22540: \$? = $ac_status" >&5
+  echo "$as_me:22542: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22543: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22545: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22546: \$? = $ac_status" >&5
+  echo "$as_me:22548: \$? = $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}:22551: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:22553: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
 
 				cf_cv_find_linkage_utf8=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -22566,7 +22568,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
-echo "${as_me:-configure}:22569: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:22571: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -22641,13 +22643,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}:22644: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:22646: 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 22650 "configure"
+#line 22652 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -22660,21 +22662,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:22663: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22665: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22666: \$? = $ac_status" >&5
+  echo "$as_me:22668: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:22669: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22671: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22672: \$? = $ac_status" >&5
+  echo "$as_me:22674: \$? = $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}:22677: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:22679: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
 
 					cf_cv_find_linkage_utf8=yes
 					cf_cv_library_file_utf8="-lutf8"
@@ -22716,7 +22718,7 @@ fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:22719: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:22721: 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
@@ -22754,7 +22756,7 @@ if test -n "$cf_cv_header_path_utf8" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 22757 "configure"
+#line 22759 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -22766,16 +22768,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:22769: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22771: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22772: \$? = $ac_status" >&5
+  echo "$as_me:22774: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:22775: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22777: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22778: \$? = $ac_status" >&5
+  echo "$as_me:22780: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -22792,7 +22794,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}:22795: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:22797: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -22828,7 +22830,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}:22831: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:22833: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -22858,13 +22860,13 @@ cf_ncuconfig_root=$cf_cv_screen
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:22861: checking pkg-config for $cf_ncuconfig_root" >&5
+	echo "$as_me:22863: 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:22864: result: yes" >&5
+		echo "$as_me:22866: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:22867: checking if the $cf_ncuconfig_root package files work" >&5
+		echo "$as_me:22869: 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
 
@@ -22997,7 +22999,7 @@ done
 LIBS="$cf_add_libs"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 23000 "configure"
+#line 23002 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -23009,37 +23011,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23012: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23014: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23015: \$? = $ac_status" >&5
+  echo "$as_me:23017: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23018: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23020: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23021: \$? = $ac_status" >&5
+  echo "$as_me:23023: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23027 "configure"
+#line 23029 "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:23034: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23036: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23037: \$? = $ac_status" >&5
+  echo "$as_me:23039: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23039: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23041: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23042: \$? = $ac_status" >&5
+  echo "$as_me:23044: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_test_ncuconfig=yes
 else
@@ -23213,7 +23215,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 23216 "configure"
+#line 23218 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -23225,37 +23227,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:23228: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23230: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23231: \$? = $ac_status" >&5
+  echo "$as_me:23233: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:23234: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23236: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23237: \$? = $ac_status" >&5
+  echo "$as_me:23239: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 23243 "configure"
+#line 23245 "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:23250: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23252: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23253: \$? = $ac_status" >&5
+  echo "$as_me:23255: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:23255: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23257: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23258: \$? = $ac_status" >&5
+  echo "$as_me:23260: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -23272,7 +23274,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:23275: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:23277: 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"
@@ -23288,7 +23290,7 @@ EOF
 
 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
-echo "$as_me:23291: checking for terminfo header" >&5
+echo "$as_me:23293: 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
@@ -23306,7 +23308,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23309 "configure"
+#line 23311 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -23321,16 +23323,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23324: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23326: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23327: \$? = $ac_status" >&5
+  echo "$as_me:23329: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23330: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23332: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23333: \$? = $ac_status" >&5
+  echo "$as_me:23335: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -23346,7 +23348,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:23349: result: $cf_cv_term_header" >&5
+echo "$as_me:23351: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -23381,7 +23383,7 @@ esac
 		fi
 
 	else
-		echo "$as_me:23384: result: no" >&5
+		echo "$as_me:23386: result: no" >&5
 echo "${ECHO_T}no" >&6
 		NCURSES_CONFIG_PKG=none
 	fi
@@ -23397,7 +23399,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:23400: checking for $ac_word" >&5
+echo "$as_me:23402: 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
@@ -23412,7 +23414,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:23415: found $ac_dir/$ac_word" >&5
+echo "$as_me:23417: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -23420,10 +23422,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:23423: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:23425: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:23426: result: no" >&5
+  echo "$as_me:23428: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -23436,7 +23438,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:23439: checking for $ac_word" >&5
+echo "$as_me:23441: 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
@@ -23451,7 +23453,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:23454: found $ac_dir/$ac_word" >&5
+echo "$as_me:23456: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -23459,10 +23461,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:23462: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:23464: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:23465: result: no" >&5
+  echo "$as_me:23467: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -23619,7 +23621,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:23622: checking if we have identified curses headers" >&5
+echo "$as_me:23624: 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
@@ -23631,7 +23633,7 @@ for cf_header in \
 	curses.h $cf_cv_screen/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 23634 "configure"
+#line 23636 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -23643,16 +23645,16 @@ initscr(); endwin()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23646: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23648: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23649: \$? = $ac_status" >&5
+  echo "$as_me:23651: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23652: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23654: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23655: \$? = $ac_status" >&5
+  echo "$as_me:23657: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -23663,11 +23665,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:23666: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:23668: 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:23670: error: No curses header-files found" >&5
+	{ { echo "$as_me:23672: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -23677,23 +23679,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:23680: checking for $ac_header" >&5
+echo "$as_me:23682: 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 23686 "configure"
+#line 23688 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:23690: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:23692: \"$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:23696: \$? = $ac_status" >&5
+  echo "$as_me:23698: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23712,7 +23714,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:23715: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:23717: 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
@@ -23768,7 +23770,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 23771 "configure"
+#line 23773 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -23780,16 +23782,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23783: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23785: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23786: \$? = $ac_status" >&5
+  echo "$as_me:23788: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23789: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23791: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23792: \$? = $ac_status" >&5
+  echo "$as_me:23794: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -23806,7 +23808,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}:23809: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:23811: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -23825,7 +23827,7 @@ fi
 
 }
 
-echo "$as_me:23828: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:23830: 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
@@ -23837,7 +23839,7 @@ else
 	do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 23840 "configure"
+#line 23842 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -23861,16 +23863,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:23864: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23866: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23867: \$? = $ac_status" >&5
+  echo "$as_me:23869: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:23870: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23872: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23873: \$? = $ac_status" >&5
+  echo "$as_me:23875: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -23885,14 +23887,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 
 fi
-echo "$as_me:23888: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:23890: 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:23895: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:23897: 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
@@ -24013,7 +24015,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 24016 "configure"
+#line 24018 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24025,16 +24027,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24028: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24030: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24031: \$? = $ac_status" >&5
+  echo "$as_me:24033: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24034: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24036: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24037: \$? = $ac_status" >&5
+  echo "$as_me:24039: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -24051,7 +24053,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}:24054: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24056: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24074,7 +24076,7 @@ fi
 		do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24077 "configure"
+#line 24079 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -24098,16 +24100,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24101: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24103: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24104: \$? = $ac_status" >&5
+  echo "$as_me:24106: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24107: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24109: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24110: \$? = $ac_status" >&5
+  echo "$as_me:24112: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -24128,12 +24130,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:24131: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:24133: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:24136: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:24138: 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%/[^/]*$%%'`
@@ -24169,7 +24171,7 @@ if test -n "$cf_1st_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 24172 "configure"
+#line 24174 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24181,16 +24183,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24184: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24186: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24187: \$? = $ac_status" >&5
+  echo "$as_me:24189: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24190: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24192: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24193: \$? = $ac_status" >&5
+  echo "$as_me:24195: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -24207,7 +24209,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}:24210: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24212: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24255,7 +24257,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:24258: checking for terminfo header" >&5
+echo "$as_me:24260: 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
@@ -24273,7 +24275,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 24276 "configure"
+#line 24278 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -24288,16 +24290,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:24291: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24293: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24294: \$? = $ac_status" >&5
+  echo "$as_me:24296: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:24297: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24299: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24300: \$? = $ac_status" >&5
+  echo "$as_me:24302: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -24313,7 +24315,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:24316: result: $cf_cv_term_header" >&5
+echo "$as_me:24318: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -24351,7 +24353,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:24354: checking for ncurses version" >&5
+echo "$as_me:24356: 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
@@ -24377,10 +24379,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:24380: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:24382: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:24383: \$? = $ac_status" >&5
+  echo "$as_me:24385: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -24390,7 +24392,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 24393 "configure"
+#line 24395 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -24417,15 +24419,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:24420: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24422: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24423: \$? = $ac_status" >&5
+  echo "$as_me:24425: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:24425: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24427: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24428: \$? = $ac_status" >&5
+  echo "$as_me:24430: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -24439,7 +24441,7 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:24442: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:24444: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -24452,7 +24454,7 @@ cf_nculib_root=$cf_cv_screen
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:24455: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:24457: 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
@@ -24460,7 +24462,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 24463 "configure"
+#line 24465 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24479,16 +24481,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24482: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24484: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24485: \$? = $ac_status" >&5
+  echo "$as_me:24487: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24488: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24490: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24491: \$? = $ac_status" >&5
+  echo "$as_me:24493: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -24499,10 +24501,10 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24502: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:24504: 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:24505: checking for initscr in -lgpm" >&5
+  echo "$as_me:24507: 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
@@ -24510,7 +24512,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 24513 "configure"
+#line 24515 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24529,16 +24531,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24532: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24534: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24535: \$? = $ac_status" >&5
+  echo "$as_me:24537: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24538: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24540: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24541: \$? = $ac_status" >&5
+  echo "$as_me:24543: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -24549,7 +24551,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24552: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:24554: 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"
@@ -24564,7 +24566,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:24567: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:24569: 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
@@ -24572,7 +24574,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 24575 "configure"
+#line 24577 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24591,16 +24593,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24594: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24596: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24597: \$? = $ac_status" >&5
+  echo "$as_me:24599: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24600: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24602: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24603: \$? = $ac_status" >&5
+  echo "$as_me:24605: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -24611,7 +24613,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24614: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:24616: 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"
@@ -24660,13 +24662,13 @@ else
 
 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
 	cf_libdir=""
-	echo "$as_me:24663: checking for initscr" >&5
+	echo "$as_me:24665: 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 24669 "configure"
+#line 24671 "configure"
 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -24697,16 +24699,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24700: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24702: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24703: \$? = $ac_status" >&5
+  echo "$as_me:24705: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24706: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24708: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24709: \$? = $ac_status" >&5
+  echo "$as_me:24711: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -24716,18 +24718,18 @@ ac_cv_func_initscr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:24719: result: $ac_cv_func_initscr" >&5
+echo "$as_me:24721: 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:24726: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:24728: 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 24730 "configure"
+#line 24732 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -24739,25 +24741,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24742: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24744: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24745: \$? = $ac_status" >&5
+  echo "$as_me:24747: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24748: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24750: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24751: \$? = $ac_status" >&5
+  echo "$as_me:24753: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:24753: result: yes" >&5
+  echo "$as_me:24755: 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:24760: result: no" >&5
+echo "$as_me:24762: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -24825,11 +24827,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:24828: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:24830: 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 24832 "configure"
+#line 24834 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -24841,25 +24843,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24844: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24846: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24847: \$? = $ac_status" >&5
+  echo "$as_me:24849: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24850: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24852: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24853: \$? = $ac_status" >&5
+  echo "$as_me:24855: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:24855: result: yes" >&5
+  echo "$as_me:24857: 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:24862: result: no" >&5
+echo "$as_me:24864: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -24874,7 +24876,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:24877: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:24879: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -24882,7 +24884,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:24885: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:24887: 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
@@ -24892,7 +24894,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 24895 "configure"
+#line 24897 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -24904,23 +24906,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:24907: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24909: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24910: \$? = $ac_status" >&5
+  echo "$as_me:24912: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:24913: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24915: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24916: \$? = $ac_status" >&5
+  echo "$as_me:24918: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:24918: result: yes" >&5
+  echo "$as_me:24920: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:24923: result: no" >&5
+echo "$as_me:24925: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -24946,13 +24948,13 @@ cf_ncuconfig_root=$cf_cv_screen
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:24949: checking pkg-config for $cf_ncuconfig_root" >&5
+	echo "$as_me:24951: 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:24952: result: yes" >&5
+		echo "$as_me:24954: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:24955: checking if the $cf_ncuconfig_root package files work" >&5
+		echo "$as_me:24957: 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
 
@@ -25085,7 +25087,7 @@ done
 LIBS="$cf_add_libs"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 25088 "configure"
+#line 25090 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -25097,37 +25099,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25100: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25102: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25103: \$? = $ac_status" >&5
+  echo "$as_me:25105: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25106: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25108: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25109: \$? = $ac_status" >&5
+  echo "$as_me:25111: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_test_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 25115 "configure"
+#line 25117 "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:25122: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25124: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25125: \$? = $ac_status" >&5
+  echo "$as_me:25127: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:25127: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25129: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25130: \$? = $ac_status" >&5
+  echo "$as_me:25132: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_test_ncuconfig=yes
 else
@@ -25301,7 +25303,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 25304 "configure"
+#line 25306 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -25313,37 +25315,37 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:25316: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25318: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25319: \$? = $ac_status" >&5
+  echo "$as_me:25321: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:25322: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25324: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25325: \$? = $ac_status" >&5
+  echo "$as_me:25327: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 25331 "configure"
+#line 25333 "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:25338: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25340: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25341: \$? = $ac_status" >&5
+  echo "$as_me:25343: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:25343: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25345: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25346: \$? = $ac_status" >&5
+  echo "$as_me:25348: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -25360,7 +25362,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:25363: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:25365: 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"
@@ -25376,7 +25378,7 @@ EOF
 
 			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 
-echo "$as_me:25379: checking for terminfo header" >&5
+echo "$as_me:25381: 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
@@ -25394,7 +25396,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 25397 "configure"
+#line 25399 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -25409,16 +25411,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25412: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25414: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25415: \$? = $ac_status" >&5
+  echo "$as_me:25417: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25418: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25420: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25421: \$? = $ac_status" >&5
+  echo "$as_me:25423: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -25434,7 +25436,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:25437: result: $cf_cv_term_header" >&5
+echo "$as_me:25439: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -25469,7 +25471,7 @@ esac
 		fi
 
 	else
-		echo "$as_me:25472: result: no" >&5
+		echo "$as_me:25474: result: no" >&5
 echo "${ECHO_T}no" >&6
 		NCURSES_CONFIG_PKG=none
 	fi
@@ -25485,7 +25487,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:25488: checking for $ac_word" >&5
+echo "$as_me:25490: 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
@@ -25500,7 +25502,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:25503: found $ac_dir/$ac_word" >&5
+echo "$as_me:25505: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -25508,10 +25510,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:25511: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:25513: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:25514: result: no" >&5
+  echo "$as_me:25516: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25524,7 +25526,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:25527: checking for $ac_word" >&5
+echo "$as_me:25529: 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
@@ -25539,7 +25541,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:25542: found $ac_dir/$ac_word" >&5
+echo "$as_me:25544: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -25547,10 +25549,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:25550: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:25552: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:25553: result: no" >&5
+  echo "$as_me:25555: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -25707,7 +25709,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:25710: checking if we have identified curses headers" >&5
+echo "$as_me:25712: 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
@@ -25719,7 +25721,7 @@ for cf_header in \
 	curses.h $cf_cv_screen/curses.h
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 25722 "configure"
+#line 25724 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -25731,16 +25733,16 @@ initscr(); endwin()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25734: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25736: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25737: \$? = $ac_status" >&5
+  echo "$as_me:25739: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25740: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25742: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25743: \$? = $ac_status" >&5
+  echo "$as_me:25745: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -25751,11 +25753,11 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:25754: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:25756: 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:25758: error: No curses header-files found" >&5
+	{ { echo "$as_me:25760: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -25765,23 +25767,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:25768: checking for $ac_header" >&5
+echo "$as_me:25770: 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 25774 "configure"
+#line 25776 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:25778: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:25780: \"$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:25784: \$? = $ac_status" >&5
+  echo "$as_me:25786: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -25800,7 +25802,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:25803: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:25805: 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
@@ -25856,7 +25858,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 25859 "configure"
+#line 25861 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -25868,16 +25870,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25871: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25873: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25874: \$? = $ac_status" >&5
+  echo "$as_me:25876: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25877: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25879: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25880: \$? = $ac_status" >&5
+  echo "$as_me:25882: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -25894,7 +25896,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}:25897: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:25899: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -25913,7 +25915,7 @@ fi
 
 }
 
-echo "$as_me:25916: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:25918: 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
@@ -25925,7 +25927,7 @@ else
 	do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 25928 "configure"
+#line 25930 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -25949,16 +25951,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:25952: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25954: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25955: \$? = $ac_status" >&5
+  echo "$as_me:25957: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:25958: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25960: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25961: \$? = $ac_status" >&5
+  echo "$as_me:25963: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -25973,14 +25975,14 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 	done
 
 fi
-echo "$as_me:25976: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:25978: 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:25983: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:25985: 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
@@ -26101,7 +26103,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 26104 "configure"
+#line 26106 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -26113,16 +26115,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26116: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26118: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26119: \$? = $ac_status" >&5
+  echo "$as_me:26121: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26122: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26124: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26125: \$? = $ac_status" >&5
+  echo "$as_me:26127: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -26139,7 +26141,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}:26142: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:26144: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -26162,7 +26164,7 @@ fi
 		do
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26165 "configure"
+#line 26167 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -26186,16 +26188,16 @@ printf("old\\n");
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26189: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26191: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26192: \$? = $ac_status" >&5
+  echo "$as_me:26194: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26195: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26197: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26198: \$? = $ac_status" >&5
+  echo "$as_me:26200: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -26216,12 +26218,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:26219: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:26221: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:26224: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:26226: 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%/[^/]*$%%'`
@@ -26257,7 +26259,7 @@ if test -n "$cf_1st_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 26260 "configure"
+#line 26262 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -26269,16 +26271,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26272: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26274: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26275: \$? = $ac_status" >&5
+  echo "$as_me:26277: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26278: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26280: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26281: \$? = $ac_status" >&5
+  echo "$as_me:26283: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -26295,7 +26297,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}:26298: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:26300: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -26343,7 +26345,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:26346: checking for terminfo header" >&5
+echo "$as_me:26348: 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
@@ -26361,7 +26363,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26364 "configure"
+#line 26366 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -26376,16 +26378,16 @@ int x = auto_left_margin; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:26379: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26381: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26382: \$? = $ac_status" >&5
+  echo "$as_me:26384: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:26385: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26387: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26388: \$? = $ac_status" >&5
+  echo "$as_me:26390: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -26401,7 +26403,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:26404: result: $cf_cv_term_header" >&5
+echo "$as_me:26406: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -26439,7 +26441,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:26442: checking for ncurses version" >&5
+echo "$as_me:26444: 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
@@ -26465,10 +26467,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:26468: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:26470: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:26471: \$? = $ac_status" >&5
+  echo "$as_me:26473: \$? = $ac_status" >&5
   (exit "$ac_status"); }
 	if test -f conftest.out ; then
 		cf_out=`sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%' conftest.out`
@@ -26478,7 +26480,7 @@ EOF
 
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 26481 "configure"
+#line 26483 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -26505,15 +26507,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:26508: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26510: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26511: \$? = $ac_status" >&5
+  echo "$as_me:26513: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:26513: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26515: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26516: \$? = $ac_status" >&5
+  echo "$as_me:26518: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -26527,7 +26529,7 @@ fi
 	rm -f "$cf_tempfile"
 
 fi
-echo "$as_me:26530: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:26532: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -26540,7 +26542,7 @@ cf_nculib_root=$cf_cv_screen
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:26543: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:26545: 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
@@ -26548,7 +26550,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26551 "configure"
+#line 26553 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -26567,16 +26569,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:26570: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26572: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26573: \$? = $ac_status" >&5
+  echo "$as_me:26575: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:26576: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26578: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26579: \$? = $ac_status" >&5
+  echo "$as_me:26581: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -26587,10 +26589,10 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:26590: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:26592: 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:26593: checking for initscr in -lgpm" >&5
+  echo "$as_me:26595: 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
@@ -26598,7 +26600,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26601 "configure"
+#line 26603 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -26617,16 +26619,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:26620: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26622: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26623: \$? = $ac_status" >&5
+  echo "$as_me:26625: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:26626: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26628: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26629: \$? = $ac_status" >&5
+  echo "$as_me:26631: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -26637,7 +26639,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:26640: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:26642: 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"
@@ -26652,7 +26654,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:26655: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:26657: 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
@@ -26660,7 +26662,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 26663 "configure"
+#line 26665 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -26679,16 +26681,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:26682: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26684: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26685: \$? = $ac_status" >&5
+  echo "$as_me:26687: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:26688: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26690: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26691: \$? = $ac_status" >&5
+  echo "$as_me:26693: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -26699,7 +26701,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:26702: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:26704: 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"
@@ -26748,13 +26750,13 @@ else
 
 	eval 'cf_cv_have_lib_'"$cf_nculib_root"'=no'
 	cf_libdir=""
-	echo "$as_me:26751: checking for initscr" >&5
+	echo "$as_me:26753: 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 26757 "configure"
+#line 26759 "configure"
 #include "confdefs.h"
 #define initscr autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -26785,16 +26787,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:26788: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26790: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26791: \$? = $ac_status" >&5
+  echo "$as_me:26793: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:26794: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26796: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26797: \$? = $ac_status" >&5
+  echo "$as_me:26799: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -26804,18 +26806,18 @@ ac_cv_func_initscr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:26807: result: $ac_cv_func_initscr" >&5
+echo "$as_me:26809: 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:26814: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:26816: 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 26818 "configure"
+#line 26820 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -26827,25 +26829,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:26830: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26832: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26833: \$? = $ac_status" >&5
+  echo "$as_me:26835: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:26836: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26838: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26839: \$? = $ac_status" >&5
+  echo "$as_me:26841: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:26841: result: yes" >&5
+  echo "$as_me:26843: 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:26848: result: no" >&5
+echo "$as_me:26850: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -26913,11 +26915,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:26916: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:26918: 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 26920 "configure"
+#line 26922 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -26929,25 +26931,25 @@ initscr()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:26932: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26934: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26935: \$? = $ac_status" >&5
+  echo "$as_me:26937: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:26938: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26940: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26941: \$? = $ac_status" >&5
+  echo "$as_me:26943: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:26943: result: yes" >&5
+  echo "$as_me:26945: 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:26950: result: no" >&5
+echo "$as_me:26952: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -26962,7 +26964,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"$cf_nculib_root"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:26965: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:26967: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -26970,7 +26972,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:26973: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:26975: 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
@@ -26980,7 +26982,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 26983 "configure"
+#line 26985 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -26992,23 +26994,23 @@ initscr(); mousemask(0,0); tigetstr((char *)0);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:26995: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26997: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26998: \$? = $ac_status" >&5
+  echo "$as_me:27000: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:27001: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27003: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27004: \$? = $ac_status" >&5
+  echo "$as_me:27006: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:27006: result: yes" >&5
+  echo "$as_me:27008: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
-echo "$as_me:27011: result: no" >&5
+echo "$as_me:27013: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -27040,7 +27042,7 @@ fi
 	;;
 (slang)
 
-echo "$as_me:27043: checking for slang header file" >&5
+echo "$as_me:27045: 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
@@ -27048,7 +27050,7 @@ else
 
 	cf_cv_slang_header=no
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 27051 "configure"
+#line 27053 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -27060,16 +27062,16 @@ printf("%s\\n", SLANG_VERSION_STRING)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27063: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27065: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27066: \$? = $ac_status" >&5
+  echo "$as_me:27068: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27069: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27071: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27072: \$? = $ac_status" >&5
+  echo "$as_me:27074: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_slang_header=predefined
 else
@@ -27174,7 +27176,7 @@ cf_search="$cf_search $cf_header_path_list"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:27177: result: $cf_cv_slang_header" >&5
+echo "$as_me:27179: result: $cf_cv_slang_header" >&5
 echo "${ECHO_T}$cf_cv_slang_header" >&6
 
 if test "x$cf_cv_slang_header" != xno
@@ -27218,7 +27220,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 27221 "configure"
+#line 27223 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -27230,16 +27232,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:27233: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27235: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27236: \$? = $ac_status" >&5
+  echo "$as_me:27238: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:27239: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27241: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27242: \$? = $ac_status" >&5
+  echo "$as_me:27244: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -27256,7 +27258,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}:27259: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:27261: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -27288,7 +27290,7 @@ else
 
 cf_cv_termlib=none
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 27291 "configure"
+#line 27293 "configure"
 #include "confdefs.h"
 extern char *tgoto(const char*,int,int);
 int
@@ -27300,19 +27302,19 @@ char *x=tgoto("",0,0); (void)x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:27303: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27305: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27306: \$? = $ac_status" >&5
+  echo "$as_me:27308: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:27309: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27311: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27312: \$? = $ac_status" >&5
+  echo "$as_me:27314: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 27315 "configure"
+#line 27317 "configure"
 #include "confdefs.h"
 extern char *tigetstr(const char *);
 int
@@ -27324,16 +27326,16 @@ char *x=tigetstr(""); (void)x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:27327: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27329: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27330: \$? = $ac_status" >&5
+  echo "$as_me:27332: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:27333: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27335: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27336: \$? = $ac_status" >&5
+  echo "$as_me:27338: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_termlib=terminfo
 else
@@ -27344,7 +27346,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}:27347: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
+echo "${as_me:-configure}:27349: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
 
 else
   echo "$as_me: failed program was:" >&5
@@ -27359,10 +27361,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:27362: checking for $cf_func in -l$cf_lib" >&5
+			echo "$as_me:27364: 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 27365 "configure"
+#line 27367 "configure"
 #include "confdefs.h"
 extern char *$cf_func(const char *);
 int
@@ -27374,16 +27376,16 @@ char *x = $cf_func(""); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:27377: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27379: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27380: \$? = $ac_status" >&5
+  echo "$as_me:27382: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:27383: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27385: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27386: \$? = $ac_status" >&5
+  echo "$as_me:27388: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -27392,7 +27394,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-			echo "$as_me:27395: result: $cf_result" >&5
+			echo "$as_me:27397: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				if test "$cf_func" = tigetstr ; then
@@ -27409,7 +27411,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:27412: checking for initscr in -lcurses" >&5
+	echo "$as_me:27414: 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
@@ -27417,7 +27419,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 27420 "configure"
+#line 27422 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -27436,16 +27438,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:27439: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27441: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27442: \$? = $ac_status" >&5
+  echo "$as_me:27444: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:27445: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27447: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27448: \$? = $ac_status" >&5
+  echo "$as_me:27450: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_curses_initscr=yes
 else
@@ -27456,7 +27458,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:27459: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:27461: 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
 
@@ -27478,7 +27480,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-	echo "$as_me:27481: checking for tgoto in -ltermcap" >&5
+	echo "$as_me:27483: 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
@@ -27486,7 +27488,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 27489 "configure"
+#line 27491 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -27505,16 +27507,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:27508: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27510: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27511: \$? = $ac_status" >&5
+  echo "$as_me:27513: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:27514: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27516: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27517: \$? = $ac_status" >&5
+  echo "$as_me:27519: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_termcap_tgoto=yes
 else
@@ -27525,7 +27527,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:27528: result: $ac_cv_lib_termcap_tgoto" >&5
+echo "$as_me:27530: 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
 
@@ -27552,20 +27554,20 @@ fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 if test "$cf_cv_termlib" = none; then
-	{ echo "$as_me:27555: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
+	{ echo "$as_me:27557: 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:27562: checking for acos" >&5
+echo "$as_me:27564: 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 27568 "configure"
+#line 27570 "configure"
 #include "confdefs.h"
 #define acos autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -27596,16 +27598,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:27599: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27601: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27602: \$? = $ac_status" >&5
+  echo "$as_me:27604: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:27605: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27607: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27608: \$? = $ac_status" >&5
+  echo "$as_me:27610: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_acos=yes
 else
@@ -27615,13 +27617,13 @@ ac_cv_func_acos=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:27618: result: $ac_cv_func_acos" >&5
+echo "$as_me:27620: 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:27624: checking for acos in -lm" >&5
+echo "$as_me:27626: 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
@@ -27629,7 +27631,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm $LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 27632 "configure"
+#line 27634 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -27648,16 +27650,16 @@ acos ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:27651: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27653: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27654: \$? = $ac_status" >&5
+  echo "$as_me:27656: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:27657: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27659: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27660: \$? = $ac_status" >&5
+  echo "$as_me:27662: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_m_acos=yes
 else
@@ -27668,7 +27670,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:27671: result: $ac_cv_lib_m_acos" >&5
+echo "$as_me:27673: 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
 
@@ -27694,13 +27696,13 @@ case "$host_os" in
 
 	eval 'cf_cv_have_lib_'"video"'=no'
 	cf_libdir=""
-	echo "$as_me:27697: checking for v_init" >&5
+	echo "$as_me:27699: 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 27703 "configure"
+#line 27705 "configure"
 #include "confdefs.h"
 #define v_init autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -27731,16 +27733,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:27734: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27736: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27737: \$? = $ac_status" >&5
+  echo "$as_me:27739: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:27740: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27742: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27743: \$? = $ac_status" >&5
+  echo "$as_me:27745: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_v_init=yes
 else
@@ -27750,18 +27752,18 @@ ac_cv_func_v_init=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:27753: result: $ac_cv_func_v_init" >&5
+echo "$as_me:27755: 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:27760: checking for v_init in -lvideo" >&5
+		echo "$as_me:27762: 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 27764 "configure"
+#line 27766 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -27773,25 +27775,25 @@ v_init()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:27776: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27778: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27779: \$? = $ac_status" >&5
+  echo "$as_me:27781: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:27782: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27784: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27785: \$? = $ac_status" >&5
+  echo "$as_me:27787: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:27787: result: yes" >&5
+  echo "$as_me:27789: 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:27794: result: no" >&5
+echo "$as_me:27796: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -27859,11 +27861,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:27862: checking for -lvideo in $cf_libdir" >&5
+				echo "$as_me:27864: 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 27866 "configure"
+#line 27868 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -27875,25 +27877,25 @@ v_init()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:27878: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27880: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27881: \$? = $ac_status" >&5
+  echo "$as_me:27883: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:27884: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27886: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27887: \$? = $ac_status" >&5
+  echo "$as_me:27889: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:27889: result: yes" >&5
+  echo "$as_me:27891: 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:27896: result: no" >&5
+echo "$as_me:27898: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -27908,7 +27910,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"video"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:27911: error: Cannot link video library" >&5
+	{ { echo "$as_me:27913: error: Cannot link video library" >&5
 echo "$as_me: error: Cannot link video library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -27918,13 +27920,13 @@ esac
 
 	eval 'cf_cv_have_lib_'"slang"'=no'
 	cf_libdir=""
-	echo "$as_me:27921: checking for SLtt_get_screen_size" >&5
+	echo "$as_me:27923: 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 27927 "configure"
+#line 27929 "configure"
 #include "confdefs.h"
 #define SLtt_get_screen_size autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -27955,16 +27957,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:27958: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27960: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27961: \$? = $ac_status" >&5
+  echo "$as_me:27963: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:27964: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27966: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27967: \$? = $ac_status" >&5
+  echo "$as_me:27969: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_SLtt_get_screen_size=yes
 else
@@ -27974,18 +27976,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:27977: result: $ac_cv_func_SLtt_get_screen_size" >&5
+echo "$as_me:27979: 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:27984: checking for SLtt_get_screen_size in -lslang" >&5
+		echo "$as_me:27986: 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 27988 "configure"
+#line 27990 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -27997,25 +27999,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28000: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28002: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28003: \$? = $ac_status" >&5
+  echo "$as_me:28005: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28006: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28008: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28009: \$? = $ac_status" >&5
+  echo "$as_me:28011: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:28011: result: yes" >&5
+  echo "$as_me:28013: 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:28018: result: no" >&5
+echo "$as_me:28020: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -28083,11 +28085,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:28086: checking for -lslang in $cf_libdir" >&5
+				echo "$as_me:28088: 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 28090 "configure"
+#line 28092 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -28099,25 +28101,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28102: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28104: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28105: \$? = $ac_status" >&5
+  echo "$as_me:28107: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28108: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28110: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28111: \$? = $ac_status" >&5
+  echo "$as_me:28113: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:28113: result: yes" >&5
+  echo "$as_me:28115: 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:28120: result: no" >&5
+echo "$as_me:28122: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -28132,13 +28134,13 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"slang"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:28135: error: Cannot link slang library" >&5
+	{ { echo "$as_me:28137: 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:28141: checking if we can link slang without termcap" >&5
+echo "$as_me:28143: 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%^.%%'`
@@ -28147,7 +28149,7 @@ else
 fi
 LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s%$cf_exclude%%" -e 's%^.%%'`
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 28150 "configure"
+#line 28152 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -28159,16 +28161,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28162: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28164: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28165: \$? = $ac_status" >&5
+  echo "$as_me:28167: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28168: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28170: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28171: \$? = $ac_status" >&5
+  echo "$as_me:28173: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -28177,13 +28179,13 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-echo "$as_me:28180: result: $cf_result" >&5
+echo "$as_me:28182: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 test "$cf_result" = no && LIBS="$cf_slang_LIBS3"
 
 else
 
-echo "$as_me:28186: checking for slang2 header file" >&5
+echo "$as_me:28188: 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
@@ -28191,7 +28193,7 @@ else
 
 	cf_cv_slang2_header=no
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 28194 "configure"
+#line 28196 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -28203,16 +28205,16 @@ printf("%s\\n", SLANG_VERSION_STRING)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28206: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28208: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28209: \$? = $ac_status" >&5
+  echo "$as_me:28211: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28212: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28214: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28215: \$? = $ac_status" >&5
+  echo "$as_me:28217: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_slang2_header=predefined
 else
@@ -28317,7 +28319,7 @@ cf_search="$cf_search $cf_header_path_list"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:28320: result: $cf_cv_slang2_header" >&5
+echo "$as_me:28322: result: $cf_cv_slang2_header" >&5
 echo "${ECHO_T}$cf_cv_slang2_header" >&6
 
 if test "x$cf_cv_slang2_header" != xno
@@ -28361,7 +28363,7 @@ if test -n "$cf_incdir" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 28364 "configure"
+#line 28366 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -28373,16 +28375,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:28376: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28378: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28379: \$? = $ac_status" >&5
+  echo "$as_me:28381: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:28382: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28384: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28385: \$? = $ac_status" >&5
+  echo "$as_me:28387: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -28399,7 +28401,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}:28402: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:28404: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -28431,7 +28433,7 @@ else
 
 cf_cv_termlib=none
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 28434 "configure"
+#line 28436 "configure"
 #include "confdefs.h"
 extern char *tgoto(const char*,int,int);
 int
@@ -28443,19 +28445,19 @@ char *x=tgoto("",0,0); (void)x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28446: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28448: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28449: \$? = $ac_status" >&5
+  echo "$as_me:28451: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28452: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28454: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28455: \$? = $ac_status" >&5
+  echo "$as_me:28457: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 28458 "configure"
+#line 28460 "configure"
 #include "confdefs.h"
 extern char *tigetstr(const char *);
 int
@@ -28467,16 +28469,16 @@ char *x=tigetstr(""); (void)x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28470: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28472: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28473: \$? = $ac_status" >&5
+  echo "$as_me:28475: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28476: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28478: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28479: \$? = $ac_status" >&5
+  echo "$as_me:28481: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_termlib=terminfo
 else
@@ -28487,7 +28489,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}:28490: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
+echo "${as_me:-configure}:28492: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
 
 else
   echo "$as_me: failed program was:" >&5
@@ -28502,10 +28504,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:28505: checking for $cf_func in -l$cf_lib" >&5
+			echo "$as_me:28507: 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 28508 "configure"
+#line 28510 "configure"
 #include "confdefs.h"
 extern char *$cf_func(const char *);
 int
@@ -28517,16 +28519,16 @@ char *x = $cf_func(""); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28520: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28522: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28523: \$? = $ac_status" >&5
+  echo "$as_me:28525: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28526: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28528: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28529: \$? = $ac_status" >&5
+  echo "$as_me:28531: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -28535,7 +28537,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-			echo "$as_me:28538: result: $cf_result" >&5
+			echo "$as_me:28540: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				if test "$cf_func" = tigetstr ; then
@@ -28552,7 +28554,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:28555: checking for initscr in -lcurses" >&5
+	echo "$as_me:28557: 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
@@ -28560,7 +28562,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 28563 "configure"
+#line 28565 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -28579,16 +28581,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28582: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28584: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28585: \$? = $ac_status" >&5
+  echo "$as_me:28587: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28588: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28590: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28591: \$? = $ac_status" >&5
+  echo "$as_me:28593: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_curses_initscr=yes
 else
@@ -28599,7 +28601,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:28602: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:28604: 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
 
@@ -28621,7 +28623,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-	echo "$as_me:28624: checking for tgoto in -ltermcap" >&5
+	echo "$as_me:28626: 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
@@ -28629,7 +28631,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 28632 "configure"
+#line 28634 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -28648,16 +28650,16 @@ tgoto ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28651: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28653: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28654: \$? = $ac_status" >&5
+  echo "$as_me:28656: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28657: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28659: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28660: \$? = $ac_status" >&5
+  echo "$as_me:28662: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_termcap_tgoto=yes
 else
@@ -28668,7 +28670,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:28671: result: $ac_cv_lib_termcap_tgoto" >&5
+echo "$as_me:28673: 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
 
@@ -28695,20 +28697,20 @@ fi
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 if test "$cf_cv_termlib" = none; then
-	{ echo "$as_me:28698: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
+	{ echo "$as_me:28700: 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:28705: checking for acos" >&5
+echo "$as_me:28707: 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 28711 "configure"
+#line 28713 "configure"
 #include "confdefs.h"
 #define acos autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -28739,16 +28741,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28742: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28744: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28745: \$? = $ac_status" >&5
+  echo "$as_me:28747: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28748: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28750: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28751: \$? = $ac_status" >&5
+  echo "$as_me:28753: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_acos=yes
 else
@@ -28758,13 +28760,13 @@ ac_cv_func_acos=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:28761: result: $ac_cv_func_acos" >&5
+echo "$as_me:28763: 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:28767: checking for acos in -lm" >&5
+echo "$as_me:28769: 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
@@ -28772,7 +28774,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm $LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 28775 "configure"
+#line 28777 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -28791,16 +28793,16 @@ acos ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28794: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28796: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28797: \$? = $ac_status" >&5
+  echo "$as_me:28799: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28800: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28802: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28803: \$? = $ac_status" >&5
+  echo "$as_me:28805: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_m_acos=yes
 else
@@ -28811,7 +28813,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:28814: result: $ac_cv_lib_m_acos" >&5
+echo "$as_me:28816: 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
 
@@ -28837,13 +28839,13 @@ case "$host_os" in
 
 	eval 'cf_cv_have_lib_'"video"'=no'
 	cf_libdir=""
-	echo "$as_me:28840: checking for v_init" >&5
+	echo "$as_me:28842: 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 28846 "configure"
+#line 28848 "configure"
 #include "confdefs.h"
 #define v_init autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -28874,16 +28876,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28877: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28879: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28880: \$? = $ac_status" >&5
+  echo "$as_me:28882: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28883: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28885: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28886: \$? = $ac_status" >&5
+  echo "$as_me:28888: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_v_init=yes
 else
@@ -28893,18 +28895,18 @@ ac_cv_func_v_init=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:28896: result: $ac_cv_func_v_init" >&5
+echo "$as_me:28898: 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:28903: checking for v_init in -lvideo" >&5
+		echo "$as_me:28905: 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 28907 "configure"
+#line 28909 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -28916,25 +28918,25 @@ v_init()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:28919: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28921: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28922: \$? = $ac_status" >&5
+  echo "$as_me:28924: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:28925: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28927: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28928: \$? = $ac_status" >&5
+  echo "$as_me:28930: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:28930: result: yes" >&5
+  echo "$as_me:28932: 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:28937: result: no" >&5
+echo "$as_me:28939: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -29002,11 +29004,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:29005: checking for -lvideo in $cf_libdir" >&5
+				echo "$as_me:29007: 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 29009 "configure"
+#line 29011 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -29018,25 +29020,25 @@ v_init()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29021: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29023: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29024: \$? = $ac_status" >&5
+  echo "$as_me:29026: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29027: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29029: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29030: \$? = $ac_status" >&5
+  echo "$as_me:29032: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:29032: result: yes" >&5
+  echo "$as_me:29034: 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:29039: result: no" >&5
+echo "$as_me:29041: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -29051,7 +29053,7 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"video"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:29054: error: Cannot link video library" >&5
+	{ { echo "$as_me:29056: error: Cannot link video library" >&5
 echo "$as_me: error: Cannot link video library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -29061,13 +29063,13 @@ esac
 
 	eval 'cf_cv_have_lib_'"slang2"'=no'
 	cf_libdir=""
-	echo "$as_me:29064: checking for SLtt_get_screen_size" >&5
+	echo "$as_me:29066: 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 29070 "configure"
+#line 29072 "configure"
 #include "confdefs.h"
 #define SLtt_get_screen_size autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -29098,16 +29100,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29101: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29103: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29104: \$? = $ac_status" >&5
+  echo "$as_me:29106: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29107: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29109: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29110: \$? = $ac_status" >&5
+  echo "$as_me:29112: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_SLtt_get_screen_size=yes
 else
@@ -29117,18 +29119,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:29120: result: $ac_cv_func_SLtt_get_screen_size" >&5
+echo "$as_me:29122: 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:29127: checking for SLtt_get_screen_size in -lslang2" >&5
+		echo "$as_me:29129: 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 29131 "configure"
+#line 29133 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -29140,25 +29142,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29143: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29145: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29146: \$? = $ac_status" >&5
+  echo "$as_me:29148: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29149: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29151: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29152: \$? = $ac_status" >&5
+  echo "$as_me:29154: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:29154: result: yes" >&5
+  echo "$as_me:29156: 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:29161: result: no" >&5
+echo "$as_me:29163: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -29226,11 +29228,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:29229: checking for -lslang2 in $cf_libdir" >&5
+				echo "$as_me:29231: 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 29233 "configure"
+#line 29235 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -29242,25 +29244,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29245: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29247: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29248: \$? = $ac_status" >&5
+  echo "$as_me:29250: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29251: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29253: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29254: \$? = $ac_status" >&5
+  echo "$as_me:29256: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
-  echo "$as_me:29256: result: yes" >&5
+  echo "$as_me:29258: 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:29263: result: no" >&5
+echo "$as_me:29265: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -29275,13 +29277,13 @@ fi
 eval 'cf_found_library="$cf_cv_have_lib_'"slang2"\"
 
 if test "$cf_found_library" = no ; then
-	{ { echo "$as_me:29278: error: Cannot link slang2 library" >&5
+	{ { echo "$as_me:29280: 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:29284: checking if we can link slang2 without termcap" >&5
+echo "$as_me:29286: 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%^.%%'`
@@ -29290,7 +29292,7 @@ else
 fi
 LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s%$cf_exclude%%" -e 's%^.%%'`
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 29293 "configure"
+#line 29295 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -29302,16 +29304,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29305: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29307: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29308: \$? = $ac_status" >&5
+  echo "$as_me:29310: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29311: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29313: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29314: \$? = $ac_status" >&5
+  echo "$as_me:29316: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -29320,12 +29322,12 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-echo "$as_me:29323: result: $cf_result" >&5
+echo "$as_me:29325: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 test "$cf_result" = no && LIBS="$cf_slang_LIBS3"
 
 	else
-		{ { echo "$as_me:29328: error: cannot find slang headers" >&5
+		{ { echo "$as_me:29330: error: cannot find slang headers" >&5
 echo "$as_me: error: cannot find slang headers" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -29333,14 +29335,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:29336: checking if we must define UTF8" >&5
+echo "$as_me:29338: 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 29343 "configure"
+#line 29345 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -29352,16 +29354,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:29355: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29357: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29358: \$? = $ac_status" >&5
+  echo "$as_me:29360: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:29361: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29363: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29364: \$? = $ac_status" >&5
+  echo "$as_me:29366: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_slang_utf8=no
 else
@@ -29369,7 +29371,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 29372 "configure"
+#line 29374 "configure"
 #include "confdefs.h"
 
 #define UTF8
@@ -29383,16 +29385,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:29386: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29388: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29389: \$? = $ac_status" >&5
+  echo "$as_me:29391: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:29392: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29394: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29395: \$? = $ac_status" >&5
+  echo "$as_me:29397: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_slang_utf8=yes
 else
@@ -29405,7 +29407,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:29408: result: $cf_cv_slang_utf8" >&5
+echo "$as_me:29410: result: $cf_cv_slang_utf8" >&5
 echo "${ECHO_T}$cf_cv_slang_utf8" >&6
 
 if test "$cf_cv_slang_utf8" = yes ; then
@@ -29416,14 +29418,14 @@ EOF
 
 fi
 
-echo "$as_me:29419: checking if we must tell slang this is UNIX" >&5
+echo "$as_me:29421: 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 29426 "configure"
+#line 29428 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -29442,16 +29444,16 @@ SLang_TT_Baud_Rate = 1
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29445: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29447: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29448: \$? = $ac_status" >&5
+  echo "$as_me:29450: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29451: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29453: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29454: \$? = $ac_status" >&5
+  echo "$as_me:29456: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_slang_unix=yes
 else
@@ -29462,20 +29464,20 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:29465: result: $cf_cv_slang_unix" >&5
+echo "$as_me:29467: 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:29472: checking for SLsmg_Color_Type" >&5
+	echo "$as_me:29474: 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 29478 "configure"
+#line 29480 "configure"
 #include "confdefs.h"
 #include <slang.h>
 
@@ -29491,16 +29493,16 @@ if (sizeof (SLsmg_Color_Type))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:29494: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29496: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29497: \$? = $ac_status" >&5
+  echo "$as_me:29499: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:29500: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29502: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29503: \$? = $ac_status" >&5
+  echo "$as_me:29505: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_SLsmg_Color_Type=yes
 else
@@ -29510,7 +29512,7 @@ ac_cv_type_SLsmg_Color_Type=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:29513: result: $ac_cv_type_SLsmg_Color_Type" >&5
+echo "$as_me:29515: 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
@@ -29526,13 +29528,13 @@ EOF
 
 fi
 
-	echo "$as_me:29529: checking for SLtt_Char_Type" >&5
+	echo "$as_me:29531: 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 29535 "configure"
+#line 29537 "configure"
 #include "confdefs.h"
 #include <slang.h>
 
@@ -29548,16 +29550,16 @@ if (sizeof (SLtt_Char_Type))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:29551: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29553: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29554: \$? = $ac_status" >&5
+  echo "$as_me:29556: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:29557: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29559: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29560: \$? = $ac_status" >&5
+  echo "$as_me:29562: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_SLtt_Char_Type=yes
 else
@@ -29567,7 +29569,7 @@ ac_cv_type_SLtt_Char_Type=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:29570: result: $ac_cv_type_SLtt_Char_Type" >&5
+echo "$as_me:29572: 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
@@ -29590,7 +29592,7 @@ esac
 LD_RPATH_OPT=
 if test "x$cf_cv_enable_rpath" != xno
 then
-	echo "$as_me:29593: checking for an rpath option" >&5
+	echo "$as_me:29595: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	case "$cf_cv_system_name" in
 	(irix*)
@@ -29621,12 +29623,12 @@ echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 	(*)
 		;;
 	esac
-	echo "$as_me:29624: result: $LD_RPATH_OPT" >&5
+	echo "$as_me:29626: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 	case "x$LD_RPATH_OPT" in
 	(x-R*)
-		echo "$as_me:29629: checking if we need a space after rpath option" >&5
+		echo "$as_me:29631: 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"
 
@@ -29647,7 +29649,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 29650 "configure"
+#line 29652 "configure"
 #include "confdefs.h"
 
 int
@@ -29659,16 +29661,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:29662: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29664: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29665: \$? = $ac_status" >&5
+  echo "$as_me:29667: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:29668: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29670: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29671: \$? = $ac_status" >&5
+  echo "$as_me:29673: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_rpath_space=no
 else
@@ -29678,7 +29680,7 @@ cf_rpath_space=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 		LIBS="$cf_save_LIBS"
-		echo "$as_me:29681: result: $cf_rpath_space" >&5
+		echo "$as_me:29683: result: $cf_rpath_space" >&5
 echo "${ECHO_T}$cf_rpath_space" >&6
 		test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
 		;;
@@ -29689,13 +29691,13 @@ if test -z "$LD_RPATH_OPT"
 then
 	test -n "$verbose" && echo "	will not attempt to use rpath" 1>&6
 
-echo "${as_me:-configure}:29692: testing will not attempt to use rpath ..." 1>&5
+echo "${as_me:-configure}:29694: 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}:29698: testing rpath is disabled ..." 1>&5
+echo "${as_me:-configure}:29700: testing rpath is disabled ..." 1>&5
 
 elif test -z "${LD_RUN_PATH}${LD_LIBRARY_PATH}"
 then
@@ -29706,7 +29708,7 @@ if test "$cross_compiling" = yes; then
   cf_check_run=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 29709 "configure"
+#line 29711 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int main(void) {
@@ -29715,15 +29717,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:29718: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29720: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29721: \$? = $ac_status" >&5
+  echo "$as_me:29723: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:29723: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29725: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29726: \$? = $ac_status" >&5
+  echo "$as_me:29728: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_check_run=yes
 else
@@ -29739,7 +29741,7 @@ fi
 		then
 			test -n "$verbose" && echo "	linkage is broken" 1>&6
 
-echo "${as_me:-configure}:29742: testing linkage is broken ..." 1>&5
+echo "${as_me:-configure}:29744: testing linkage is broken ..." 1>&5
 
 			cf_result=
 			for cf_item in $LIBS
@@ -29771,7 +29773,7 @@ if test "$cross_compiling" = yes; then
   cf_check_run=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 29774 "configure"
+#line 29776 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int main(void) {
@@ -29780,15 +29782,15 @@ int main(void) {
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:29783: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29785: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29786: \$? = $ac_status" >&5
+  echo "$as_me:29788: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:29788: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29790: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29791: \$? = $ac_status" >&5
+  echo "$as_me:29793: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_check_run=yes
 else
@@ -29804,12 +29806,12 @@ fi
 				then
 					test -n "$verbose" && echo "	use rpath for $cf_save_LIBS" 1>&6
 
-echo "${as_me:-configure}:29807: testing use rpath for $cf_save_LIBS ..." 1>&5
+echo "${as_me:-configure}:29809: 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}:29812: testing result is now $LIBS ..." 1>&5
+echo "${as_me:-configure}:29814: testing result is now $LIBS ..." 1>&5
 
 				else
 					LIBS="$cf_save_LIBS"
@@ -29820,20 +29822,20 @@ echo "${as_me:-configure}:29812: testing result is now $LIBS ..." 1>&5
 	(*)
 		test -n "$verbose" && echo "	will not attempt to use rpath" 1>&6
 
-echo "${as_me:-configure}:29823: testing will not attempt to use rpath ..." 1>&5
+echo "${as_me:-configure}:29825: testing will not attempt to use rpath ..." 1>&5
 
 		;;
 	esac
 fi
 
-echo "$as_me:29829: checking for chtype typedef" >&5
+echo "$as_me:29831: 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 29836 "configure"
+#line 29838 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -29845,16 +29847,16 @@ chtype foo; (void)foo
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:29848: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29850: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29851: \$? = $ac_status" >&5
+  echo "$as_me:29853: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:29854: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29856: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29857: \$? = $ac_status" >&5
+  echo "$as_me:29859: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_chtype_decl=yes
 else
@@ -29864,7 +29866,7 @@ cf_cv_chtype_decl=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:29867: result: $cf_cv_chtype_decl" >&5
+echo "$as_me:29869: result: $cf_cv_chtype_decl" >&5
 echo "${ECHO_T}$cf_cv_chtype_decl" >&6
 if test "$cf_cv_chtype_decl" = yes ; then
 
@@ -29872,14 +29874,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_TYPE_CHTYPE 1
 EOF
 
-	echo "$as_me:29875: checking if chtype is scalar or struct" >&5
+	echo "$as_me:29877: 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 29882 "configure"
+#line 29884 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -29891,16 +29893,16 @@ static chtype foo; long x = foo; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:29894: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29896: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29897: \$? = $ac_status" >&5
+  echo "$as_me:29899: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:29900: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29902: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29903: \$? = $ac_status" >&5
+  echo "$as_me:29905: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_chtype_type=scalar
 else
@@ -29910,7 +29912,7 @@ cf_cv_chtype_type=struct
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:29913: result: $cf_cv_chtype_type" >&5
+echo "$as_me:29915: result: $cf_cv_chtype_type" >&5
 echo "${ECHO_T}$cf_cv_chtype_type" >&6
 	if test "$cf_cv_chtype_type" = scalar ; then
 
@@ -29921,7 +29923,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:29924: checking if you want the wide-curses features" >&5
+echo "$as_me:29926: 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.
@@ -29938,10 +29940,10 @@ else
 	use_wide_curses=$cf_wide_curses
 
 fi;
-echo "$as_me:29941: result: $use_wide_curses" >&5
+echo "$as_me:29943: result: $use_wide_curses" >&5
 echo "${ECHO_T}$use_wide_curses" >&6
 
-echo "$as_me:29944: checking if color-style code should be used" >&5
+echo "$as_me:29946: 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.
@@ -29961,7 +29963,7 @@ fi;
 
 case "$use_color_style" in
 (no)
-	echo "$as_me:29964: result: no" >&5
+	echo "$as_me:29966: result: no" >&5
 echo "${ECHO_T}no" >&6
 	INSTALL_LSS=
 	;;
@@ -29971,10 +29973,10 @@ cat >>confdefs.h <<\EOF
 #define USE_COLOR_STYLE 1
 EOF
 
-	echo "$as_me:29974: result: yes" >&5
+	echo "$as_me:29976: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-	echo "$as_me:29977: checking for location of style-sheet file" >&5
+	echo "$as_me:29979: 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.
@@ -30010,7 +30012,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:30013: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:30015: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -30019,7 +30021,7 @@ esac
 fi
 eval LYNX_LSS_FILE="$withval"
 
-	echo "$as_me:30022: result: $LYNX_LSS_FILE" >&5
+	echo "$as_me:30024: result: $LYNX_LSS_FILE" >&5
 echo "${ECHO_T}$LYNX_LSS_FILE" >&6
 
 	test "$LYNX_LSS_FILE" = no && LYNX_LSS_FILE=
@@ -30032,7 +30034,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:30035: checking for the default configuration-file" >&5
+echo "$as_me:30037: 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.
@@ -30068,7 +30070,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:30071: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:30073: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -30077,7 +30079,7 @@ esac
 fi
 eval LYNX_CFG_FILE="$withval"
 
-echo "$as_me:30080: result: $LYNX_CFG_FILE" >&5
+echo "$as_me:30082: result: $LYNX_CFG_FILE" >&5
 echo "${ECHO_T}$LYNX_CFG_FILE" >&6
 
 test "$LYNX_CFG_FILE" = no && LYNX_CFG_FILE=
@@ -30086,7 +30088,7 @@ cat >>confdefs.h <<EOF
 #define LYNX_CFG_FILE "$LYNX_CFG_FILE"
 EOF
 
-echo "$as_me:30089: checking for the default configuration-path" >&5
+echo "$as_me:30091: 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.
@@ -30122,7 +30124,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:30125: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:30127: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -30131,7 +30133,7 @@ esac
 fi
 eval LYNX_CFG_PATH="$withval"
 
-echo "$as_me:30134: result: $LYNX_CFG_PATH" >&5
+echo "$as_me:30136: 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%/[^/]*$%%'`"
@@ -30141,7 +30143,7 @@ cat >>confdefs.h <<EOF
 #define LYNX_CFG_PATH "$LYNX_CFG_PATH"
 EOF
 
-echo "$as_me:30144: checking if htmlized lynx.cfg should be built" >&5
+echo "$as_me:30146: 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.
@@ -30158,7 +30160,7 @@ else
 	use_htmlized_cfg=no
 
 fi;
-echo "$as_me:30161: result: $use_htmlized_cfg" >&5
+echo "$as_me:30163: result: $use_htmlized_cfg" >&5
 echo "${ECHO_T}$use_htmlized_cfg" >&6
 
 LYNXCFG_MAKE=''
@@ -30169,7 +30171,7 @@ else
 	LYNXCFG_NO_MAKE='#'
 fi
 
-echo "$as_me:30172: checking if local doc directory should be linked to help page" >&5
+echo "$as_me:30174: 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.
@@ -30186,7 +30188,7 @@ else
 	use_local_docs=no
 
 fi;
-echo "$as_me:30189: result: $use_local_docs" >&5
+echo "$as_me:30191: result: $use_local_docs" >&5
 echo "${ECHO_T}$use_local_docs" >&6
 
 LYNXDOC_MAKE=''
@@ -30194,7 +30196,7 @@ if test "$use_local_docs" = no ; then
 	LYNXDOC_MAKE='#'
 fi
 
-echo "$as_me:30197: checking for MIME library directory" >&5
+echo "$as_me:30199: 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.
@@ -30230,7 +30232,7 @@ case ".$withval" in
 	withval=`echo "$withval" | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:30233: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:30235: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -30239,7 +30241,7 @@ esac
 fi
 eval MIME_LIBDIR="$withval"
 
-echo "$as_me:30242: result: $MIME_LIBDIR" >&5
+echo "$as_me:30244: result: $MIME_LIBDIR" >&5
 echo "${ECHO_T}$MIME_LIBDIR" >&6
 MIME_LIBDIR=`echo "$MIME_LIBDIR" | sed -e 's,/$,,' -e 's,$,/,'`
 
@@ -30247,7 +30249,7 @@ cat >>confdefs.h <<EOF
 #define MIME_LIBDIR "$MIME_LIBDIR"
 EOF
 
-echo "$as_me:30250: checking if locale-charset selection logic should be used" >&5
+echo "$as_me:30252: 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.
@@ -30264,7 +30266,7 @@ else
 	use_locale_charset=yes
 
 fi;
-echo "$as_me:30267: result: $use_locale_charset" >&5
+echo "$as_me:30269: result: $use_locale_charset" >&5
 echo "${ECHO_T}$use_locale_charset" >&6
 test "$use_locale_charset" != no &&
 cat >>confdefs.h <<\EOF
@@ -30273,7 +30275,7 @@ EOF
 
 CHARSET_DEFS=
 
-echo "$as_me:30276: checking if you want only a few charsets" >&5
+echo "$as_me:30278: 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.
@@ -30285,7 +30287,7 @@ else
 fi;
 
 if test -n "$cf_charsets" ; then
-	echo "$as_me:30288: result: yes" >&5
+	echo "$as_me:30290: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 cat >>confdefs.h <<\EOF
@@ -30299,7 +30301,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}:30302: testing using minimal list of charsets: $cf_min_charsets ..." 1>&5
+echo "${as_me:-configure}:30304: 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'`
@@ -30326,28 +30328,28 @@ echo "${as_me:-configure}:30302: testing using minimal list of charsets: $cf_min
 		then
 			test -n "$verbose" && echo "	found $cf_charset" 1>&6
 
-echo "${as_me:-configure}:30329: testing found $cf_charset ..." 1>&5
+echo "${as_me:-configure}:30331: 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}:30335: testing not found $cf_charset ..." 1>&5
+echo "${as_me:-configure}:30337: testing not found $cf_charset ..." 1>&5
 
 		fi
 	done
 else
-	echo "$as_me:30340: result: no" >&5
+	echo "$as_me:30342: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:30344: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:30346: 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 30350 "configure"
+#line 30352 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -30363,16 +30365,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:30366: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30368: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30369: \$? = $ac_status" >&5
+  echo "$as_me:30371: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:30372: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30374: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30375: \$? = $ac_status" >&5
+  echo "$as_me:30377: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_header_time=yes
 else
@@ -30382,7 +30384,7 @@ ac_cv_header_time=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:30385: result: $ac_cv_header_time" >&5
+echo "$as_me:30387: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -30395,13 +30397,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:30398: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:30400: 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 30404 "configure"
+#line 30406 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -30416,16 +30418,16 @@ return 0;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:30419: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30421: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30422: \$? = $ac_status" >&5
+  echo "$as_me:30424: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:30425: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30427: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30428: \$? = $ac_status" >&5
+  echo "$as_me:30430: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -30435,7 +30437,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:30438: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:30440: 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
@@ -30448,7 +30450,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:30451: checking for opendir in -ldir" >&5
+  echo "$as_me:30453: 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
@@ -30456,7 +30458,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 30459 "configure"
+#line 30461 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -30475,16 +30477,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:30478: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30480: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30481: \$? = $ac_status" >&5
+  echo "$as_me:30483: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:30484: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30486: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30487: \$? = $ac_status" >&5
+  echo "$as_me:30489: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -30495,14 +30497,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:30498: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:30500: 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:30505: checking for opendir in -lx" >&5
+  echo "$as_me:30507: 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
@@ -30510,7 +30512,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 30513 "configure"
+#line 30515 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -30529,16 +30531,16 @@ opendir ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:30532: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30534: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30535: \$? = $ac_status" >&5
+  echo "$as_me:30537: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:30538: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30540: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30541: \$? = $ac_status" >&5
+  echo "$as_me:30543: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -30549,7 +30551,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:30552: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:30554: 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"
@@ -30575,23 +30577,23 @@ for ac_header in \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:30578: checking for $ac_header" >&5
+echo "$as_me:30580: 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 30584 "configure"
+#line 30586 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:30588: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:30590: \"$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:30594: \$? = $ac_status" >&5
+  echo "$as_me:30596: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -30610,7 +30612,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:30613: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:30615: 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
@@ -30620,14 +30622,14 @@ EOF
 fi
 done
 
-echo "$as_me:30623: checking termio.h and termios.h" >&5
+echo "$as_me:30625: 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 30630 "configure"
+#line 30632 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -30646,16 +30648,16 @@ putchar (0x0a)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:30649: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30651: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30652: \$? = $ac_status" >&5
+  echo "$as_me:30654: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:30655: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30657: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30658: \$? = $ac_status" >&5
+  echo "$as_me:30660: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_termio_and_termios=yes
 else
@@ -30666,21 +30668,21 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:30669: result: $cf_cv_termio_and_termios" >&5
+echo "$as_me:30671: 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:30676: checking for sigaction and structs" >&5
+echo "$as_me:30678: 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 30683 "configure"
+#line 30685 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -30700,16 +30702,16 @@ struct sigaction act;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:30703: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30705: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30706: \$? = $ac_status" >&5
+  echo "$as_me:30708: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:30709: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30711: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30712: \$? = $ac_status" >&5
+  echo "$as_me:30714: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_sigaction=yes
 else
@@ -30720,7 +30722,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:30723: result: $cf_cv_func_sigaction" >&5
+echo "$as_me:30725: result: $cf_cv_func_sigaction" >&5
 echo "${ECHO_T}$cf_cv_func_sigaction" >&6
 test "$cf_cv_func_sigaction" = yes &&
 cat >>confdefs.h <<\EOF
@@ -30730,23 +30732,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:30733: checking for $ac_header" >&5
+echo "$as_me:30735: 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 30739 "configure"
+#line 30741 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:30743: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:30745: \"$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:30749: \$? = $ac_status" >&5
+  echo "$as_me:30751: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -30765,7 +30767,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:30768: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:30770: 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
@@ -30786,23 +30788,23 @@ else
 for ac_header in wait.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:30789: checking for $ac_header" >&5
+echo "$as_me:30791: 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 30795 "configure"
+#line 30797 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:30799: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:30801: \"$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:30805: \$? = $ac_status" >&5
+  echo "$as_me:30807: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -30821,7 +30823,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:30824: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:30826: 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
@@ -30834,23 +30836,23 @@ done
 for ac_header in waitstatus.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:30837: checking for $ac_header" >&5
+echo "$as_me:30839: 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 30843 "configure"
+#line 30845 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:30847: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:30849: \"$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:30853: \$? = $ac_status" >&5
+  echo "$as_me:30855: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -30869,7 +30871,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:30872: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:30874: 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
@@ -30891,14 +30893,14 @@ cf_wait_headers="$cf_wait_headers
 fi
 fi
 
-echo "$as_me:30894: checking for union wait" >&5
+echo "$as_me:30896: 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 30901 "configure"
+#line 30903 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -30917,16 +30919,16 @@ static int x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:30920: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30922: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30923: \$? = $ac_status" >&5
+  echo "$as_me:30925: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:30926: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30928: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30929: \$? = $ac_status" >&5
+  echo "$as_me:30931: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_type_unionwait=no
 	 echo compiles ok w/o union wait 1>&5
@@ -30936,7 +30938,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 30939 "configure"
+#line 30941 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -30963,16 +30965,16 @@ union wait x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:30966: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30968: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30969: \$? = $ac_status" >&5
+  echo "$as_me:30971: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:30972: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30974: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30975: \$? = $ac_status" >&5
+  echo "$as_me:30977: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_type_unionwait=yes
 	 echo compiles ok with union wait and possibly macros too 1>&5
@@ -30987,7 +30989,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:30990: result: $cf_cv_type_unionwait" >&5
+echo "$as_me:30992: result: $cf_cv_type_unionwait" >&5
 echo "${ECHO_T}$cf_cv_type_unionwait" >&6
 test "$cf_cv_type_unionwait" = yes &&
 cat >>confdefs.h <<\EOF
@@ -30996,14 +30998,14 @@ EOF
 
 if test "$cf_cv_type_unionwait" = yes; then
 
-	echo "$as_me:30999: checking if union wait can be used as wait-arg" >&5
+	echo "$as_me:31001: 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 31006 "configure"
+#line 31008 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -31015,16 +31017,16 @@ union wait x; wait(&x)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:31018: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31020: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31021: \$? = $ac_status" >&5
+  echo "$as_me:31023: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:31024: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31026: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31027: \$? = $ac_status" >&5
+  echo "$as_me:31029: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_arg_union_wait=yes
 else
@@ -31036,21 +31038,21 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-	echo "$as_me:31039: result: $cf_cv_arg_union_wait" >&5
+	echo "$as_me:31041: 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:31046: checking if union wait can be used as waitpid-arg" >&5
+	echo "$as_me:31048: 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 31053 "configure"
+#line 31055 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -31062,16 +31064,16 @@ union wait x; waitpid(0, &x, 0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:31065: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31067: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31068: \$? = $ac_status" >&5
+  echo "$as_me:31070: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:31071: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31073: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31074: \$? = $ac_status" >&5
+  echo "$as_me:31076: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_arg_union_waitpid=yes
 else
@@ -31083,7 +31085,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-	echo "$as_me:31086: result: $cf_cv_arg_union_waitpid" >&5
+	echo "$as_me:31088: 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
@@ -31092,13 +31094,13 @@ EOF
 
 fi
 
-echo "$as_me:31095: checking for uid_t in sys/types.h" >&5
+echo "$as_me:31097: 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 31101 "configure"
+#line 31103 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -31112,7 +31114,7 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:31115: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:31117: 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
 
@@ -31126,7 +31128,7 @@ EOF
 
 fi
 
-echo "$as_me:31129: checking type of array argument to getgroups" >&5
+echo "$as_me:31131: 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
@@ -31135,7 +31137,7 @@ else
   ac_cv_type_getgroups=cross
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 31138 "configure"
+#line 31140 "configure"
 #include "confdefs.h"
 $ac_includes_default
 /* Thanks to Mike Rendell for this test.  */
@@ -31162,15 +31164,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:31165: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31167: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31168: \$? = $ac_status" >&5
+  echo "$as_me:31170: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:31170: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31172: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31173: \$? = $ac_status" >&5
+  echo "$as_me:31175: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_getgroups=gid_t
 else
@@ -31183,7 +31185,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 31186 "configure"
+#line 31188 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 
@@ -31198,20 +31200,20 @@ rm -rf conftest*
 
 fi
 fi
-echo "$as_me:31201: result: $ac_cv_type_getgroups" >&5
+echo "$as_me:31203: 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:31208: checking for off_t" >&5
+echo "$as_me:31210: 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 31214 "configure"
+#line 31216 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -31226,16 +31228,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:31229: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31231: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31232: \$? = $ac_status" >&5
+  echo "$as_me:31234: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:31235: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31237: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31238: \$? = $ac_status" >&5
+  echo "$as_me:31240: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -31245,7 +31247,7 @@ ac_cv_type_off_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:31248: result: $ac_cv_type_off_t" >&5
+echo "$as_me:31250: 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
   :
@@ -31257,13 +31259,13 @@ EOF
 
 fi
 
-echo "$as_me:31260: checking for pid_t" >&5
+echo "$as_me:31262: 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 31266 "configure"
+#line 31268 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -31278,16 +31280,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:31281: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31283: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31284: \$? = $ac_status" >&5
+  echo "$as_me:31286: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:31287: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31289: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31290: \$? = $ac_status" >&5
+  echo "$as_me:31292: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -31297,7 +31299,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:31300: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:31302: 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
   :
@@ -31309,13 +31311,13 @@ EOF
 
 fi
 
-echo "$as_me:31312: checking for uid_t in sys/types.h" >&5
+echo "$as_me:31314: 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 31318 "configure"
+#line 31320 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -31329,7 +31331,7 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:31332: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:31334: 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
 
@@ -31343,13 +31345,13 @@ EOF
 
 fi
 
-echo "$as_me:31346: checking for mode_t" >&5
+echo "$as_me:31348: 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 31352 "configure"
+#line 31354 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -31364,16 +31366,16 @@ if (sizeof (mode_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:31367: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31369: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31370: \$? = $ac_status" >&5
+  echo "$as_me:31372: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:31373: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31375: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31376: \$? = $ac_status" >&5
+  echo "$as_me:31378: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_mode_t=yes
 else
@@ -31383,7 +31385,7 @@ ac_cv_type_mode_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:31386: result: $ac_cv_type_mode_t" >&5
+echo "$as_me:31388: 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
   :
@@ -31395,13 +31397,13 @@ EOF
 
 fi
 
-	echo "$as_me:31398: checking for ssize_t" >&5
+	echo "$as_me:31400: 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 31404 "configure"
+#line 31406 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -31416,16 +31418,16 @@ if (sizeof (ssize_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:31419: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31421: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31422: \$? = $ac_status" >&5
+  echo "$as_me:31424: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:31425: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31427: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31428: \$? = $ac_status" >&5
+  echo "$as_me:31430: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_ssize_t=yes
 else
@@ -31435,7 +31437,7 @@ ac_cv_type_ssize_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:31438: result: $ac_cv_type_ssize_t" >&5
+echo "$as_me:31440: 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
@@ -31451,13 +31453,13 @@ EOF
 
 fi
 
-	echo "$as_me:31454: checking for socklen_t" >&5
+	echo "$as_me:31456: 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 31460 "configure"
+#line 31462 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -31475,16 +31477,16 @@ if (sizeof (socklen_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:31478: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31480: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31481: \$? = $ac_status" >&5
+  echo "$as_me:31483: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:31484: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31486: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31487: \$? = $ac_status" >&5
+  echo "$as_me:31489: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_socklen_t=yes
 else
@@ -31494,7 +31496,7 @@ ac_cv_type_socklen_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:31497: result: $ac_cv_type_socklen_t" >&5
+echo "$as_me:31499: 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
@@ -31510,7 +31512,7 @@ EOF
 
 fi
 
-echo "$as_me:31513: checking for long long type" >&5
+echo "$as_me:31515: 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
@@ -31541,7 +31543,7 @@ _CFEOF
 	rm -f conftest*
 
 fi
-echo "$as_me:31544: result: $cf_cv_type_long_long" >&5
+echo "$as_me:31546: 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
@@ -31552,14 +31554,14 @@ EOF
 
 fi
 
-echo "$as_me:31555: checking for tm.tm_gmtoff" >&5
+echo "$as_me:31557: 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 31562 "configure"
+#line 31564 "configure"
 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME
@@ -31584,16 +31586,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:31587: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31589: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31590: \$? = $ac_status" >&5
+  echo "$as_me:31592: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:31593: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31595: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31596: \$? = $ac_status" >&5
+  echo "$as_me:31598: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_tm_gmtoff=yes
 else
@@ -31604,20 +31606,20 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:31607: result: $cf_cv_tm_gmtoff" >&5
+echo "$as_me:31609: 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:31614: checking for int" >&5
+echo "$as_me:31616: 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 31620 "configure"
+#line 31622 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -31632,16 +31634,16 @@ if (sizeof (int))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:31635: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31637: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31638: \$? = $ac_status" >&5
+  echo "$as_me:31640: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:31641: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31643: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31644: \$? = $ac_status" >&5
+  echo "$as_me:31646: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_int=yes
 else
@@ -31651,10 +31653,10 @@ ac_cv_type_int=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:31654: result: $ac_cv_type_int" >&5
+echo "$as_me:31656: result: $ac_cv_type_int" >&5
 echo "${ECHO_T}$ac_cv_type_int" >&6
 
-echo "$as_me:31657: checking size of int" >&5
+echo "$as_me:31659: 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
@@ -31663,7 +31665,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 31666 "configure"
+#line 31668 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -31675,21 +31677,21 @@ int _array_ [1 - 2 * !((sizeof (int)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:31678: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31680: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31681: \$? = $ac_status" >&5
+  echo "$as_me:31683: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:31684: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31686: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31687: \$? = $ac_status" >&5
+  echo "$as_me:31689: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 31692 "configure"
+#line 31694 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -31701,16 +31703,16 @@ int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:31704: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31706: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31707: \$? = $ac_status" >&5
+  echo "$as_me:31709: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:31710: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31712: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31713: \$? = $ac_status" >&5
+  echo "$as_me:31715: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -31726,7 +31728,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 31729 "configure"
+#line 31731 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -31738,16 +31740,16 @@ int _array_ [1 - 2 * !((sizeof (int)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:31741: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31743: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31744: \$? = $ac_status" >&5
+  echo "$as_me:31746: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:31747: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31749: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31750: \$? = $ac_status" >&5
+  echo "$as_me:31752: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -31763,7 +31765,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 31766 "configure"
+#line 31768 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -31775,16 +31777,16 @@ int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:31778: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31780: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31781: \$? = $ac_status" >&5
+  echo "$as_me:31783: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:31784: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31786: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31787: \$? = $ac_status" >&5
+  echo "$as_me:31789: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -31797,12 +31799,12 @@ done
 ac_cv_sizeof_int=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:31800: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:31802: 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 31805 "configure"
+#line 31807 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -31818,15 +31820,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:31821: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31823: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31824: \$? = $ac_status" >&5
+  echo "$as_me:31826: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:31826: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31828: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31829: \$? = $ac_status" >&5
+  echo "$as_me:31831: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_int=`cat conftest.val`
 else
@@ -31842,7 +31844,7 @@ else
   ac_cv_sizeof_int=0
 fi
 fi
-echo "$as_me:31845: result: $ac_cv_sizeof_int" >&5
+echo "$as_me:31847: 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
@@ -31851,11 +31853,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:31854: WARNING: using 4 for sizeof int" >&5
+		{ echo "$as_me:31856: 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:31858: WARNING: sizeof int not found, using 4" >&5
+		{ echo "$as_me:31860: 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
@@ -31869,13 +31871,13 @@ cf_cv_type=`echo "sizeof_int" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKL
 	fi
 fi
 
-echo "$as_me:31872: checking for long" >&5
+echo "$as_me:31874: 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 31878 "configure"
+#line 31880 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -31890,16 +31892,16 @@ if (sizeof (long))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:31893: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31895: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31896: \$? = $ac_status" >&5
+  echo "$as_me:31898: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:31899: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31901: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31902: \$? = $ac_status" >&5
+  echo "$as_me:31904: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_long=yes
 else
@@ -31909,10 +31911,10 @@ ac_cv_type_long=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:31912: result: $ac_cv_type_long" >&5
+echo "$as_me:31914: result: $ac_cv_type_long" >&5
 echo "${ECHO_T}$ac_cv_type_long" >&6
 
-echo "$as_me:31915: checking size of long" >&5
+echo "$as_me:31917: 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
@@ -31921,7 +31923,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 31924 "configure"
+#line 31926 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -31933,21 +31935,21 @@ int _array_ [1 - 2 * !((sizeof (long)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:31936: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31938: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31939: \$? = $ac_status" >&5
+  echo "$as_me:31941: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:31942: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31944: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31945: \$? = $ac_status" >&5
+  echo "$as_me:31947: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 31950 "configure"
+#line 31952 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -31959,16 +31961,16 @@ int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:31962: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31964: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31965: \$? = $ac_status" >&5
+  echo "$as_me:31967: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:31968: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31970: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31971: \$? = $ac_status" >&5
+  echo "$as_me:31973: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -31984,7 +31986,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 31987 "configure"
+#line 31989 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -31996,16 +31998,16 @@ int _array_ [1 - 2 * !((sizeof (long)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:31999: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32001: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32002: \$? = $ac_status" >&5
+  echo "$as_me:32004: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32005: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32007: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32008: \$? = $ac_status" >&5
+  echo "$as_me:32010: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -32021,7 +32023,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 32024 "configure"
+#line 32026 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32033,16 +32035,16 @@ int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32036: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32038: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32039: \$? = $ac_status" >&5
+  echo "$as_me:32041: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32042: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32044: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32045: \$? = $ac_status" >&5
+  echo "$as_me:32047: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -32055,12 +32057,12 @@ done
 ac_cv_sizeof_long=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:32058: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:32060: 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 32063 "configure"
+#line 32065 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32076,15 +32078,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:32079: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32081: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32082: \$? = $ac_status" >&5
+  echo "$as_me:32084: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:32084: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32086: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32087: \$? = $ac_status" >&5
+  echo "$as_me:32089: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_long=`cat conftest.val`
 else
@@ -32100,7 +32102,7 @@ else
   ac_cv_sizeof_long=0
 fi
 fi
-echo "$as_me:32103: result: $ac_cv_sizeof_long" >&5
+echo "$as_me:32105: 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
@@ -32109,11 +32111,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:32112: WARNING: using 4 for sizeof long" >&5
+		{ echo "$as_me:32114: 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:32116: WARNING: sizeof long not found, using 4" >&5
+		{ echo "$as_me:32118: 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
@@ -32127,13 +32129,13 @@ cf_cv_type=`echo "sizeof_long" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJK
 	fi
 fi
 
-echo "$as_me:32130: checking for off_t" >&5
+echo "$as_me:32132: 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 32136 "configure"
+#line 32138 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32148,16 +32150,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32151: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32153: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32154: \$? = $ac_status" >&5
+  echo "$as_me:32156: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32157: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32159: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32160: \$? = $ac_status" >&5
+  echo "$as_me:32162: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -32167,10 +32169,10 @@ ac_cv_type_off_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:32170: result: $ac_cv_type_off_t" >&5
+echo "$as_me:32172: result: $ac_cv_type_off_t" >&5
 echo "${ECHO_T}$ac_cv_type_off_t" >&6
 
-echo "$as_me:32173: checking size of off_t" >&5
+echo "$as_me:32175: 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
@@ -32179,7 +32181,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 32182 "configure"
+#line 32184 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32191,21 +32193,21 @@ int _array_ [1 - 2 * !((sizeof (off_t)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32194: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32196: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32197: \$? = $ac_status" >&5
+  echo "$as_me:32199: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32200: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32202: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32203: \$? = $ac_status" >&5
+  echo "$as_me:32205: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 32208 "configure"
+#line 32210 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32217,16 +32219,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32220: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32222: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32223: \$? = $ac_status" >&5
+  echo "$as_me:32225: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32226: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32228: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32229: \$? = $ac_status" >&5
+  echo "$as_me:32231: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -32242,7 +32244,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 32245 "configure"
+#line 32247 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32254,16 +32256,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32257: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32259: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32260: \$? = $ac_status" >&5
+  echo "$as_me:32262: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32263: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32265: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32266: \$? = $ac_status" >&5
+  echo "$as_me:32268: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -32279,7 +32281,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 32282 "configure"
+#line 32284 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32291,16 +32293,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32294: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32296: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32297: \$? = $ac_status" >&5
+  echo "$as_me:32299: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32300: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32302: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32303: \$? = $ac_status" >&5
+  echo "$as_me:32305: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -32313,12 +32315,12 @@ done
 ac_cv_sizeof_off_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:32316: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:32318: 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 32321 "configure"
+#line 32323 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32334,15 +32336,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:32337: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32339: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32340: \$? = $ac_status" >&5
+  echo "$as_me:32342: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:32342: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32344: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32345: \$? = $ac_status" >&5
+  echo "$as_me:32347: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_off_t=`cat conftest.val`
 else
@@ -32358,7 +32360,7 @@ else
   ac_cv_sizeof_off_t=0
 fi
 fi
-echo "$as_me:32361: result: $ac_cv_sizeof_off_t" >&5
+echo "$as_me:32363: 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
@@ -32367,11 +32369,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:32370: WARNING: using 4 for sizeof off_t" >&5
+		{ echo "$as_me:32372: 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:32374: WARNING: sizeof off_t not found, using 4" >&5
+		{ echo "$as_me:32376: 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
@@ -32385,13 +32387,13 @@ cf_cv_type=`echo "sizeof_off_t" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJ
 	fi
 fi
 
-echo "$as_me:32388: checking for size_t" >&5
+echo "$as_me:32390: 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 32394 "configure"
+#line 32396 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32406,16 +32408,16 @@ if (sizeof (size_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32409: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32411: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32412: \$? = $ac_status" >&5
+  echo "$as_me:32414: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32415: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32417: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32418: \$? = $ac_status" >&5
+  echo "$as_me:32420: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_size_t=yes
 else
@@ -32425,10 +32427,10 @@ ac_cv_type_size_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:32428: result: $ac_cv_type_size_t" >&5
+echo "$as_me:32430: result: $ac_cv_type_size_t" >&5
 echo "${ECHO_T}$ac_cv_type_size_t" >&6
 
-echo "$as_me:32431: checking size of size_t" >&5
+echo "$as_me:32433: 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
@@ -32437,7 +32439,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 32440 "configure"
+#line 32442 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32449,21 +32451,21 @@ int _array_ [1 - 2 * !((sizeof (size_t)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32452: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32454: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32455: \$? = $ac_status" >&5
+  echo "$as_me:32457: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32458: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32460: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32461: \$? = $ac_status" >&5
+  echo "$as_me:32463: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 32466 "configure"
+#line 32468 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32475,16 +32477,16 @@ int _array_ [1 - 2 * !((sizeof (size_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32478: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32480: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32481: \$? = $ac_status" >&5
+  echo "$as_me:32483: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32484: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32486: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32487: \$? = $ac_status" >&5
+  echo "$as_me:32489: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -32500,7 +32502,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 32503 "configure"
+#line 32505 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32512,16 +32514,16 @@ int _array_ [1 - 2 * !((sizeof (size_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32515: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32517: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32518: \$? = $ac_status" >&5
+  echo "$as_me:32520: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32521: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32523: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32524: \$? = $ac_status" >&5
+  echo "$as_me:32526: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -32537,7 +32539,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 32540 "configure"
+#line 32542 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32549,16 +32551,16 @@ int _array_ [1 - 2 * !((sizeof (size_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32552: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32554: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32555: \$? = $ac_status" >&5
+  echo "$as_me:32557: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32558: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32560: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32561: \$? = $ac_status" >&5
+  echo "$as_me:32563: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -32571,12 +32573,12 @@ done
 ac_cv_sizeof_size_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:32574: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:32576: 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 32579 "configure"
+#line 32581 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32592,15 +32594,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:32595: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32597: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32598: \$? = $ac_status" >&5
+  echo "$as_me:32600: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:32600: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32602: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32603: \$? = $ac_status" >&5
+  echo "$as_me:32605: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_size_t=`cat conftest.val`
 else
@@ -32616,7 +32618,7 @@ else
   ac_cv_sizeof_size_t=0
 fi
 fi
-echo "$as_me:32619: result: $ac_cv_sizeof_size_t" >&5
+echo "$as_me:32621: 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
@@ -32625,11 +32627,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:32628: WARNING: using 4 for sizeof size_t" >&5
+		{ echo "$as_me:32630: 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:32632: WARNING: sizeof size_t not found, using 4" >&5
+		{ echo "$as_me:32634: 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
@@ -32643,13 +32645,13 @@ cf_cv_type=`echo "sizeof_size_t" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHI
 	fi
 fi
 
-echo "$as_me:32646: checking for time_t" >&5
+echo "$as_me:32648: 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 32652 "configure"
+#line 32654 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32664,16 +32666,16 @@ if (sizeof (time_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32667: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32669: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32670: \$? = $ac_status" >&5
+  echo "$as_me:32672: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32673: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32675: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32676: \$? = $ac_status" >&5
+  echo "$as_me:32678: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_time_t=yes
 else
@@ -32683,10 +32685,10 @@ ac_cv_type_time_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:32686: result: $ac_cv_type_time_t" >&5
+echo "$as_me:32688: result: $ac_cv_type_time_t" >&5
 echo "${ECHO_T}$ac_cv_type_time_t" >&6
 
-echo "$as_me:32689: checking size of time_t" >&5
+echo "$as_me:32691: 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
@@ -32695,7 +32697,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 32698 "configure"
+#line 32700 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32707,21 +32709,21 @@ int _array_ [1 - 2 * !((sizeof (time_t)) >= 0)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32710: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32712: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32713: \$? = $ac_status" >&5
+  echo "$as_me:32715: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32716: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32718: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32719: \$? = $ac_status" >&5
+  echo "$as_me:32721: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 32724 "configure"
+#line 32726 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32733,16 +32735,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32736: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32738: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32739: \$? = $ac_status" >&5
+  echo "$as_me:32741: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32742: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32744: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32745: \$? = $ac_status" >&5
+  echo "$as_me:32747: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -32758,7 +32760,7 @@ cat "conftest.$ac_ext" >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >"conftest.$ac_ext" <<_ACEOF
-#line 32761 "configure"
+#line 32763 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32770,16 +32772,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32773: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32775: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32776: \$? = $ac_status" >&5
+  echo "$as_me:32778: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32779: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32781: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32782: \$? = $ac_status" >&5
+  echo "$as_me:32784: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -32795,7 +32797,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 32798 "configure"
+#line 32800 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32807,16 +32809,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32810: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32812: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32813: \$? = $ac_status" >&5
+  echo "$as_me:32815: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32816: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32818: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32819: \$? = $ac_status" >&5
+  echo "$as_me:32821: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_hi=$ac_mid
 else
@@ -32829,12 +32831,12 @@ done
 ac_cv_sizeof_time_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:32832: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:32834: 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 32837 "configure"
+#line 32839 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32850,15 +32852,15 @@ fclose (f);
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:32853: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32855: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32856: \$? = $ac_status" >&5
+  echo "$as_me:32858: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:32858: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32860: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32861: \$? = $ac_status" >&5
+  echo "$as_me:32863: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_sizeof_time_t=`cat conftest.val`
 else
@@ -32874,7 +32876,7 @@ else
   ac_cv_sizeof_time_t=0
 fi
 fi
-echo "$as_me:32877: result: $ac_cv_sizeof_time_t" >&5
+echo "$as_me:32879: 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
@@ -32883,11 +32885,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:32886: WARNING: using 4 for sizeof time_t" >&5
+		{ echo "$as_me:32888: 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:32890: WARNING: sizeof time_t not found, using 4" >&5
+		{ echo "$as_me:32892: 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
@@ -32901,13 +32903,13 @@ cf_cv_type=`echo "sizeof_time_t" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHI
 	fi
 fi
 
-echo "$as_me:32904: checking for intptr_t" >&5
+echo "$as_me:32906: 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 32910 "configure"
+#line 32912 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -32922,16 +32924,16 @@ if (sizeof (intptr_t))
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:32925: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32927: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32928: \$? = $ac_status" >&5
+  echo "$as_me:32930: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:32931: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32933: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32934: \$? = $ac_status" >&5
+  echo "$as_me:32936: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_type_intptr_t=yes
 else
@@ -32941,7 +32943,7 @@ ac_cv_type_intptr_t=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:32944: result: $ac_cv_type_intptr_t" >&5
+echo "$as_me:32946: 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
   :
@@ -32955,13 +32957,13 @@ fi
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo "$as_me:32958: checking for working alloca.h" >&5
+echo "$as_me:32960: 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 32964 "configure"
+#line 32966 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int
@@ -32973,16 +32975,16 @@ char *p = (char *) alloca (2 * sizeof (int));
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:32976: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32978: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32979: \$? = $ac_status" >&5
+  echo "$as_me:32981: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:32982: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32984: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32985: \$? = $ac_status" >&5
+  echo "$as_me:32987: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_working_alloca_h=yes
 else
@@ -32992,7 +32994,7 @@ ac_cv_working_alloca_h=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:32995: result: $ac_cv_working_alloca_h" >&5
+echo "$as_me:32997: 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
 
@@ -33002,13 +33004,13 @@ EOF
 
 fi
 
-echo "$as_me:33005: checking for alloca" >&5
+echo "$as_me:33007: 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 33011 "configure"
+#line 33013 "configure"
 #include "confdefs.h"
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -33040,16 +33042,16 @@ char *p = (char *) alloca (1);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:33043: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33045: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33046: \$? = $ac_status" >&5
+  echo "$as_me:33048: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:33049: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33051: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33052: \$? = $ac_status" >&5
+  echo "$as_me:33054: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_alloca_works=yes
 else
@@ -33059,7 +33061,7 @@ ac_cv_func_alloca_works=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:33062: result: $ac_cv_func_alloca_works" >&5
+echo "$as_me:33064: 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
@@ -33080,13 +33082,13 @@ cat >>confdefs.h <<\EOF
 #define C_ALLOCA 1
 EOF
 
-echo "$as_me:33083: checking whether \`alloca.c' needs Cray hooks" >&5
+echo "$as_me:33085: 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 33089 "configure"
+#line 33091 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -33104,18 +33106,18 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:33107: result: $ac_cv_os_cray" >&5
+echo "$as_me:33109: 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:33112: checking for $ac_func" >&5
+echo "$as_me:33114: 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 33118 "configure"
+#line 33120 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -33146,16 +33148,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:33149: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33151: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33152: \$? = $ac_status" >&5
+  echo "$as_me:33154: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:33155: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33157: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33158: \$? = $ac_status" >&5
+  echo "$as_me:33160: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -33165,7 +33167,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:33168: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:33170: 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
 
@@ -33179,7 +33181,7 @@ fi
   done
 fi
 
-echo "$as_me:33182: checking stack direction for C alloca" >&5
+echo "$as_me:33184: 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
@@ -33188,7 +33190,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 33191 "configure"
+#line 33193 "configure"
 #include "confdefs.h"
 int
 find_stack_direction (void)
@@ -33211,15 +33213,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:33214: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33216: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33217: \$? = $ac_status" >&5
+  echo "$as_me:33219: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:33219: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33221: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33222: \$? = $ac_status" >&5
+  echo "$as_me:33224: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_c_stack_direction=1
 else
@@ -33231,7 +33233,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:33234: result: $ac_cv_c_stack_direction" >&5
+echo "$as_me:33236: result: $ac_cv_c_stack_direction" >&5
 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
 cat >>confdefs.h <<EOF
@@ -33243,23 +33245,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:33246: checking for $ac_header" >&5
+echo "$as_me:33248: 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 33252 "configure"
+#line 33254 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:33256: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:33258: \"$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:33262: \$? = $ac_status" >&5
+  echo "$as_me:33264: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -33278,7 +33280,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:33281: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:33283: 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
@@ -33291,13 +33293,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:33294: checking for $ac_func" >&5
+echo "$as_me:33296: 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 33300 "configure"
+#line 33302 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -33328,16 +33330,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:33331: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33333: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33334: \$? = $ac_status" >&5
+  echo "$as_me:33336: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:33337: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33339: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33340: \$? = $ac_status" >&5
+  echo "$as_me:33342: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -33347,7 +33349,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:33350: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:33352: 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
@@ -33359,7 +33361,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:33362: checking for working fork" >&5
+  echo "$as_me:33364: 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
@@ -33382,15 +33384,15 @@ else
       }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:33385: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33387: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33388: \$? = $ac_status" >&5
+  echo "$as_me:33390: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:33390: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33392: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33393: \$? = $ac_status" >&5
+  echo "$as_me:33395: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -33402,7 +33404,7 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:33405: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:33407: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -33416,12 +33418,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:33419: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:33421: 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:33424: checking for working vfork" >&5
+  echo "$as_me:33426: 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
@@ -33430,7 +33432,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 33433 "configure"
+#line 33435 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -33523,15 +33525,15 @@ main (void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:33526: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33528: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33529: \$? = $ac_status" >&5
+  echo "$as_me:33531: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:33531: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33533: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33534: \$? = $ac_status" >&5
+  echo "$as_me:33536: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -33543,13 +33545,13 @@ fi
 rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 fi
-echo "$as_me:33546: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:33548: 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:33552: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:33554: 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
 
@@ -33574,14 +33576,14 @@ EOF
 
 fi
 
-echo "$as_me:33577: checking if we should use fcntl or ioctl" >&5
+echo "$as_me:33579: 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 33584 "configure"
+#line 33586 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -33598,16 +33600,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:33601: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33603: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33604: \$? = $ac_status" >&5
+  echo "$as_me:33606: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:33607: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33609: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33610: \$? = $ac_status" >&5
+  echo "$as_me:33612: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fionbio=ioctl
 else
@@ -33615,7 +33617,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 33618 "configure"
+#line 33620 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -33637,16 +33639,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:33640: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33642: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33643: \$? = $ac_status" >&5
+  echo "$as_me:33645: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:33646: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33648: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33649: \$? = $ac_status" >&5
+  echo "$as_me:33651: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fionbio=fcntl
 else
@@ -33659,21 +33661,21 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:33662: result: $cf_cv_fionbio" >&5
+echo "$as_me:33664: 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:33669: checking for broken/missing definition of remove" >&5
+echo "$as_me:33671: 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 33676 "configure"
+#line 33678 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -33685,23 +33687,23 @@ remove("dummy")
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:33688: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33690: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33691: \$? = $ac_status" >&5
+  echo "$as_me:33693: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:33694: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33696: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33697: \$? = $ac_status" >&5
+  echo "$as_me:33699: \$? = $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 33704 "configure"
+#line 33706 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 		int __unlink(name) { return unlink(name); }
@@ -33714,16 +33716,16 @@ remove("dummy")
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:33717: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33719: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33720: \$? = $ac_status" >&5
+  echo "$as_me:33722: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:33723: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33725: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33726: \$? = $ac_status" >&5
+  echo "$as_me:33728: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_baddef_remove=yes
 else
@@ -33738,21 +33740,21 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:33741: result: $cf_cv_baddef_remove" >&5
+echo "$as_me:33743: 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:33748: checking for lstat" >&5
+echo "$as_me:33750: 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 33755 "configure"
+#line 33757 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -33764,16 +33766,16 @@ struct stat sb; lstat(".", &sb); (void) sb
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:33767: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33769: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33770: \$? = $ac_status" >&5
+  echo "$as_me:33772: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:33773: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33775: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33776: \$? = $ac_status" >&5
+  echo "$as_me:33778: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_lstat=yes
 else
@@ -33785,7 +33787,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:33788: result: $ac_cv_func_lstat " >&5
+echo "$as_me:33790: result: $ac_cv_func_lstat " >&5
 echo "${ECHO_T}$ac_cv_func_lstat " >&6
 if test "$ac_cv_func_lstat" = yes; then
 
@@ -33795,14 +33797,14 @@ EOF
 
 fi
 
-echo "$as_me:33798: checking for getpwuid" >&5
+echo "$as_me:33800: 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 33805 "configure"
+#line 33807 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -33820,16 +33822,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:33823: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33825: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33826: \$? = $ac_status" >&5
+  echo "$as_me:33828: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:33829: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33831: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33832: \$? = $ac_status" >&5
+  echo "$as_me:33834: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_getpwuid=yes
 else
@@ -33840,7 +33842,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:33843: result: $ac_cv_func_getpwuid" >&5
+echo "$as_me:33845: 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
@@ -33855,14 +33857,14 @@ EOF
 
 fi
 
-echo "$as_me:33858: checking for passwd.pw_gecos" >&5
+echo "$as_me:33860: 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 33865 "configure"
+#line 33867 "configure"
 #include "confdefs.h"
 
 #include <pwd.h>
@@ -33879,16 +33881,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:33882: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33884: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33885: \$? = $ac_status" >&5
+  echo "$as_me:33887: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:33888: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33890: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33891: \$? = $ac_status" >&5
+  echo "$as_me:33893: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_pw_gecos=yes
 else
@@ -33898,20 +33900,20 @@ cf_cv_pw_gecos=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:33901: result: $cf_cv_pw_gecos" >&5
+echo "$as_me:33903: 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:33908: checking for vasprintf" >&5
+echo "$as_me:33910: 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 33914 "configure"
+#line 33916 "configure"
 #include "confdefs.h"
 #define vasprintf autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -33942,16 +33944,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:33945: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33947: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33948: \$? = $ac_status" >&5
+  echo "$as_me:33950: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:33951: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33953: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33954: \$? = $ac_status" >&5
+  echo "$as_me:33956: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_vasprintf=yes
 else
@@ -33961,7 +33963,7 @@ ac_cv_func_vasprintf=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:33964: result: $ac_cv_func_vasprintf" >&5
+echo "$as_me:33966: result: $ac_cv_func_vasprintf" >&5
 echo "${ECHO_T}$ac_cv_func_vasprintf" >&6
 if test "$ac_cv_func_vasprintf" = yes; then
 
@@ -33969,10 +33971,10 @@ cat >>confdefs.h <<\EOF
 #define HAVE_VASPRINTF 1
 EOF
 
-	echo "$as_me:33972: checking if vasprintf requires workaround" >&5
+	echo "$as_me:33974: checking if vasprintf requires workaround" >&5
 echo $ECHO_N "checking if vasprintf requires workaround... $ECHO_C" >&6
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 33975 "configure"
+#line 33977 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -33988,19 +33990,19 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:33991: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33993: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33994: \$? = $ac_status" >&5
+  echo "$as_me:33996: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:33997: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33999: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34000: \$? = $ac_status" >&5
+  echo "$as_me:34002: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-		echo "$as_me:34003: result: no" >&5
+		echo "$as_me:34005: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 else
@@ -34008,7 +34010,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 34011 "configure"
+#line 34013 "configure"
 #include "confdefs.h"
 
 			#ifndef _GNU_SOURCE
@@ -34027,19 +34029,19 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:34030: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34032: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34033: \$? = $ac_status" >&5
+  echo "$as_me:34035: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:34036: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34038: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34039: \$? = $ac_status" >&5
+  echo "$as_me:34041: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
-			echo "$as_me:34042: result: yes" >&5
+			echo "$as_me:34044: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
@@ -34049,7 +34051,7 @@ else
   echo "$as_me: failed program was:" >&5
 cat "conftest.$ac_ext" >&5
 
-			echo "$as_me:34052: result: unknown" >&5
+			echo "$as_me:34054: result: unknown" >&5
 echo "${ECHO_T}unknown" >&6
 
 fi
@@ -34082,13 +34084,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:34085: checking for $ac_func" >&5
+echo "$as_me:34087: 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 34091 "configure"
+#line 34093 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -34119,16 +34121,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:34122: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34124: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34125: \$? = $ac_status" >&5
+  echo "$as_me:34127: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:34128: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34130: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34131: \$? = $ac_status" >&5
+  echo "$as_me:34133: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -34138,7 +34140,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:34141: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:34143: 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
@@ -34152,13 +34154,13 @@ for ac_func in \
 	mkdtemp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:34155: checking for $ac_func" >&5
+echo "$as_me:34157: 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 34161 "configure"
+#line 34163 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -34189,16 +34191,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:34192: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34194: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34195: \$? = $ac_status" >&5
+  echo "$as_me:34197: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:34198: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34200: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34201: \$? = $ac_status" >&5
+  echo "$as_me:34203: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -34208,7 +34210,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:34211: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:34213: 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
@@ -34220,13 +34222,13 @@ else
 for ac_func in mktemp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:34223: checking for $ac_func" >&5
+echo "$as_me:34225: 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 34229 "configure"
+#line 34231 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -34257,16 +34259,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:34260: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34262: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34263: \$? = $ac_status" >&5
+  echo "$as_me:34265: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:34266: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34268: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34269: \$? = $ac_status" >&5
+  echo "$as_me:34271: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -34276,7 +34278,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:34279: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:34281: 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
@@ -34296,13 +34298,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:34299: checking for $ac_func" >&5
+echo "$as_me:34301: 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 34305 "configure"
+#line 34307 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -34333,16 +34335,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:34336: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34338: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34339: \$? = $ac_status" >&5
+  echo "$as_me:34341: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:34342: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34344: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34345: \$? = $ac_status" >&5
+  echo "$as_me:34347: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -34352,7 +34354,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:34355: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:34357: 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
@@ -34367,23 +34369,23 @@ done
 for ac_header in limits.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:34370: checking for $ac_header" >&5
+echo "$as_me:34372: 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 34376 "configure"
+#line 34378 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:34380: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:34382: \"$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:34386: \$? = $ac_status" >&5
+  echo "$as_me:34388: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -34402,7 +34404,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:34405: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:34407: 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
@@ -34412,13 +34414,13 @@ EOF
 fi
 done
 
-echo "$as_me:34415: checking for arc4random" >&5
+echo "$as_me:34417: checking for arc4random" >&5
 echo $ECHO_N "checking for arc4random... $ECHO_C" >&6
 if test "${ac_cv_func_arc4random+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 34421 "configure"
+#line 34423 "configure"
 #include "confdefs.h"
 #define arc4random autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -34449,16 +34451,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:34452: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34454: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34455: \$? = $ac_status" >&5
+  echo "$as_me:34457: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:34458: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34460: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34461: \$? = $ac_status" >&5
+  echo "$as_me:34463: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_arc4random=yes
 else
@@ -34468,12 +34470,12 @@ ac_cv_func_arc4random=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:34471: result: $ac_cv_func_arc4random" >&5
+echo "$as_me:34473: result: $ac_cv_func_arc4random" >&5
 echo "${ECHO_T}$ac_cv_func_arc4random" >&6
 if test "$ac_cv_func_arc4random" = yes; then
   :
 else
-  echo "$as_me:34476: checking for arc4random in -lbsd" >&5
+  echo "$as_me:34478: 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
@@ -34481,7 +34483,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 34484 "configure"
+#line 34486 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -34500,16 +34502,16 @@ arc4random ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:34503: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34505: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34506: \$? = $ac_status" >&5
+  echo "$as_me:34508: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:34509: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34511: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34512: \$? = $ac_status" >&5
+  echo "$as_me:34514: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_bsd_arc4random=yes
 else
@@ -34520,7 +34522,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:34523: result: $ac_cv_lib_bsd_arc4random" >&5
+echo "$as_me:34525: 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
 
@@ -34544,7 +34546,7 @@ fi
 
 fi
 
-echo "$as_me:34547: checking for random-integer functions" >&5
+echo "$as_me:34549: 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
@@ -34564,7 +34566,7 @@ do
 	esac
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 34567 "configure"
+#line 34569 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -34581,16 +34583,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:34584: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34586: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34587: \$? = $ac_status" >&5
+  echo "$as_me:34589: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:34590: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34592: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34593: \$? = $ac_status" >&5
+  echo "$as_me:34595: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_srand_func=$cf_func
  break
@@ -34602,10 +34604,10 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:34605: result: $cf_cv_srand_func" >&5
+echo "$as_me:34607: 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:34608: checking for range of random-integers" >&5
+	echo "$as_me:34610: 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
@@ -34626,7 +34628,7 @@ else
 			;;
 		esac
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 34629 "configure"
+#line 34631 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -34643,16 +34645,16 @@ long x = $cf_cv_rand_max; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:34646: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34648: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34649: \$? = $ac_status" >&5
+  echo "$as_me:34651: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:34652: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34654: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34655: \$? = $ac_status" >&5
+  echo "$as_me:34657: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -34663,15 +34665,15 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:34666: result: $cf_cv_rand_max" >&5
+echo "$as_me:34668: result: $cf_cv_rand_max" >&5
 echo "${ECHO_T}$cf_cv_rand_max" >&6
 
 	case "$cf_cv_srand_func" in
 	(*/arc4random)
-		echo "$as_me:34671: checking if <bsd/stdlib.h> should be included" >&5
+		echo "$as_me:34673: 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 34674 "configure"
+#line 34676 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -34689,23 +34691,23 @@ void *arc4random(int);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:34692: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34694: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34695: \$? = $ac_status" >&5
+  echo "$as_me:34697: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:34698: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34700: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34701: \$? = $ac_status" >&5
+  echo "$as_me:34703: \$? = $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 34708 "configure"
+#line 34710 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -34722,16 +34724,16 @@ unsigned long x = arc4random(); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:34725: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34727: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34728: \$? = $ac_status" >&5
+  echo "$as_me:34730: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:34731: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34733: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34734: \$? = $ac_status" >&5
+  echo "$as_me:34736: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_bsd_stdlib_h=yes
 else
@@ -34742,7 +34744,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	    echo "$as_me:34745: result: $cf_bsd_stdlib_h" >&5
+	    echo "$as_me:34747: result: $cf_bsd_stdlib_h" >&5
 echo "${ECHO_T}$cf_bsd_stdlib_h" >&6
 		if test "$cf_bsd_stdlib_h" = yes
 		then
@@ -34752,10 +34754,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 		else
-			echo "$as_me:34755: checking if <bsd/random.h> should be included" >&5
+			echo "$as_me:34757: 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 34758 "configure"
+#line 34760 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -34773,23 +34775,23 @@ void *arc4random(int);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:34776: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34778: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34779: \$? = $ac_status" >&5
+  echo "$as_me:34781: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:34782: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34784: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34785: \$? = $ac_status" >&5
+  echo "$as_me:34787: \$? = $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 34792 "configure"
+#line 34794 "configure"
 #include "confdefs.h"
 #include <bsd/random.h>
 int
@@ -34801,16 +34803,16 @@ unsigned long x = arc4random(); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:34804: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34806: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34807: \$? = $ac_status" >&5
+  echo "$as_me:34809: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:34810: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34812: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34813: \$? = $ac_status" >&5
+  echo "$as_me:34815: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_bsd_random_h=yes
 else
@@ -34821,7 +34823,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-			echo "$as_me:34824: result: $cf_bsd_random_h" >&5
+			echo "$as_me:34826: result: $cf_bsd_random_h" >&5
 echo "${ECHO_T}$cf_bsd_random_h" >&6
 			if test "$cf_bsd_random_h" = yes
 			then
@@ -34831,7 +34833,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 			else
-				{ echo "$as_me:34834: WARNING: no header file found for arc4random" >&5
+				{ echo "$as_me:34836: WARNING: no header file found for arc4random" >&5
 echo "$as_me: WARNING: no header file found for arc4random" >&2;}
 			fi
 		fi
@@ -34866,13 +34868,13 @@ fi
 for ac_func in sleep
 do
 
-echo "$as_me:34869: checking for $ac_func declaration" >&5
+echo "$as_me:34871: 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 34875 "configure"
+#line 34877 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -34895,20 +34897,20 @@ extern	int	$ac_func(void);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:34898: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34900: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34901: \$? = $ac_status" >&5
+  echo "$as_me:34903: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:34904: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34906: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34907: \$? = $ac_status" >&5
+  echo "$as_me:34909: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 34911 "configure"
+#line 34913 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -34929,16 +34931,16 @@ int	(*p)(struct cf_check_funcdecl*) = $ac_func;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:34932: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34934: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34935: \$? = $ac_status" >&5
+  echo "$as_me:34937: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:34938: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34940: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34941: \$? = $ac_status" >&5
+  echo "$as_me:34943: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -34959,11 +34961,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:34962: result: yes" >&5
+  echo "$as_me:34964: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:34966: result: no" >&5
+  echo "$as_me:34968: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -34978,13 +34980,13 @@ done
 for ac_func in strstr
 do
 
-echo "$as_me:34981: checking for $ac_func declaration" >&5
+echo "$as_me:34983: 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 34987 "configure"
+#line 34989 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -35000,20 +35002,20 @@ extern	int	$ac_func(void);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35003: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35005: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35006: \$? = $ac_status" >&5
+  echo "$as_me:35008: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35009: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35011: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35012: \$? = $ac_status" >&5
+  echo "$as_me:35014: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 35016 "configure"
+#line 35018 "configure"
 #include "confdefs.h"
 #include <string.h>
 int
@@ -35027,16 +35029,16 @@ int	(*p)(struct cf_check_funcdecl*) = $ac_func;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35030: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35032: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35033: \$? = $ac_status" >&5
+  echo "$as_me:35035: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35036: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35038: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35039: \$? = $ac_status" >&5
+  echo "$as_me:35041: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -35057,11 +35059,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:35060: result: yes" >&5
+  echo "$as_me:35062: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:35064: result: no" >&5
+  echo "$as_me:35066: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -35076,13 +35078,13 @@ done
 for ac_func in getgrgid getgrnam
 do
 
-echo "$as_me:35079: checking for $ac_func declaration" >&5
+echo "$as_me:35081: 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 35085 "configure"
+#line 35087 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -35100,20 +35102,20 @@ extern	int	$ac_func(void);
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35103: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35105: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35106: \$? = $ac_status" >&5
+  echo "$as_me:35108: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35109: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35111: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35112: \$? = $ac_status" >&5
+  echo "$as_me:35114: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 35116 "configure"
+#line 35118 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -35129,16 +35131,16 @@ int	(*p)(struct cf_check_funcdecl*) = $ac_func;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35132: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35134: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35135: \$? = $ac_status" >&5
+  echo "$as_me:35137: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35138: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35140: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35141: \$? = $ac_status" >&5
+  echo "$as_me:35143: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -35159,11 +35161,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:35162: result: yes" >&5
+  echo "$as_me:35164: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:35166: result: no" >&5
+  echo "$as_me:35168: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -35175,14 +35177,14 @@ EOF
 fi
 done
 
-echo "$as_me:35178: checking if TRUE/FALSE are defined" >&5
+echo "$as_me:35180: 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 35185 "configure"
+#line 35187 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -35196,16 +35198,16 @@ int x = TRUE, y = FALSE; (void)x; (void)y
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35199: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35201: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35202: \$? = $ac_status" >&5
+  echo "$as_me:35204: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35205: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35207: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35208: \$? = $ac_status" >&5
+  echo "$as_me:35210: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_bool_defs=yes
 else
@@ -35216,7 +35218,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:35219: result: $cf_cv_bool_defs" >&5
+echo "$as_me:35221: result: $cf_cv_bool_defs" >&5
 echo "${ECHO_T}$cf_cv_bool_defs" >&6
 if test "$cf_cv_bool_defs" = no ; then
 
@@ -35230,14 +35232,14 @@ EOF
 
 fi
 
-echo "$as_me:35233: checking if external errno is declared" >&5
+echo "$as_me:35235: 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 35240 "configure"
+#line 35242 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -35251,16 +35253,16 @@ int x = (int) errno; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35254: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35256: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35257: \$? = $ac_status" >&5
+  echo "$as_me:35259: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35260: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35262: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35263: \$? = $ac_status" >&5
+  echo "$as_me:35265: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -35271,7 +35273,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:35274: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:35276: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -35286,14 +35288,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:35289: checking if external errno exists" >&5
+echo "$as_me:35291: 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 35296 "configure"
+#line 35298 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -35308,16 +35310,16 @@ errno = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:35311: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35313: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35314: \$? = $ac_status" >&5
+  echo "$as_me:35316: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:35317: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35319: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35320: \$? = $ac_status" >&5
+  echo "$as_me:35322: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_errno=yes
 else
@@ -35328,7 +35330,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:35331: result: $cf_cv_have_errno" >&5
+echo "$as_me:35333: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -35341,7 +35343,7 @@ EOF
 
 fi
 
-echo "$as_me:35344: checking if we can set errno" >&5
+echo "$as_me:35346: 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
@@ -35349,7 +35351,7 @@ else
 
 if test "$cross_compiling" = yes; then
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 35352 "configure"
+#line 35354 "configure"
 #include "confdefs.h"
 #include <errno.h>
 int
@@ -35361,16 +35363,16 @@ errno = 255
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:35364: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35366: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35367: \$? = $ac_status" >&5
+  echo "$as_me:35369: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:35370: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35372: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35373: \$? = $ac_status" >&5
+  echo "$as_me:35375: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_set_errno=maybe
 else
@@ -35381,7 +35383,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 35384 "configure"
+#line 35386 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -35395,15 +35397,15 @@ int main(void)
 }
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:35398: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35400: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35401: \$? = $ac_status" >&5
+  echo "$as_me:35403: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:35403: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35405: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35406: \$? = $ac_status" >&5
+  echo "$as_me:35408: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_set_errno=yes
 else
@@ -35416,21 +35418,21 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 
 fi
-echo "$as_me:35419: result: $cf_cv_set_errno" >&5
+echo "$as_me:35421: 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:35426: checking for setlocale()" >&5
+echo "$as_me:35428: 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 35433 "configure"
+#line 35435 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -35444,16 +35446,16 @@ setlocale(LC_ALL, "")
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:35447: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35449: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35450: \$? = $ac_status" >&5
+  echo "$as_me:35452: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:35453: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35455: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35456: \$? = $ac_status" >&5
+  echo "$as_me:35458: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_locale=yes
 else
@@ -35465,7 +35467,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:35468: result: $cf_cv_locale" >&5
+echo "$as_me:35470: result: $cf_cv_locale" >&5
 echo "${ECHO_T}$cf_cv_locale" >&6
 test "$cf_cv_locale" = yes && {
 cat >>confdefs.h <<\EOF
@@ -35476,23 +35478,23 @@ EOF
 for ac_header in sys/param.h limits.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:35479: checking for $ac_header" >&5
+echo "$as_me:35481: 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 35485 "configure"
+#line 35487 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:35489: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:35491: \"$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:35495: \$? = $ac_status" >&5
+  echo "$as_me:35497: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -35511,7 +35513,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:35514: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:35516: 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
@@ -35521,14 +35523,14 @@ EOF
 fi
 done
 
-echo "$as_me:35524: checking if NGROUPS is defined" >&5
+echo "$as_me:35526: 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 35531 "configure"
+#line 35533 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -35547,23 +35549,23 @@ int x = NGROUPS; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35550: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35552: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35553: \$? = $ac_status" >&5
+  echo "$as_me:35555: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35556: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35558: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35559: \$? = $ac_status" >&5
+  echo "$as_me:35561: \$? = $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 35566 "configure"
+#line 35568 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -35582,16 +35584,16 @@ int x = NGROUPS_MAX
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35585: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35587: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35588: \$? = $ac_status" >&5
+  echo "$as_me:35590: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35591: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35593: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35594: \$? = $ac_status" >&5
+  echo "$as_me:35596: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ngroups=NGROUPS_MAX
 else
@@ -35603,7 +35605,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-echo "$as_me:35606: result: $cf_cv_ngroups" >&5
+echo "$as_me:35608: result: $cf_cv_ngroups" >&5
 echo "${ECHO_T}$cf_cv_ngroups" >&6
 
 fi
@@ -35624,13 +35626,13 @@ fi
 for ac_func in strerror
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:35627: checking for $ac_func" >&5
+echo "$as_me:35629: 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 35633 "configure"
+#line 35635 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -35661,16 +35663,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:35664: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35666: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35667: \$? = $ac_status" >&5
+  echo "$as_me:35669: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:35670: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35672: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35673: \$? = $ac_status" >&5
+  echo "$as_me:35675: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -35680,7 +35682,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:35683: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:35685: 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
@@ -35689,14 +35691,14 @@ EOF
 
 else
 
-echo "$as_me:35692: checking if external sys_nerr is declared" >&5
+echo "$as_me:35694: 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 35699 "configure"
+#line 35701 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -35710,16 +35712,16 @@ int x = (int) sys_nerr; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35713: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35715: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35716: \$? = $ac_status" >&5
+  echo "$as_me:35718: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35719: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35721: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35722: \$? = $ac_status" >&5
+  echo "$as_me:35724: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_sys_nerr=yes
 else
@@ -35730,7 +35732,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:35733: result: $cf_cv_dcl_sys_nerr" >&5
+echo "$as_me:35735: 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
@@ -35745,14 +35747,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:35748: checking if external sys_nerr exists" >&5
+echo "$as_me:35750: 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 35755 "configure"
+#line 35757 "configure"
 #include "confdefs.h"
 
 #undef sys_nerr
@@ -35767,16 +35769,16 @@ sys_nerr = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:35770: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35772: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35773: \$? = $ac_status" >&5
+  echo "$as_me:35775: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:35776: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35778: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35779: \$? = $ac_status" >&5
+  echo "$as_me:35781: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_sys_nerr=yes
 else
@@ -35787,7 +35789,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:35790: result: $cf_cv_have_sys_nerr" >&5
+echo "$as_me:35792: 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
@@ -35800,14 +35802,14 @@ EOF
 
 fi
 
-echo "$as_me:35803: checking if external sys_errlist is declared" >&5
+echo "$as_me:35805: 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 35810 "configure"
+#line 35812 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -35821,16 +35823,16 @@ int x = (int) sys_errlist; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35824: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35826: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35827: \$? = $ac_status" >&5
+  echo "$as_me:35829: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35830: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35832: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35833: \$? = $ac_status" >&5
+  echo "$as_me:35835: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_dcl_sys_errlist=yes
 else
@@ -35841,7 +35843,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:35844: result: $cf_cv_dcl_sys_errlist" >&5
+echo "$as_me:35846: 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
@@ -35856,14 +35858,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:35859: checking if external sys_errlist exists" >&5
+echo "$as_me:35861: 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 35866 "configure"
+#line 35868 "configure"
 #include "confdefs.h"
 
 #undef sys_errlist
@@ -35878,16 +35880,16 @@ sys_errlist = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:35881: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35883: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35884: \$? = $ac_status" >&5
+  echo "$as_me:35886: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:35887: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35889: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35890: \$? = $ac_status" >&5
+  echo "$as_me:35892: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_sys_errlist=yes
 else
@@ -35898,7 +35900,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:35901: result: $cf_cv_have_sys_errlist" >&5
+echo "$as_me:35903: 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
@@ -35917,23 +35919,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:35920: checking for $ac_header" >&5
+echo "$as_me:35922: 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 35926 "configure"
+#line 35928 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:35930: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:35932: \"$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:35936: \$? = $ac_status" >&5
+  echo "$as_me:35938: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -35952,7 +35954,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:35955: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:35957: 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
@@ -35962,14 +35964,14 @@ EOF
 fi
 done
 
-echo "$as_me:35965: checking for lastlog path" >&5
+echo "$as_me:35967: 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 35972 "configure"
+#line 35974 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -35989,16 +35991,16 @@ static char path[] = _PATH_LASTLOG; (void)path
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:35992: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35994: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35995: \$? = $ac_status" >&5
+  echo "$as_me:35997: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:35998: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36000: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36001: \$? = $ac_status" >&5
+  echo "$as_me:36003: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_path_lastlog="_PATH_LASTLOG"
 else
@@ -36013,14 +36015,14 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:36016: result: $cf_cv_path_lastlog" >&5
+echo "$as_me:36018: 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:36023: checking for utmp implementation" >&5
+echo "$as_me:36025: 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
@@ -36037,7 +36039,7 @@ cf_utmp_includes="
 #endif
 "
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 36040 "configure"
+#line 36042 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -36053,16 +36055,16 @@ struct $cf_header x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36056: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36058: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36059: \$? = $ac_status" >&5
+  echo "$as_me:36061: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36062: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36064: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36065: \$? = $ac_status" >&5
+  echo "$as_me:36067: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -36071,7 +36073,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 36074 "configure"
+#line 36076 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -36087,16 +36089,16 @@ struct $cf_header x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36090: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36092: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36093: \$? = $ac_status" >&5
+  echo "$as_me:36095: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36096: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36098: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36099: \$? = $ac_status" >&5
+  echo "$as_me:36101: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -36111,7 +36113,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:36114: result: $cf_cv_have_utmp" >&5
+echo "$as_me:36116: result: $cf_cv_have_utmp" >&5
 echo "${ECHO_T}$cf_cv_have_utmp" >&6
 
 if test "$cf_cv_have_utmp" != no ; then
@@ -36126,14 +36128,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test "$cf_cv_have_utmp" != no ; then
-echo "$as_me:36129: checking if ${cf_cv_have_utmp}.ut_host is declared" >&5
+echo "$as_me:36131: 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 36136 "configure"
+#line 36138 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -36150,16 +36152,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36153: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36155: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36156: \$? = $ac_status" >&5
+  echo "$as_me:36158: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36159: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36161: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36162: \$? = $ac_status" >&5
+  echo "$as_me:36164: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_host=yes
 else
@@ -36171,7 +36173,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:36174: result: $cf_cv_have_utmp_ut_host" >&5
+echo "$as_me:36176: 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
@@ -36181,14 +36183,14 @@ EOF
 fi
 
 if test "$cf_cv_have_utmp" != no ; then
-echo "$as_me:36184: checking if ${cf_cv_have_utmp}.ut_syslen is declared" >&5
+echo "$as_me:36186: 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 36191 "configure"
+#line 36193 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -36205,16 +36207,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36208: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36210: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36211: \$? = $ac_status" >&5
+  echo "$as_me:36213: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36214: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36216: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36217: \$? = $ac_status" >&5
+  echo "$as_me:36219: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_syslen=yes
 else
@@ -36226,7 +36228,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:36229: result: $cf_cv_have_utmp_ut_syslen" >&5
+echo "$as_me:36231: 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
@@ -36236,7 +36238,7 @@ EOF
 fi
 
 if test "$cf_cv_have_utmp" != no ; then
-echo "$as_me:36239: checking if ${cf_cv_have_utmp}.ut_name is declared" >&5
+echo "$as_me:36241: 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
@@ -36253,7 +36255,7 @@ cf_utmp_includes="
 "
 for cf_header in ut_name ut_user ; do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 36256 "configure"
+#line 36258 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -36269,16 +36271,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36272: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36274: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36275: \$? = $ac_status" >&5
+  echo "$as_me:36277: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36278: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36280: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36281: \$? = $ac_status" >&5
+  echo "$as_me:36283: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_name=$cf_header
 	 break
@@ -36290,12 +36292,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:36293: result: $cf_cv_have_utmp_ut_name" >&5
+echo "$as_me:36295: 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:36298: error: Cannot find declaration for ut.ut_name" >&5
+	{ { echo "$as_me:36300: 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; }; }
 	;;
@@ -36310,7 +36312,7 @@ esac
 fi
 
 if test "$cf_cv_have_utmp" != no ; then
-echo "$as_me:36313: checking for exit-status in $cf_cv_have_utmp" >&5
+echo "$as_me:36315: 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
@@ -36323,7 +36325,7 @@ for cf_result in \
 	ut_exit.ut_exit
 do
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 36326 "configure"
+#line 36328 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -36340,16 +36342,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36343: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36345: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36346: \$? = $ac_status" >&5
+  echo "$as_me:36348: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36349: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36351: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36352: \$? = $ac_status" >&5
+  echo "$as_me:36354: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_xstatus=$cf_result
 	 break
@@ -36362,7 +36364,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:36365: result: $cf_cv_have_utmp_ut_xstatus" >&5
+echo "$as_me:36367: 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
 
@@ -36378,14 +36380,14 @@ fi
 fi
 
 if test "$cf_cv_have_utmp" != no ; then
-echo "$as_me:36381: checking if ${cf_cv_have_utmp}.ut_xtime is declared" >&5
+echo "$as_me:36383: 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 36388 "configure"
+#line 36390 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -36402,23 +36404,23 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36405: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36407: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36408: \$? = $ac_status" >&5
+  echo "$as_me:36410: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36411: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36413: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36414: \$? = $ac_status" >&5
+  echo "$as_me:36416: \$? = $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 36421 "configure"
+#line 36423 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -36435,16 +36437,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36438: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36440: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36441: \$? = $ac_status" >&5
+  echo "$as_me:36443: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36444: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36446: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36447: \$? = $ac_status" >&5
+  echo "$as_me:36449: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_xtime=define
 else
@@ -36458,7 +36460,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:36461: result: $cf_cv_have_utmp_ut_xtime" >&5
+echo "$as_me:36463: 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
 
@@ -36477,14 +36479,14 @@ fi
 fi
 
 if test "$cf_cv_have_utmp" != no ; then
-echo "$as_me:36480: checking if ${cf_cv_have_utmp}.ut_session is declared" >&5
+echo "$as_me:36482: 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 36487 "configure"
+#line 36489 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -36501,16 +36503,16 @@ static struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36504: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36506: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36507: \$? = $ac_status" >&5
+  echo "$as_me:36509: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36510: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36512: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36513: \$? = $ac_status" >&5
+  echo "$as_me:36515: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_utmp_ut_session=yes
 else
@@ -36521,7 +36523,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:36524: result: $cf_cv_have_utmp_ut_session" >&5
+echo "$as_me:36526: 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
 
@@ -36532,7 +36534,7 @@ EOF
 fi
 fi
 
-echo "$as_me:36535: checking if $cf_cv_have_utmp is SYSV flavor" >&5
+echo "$as_me:36537: 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
@@ -36540,7 +36542,7 @@ else
 
 test "$cf_cv_have_utmp" = "utmp" && cf_prefix="ut" || cf_prefix="utx"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 36543 "configure"
+#line 36545 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -36559,16 +36561,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:36562: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36564: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36565: \$? = $ac_status" >&5
+  echo "$as_me:36567: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:36568: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36570: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36571: \$? = $ac_status" >&5
+  echo "$as_me:36573: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sysv_utmp=yes
 else
@@ -36579,7 +36581,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:36582: result: $cf_cv_sysv_utmp" >&5
+echo "$as_me:36584: result: $cf_cv_sysv_utmp" >&5
 echo "${ECHO_T}$cf_cv_sysv_utmp" >&6
 test "$cf_cv_sysv_utmp" = yes &&
 cat >>confdefs.h <<\EOF
@@ -36588,14 +36590,14 @@ EOF
 
 fi
 
-echo "$as_me:36591: checking if external h_errno exists" >&5
+echo "$as_me:36593: 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 36598 "configure"
+#line 36600 "configure"
 #include "confdefs.h"
 
 #undef h_errno
@@ -36610,16 +36612,16 @@ h_errno = 2
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:36613: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36615: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36616: \$? = $ac_status" >&5
+  echo "$as_me:36618: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:36619: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36621: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36622: \$? = $ac_status" >&5
+  echo "$as_me:36624: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_h_errno=yes
 else
@@ -36630,7 +36632,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:36633: result: $cf_cv_have_h_errno" >&5
+echo "$as_me:36635: 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
@@ -36643,7 +36645,7 @@ EOF
 
 fi
 
-echo "$as_me:36646: checking if bibp: URLs should be supported" >&5
+echo "$as_me:36648: 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.
@@ -36660,14 +36662,14 @@ else
 	use_bibp_urls=yes
 
 fi;
-echo "$as_me:36663: result: $use_bibp_urls" >&5
+echo "$as_me:36665: 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:36670: checking if configuration info should be browsable" >&5
+echo "$as_me:36672: 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.
@@ -36684,14 +36686,14 @@ else
 	use_config_info=yes
 
 fi;
-echo "$as_me:36687: result: $use_config_info" >&5
+echo "$as_me:36689: 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:36694: checking if new-style forms-based options screen should be used" >&5
+echo "$as_me:36696: 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.
@@ -36708,14 +36710,14 @@ else
 	use_forms_options=yes
 
 fi;
-echo "$as_me:36711: result: $use_forms_options" >&5
+echo "$as_me:36713: 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:36718: checking if old-style options menu should be used" >&5
+echo "$as_me:36720: 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.
@@ -36732,14 +36734,14 @@ else
 	use_menu_options=yes
 
 fi;
-echo "$as_me:36735: result: $use_menu_options" >&5
+echo "$as_me:36737: 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:36742: checking if sessions code should be used" >&5
+echo "$as_me:36744: 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.
@@ -36756,7 +36758,7 @@ else
 	use_sessions=yes
 
 fi;
-echo "$as_me:36759: result: $use_sessions" >&5
+echo "$as_me:36761: result: $use_sessions" >&5
 echo "${ECHO_T}$use_sessions" >&6
 if test "$use_sessions" != no ; then
 
@@ -36767,7 +36769,7 @@ EOF
 	EXTRA_OBJS="$EXTRA_OBJS LYSession\$o"
 fi
 
-echo "$as_me:36770: checking if session-caching code should be used" >&5
+echo "$as_me:36772: 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.
@@ -36784,7 +36786,7 @@ else
 	use_session_cache=yes
 
 fi;
-echo "$as_me:36787: result: $use_session_cache" >&5
+echo "$as_me:36789: result: $use_session_cache" >&5
 echo "${ECHO_T}$use_session_cache" >&6
 if test "$use_session_cache" != no ; then
 
@@ -36794,7 +36796,7 @@ EOF
 
 fi
 
-echo "$as_me:36797: checking if address-list page should be used" >&5
+echo "$as_me:36799: 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.
@@ -36811,14 +36813,14 @@ else
 	use_addrlist_page=yes
 
 fi;
-echo "$as_me:36814: result: $use_addrlist_page" >&5
+echo "$as_me:36816: 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:36821: checking if support for CJK should be used" >&5
+echo "$as_me:36823: 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.
@@ -36835,7 +36837,7 @@ else
 	use_cjk=yes
 
 fi;
-echo "$as_me:36838: result: $use_cjk" >&5
+echo "$as_me:36840: result: $use_cjk" >&5
 echo "${ECHO_T}$use_cjk" >&6
 test "$use_cjk" != no &&
 cat >>confdefs.h <<\EOF
@@ -36883,7 +36885,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 36886 "configure"
+#line 36888 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -36895,16 +36897,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36898: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36900: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36901: \$? = $ac_status" >&5
+  echo "$as_me:36903: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36904: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36906: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36907: \$? = $ac_status" >&5
+  echo "$as_me:36909: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -36921,7 +36923,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}:36924: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:36926: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -36967,7 +36969,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 36970 "configure"
+#line 36972 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -36979,16 +36981,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:36982: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36984: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36985: \$? = $ac_status" >&5
+  echo "$as_me:36987: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:36988: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36990: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36991: \$? = $ac_status" >&5
+  echo "$as_me:36993: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -37005,7 +37007,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}:37008: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:37010: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -37023,7 +37025,7 @@ echo "${as_me:-configure}:37008: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:37026: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:37028: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -37048,7 +37050,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}:37051: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:37053: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -37077,7 +37079,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}:37080: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:37082: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -37086,7 +37088,7 @@ echo "${as_me:-configure}:37080: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:37089: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:37091: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -37094,14 +37096,14 @@ done
 
 	test -n "$verbose" && echo "	setting path value for libiconv to $withval" 1>&6
 
-echo "${as_me:-configure}:37097: testing setting path value for libiconv to $withval ..." 1>&5
+echo "${as_me:-configure}:37099: testing setting path value for libiconv to $withval ..." 1>&5
 
 	;;
 esac
 
 fi;
 
-  echo "$as_me:37104: checking for iconv" >&5
+  echo "$as_me:37106: 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
@@ -37112,12 +37114,12 @@ else
 cf_cv_header_path_iconv=
 cf_cv_library_path_iconv=
 
-echo "${as_me:-configure}:37115: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:37117: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 37120 "configure"
+#line 37122 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -37136,16 +37138,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:37139: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37141: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37142: \$? = $ac_status" >&5
+  echo "$as_me:37144: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:37145: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37147: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37148: \$? = $ac_status" >&5
+  echo "$as_me:37150: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -37159,7 +37161,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-liconv  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 37162 "configure"
+#line 37164 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -37178,16 +37180,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:37181: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37183: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37184: \$? = $ac_status" >&5
+  echo "$as_me:37186: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:37187: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37189: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37190: \$? = $ac_status" >&5
+  echo "$as_me:37192: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -37204,9 +37206,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for iconv library" 1>&6
 
-echo "${as_me:-configure}:37207: testing find linkage for iconv library ..." 1>&5
+echo "${as_me:-configure}:37209: testing find linkage for iconv library ..." 1>&5
 
-echo "${as_me:-configure}:37209: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:37211: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -37297,7 +37299,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}:37300: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:37302: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -37305,7 +37307,7 @@ echo "${as_me:-configure}:37300: testing ... testing $cf_cv_header_path_iconv ..
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_iconv"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 37308 "configure"
+#line 37310 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -37324,21 +37326,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:37327: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:37329: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:37330: \$? = $ac_status" >&5
+  echo "$as_me:37332: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:37333: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37335: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37336: \$? = $ac_status" >&5
+  echo "$as_me:37338: \$? = $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}:37341: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:37343: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
 
 				cf_cv_find_linkage_iconv=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -37356,7 +37358,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_iconv" = maybe ; then
 
-echo "${as_me:-configure}:37359: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:37361: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -37431,13 +37433,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}:37434: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:37436: 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 37440 "configure"
+#line 37442 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -37456,21 +37458,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:37459: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37461: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37462: \$? = $ac_status" >&5
+  echo "$as_me:37464: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:37465: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37467: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37468: \$? = $ac_status" >&5
+  echo "$as_me:37470: \$? = $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}:37473: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:37475: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
 
 					cf_cv_find_linkage_iconv=yes
 					cf_cv_library_file_iconv="-liconv"
@@ -37510,7 +37512,7 @@ am_cv_func_iconv="no, consider installing GNU libiconv"
 fi
 
 fi
-echo "$as_me:37513: result: $am_cv_func_iconv" >&5
+echo "$as_me:37515: result: $am_cv_func_iconv" >&5
 echo "${ECHO_T}$am_cv_func_iconv" >&6
 
   if test "$am_cv_func_iconv" = yes; then
@@ -37519,14 +37521,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_ICONV 1
 EOF
 
-    echo "$as_me:37522: checking if the declaration of iconv() needs const." >&5
+    echo "$as_me:37524: 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 37529 "configure"
+#line 37531 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -37551,16 +37553,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:37554: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:37556: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:37557: \$? = $ac_status" >&5
+  echo "$as_me:37559: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:37560: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37562: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37563: \$? = $ac_status" >&5
+  echo "$as_me:37565: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   am_cv_proto_iconv_const=no
 else
@@ -37570,7 +37572,7 @@ am_cv_proto_iconv_const=yes
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:37573: result: $am_cv_proto_iconv_const" >&5
+echo "$as_me:37575: 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
@@ -37615,7 +37617,7 @@ if test -n "$cf_cv_header_path_iconv" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 37618 "configure"
+#line 37620 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -37627,16 +37629,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:37630: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:37632: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:37633: \$? = $ac_status" >&5
+  echo "$as_me:37635: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:37636: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37638: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37639: \$? = $ac_status" >&5
+  echo "$as_me:37641: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -37653,7 +37655,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}:37656: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:37658: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -37692,7 +37694,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}:37695: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:37697: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -37706,7 +37708,7 @@ fi
 if test "x$am_cv_func_iconv" = "xyes"
 then
 
-echo "$as_me:37709: checking if experimental support for Chinese UTF-8 should be used" >&5
+echo "$as_me:37711: 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.
@@ -37723,7 +37725,7 @@ else
 	use_cn_utf8=yes
 
 fi;
-echo "$as_me:37726: result: $use_cn_utf8" >&5
+echo "$as_me:37728: result: $use_cn_utf8" >&5
 echo "${ECHO_T}$use_cn_utf8" >&6
 if test "$use_cn_utf8" != no ; then
 
@@ -37734,7 +37736,7 @@ EOF
 	use_cjk_utf8=yes
 fi
 
-echo "$as_me:37737: checking if support for Japanese UTF-8 should be used" >&5
+echo "$as_me:37739: 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.
@@ -37751,7 +37753,7 @@ else
 	use_ja_utf8=yes
 
 fi;
-echo "$as_me:37754: result: $use_ja_utf8" >&5
+echo "$as_me:37756: result: $use_ja_utf8" >&5
 echo "${ECHO_T}$use_ja_utf8" >&6
 if test "$use_ja_utf8" != no ; then
 
@@ -37772,11 +37774,11 @@ fi
 else
 	test -n "$verbose" && echo "	skipping CJK features which depend on iconv" 1>&6
 
-echo "${as_me:-configure}:37775: testing skipping CJK features which depend on iconv ..." 1>&5
+echo "${as_me:-configure}:37777: testing skipping CJK features which depend on iconv ..." 1>&5
 
 fi
 
-echo "$as_me:37779: checking if experimental wcwidth/UTF-8 logic should be used" >&5
+echo "$as_me:37781: 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.
@@ -37793,7 +37795,7 @@ else
 	use_wcwidth=no
 
 fi;
-echo "$as_me:37796: result: $use_wcwidth" >&5
+echo "$as_me:37798: result: $use_wcwidth" >&5
 echo "${ECHO_T}$use_wcwidth" >&6
 test "$use_wcwidth" != no &&
 cat >>confdefs.h <<\EOF
@@ -37808,7 +37810,7 @@ case "$cf_cv_screen" in
 esac
 
 if test "$use_dft_colors" != no ; then
-echo "$as_me:37811: checking if you want to use default-colors" >&5
+echo "$as_me:37813: 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.
@@ -37825,7 +37827,7 @@ else
 	use_dft_colors=no
 
 fi;
-echo "$as_me:37828: result: $use_dft_colors" >&5
+echo "$as_me:37830: result: $use_dft_colors" >&5
 echo "${ECHO_T}$use_dft_colors" >&6
 test "$use_dft_colors" = "yes" &&
 cat >>confdefs.h <<\EOF
@@ -37834,7 +37836,7 @@ EOF
 
 fi
 
-echo "$as_me:37837: checking if experimental keyboard-layout logic should be used" >&5
+echo "$as_me:37839: 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.
@@ -37851,14 +37853,14 @@ else
 	use_kbd_layout=no
 
 fi;
-echo "$as_me:37854: result: $use_kbd_layout" >&5
+echo "$as_me:37856: 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:37861: checking if experimental nested-table logic should be used" >&5
+echo "$as_me:37863: 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.
@@ -37875,14 +37877,14 @@ else
 	use_nested_tables=no
 
 fi;
-echo "$as_me:37878: result: $use_nested_tables" >&5
+echo "$as_me:37880: 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:37885: checking if alternative line-edit bindings should be used" >&5
+echo "$as_me:37887: 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.
@@ -37899,14 +37901,14 @@ else
 	use_alt_bindings=yes
 
 fi;
-echo "$as_me:37902: result: $use_alt_bindings" >&5
+echo "$as_me:37904: 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:37909: checking if ascii case-conversion should be used" >&5
+echo "$as_me:37911: 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.
@@ -37923,14 +37925,14 @@ else
 	use_ascii_ctypes=yes
 
 fi;
-echo "$as_me:37926: result: $use_ascii_ctypes" >&5
+echo "$as_me:37928: 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:37933: checking if you want to use extended HTML DTD logic" >&5
+echo "$as_me:37935: 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.
@@ -37947,14 +37949,14 @@ else
 	use_ext_htmldtd=yes
 
 fi;
-echo "$as_me:37950: result: $use_ext_htmldtd" >&5
+echo "$as_me:37952: 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:37957: checking if file-upload logic should be used" >&5
+echo "$as_me:37959: 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.
@@ -37971,14 +37973,14 @@ else
 	use_file_upload=yes
 
 fi;
-echo "$as_me:37974: result: $use_file_upload" >&5
+echo "$as_me:37976: 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:37981: checking if IDNA support should be used" >&5
+echo "$as_me:37983: 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.
@@ -37995,7 +37997,7 @@ else
 	use_idna=yes
 
 fi;
-echo "$as_me:37998: result: $use_idna" >&5
+echo "$as_me:38000: result: $use_idna" >&5
 echo "${ECHO_T}$use_idna" >&6
 
 if test "$use_idna" = yes ; then
@@ -38035,7 +38037,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 38038 "configure"
+#line 38040 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -38047,16 +38049,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:38050: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:38052: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:38053: \$? = $ac_status" >&5
+  echo "$as_me:38055: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:38056: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38058: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38059: \$? = $ac_status" >&5
+  echo "$as_me:38061: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -38073,7 +38075,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}:38076: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:38078: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -38119,7 +38121,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 38122 "configure"
+#line 38124 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -38131,16 +38133,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:38134: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:38136: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:38137: \$? = $ac_status" >&5
+  echo "$as_me:38139: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:38140: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38142: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38143: \$? = $ac_status" >&5
+  echo "$as_me:38145: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -38157,7 +38159,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}:38160: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:38162: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -38175,7 +38177,7 @@ echo "${as_me:-configure}:38160: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:38178: error: cannot find idna library under $use_idna" >&5
+{ { echo "$as_me:38180: error: cannot find idna library under $use_idna" >&5
 echo "$as_me: error: cannot find idna library under $use_idna" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -38200,7 +38202,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}:38203: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:38205: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -38229,7 +38231,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}:38232: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:38234: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -38238,7 +38240,7 @@ echo "${as_me:-configure}:38232: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:38241: error: cannot find idna library under $use_idna" >&5
+{ { echo "$as_me:38243: error: cannot find idna library under $use_idna" >&5
 echo "$as_me: error: cannot find idna library under $use_idna" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -38246,7 +38248,7 @@ done
 
 	test -n "$verbose" && echo "	setting path value for idna library to $use_idna" 1>&6
 
-echo "${as_me:-configure}:38249: testing setting path value for idna library to $use_idna ..." 1>&5
+echo "${as_me:-configure}:38251: testing setting path value for idna library to $use_idna ..." 1>&5
 
 	;;
 esac
@@ -38256,12 +38258,12 @@ esac
 cf_cv_header_path_idn2=
 cf_cv_library_path_idn2=
 
-echo "${as_me:-configure}:38259: testing Starting FIND_LINKAGE(idn2,) ..." 1>&5
+echo "${as_me:-configure}:38261: testing Starting FIND_LINKAGE(idn2,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 38264 "configure"
+#line 38266 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -38280,16 +38282,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:38283: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38285: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38286: \$? = $ac_status" >&5
+  echo "$as_me:38288: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:38289: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38291: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38292: \$? = $ac_status" >&5
+  echo "$as_me:38294: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_idn2=yes
@@ -38303,7 +38305,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lidn2 $LIBICONV $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 38306 "configure"
+#line 38308 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -38322,16 +38324,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:38325: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38327: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38328: \$? = $ac_status" >&5
+  echo "$as_me:38330: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:38331: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38333: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38334: \$? = $ac_status" >&5
+  echo "$as_me:38336: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_idn2=yes
@@ -38348,9 +38350,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for idn2 library" 1>&6
 
-echo "${as_me:-configure}:38351: testing find linkage for idn2 library ..." 1>&5
+echo "${as_me:-configure}:38353: testing find linkage for idn2 library ..." 1>&5
 
-echo "${as_me:-configure}:38353: testing Searching for headers in FIND_LINKAGE(idn2,) ..." 1>&5
+echo "${as_me:-configure}:38355: testing Searching for headers in FIND_LINKAGE(idn2,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -38441,7 +38443,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}:38444: testing ... testing $cf_cv_header_path_idn2 ..." 1>&5
+echo "${as_me:-configure}:38446: testing ... testing $cf_cv_header_path_idn2 ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -38449,7 +38451,7 @@ echo "${as_me:-configure}:38444: testing ... testing $cf_cv_header_path_idn2 ...
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_idn2"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 38452 "configure"
+#line 38454 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -38468,21 +38470,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:38471: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:38473: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:38474: \$? = $ac_status" >&5
+  echo "$as_me:38476: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:38477: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38479: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38480: \$? = $ac_status" >&5
+  echo "$as_me:38482: \$? = $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}:38485: testing ... found idn2 headers in $cf_cv_header_path_idn2 ..." 1>&5
+echo "${as_me:-configure}:38487: testing ... found idn2 headers in $cf_cv_header_path_idn2 ..." 1>&5
 
 				cf_cv_find_linkage_idn2=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -38500,7 +38502,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_idn2" = maybe ; then
 
-echo "${as_me:-configure}:38503: testing Searching for idn2 library in FIND_LINKAGE(idn2,) ..." 1>&5
+echo "${as_me:-configure}:38505: testing Searching for idn2 library in FIND_LINKAGE(idn2,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -38575,13 +38577,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}:38578: testing ... testing $cf_cv_library_path_idn2 ..." 1>&5
+echo "${as_me:-configure}:38580: 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 38584 "configure"
+#line 38586 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -38600,21 +38602,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:38603: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38605: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38606: \$? = $ac_status" >&5
+  echo "$as_me:38608: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:38609: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38611: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38612: \$? = $ac_status" >&5
+  echo "$as_me:38614: \$? = $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}:38617: testing ... found idn2 library in $cf_cv_library_path_idn2 ..." 1>&5
+echo "${as_me:-configure}:38619: testing ... found idn2 library in $cf_cv_library_path_idn2 ..." 1>&5
 
 					cf_cv_find_linkage_idn2=yes
 					cf_cv_library_file_idn2="-lidn2"
@@ -38676,7 +38678,7 @@ if test -n "$cf_cv_header_path_idn2" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 38679 "configure"
+#line 38681 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -38688,16 +38690,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:38691: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:38693: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:38694: \$? = $ac_status" >&5
+  echo "$as_me:38696: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:38697: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38699: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38700: \$? = $ac_status" >&5
+  echo "$as_me:38702: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -38714,7 +38716,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}:38717: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:38719: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -38750,7 +38752,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}:38753: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:38755: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -38777,14 +38779,14 @@ LIBS="$cf_add_libs"
 else
 test -n "$verbose" && echo "	unsuccessful, will try idn (older)" 1>&6
 
-echo "${as_me:-configure}:38780: testing unsuccessful, will try idn (older) ..." 1>&5
+echo "${as_me:-configure}:38782: 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}:38787: testing found idn2 library ..." 1>&5
+echo "${as_me:-configure}:38789: testing found idn2 library ..." 1>&5
 
 cat >>confdefs.h <<\EOF
 #define USE_IDN2 1
@@ -38797,12 +38799,12 @@ else
 cf_cv_header_path_idn=
 cf_cv_library_path_idn=
 
-echo "${as_me:-configure}:38800: testing Starting FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:38802: testing Starting FIND_LINKAGE(idn,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 38805 "configure"
+#line 38807 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -38821,16 +38823,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:38824: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38826: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38827: \$? = $ac_status" >&5
+  echo "$as_me:38829: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:38830: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38832: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38833: \$? = $ac_status" >&5
+  echo "$as_me:38835: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_idn=yes
@@ -38844,7 +38846,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lidn $LIBICONV $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 38847 "configure"
+#line 38849 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -38863,16 +38865,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:38866: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38868: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38869: \$? = $ac_status" >&5
+  echo "$as_me:38871: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:38872: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38874: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38875: \$? = $ac_status" >&5
+  echo "$as_me:38877: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_idn=yes
@@ -38889,9 +38891,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for idn library" 1>&6
 
-echo "${as_me:-configure}:38892: testing find linkage for idn library ..." 1>&5
+echo "${as_me:-configure}:38894: testing find linkage for idn library ..." 1>&5
 
-echo "${as_me:-configure}:38894: testing Searching for headers in FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:38896: testing Searching for headers in FIND_LINKAGE(idn,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -38982,7 +38984,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}:38985: testing ... testing $cf_cv_header_path_idn ..." 1>&5
+echo "${as_me:-configure}:38987: testing ... testing $cf_cv_header_path_idn ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -38990,7 +38992,7 @@ echo "${as_me:-configure}:38985: testing ... testing $cf_cv_header_path_idn ..."
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_idn"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 38993 "configure"
+#line 38995 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -39009,21 +39011,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:39012: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:39014: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:39015: \$? = $ac_status" >&5
+  echo "$as_me:39017: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:39018: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39020: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39021: \$? = $ac_status" >&5
+  echo "$as_me:39023: \$? = $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}:39026: testing ... found idn headers in $cf_cv_header_path_idn ..." 1>&5
+echo "${as_me:-configure}:39028: testing ... found idn headers in $cf_cv_header_path_idn ..." 1>&5
 
 				cf_cv_find_linkage_idn=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -39041,7 +39043,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_idn" = maybe ; then
 
-echo "${as_me:-configure}:39044: testing Searching for idn library in FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:39046: testing Searching for idn library in FIND_LINKAGE(idn,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -39116,13 +39118,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}:39119: testing ... testing $cf_cv_library_path_idn ..." 1>&5
+echo "${as_me:-configure}:39121: 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 39125 "configure"
+#line 39127 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -39141,21 +39143,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:39144: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39146: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39147: \$? = $ac_status" >&5
+  echo "$as_me:39149: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:39150: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39152: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39153: \$? = $ac_status" >&5
+  echo "$as_me:39155: \$? = $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}:39158: testing ... found idn library in $cf_cv_library_path_idn ..." 1>&5
+echo "${as_me:-configure}:39160: testing ... found idn library in $cf_cv_library_path_idn ..." 1>&5
 
 					cf_cv_find_linkage_idn=yes
 					cf_cv_library_file_idn="-lidn"
@@ -39217,7 +39219,7 @@ if test -n "$cf_cv_header_path_idn" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 39220 "configure"
+#line 39222 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -39229,16 +39231,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:39232: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:39234: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:39235: \$? = $ac_status" >&5
+  echo "$as_me:39237: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:39238: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39240: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39241: \$? = $ac_status" >&5
+  echo "$as_me:39243: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -39255,7 +39257,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}:39258: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:39260: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -39291,7 +39293,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}:39294: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:39296: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -39316,14 +39318,14 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:39319: WARNING: Cannot find idn library" >&5
+{ echo "$as_me:39321: 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}:39326: testing found idn library ..." 1>&5
+echo "${as_me:-configure}:39328: testing found idn library ..." 1>&5
 
 cat >>confdefs.h <<\EOF
 #define USE_IDNA 1
@@ -39334,7 +39336,7 @@ fi
 
 fi
 
-echo "$as_me:39337: checking if element-justification logic should be used" >&5
+echo "$as_me:39339: 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.
@@ -39351,14 +39353,14 @@ else
 	use_justify_elts=yes
 
 fi;
-echo "$as_me:39354: result: $use_justify_elts" >&5
+echo "$as_me:39356: 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:39361: checking if partial-display should be used" >&5
+echo "$as_me:39363: 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.
@@ -39375,14 +39377,14 @@ else
 	use_partial_display=yes
 
 fi;
-echo "$as_me:39378: result: $use_partial_display" >&5
+echo "$as_me:39380: 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:39385: checking if persistent-cookie logic should be used" >&5
+echo "$as_me:39387: 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.
@@ -39399,14 +39401,14 @@ else
 	use_filed_cookies=yes
 
 fi;
-echo "$as_me:39402: result: $use_filed_cookies" >&5
+echo "$as_me:39404: 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:39409: checking if html source should be colorized" >&5
+echo "$as_me:39411: 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.
@@ -39423,14 +39425,14 @@ else
 	use_prettysrc=yes
 
 fi;
-echo "$as_me:39426: result: $use_prettysrc" >&5
+echo "$as_me:39428: 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:39433: checking if progress-bar code should be used" >&5
+echo "$as_me:39435: 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.
@@ -39447,14 +39449,14 @@ else
 	use_progressbar=yes
 
 fi;
-echo "$as_me:39450: result: $use_progressbar" >&5
+echo "$as_me:39452: 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:39457: checking if read-progress message should show ETA" >&5
+echo "$as_me:39459: 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.
@@ -39471,14 +39473,14 @@ else
 	use_read_eta=yes
 
 fi;
-echo "$as_me:39474: result: $use_read_eta" >&5
+echo "$as_me:39476: 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:39481: checking if source caching should be used" >&5
+echo "$as_me:39483: 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.
@@ -39495,14 +39497,14 @@ else
 	use_source_cache=yes
 
 fi;
-echo "$as_me:39498: result: $use_source_cache" >&5
+echo "$as_me:39500: 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:39505: checking if scrollbar code should be used" >&5
+echo "$as_me:39507: 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.
@@ -39519,10 +39521,10 @@ else
 	use_scrollbar=yes
 
 fi;
-echo "$as_me:39522: result: $use_scrollbar" >&5
+echo "$as_me:39524: result: $use_scrollbar" >&5
 echo "${ECHO_T}$use_scrollbar" >&6
 
-echo "$as_me:39525: checking if charset-selection logic should be used" >&5
+echo "$as_me:39527: 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.
@@ -39539,14 +39541,14 @@ else
 	use_charset_choice=no
 
 fi;
-echo "$as_me:39542: result: $use_charset_choice" >&5
+echo "$as_me:39544: 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:39549: checking if you want to use external commands" >&5
+echo "$as_me:39551: 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.
@@ -39563,7 +39565,7 @@ else
 	use_externs=no
 
 fi;
-echo "$as_me:39566: result: $use_externs" >&5
+echo "$as_me:39568: result: $use_externs" >&5
 echo "${ECHO_T}$use_externs" >&6
 if test "$use_externs" != "no" ; then
 
@@ -39574,7 +39576,7 @@ EOF
 	EXTRA_OBJS="$EXTRA_OBJS LYExtern\$o"
 fi
 
-echo "$as_me:39577: checking if you want to use setfont support" >&5
+echo "$as_me:39579: 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.
@@ -39591,7 +39593,7 @@ else
 	use_setfont=no
 
 fi;
-echo "$as_me:39594: result: $use_setfont" >&5
+echo "$as_me:39596: result: $use_setfont" >&5
 echo "${ECHO_T}$use_setfont" >&6
 if test "$use_setfont" = yes ; then
 	case "$host_os" in
@@ -39602,7 +39604,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:39605: checking for $ac_word" >&5
+echo "$as_me:39607: 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
@@ -39619,7 +39621,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:39622: found $ac_dir/$ac_word" >&5
+   echo "$as_me:39624: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -39630,10 +39632,10 @@ fi
 SETFONT=$ac_cv_path_SETFONT
 
 if test -n "$SETFONT"; then
-  echo "$as_me:39633: result: $SETFONT" >&5
+  echo "$as_me:39635: result: $SETFONT" >&5
 echo "${ECHO_T}$SETFONT" >&6
 else
-  echo "$as_me:39636: result: no" >&5
+  echo "$as_me:39638: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -39692,7 +39694,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:39695: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:39697: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define SETFONT_PATH "$cf_path_prog"
@@ -39710,19 +39712,19 @@ fi
 		SETFONT=built-in
 		test -n "$verbose" && echo "	Assume $host_os has font-switching" 1>&6
 
-echo "${as_me:-configure}:39713: testing Assume $host_os has font-switching ..." 1>&5
+echo "${as_me:-configure}:39715: 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}:39720: testing Assume $host_os has no font-switching ..." 1>&5
+echo "${as_me:-configure}:39722: testing Assume $host_os has no font-switching ..." 1>&5
 
 		;;
 	esac
 	if test -z "$SETFONT" ; then
-		{ echo "$as_me:39725: WARNING: Cannot find a font-setting program" >&5
+		{ echo "$as_me:39727: WARNING: Cannot find a font-setting program" >&5
 echo "$as_me: WARNING: Cannot find a font-setting program" >&2;}
 	elif test "$SETFONT" != unknown ; then
 
@@ -39733,7 +39735,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:39736: checking if you want cgi-link support" >&5
+echo "$as_me:39738: 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.
@@ -39750,10 +39752,10 @@ EOF
 else
   enableval=no
 fi;
-echo "$as_me:39753: result: $enableval" >&5
+echo "$as_me:39755: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:39756: checking if you want change-exec support" >&5
+echo "$as_me:39758: 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.
@@ -39770,14 +39772,14 @@ else
 	use_change_exec=no
 
 fi;
-echo "$as_me:39773: result: $use_change_exec" >&5
+echo "$as_me:39775: 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:39780: checking if you want exec-links support" >&5
+echo "$as_me:39782: 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.
@@ -39794,14 +39796,14 @@ else
 	use_exec_links=$enableval
 
 fi;
-echo "$as_me:39797: result: $use_exec_links" >&5
+echo "$as_me:39799: 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:39804: checking if you want exec-scripts support" >&5
+echo "$as_me:39806: 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.
@@ -39818,14 +39820,14 @@ else
 	use_exec_scripts=$enableval
 
 fi;
-echo "$as_me:39821: result: $use_exec_scripts" >&5
+echo "$as_me:39823: 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:39828: checking if you want internal-links feature" >&5
+echo "$as_me:39830: 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.
@@ -39842,14 +39844,14 @@ else
 	use_internal_links=no
 
 fi;
-echo "$as_me:39845: result: $use_internal_links" >&5
+echo "$as_me:39847: 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:39852: checking if you want to fork NSL requests" >&5
+echo "$as_me:39854: 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.
@@ -39866,7 +39868,7 @@ else
 	use_nsl_fork=no
 
 fi;
-echo "$as_me:39869: result: $use_nsl_fork" >&5
+echo "$as_me:39871: result: $use_nsl_fork" >&5
 echo "${ECHO_T}$use_nsl_fork" >&6
 if test "$use_nsl_fork" = yes ; then
 	case "$host_os" in
@@ -39887,7 +39889,7 @@ EOF
 	esac
 fi
 
-echo "$as_me:39890: checking if you want to log URL requests via syslog" >&5
+echo "$as_me:39892: 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.
@@ -39904,14 +39906,14 @@ else
 	use_syslog=no
 
 fi;
-echo "$as_me:39907: result: $use_syslog" >&5
+echo "$as_me:39909: 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:39914: checking if you want to underline links" >&5
+echo "$as_me:39916: 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.
@@ -39928,7 +39930,7 @@ else
 	use_underline=no
 
 fi;
-echo "$as_me:39931: result: $use_underline" >&5
+echo "$as_me:39933: result: $use_underline" >&5
 echo "${ECHO_T}$use_underline" >&6
 test "$use_underline" = yes &&
 cat >>confdefs.h <<\EOF
@@ -39940,7 +39942,7 @@ cat >>confdefs.h <<\EOF
 #define UNDERLINE_LINKS 0
 EOF
 
-echo "$as_me:39943: checking if help files should be gzip'ed" >&5
+echo "$as_me:39945: 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.
@@ -39957,10 +39959,10 @@ else
 	use_gzip_help=no
 
 fi;
-echo "$as_me:39960: result: $use_gzip_help" >&5
+echo "$as_me:39962: result: $use_gzip_help" >&5
 echo "${ECHO_T}$use_gzip_help" >&6
 
-echo "$as_me:39963: checking if you want to use libbz2 for decompression of some bzip2 files" >&5
+echo "$as_me:39965: 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.
@@ -39970,7 +39972,7 @@ if test "${with_bzlib+set}" = set; then
 else
   use_bzlib=yes
 fi;
-echo "$as_me:39973: result: $use_bzlib" >&5
+echo "$as_me:39975: result: $use_bzlib" >&5
 echo "${ECHO_T}$use_bzlib" >&6
 
 if test ".$use_bzlib" != ".no" ; then
@@ -40010,7 +40012,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 40013 "configure"
+#line 40015 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -40022,16 +40024,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:40025: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:40027: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:40028: \$? = $ac_status" >&5
+  echo "$as_me:40030: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:40031: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40033: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40034: \$? = $ac_status" >&5
+  echo "$as_me:40036: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -40048,7 +40050,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}:40051: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:40053: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -40094,7 +40096,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 40097 "configure"
+#line 40099 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -40106,16 +40108,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:40109: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:40111: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:40112: \$? = $ac_status" >&5
+  echo "$as_me:40114: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:40115: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40117: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40118: \$? = $ac_status" >&5
+  echo "$as_me:40120: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -40132,7 +40134,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}:40135: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:40137: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -40150,7 +40152,7 @@ echo "${as_me:-configure}:40135: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:40153: error: cannot find bzip2 library under $use_bzlib" >&5
+{ { echo "$as_me:40155: error: cannot find bzip2 library under $use_bzlib" >&5
 echo "$as_me: error: cannot find bzip2 library under $use_bzlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -40175,7 +40177,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}:40178: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:40180: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -40204,7 +40206,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}:40207: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:40209: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -40213,7 +40215,7 @@ echo "${as_me:-configure}:40207: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:40216: error: cannot find bzip2 library under $use_bzlib" >&5
+{ { echo "$as_me:40218: error: cannot find bzip2 library under $use_bzlib" >&5
 echo "$as_me: error: cannot find bzip2 library under $use_bzlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -40221,7 +40223,7 @@ done
 
 	test -n "$verbose" && echo "	setting path value for bzip2 library to $use_bzlib" 1>&6
 
-echo "${as_me:-configure}:40224: testing setting path value for bzip2 library to $use_bzlib ..." 1>&5
+echo "${as_me:-configure}:40226: testing setting path value for bzip2 library to $use_bzlib ..." 1>&5
 
 	;;
 esac
@@ -40231,12 +40233,12 @@ esac
 cf_cv_header_path_bz2=
 cf_cv_library_path_bz2=
 
-echo "${as_me:-configure}:40234: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:40236: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 40239 "configure"
+#line 40241 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -40253,16 +40255,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:40256: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40258: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40259: \$? = $ac_status" >&5
+  echo "$as_me:40261: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:40262: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40264: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40265: \$? = $ac_status" >&5
+  echo "$as_me:40267: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_bz2=yes
@@ -40276,7 +40278,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lbz2  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 40279 "configure"
+#line 40281 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -40293,16 +40295,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:40296: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40298: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40299: \$? = $ac_status" >&5
+  echo "$as_me:40301: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:40302: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40304: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40305: \$? = $ac_status" >&5
+  echo "$as_me:40307: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_bz2=yes
@@ -40319,9 +40321,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for bz2 library" 1>&6
 
-echo "${as_me:-configure}:40322: testing find linkage for bz2 library ..." 1>&5
+echo "${as_me:-configure}:40324: testing find linkage for bz2 library ..." 1>&5
 
-echo "${as_me:-configure}:40324: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:40326: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -40412,7 +40414,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}:40415: testing ... testing $cf_cv_header_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:40417: testing ... testing $cf_cv_header_path_bz2 ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -40420,7 +40422,7 @@ echo "${as_me:-configure}:40415: testing ... testing $cf_cv_header_path_bz2 ..."
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_bz2"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 40423 "configure"
+#line 40425 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -40437,21 +40439,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:40440: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:40442: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:40443: \$? = $ac_status" >&5
+  echo "$as_me:40445: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:40446: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40448: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40449: \$? = $ac_status" >&5
+  echo "$as_me:40451: \$? = $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}:40454: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:40456: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5
 
 				cf_cv_find_linkage_bz2=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -40469,7 +40471,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_bz2" = maybe ; then
 
-echo "${as_me:-configure}:40472: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:40474: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -40477,7 +40479,7 @@ echo "${as_me:-configure}:40472: testing Searching for bz2 library in FIND_LINKA
 		CPPFLAGS="$cf_test_CPPFLAGS"
 		LIBS="-lbz2  $cf_save_LIBS"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 40480 "configure"
+#line 40482 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -40494,21 +40496,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:40497: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40499: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40500: \$? = $ac_status" >&5
+  echo "$as_me:40502: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:40503: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40505: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40506: \$? = $ac_status" >&5
+  echo "$as_me:40508: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			test -n "$verbose" && echo "	... found bz2 library in system" 1>&6
 
-echo "${as_me:-configure}:40511: testing ... found bz2 library in system ..." 1>&5
+echo "${as_me:-configure}:40513: testing ... found bz2 library in system ..." 1>&5
 
 			cf_cv_find_linkage_bz2=yes
 else
@@ -40589,13 +40591,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}:40592: testing ... testing $cf_cv_library_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:40594: 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 40598 "configure"
+#line 40600 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -40612,21 +40614,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:40615: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40617: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40618: \$? = $ac_status" >&5
+  echo "$as_me:40620: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:40621: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40623: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40624: \$? = $ac_status" >&5
+  echo "$as_me:40626: \$? = $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}:40629: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:40631: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5
 
 					cf_cv_find_linkage_bz2=yes
 					cf_cv_library_file_bz2="-lbz2"
@@ -40688,7 +40690,7 @@ if test -n "$cf_cv_header_path_bz2" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 40691 "configure"
+#line 40693 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -40700,16 +40702,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:40703: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:40705: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:40706: \$? = $ac_status" >&5
+  echo "$as_me:40708: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:40709: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40711: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40712: \$? = $ac_status" >&5
+  echo "$as_me:40714: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -40726,7 +40728,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}:40729: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:40731: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -40762,7 +40764,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}:40765: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:40767: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -40787,7 +40789,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:40790: WARNING: Cannot find bz2 library" >&5
+{ echo "$as_me:40792: WARNING: Cannot find bz2 library" >&5
 echo "$as_me: WARNING: Cannot find bz2 library" >&2;}
 fi
 
@@ -40798,7 +40800,7 @@ EOF
 
 fi
 
-echo "$as_me:40801: checking if you want to use zlib for decompression of some gzip files" >&5
+echo "$as_me:40803: 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.
@@ -40808,7 +40810,7 @@ if test "${with_zlib+set}" = set; then
 else
   use_zlib=yes
 fi;
-echo "$as_me:40811: result: $use_zlib" >&5
+echo "$as_me:40813: result: $use_zlib" >&5
 echo "${ECHO_T}$use_zlib" >&6
 
 if test ".$use_zlib" != ".no" ; then
@@ -40848,7 +40850,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 40851 "configure"
+#line 40853 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -40860,16 +40862,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:40863: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:40865: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:40866: \$? = $ac_status" >&5
+  echo "$as_me:40868: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:40869: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40871: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40872: \$? = $ac_status" >&5
+  echo "$as_me:40874: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -40886,7 +40888,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}:40889: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:40891: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -40932,7 +40934,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 40935 "configure"
+#line 40937 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -40944,16 +40946,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:40947: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:40949: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:40950: \$? = $ac_status" >&5
+  echo "$as_me:40952: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:40953: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40955: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40956: \$? = $ac_status" >&5
+  echo "$as_me:40958: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -40970,7 +40972,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}:40973: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:40975: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -40988,7 +40990,7 @@ echo "${as_me:-configure}:40973: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:40991: error: cannot find zlib under $use_zlib" >&5
+{ { echo "$as_me:40993: error: cannot find zlib under $use_zlib" >&5
 echo "$as_me: error: cannot find zlib under $use_zlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -41013,7 +41015,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}:41016: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:41018: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -41042,7 +41044,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}:41045: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:41047: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -41051,7 +41053,7 @@ echo "${as_me:-configure}:41045: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:41054: error: cannot find zlib under $use_zlib" >&5
+{ { echo "$as_me:41056: error: cannot find zlib under $use_zlib" >&5
 echo "$as_me: error: cannot find zlib under $use_zlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -41059,7 +41061,7 @@ done
 
 	test -n "$verbose" && echo "	setting path value for zlib to $use_zlib" 1>&6
 
-echo "${as_me:-configure}:41062: testing setting path value for zlib to $use_zlib ..." 1>&5
+echo "${as_me:-configure}:41064: testing setting path value for zlib to $use_zlib ..." 1>&5
 
 	;;
 esac
@@ -41069,12 +41071,12 @@ esac
 cf_cv_header_path_z=
 cf_cv_library_path_z=
 
-echo "${as_me:-configure}:41072: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:41074: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 41077 "configure"
+#line 41079 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -41090,16 +41092,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:41093: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41095: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41096: \$? = $ac_status" >&5
+  echo "$as_me:41098: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:41099: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41101: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41102: \$? = $ac_status" >&5
+  echo "$as_me:41104: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_z=yes
@@ -41113,7 +41115,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lz  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 41116 "configure"
+#line 41118 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -41129,16 +41131,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:41132: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41134: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41135: \$? = $ac_status" >&5
+  echo "$as_me:41137: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:41138: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41140: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41141: \$? = $ac_status" >&5
+  echo "$as_me:41143: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_z=yes
@@ -41155,9 +41157,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for z library" 1>&6
 
-echo "${as_me:-configure}:41158: testing find linkage for z library ..." 1>&5
+echo "${as_me:-configure}:41160: testing find linkage for z library ..." 1>&5
 
-echo "${as_me:-configure}:41160: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:41162: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -41248,7 +41250,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}:41251: testing ... testing $cf_cv_header_path_z ..." 1>&5
+echo "${as_me:-configure}:41253: testing ... testing $cf_cv_header_path_z ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -41256,7 +41258,7 @@ echo "${as_me:-configure}:41251: testing ... testing $cf_cv_header_path_z ..." 1
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_z"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 41259 "configure"
+#line 41261 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -41272,21 +41274,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:41275: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:41277: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:41278: \$? = $ac_status" >&5
+  echo "$as_me:41280: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:41281: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41283: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41284: \$? = $ac_status" >&5
+  echo "$as_me:41286: \$? = $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}:41289: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5
+echo "${as_me:-configure}:41291: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5
 
 				cf_cv_find_linkage_z=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -41304,7 +41306,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_z" = maybe ; then
 
-echo "${as_me:-configure}:41307: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:41309: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -41312,7 +41314,7 @@ echo "${as_me:-configure}:41307: testing Searching for z library in FIND_LINKAGE
 		CPPFLAGS="$cf_test_CPPFLAGS"
 		LIBS="-lz  $cf_save_LIBS"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 41315 "configure"
+#line 41317 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -41328,21 +41330,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:41331: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41333: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41334: \$? = $ac_status" >&5
+  echo "$as_me:41336: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:41337: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41339: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41340: \$? = $ac_status" >&5
+  echo "$as_me:41342: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			test -n "$verbose" && echo "	... found z library in system" 1>&6
 
-echo "${as_me:-configure}:41345: testing ... found z library in system ..." 1>&5
+echo "${as_me:-configure}:41347: testing ... found z library in system ..." 1>&5
 
 			cf_cv_find_linkage_z=yes
 else
@@ -41423,13 +41425,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}:41426: testing ... testing $cf_cv_library_path_z ..." 1>&5
+echo "${as_me:-configure}:41428: 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 41432 "configure"
+#line 41434 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -41445,21 +41447,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:41448: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41450: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41451: \$? = $ac_status" >&5
+  echo "$as_me:41453: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:41454: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41456: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41457: \$? = $ac_status" >&5
+  echo "$as_me:41459: \$? = $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}:41462: testing ... found z library in $cf_cv_library_path_z ..." 1>&5
+echo "${as_me:-configure}:41464: testing ... found z library in $cf_cv_library_path_z ..." 1>&5
 
 					cf_cv_find_linkage_z=yes
 					cf_cv_library_file_z="-lz"
@@ -41521,7 +41523,7 @@ if test -n "$cf_cv_header_path_z" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 41524 "configure"
+#line 41526 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -41533,16 +41535,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:41536: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:41538: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:41539: \$? = $ac_status" >&5
+  echo "$as_me:41541: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:41542: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41544: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41545: \$? = $ac_status" >&5
+  echo "$as_me:41547: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -41559,7 +41561,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}:41562: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:41564: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -41595,7 +41597,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}:41598: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:41600: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -41620,7 +41622,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:41623: WARNING: Cannot find z library" >&5
+{ echo "$as_me:41625: WARNING: Cannot find z library" >&5
 echo "$as_me: WARNING: Cannot find z library" >&2;}
 fi
 
@@ -41629,13 +41631,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:41632: checking for $ac_func" >&5
+echo "$as_me:41634: 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 41638 "configure"
+#line 41640 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -41666,16 +41668,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:41669: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41671: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41672: \$? = $ac_status" >&5
+  echo "$as_me:41674: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:41675: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41677: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41678: \$? = $ac_status" >&5
+  echo "$as_me:41680: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -41685,7 +41687,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:41688: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:41690: 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
@@ -41702,7 +41704,7 @@ EOF
 
 fi
 
-echo "$as_me:41705: checking if you want to use brotli decompression" >&5
+echo "$as_me:41707: 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.
@@ -41712,7 +41714,7 @@ if test "${with_brotli+set}" = set; then
 else
   use_brotli=yes
 fi;
-echo "$as_me:41715: result: $use_brotli" >&5
+echo "$as_me:41717: result: $use_brotli" >&5
 echo "${ECHO_T}$use_brotli" >&6
 
 if test ".$use_brotli" != ".no" ; then
@@ -41752,7 +41754,7 @@ if test -n "$cf_searchpath/include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 41755 "configure"
+#line 41757 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -41764,16 +41766,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:41767: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:41769: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:41770: \$? = $ac_status" >&5
+  echo "$as_me:41772: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:41773: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41775: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41776: \$? = $ac_status" >&5
+  echo "$as_me:41778: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -41790,7 +41792,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}:41793: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:41795: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -41836,7 +41838,7 @@ if test -n "$cf_searchpath/../include" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 41839 "configure"
+#line 41841 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -41848,16 +41850,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:41851: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:41853: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:41854: \$? = $ac_status" >&5
+  echo "$as_me:41856: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:41857: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41859: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41860: \$? = $ac_status" >&5
+  echo "$as_me:41862: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -41874,7 +41876,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}:41877: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:41879: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -41892,7 +41894,7 @@ echo "${as_me:-configure}:41877: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:41895: error: cannot find brotli library under $use_brotli" >&5
+{ { echo "$as_me:41897: error: cannot find brotli library under $use_brotli" >&5
 echo "$as_me: error: cannot find brotli library under $use_brotli" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -41917,7 +41919,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}:41920: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:41922: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -41946,7 +41948,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}:41949: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:41951: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -41955,7 +41957,7 @@ echo "${as_me:-configure}:41949: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:41958: error: cannot find brotli library under $use_brotli" >&5
+{ { echo "$as_me:41960: error: cannot find brotli library under $use_brotli" >&5
 echo "$as_me: error: cannot find brotli library under $use_brotli" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -41963,7 +41965,7 @@ done
 
 	test -n "$verbose" && echo "	setting path value for brotli library to $use_brotli" 1>&6
 
-echo "${as_me:-configure}:41966: testing setting path value for brotli library to $use_brotli ..." 1>&5
+echo "${as_me:-configure}:41968: testing setting path value for brotli library to $use_brotli ..." 1>&5
 
 	;;
 esac
@@ -41973,12 +41975,12 @@ esac
 cf_cv_header_path_brotlidec=
 cf_cv_library_path_brotlidec=
 
-echo "${as_me:-configure}:41976: testing Starting FIND_LINKAGE(brotlidec,brotlilib) ..." 1>&5
+echo "${as_me:-configure}:41978: testing Starting FIND_LINKAGE(brotlidec,brotlilib) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 41981 "configure"
+#line 41983 "configure"
 #include "confdefs.h"
 
 #include <brotli/decode.h>
@@ -42001,16 +42003,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:42004: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42006: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42007: \$? = $ac_status" >&5
+  echo "$as_me:42009: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:42010: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42012: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42013: \$? = $ac_status" >&5
+  echo "$as_me:42015: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_brotlidec=yes
@@ -42024,7 +42026,7 @@ cat "conftest.$ac_ext" >&5
 LIBS="-lbrotlidec  $cf_save_LIBS"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 42027 "configure"
+#line 42029 "configure"
 #include "confdefs.h"
 
 #include <brotli/decode.h>
@@ -42047,16 +42049,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:42050: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42052: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42053: \$? = $ac_status" >&5
+  echo "$as_me:42055: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:42056: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42058: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42059: \$? = $ac_status" >&5
+  echo "$as_me:42061: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 	cf_cv_find_linkage_brotlidec=yes
@@ -42073,9 +42075,9 @@ cat "conftest.$ac_ext" >&5
 
 	test -n "$verbose" && echo "	find linkage for brotlidec library" 1>&6
 
-echo "${as_me:-configure}:42076: testing find linkage for brotlidec library ..." 1>&5
+echo "${as_me:-configure}:42078: testing find linkage for brotlidec library ..." 1>&5
 
-echo "${as_me:-configure}:42078: testing Searching for headers in FIND_LINKAGE(brotlidec,brotlilib) ..." 1>&5
+echo "${as_me:-configure}:42080: testing Searching for headers in FIND_LINKAGE(brotlidec,brotlilib) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -42166,7 +42168,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}:42169: testing ... testing $cf_cv_header_path_brotlidec ..." 1>&5
+echo "${as_me:-configure}:42171: testing ... testing $cf_cv_header_path_brotlidec ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS"
 
@@ -42174,7 +42176,7 @@ echo "${as_me:-configure}:42169: testing ... testing $cf_cv_header_path_brotlide
 	CPPFLAGS="${CPPFLAGS}-I$cf_cv_header_path_brotlidec"
 
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 42177 "configure"
+#line 42179 "configure"
 #include "confdefs.h"
 
 #include <brotli/decode.h>
@@ -42197,21 +42199,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:42200: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42202: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:42203: \$? = $ac_status" >&5
+  echo "$as_me:42205: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:42206: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42208: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42209: \$? = $ac_status" >&5
+  echo "$as_me:42211: \$? = $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}:42214: testing ... found brotlidec headers in $cf_cv_header_path_brotlidec ..." 1>&5
+echo "${as_me:-configure}:42216: testing ... found brotlidec headers in $cf_cv_header_path_brotlidec ..." 1>&5
 
 				cf_cv_find_linkage_brotlidec=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -42229,7 +42231,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 	if test "$cf_cv_find_linkage_brotlidec" = maybe ; then
 
-echo "${as_me:-configure}:42232: testing Searching for brotlidec library in FIND_LINKAGE(brotlidec,brotlilib) ..." 1>&5
+echo "${as_me:-configure}:42234: testing Searching for brotlidec library in FIND_LINKAGE(brotlidec,brotlilib) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -42237,7 +42239,7 @@ echo "${as_me:-configure}:42232: testing Searching for brotlidec library in FIND
 		CPPFLAGS="$cf_test_CPPFLAGS"
 		LIBS="-lbrotlidec  $cf_save_LIBS"
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 42240 "configure"
+#line 42242 "configure"
 #include "confdefs.h"
 
 #include <brotli/decode.h>
@@ -42260,21 +42262,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:42263: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42265: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42266: \$? = $ac_status" >&5
+  echo "$as_me:42268: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:42269: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42271: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42272: \$? = $ac_status" >&5
+  echo "$as_me:42274: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
 
 			test -n "$verbose" && echo "	... found brotlidec library in system" 1>&6
 
-echo "${as_me:-configure}:42277: testing ... found brotlidec library in system ..." 1>&5
+echo "${as_me:-configure}:42279: testing ... found brotlidec library in system ..." 1>&5
 
 			cf_cv_find_linkage_brotlidec=yes
 else
@@ -42355,13 +42357,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}:42358: testing ... testing $cf_cv_library_path_brotlidec ..." 1>&5
+echo "${as_me:-configure}:42360: 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 42364 "configure"
+#line 42366 "configure"
 #include "confdefs.h"
 
 #include <brotli/decode.h>
@@ -42384,21 +42386,21 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:42387: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42389: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42390: \$? = $ac_status" >&5
+  echo "$as_me:42392: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:42393: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42395: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42396: \$? = $ac_status" >&5
+  echo "$as_me:42398: \$? = $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}:42401: testing ... found brotlidec library in $cf_cv_library_path_brotlidec ..." 1>&5
+echo "${as_me:-configure}:42403: testing ... found brotlidec library in $cf_cv_library_path_brotlidec ..." 1>&5
 
 					cf_cv_find_linkage_brotlidec=yes
 					cf_cv_library_file_brotlidec="-lbrotlidec"
@@ -42460,7 +42462,7 @@ if test -n "$cf_cv_header_path_brotlidec" ; then
 	CPPFLAGS="${CPPFLAGS}-I$cf_add_incdir"
 
 			  cat >"conftest.$ac_ext" <<_ACEOF
-#line 42463 "configure"
+#line 42465 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -42472,16 +42474,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:42475: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42477: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:42478: \$? = $ac_status" >&5
+  echo "$as_me:42480: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:42481: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42483: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42484: \$? = $ac_status" >&5
+  echo "$as_me:42486: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -42498,7 +42500,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}:42501: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:42503: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -42534,7 +42536,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}:42537: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:42539: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -42559,7 +42561,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:42562: WARNING: Cannot find brotlidec library" >&5
+{ echo "$as_me:42564: WARNING: Cannot find brotlidec library" >&5
 echo "$as_me: WARNING: Cannot find brotlidec library" >&2;}
 fi
 
@@ -42570,7 +42572,7 @@ EOF
 
 fi
 
-echo "$as_me:42573: checking if you want to exclude FINGER code" >&5
+echo "$as_me:42575: 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.
@@ -42587,14 +42589,14 @@ else
 	use_finger=no
 
 fi;
-echo "$as_me:42590: result: $use_finger" >&5
+echo "$as_me:42592: 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:42597: checking if you want to exclude GOPHER code" >&5
+echo "$as_me:42599: 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.
@@ -42611,14 +42613,14 @@ else
 	use_gopher=no
 
 fi;
-echo "$as_me:42614: result: $use_gopher" >&5
+echo "$as_me:42616: 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:42621: checking if you want to exclude NEWS code" >&5
+echo "$as_me:42623: 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.
@@ -42635,14 +42637,14 @@ else
 	use_news=no
 
 fi;
-echo "$as_me:42638: result: $use_news" >&5
+echo "$as_me:42640: 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:42645: checking if you want to exclude FTP code" >&5
+echo "$as_me:42647: 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.
@@ -42659,14 +42661,14 @@ else
 	use_ftp=no
 
 fi;
-echo "$as_me:42662: result: $use_ftp" >&5
+echo "$as_me:42664: 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:42669: checking if you want to include WAIS code" >&5
+echo "$as_me:42671: 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.
@@ -42683,13 +42685,13 @@ else
 	use_wais=no
 
 fi;
-echo "$as_me:42686: result: $use_wais" >&5
+echo "$as_me:42688: result: $use_wais" >&5
 echo "${ECHO_T}$use_wais" >&6
 
 MAKE_WAIS="#"
 if test "$use_wais" != "no"
 then
-	echo "$as_me:42692: checking for fs_free in -lwais" >&5
+	echo "$as_me:42694: 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
@@ -42697,7 +42699,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lwais  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 42700 "configure"
+#line 42702 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -42716,16 +42718,16 @@ fs_free ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:42719: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42721: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42722: \$? = $ac_status" >&5
+  echo "$as_me:42724: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:42725: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42727: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42728: \$? = $ac_status" >&5
+  echo "$as_me:42730: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_wais_fs_free=yes
 else
@@ -42736,18 +42738,18 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:42739: result: $ac_cv_lib_wais_fs_free" >&5
+echo "$as_me:42741: 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:42743: checking if -lm needed for math functions" >&5
+echo "$as_me:42745: 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 42750 "configure"
+#line 42752 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -42763,16 +42765,16 @@ double x = rand(); printf("result = %g\\n", sin(x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:42766: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42768: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42769: \$? = $ac_status" >&5
+  echo "$as_me:42771: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:42772: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42774: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42775: \$? = $ac_status" >&5
+  echo "$as_me:42777: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_libm=no
 else
@@ -42782,7 +42784,7 @@ cf_cv_need_libm=yes
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:42785: result: $cf_cv_need_libm" >&5
+echo "$as_me:42787: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
 
 if test "$cf_cv_need_libm" = yes
@@ -42790,14 +42792,14 @@ then
 
 	cf_save_LIBS="$LIBS"
 	LIBS="$LIBS -lm"
-	echo "$as_me:42793: checking if -lm is available for math functions" >&5
+	echo "$as_me:42795: 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 42800 "configure"
+#line 42802 "configure"
 #include "confdefs.h"
 
 		#include <stdio.h>
@@ -42813,16 +42815,16 @@ double x = rand(); printf("result = %g\\n", sin(x))
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:42816: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42818: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42819: \$? = $ac_status" >&5
+  echo "$as_me:42821: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:42822: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42824: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42825: \$? = $ac_status" >&5
+  echo "$as_me:42827: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_libm=yes
 else
@@ -42832,7 +42834,7 @@ cf_cv_have_libm=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:42835: result: $cf_cv_have_libm" >&5
+echo "$as_me:42837: result: $cf_cv_have_libm" >&5
 echo "${ECHO_T}$cf_cv_have_libm" >&6
 	LIBS="$cf_save_LIBS"
 
@@ -42888,23 +42890,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:42891: checking for $ac_header" >&5
+echo "$as_me:42893: 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 42897 "configure"
+#line 42899 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:42901: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:42903: \"$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:42907: \$? = $ac_status" >&5
+  echo "$as_me:42909: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -42923,7 +42925,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:42926: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:42928: 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
@@ -42936,7 +42938,7 @@ done
 		MAKE_WAIS=
 
 else
-  { echo "$as_me:42939: WARNING: could not find WAIS library" >&5
+  { echo "$as_me:42941: WARNING: could not find WAIS library" >&5
 echo "$as_me: WARNING: could not find WAIS library" >&2;}
 fi
 
@@ -42944,7 +42946,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:42947: checking if directory-editor code should be used" >&5
+echo "$as_me:42949: 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.
@@ -42961,7 +42963,7 @@ else
 	use_dired=yes
 
 fi;
-echo "$as_me:42964: result: $use_dired" >&5
+echo "$as_me:42966: result: $use_dired" >&5
 echo "${ECHO_T}$use_dired" >&6
 
 if test ".$use_dired" != ".no" ; then
@@ -42971,7 +42973,7 @@ cat >>confdefs.h <<\EOF
 #define DIRED_SUPPORT 1
 EOF
 
-	echo "$as_me:42974: checking if you wish to allow extracting from archives via DirEd" >&5
+	echo "$as_me:42976: 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.
@@ -42988,10 +42990,10 @@ EOF
 else
   enableval=yes
 fi;
-	echo "$as_me:42991: result: $enableval" >&5
+	echo "$as_me:42993: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:42994: checking if DirEd mode should override keys" >&5
+	echo "$as_me:42996: 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.
@@ -43015,10 +43017,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:43018: result: $enableval" >&5
+	echo "$as_me:43020: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:43021: checking if you wish to allow permissions commands via DirEd" >&5
+	echo "$as_me:43023: 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.
@@ -43042,10 +43044,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:43045: result: $enableval" >&5
+	echo "$as_me:43047: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:43048: checking if you wish to allow executable-permission commands via DirEd" >&5
+	echo "$as_me:43050: 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.
@@ -43062,10 +43064,10 @@ EOF
 else
   enableval=yes
 fi;
-	echo "$as_me:43065: result: $enableval" >&5
+	echo "$as_me:43067: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:43068: checking if you wish to allow \"tar\" commands from DirEd" >&5
+	echo "$as_me:43070: 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.
@@ -43089,10 +43091,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:43092: result: $enableval" >&5
+	echo "$as_me:43094: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:43095: checking if you wish to allow \"uudecode\" commands from DirEd" >&5
+	echo "$as_me:43097: 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.
@@ -43116,10 +43118,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:43119: result: $enableval" >&5
+	echo "$as_me:43121: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:43122: checking if you wish to allow \"zip\" and \"unzip\" commands from DirEd" >&5
+	echo "$as_me:43124: 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.
@@ -43143,10 +43145,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:43146: result: $enableval" >&5
+	echo "$as_me:43148: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:43149: checking if you wish to allow \"gzip\" and \"gunzip\" commands from DirEd" >&5
+	echo "$as_me:43151: 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.
@@ -43170,11 +43172,11 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:43173: result: $enableval" >&5
+	echo "$as_me:43175: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 fi
 
-echo "$as_me:43177: checking if you want long-directory listings" >&5
+echo "$as_me:43179: 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.
@@ -43198,10 +43200,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-echo "$as_me:43201: result: $enableval" >&5
+echo "$as_me:43203: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:43204: checking if parent-directory references are permitted" >&5
+echo "$as_me:43206: 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.
@@ -43218,7 +43220,7 @@ EOF
 else
   enableval=yes
 fi;
-echo "$as_me:43221: result: $enableval" >&5
+echo "$as_me:43223: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 test -z "$TELNET" && TELNET="telnet"
@@ -43226,7 +43228,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:43229: checking for $ac_word" >&5
+echo "$as_me:43231: 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
@@ -43243,7 +43245,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:43246: found $ac_dir/$ac_word" >&5
+   echo "$as_me:43248: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -43254,10 +43256,10 @@ fi
 TELNET=$ac_cv_path_TELNET
 
 if test -n "$TELNET"; then
-  echo "$as_me:43257: result: $TELNET" >&5
+  echo "$as_me:43259: result: $TELNET" >&5
 echo "${ECHO_T}$TELNET" >&6
 else
-  echo "$as_me:43260: result: no" >&5
+  echo "$as_me:43262: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -43316,7 +43318,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:43319: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:43321: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TELNET_PATH "$cf_path_prog"
@@ -43334,7 +43336,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:43337: checking for $ac_word" >&5
+echo "$as_me:43339: 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
@@ -43351,7 +43353,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:43354: found $ac_dir/$ac_word" >&5
+   echo "$as_me:43356: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -43362,10 +43364,10 @@ fi
 TN3270=$ac_cv_path_TN3270
 
 if test -n "$TN3270"; then
-  echo "$as_me:43365: result: $TN3270" >&5
+  echo "$as_me:43367: result: $TN3270" >&5
 echo "${ECHO_T}$TN3270" >&6
 else
-  echo "$as_me:43368: result: no" >&5
+  echo "$as_me:43370: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -43424,7 +43426,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:43427: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:43429: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TN3270_PATH "$cf_path_prog"
@@ -43442,7 +43444,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:43445: checking for $ac_word" >&5
+echo "$as_me:43447: 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
@@ -43459,7 +43461,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:43462: found $ac_dir/$ac_word" >&5
+   echo "$as_me:43464: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -43470,10 +43472,10 @@ fi
 RLOGIN=$ac_cv_path_RLOGIN
 
 if test -n "$RLOGIN"; then
-  echo "$as_me:43473: result: $RLOGIN" >&5
+  echo "$as_me:43475: result: $RLOGIN" >&5
 echo "${ECHO_T}$RLOGIN" >&6
 else
-  echo "$as_me:43476: result: no" >&5
+  echo "$as_me:43478: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -43532,7 +43534,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:43535: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:43537: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define RLOGIN_PATH "$cf_path_prog"
@@ -43550,7 +43552,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:43553: checking for $ac_word" >&5
+echo "$as_me:43555: 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
@@ -43567,7 +43569,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:43570: found $ac_dir/$ac_word" >&5
+   echo "$as_me:43572: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -43578,10 +43580,10 @@ fi
 MV=$ac_cv_path_MV
 
 if test -n "$MV"; then
-  echo "$as_me:43581: result: $MV" >&5
+  echo "$as_me:43583: result: $MV" >&5
 echo "${ECHO_T}$MV" >&6
 else
-  echo "$as_me:43584: result: no" >&5
+  echo "$as_me:43586: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -43640,7 +43642,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:43643: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:43645: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define MV_PATH "$cf_path_prog"
@@ -43658,7 +43660,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:43661: checking for $ac_word" >&5
+echo "$as_me:43663: 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
@@ -43675,7 +43677,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:43678: found $ac_dir/$ac_word" >&5
+   echo "$as_me:43680: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -43686,10 +43688,10 @@ fi
 GZIP=$ac_cv_path_GZIP
 
 if test -n "$GZIP"; then
-  echo "$as_me:43689: result: $GZIP" >&5
+  echo "$as_me:43691: result: $GZIP" >&5
 echo "${ECHO_T}$GZIP" >&6
 else
-  echo "$as_me:43692: result: no" >&5
+  echo "$as_me:43694: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -43748,7 +43750,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:43751: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:43753: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define GZIP_PATH "$cf_path_prog"
@@ -43766,7 +43768,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:43769: checking for $ac_word" >&5
+echo "$as_me:43771: 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
@@ -43783,7 +43785,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:43786: found $ac_dir/$ac_word" >&5
+   echo "$as_me:43788: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -43794,10 +43796,10 @@ fi
 UNCOMPRESS=$ac_cv_path_UNCOMPRESS
 
 if test -n "$UNCOMPRESS"; then
-  echo "$as_me:43797: result: $UNCOMPRESS" >&5
+  echo "$as_me:43799: result: $UNCOMPRESS" >&5
 echo "${ECHO_T}$UNCOMPRESS" >&6
 else
-  echo "$as_me:43800: result: no" >&5
+  echo "$as_me:43802: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -43856,7 +43858,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:43859: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:43861: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define UNCOMPRESS_PATH "$cf_path_prog"
@@ -43874,7 +43876,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:43877: checking for $ac_word" >&5
+echo "$as_me:43879: 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
@@ -43891,7 +43893,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:43894: found $ac_dir/$ac_word" >&5
+   echo "$as_me:43896: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -43902,10 +43904,10 @@ fi
 UNZIP=$ac_cv_path_UNZIP
 
 if test -n "$UNZIP"; then
-  echo "$as_me:43905: result: $UNZIP" >&5
+  echo "$as_me:43907: result: $UNZIP" >&5
 echo "${ECHO_T}$UNZIP" >&6
 else
-  echo "$as_me:43908: result: no" >&5
+  echo "$as_me:43910: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -43964,7 +43966,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:43967: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:43969: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define UNZIP_PATH "$cf_path_prog"
@@ -43982,7 +43984,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:43985: checking for $ac_word" >&5
+echo "$as_me:43987: 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
@@ -43999,7 +44001,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:44002: found $ac_dir/$ac_word" >&5
+   echo "$as_me:44004: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -44010,10 +44012,10 @@ fi
 BZIP2=$ac_cv_path_BZIP2
 
 if test -n "$BZIP2"; then
-  echo "$as_me:44013: result: $BZIP2" >&5
+  echo "$as_me:44015: result: $BZIP2" >&5
 echo "${ECHO_T}$BZIP2" >&6
 else
-  echo "$as_me:44016: result: no" >&5
+  echo "$as_me:44018: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44072,7 +44074,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:44075: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:44077: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define BZIP2_PATH "$cf_path_prog"
@@ -44090,7 +44092,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:44093: checking for $ac_word" >&5
+echo "$as_me:44095: 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
@@ -44107,7 +44109,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:44110: found $ac_dir/$ac_word" >&5
+   echo "$as_me:44112: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -44118,10 +44120,10 @@ fi
 BROTLI=$ac_cv_path_BROTLI
 
 if test -n "$BROTLI"; then
-  echo "$as_me:44121: result: $BROTLI" >&5
+  echo "$as_me:44123: result: $BROTLI" >&5
 echo "${ECHO_T}$BROTLI" >&6
 else
-  echo "$as_me:44124: result: no" >&5
+  echo "$as_me:44126: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44180,7 +44182,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:44183: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:44185: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define BROTLI_PATH "$cf_path_prog"
@@ -44198,7 +44200,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:44201: checking for $ac_word" >&5
+echo "$as_me:44203: 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
@@ -44215,7 +44217,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:44218: found $ac_dir/$ac_word" >&5
+   echo "$as_me:44220: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -44226,10 +44228,10 @@ fi
 TAR=$ac_cv_path_TAR
 
 if test -n "$TAR"; then
-  echo "$as_me:44229: result: $TAR" >&5
+  echo "$as_me:44231: result: $TAR" >&5
 echo "${ECHO_T}$TAR" >&6
 else
-  echo "$as_me:44232: result: no" >&5
+  echo "$as_me:44234: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44288,7 +44290,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:44291: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:44293: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TAR_PATH "$cf_path_prog"
@@ -44346,7 +44348,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:44349: checking for $ac_word" >&5
+echo "$as_me:44351: 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
@@ -44363,7 +44365,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:44366: found $ac_dir/$ac_word" >&5
+   echo "$as_me:44368: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -44374,10 +44376,10 @@ fi
 COMPRESS=$ac_cv_path_COMPRESS
 
 if test -n "$COMPRESS"; then
-  echo "$as_me:44377: result: $COMPRESS" >&5
+  echo "$as_me:44379: result: $COMPRESS" >&5
 echo "${ECHO_T}$COMPRESS" >&6
 else
-  echo "$as_me:44380: result: no" >&5
+  echo "$as_me:44382: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44436,7 +44438,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:44439: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:44441: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define COMPRESS_PATH "$cf_path_prog"
@@ -44454,7 +44456,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:44457: checking for $ac_word" >&5
+echo "$as_me:44459: 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
@@ -44471,7 +44473,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:44474: found $ac_dir/$ac_word" >&5
+   echo "$as_me:44476: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -44482,10 +44484,10 @@ fi
 RM=$ac_cv_path_RM
 
 if test -n "$RM"; then
-  echo "$as_me:44485: result: $RM" >&5
+  echo "$as_me:44487: result: $RM" >&5
 echo "${ECHO_T}$RM" >&6
 else
-  echo "$as_me:44488: result: no" >&5
+  echo "$as_me:44490: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44544,7 +44546,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:44547: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:44549: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define RM_PATH "$cf_path_prog"
@@ -44562,7 +44564,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:44565: checking for $ac_word" >&5
+echo "$as_me:44567: 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
@@ -44579,7 +44581,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:44582: found $ac_dir/$ac_word" >&5
+   echo "$as_me:44584: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -44590,10 +44592,10 @@ fi
 UUDECODE=$ac_cv_path_UUDECODE
 
 if test -n "$UUDECODE"; then
-  echo "$as_me:44593: result: $UUDECODE" >&5
+  echo "$as_me:44595: result: $UUDECODE" >&5
 echo "${ECHO_T}$UUDECODE" >&6
 else
-  echo "$as_me:44596: result: no" >&5
+  echo "$as_me:44598: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44652,7 +44654,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:44655: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:44657: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define UUDECODE_PATH "$cf_path_prog"
@@ -44670,7 +44672,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:44673: checking for $ac_word" >&5
+echo "$as_me:44675: 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
@@ -44687,7 +44689,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:44690: found $ac_dir/$ac_word" >&5
+   echo "$as_me:44692: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -44698,10 +44700,10 @@ fi
 ZCAT=$ac_cv_path_ZCAT
 
 if test -n "$ZCAT"; then
-  echo "$as_me:44701: result: $ZCAT" >&5
+  echo "$as_me:44703: result: $ZCAT" >&5
 echo "${ECHO_T}$ZCAT" >&6
 else
-  echo "$as_me:44704: result: no" >&5
+  echo "$as_me:44706: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44760,7 +44762,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:44763: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:44765: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define ZCAT_PATH "$cf_path_prog"
@@ -44778,7 +44780,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:44781: checking for $ac_word" >&5
+echo "$as_me:44783: 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
@@ -44795,7 +44797,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:44798: found $ac_dir/$ac_word" >&5
+   echo "$as_me:44800: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -44806,10 +44808,10 @@ fi
 ZIP=$ac_cv_path_ZIP
 
 if test -n "$ZIP"; then
-  echo "$as_me:44809: result: $ZIP" >&5
+  echo "$as_me:44811: result: $ZIP" >&5
 echo "${ECHO_T}$ZIP" >&6
 else
-  echo "$as_me:44812: result: no" >&5
+  echo "$as_me:44814: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44868,7 +44870,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:44871: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:44873: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define ZIP_PATH "$cf_path_prog"
@@ -44896,7 +44898,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:44899: checking for $ac_word" >&5
+echo "$as_me:44901: 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
@@ -44913,7 +44915,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:44916: found $ac_dir/$ac_word" >&5
+   echo "$as_me:44918: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -44924,10 +44926,10 @@ fi
 INSTALL=$ac_cv_path_INSTALL
 
 if test -n "$INSTALL"; then
-  echo "$as_me:44927: result: $INSTALL" >&5
+  echo "$as_me:44929: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 else
-  echo "$as_me:44930: result: no" >&5
+  echo "$as_me:44932: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44986,7 +44988,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:44989: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:44991: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define INSTALL_PATH "$cf_path_prog"
@@ -45016,7 +45018,7 @@ if test "$cf_cv_screen" = pdcurses ; then
 	case "$host_os" in
 	(mingw*)
 
-echo "$as_me:45019: checking for initscr in -lpdcurses" >&5
+echo "$as_me:45021: 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
@@ -45024,7 +45026,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpdcurses  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 45027 "configure"
+#line 45029 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -45043,16 +45045,16 @@ initscr ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:45046: \"$ac_link\"") >&5
+if { (eval echo "$as_me:45048: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:45049: \$? = $ac_status" >&5
+  echo "$as_me:45051: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:45052: \"$ac_try\"") >&5
+  { (eval echo "$as_me:45054: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:45055: \$? = $ac_status" >&5
+  echo "$as_me:45057: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_pdcurses_initscr=yes
 else
@@ -45063,7 +45065,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:45066: result: $ac_cv_lib_pdcurses_initscr" >&5
+echo "$as_me:45068: 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
 
@@ -45085,13 +45087,13 @@ LIBS="$cf_add_libs"
 
 	cf_cv_term_header=no
 	cf_cv_unctrl_header=no
-	echo "$as_me:45088: checking for winwstr" >&5
+	echo "$as_me:45090: 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 45094 "configure"
+#line 45096 "configure"
 #include "confdefs.h"
 #define winwstr autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -45122,16 +45124,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:45125: \"$ac_link\"") >&5
+if { (eval echo "$as_me:45127: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:45128: \$? = $ac_status" >&5
+  echo "$as_me:45130: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:45131: \"$ac_try\"") >&5
+  { (eval echo "$as_me:45133: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:45134: \$? = $ac_status" >&5
+  echo "$as_me:45136: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_winwstr=yes
 else
@@ -45141,7 +45143,7 @@ ac_cv_func_winwstr=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:45144: result: $ac_cv_func_winwstr" >&5
+echo "$as_me:45146: result: $ac_cv_func_winwstr" >&5
 echo "${ECHO_T}$ac_cv_func_winwstr" >&6
 if test "$ac_cv_func_winwstr" = yes; then
 
@@ -45151,13 +45153,13 @@ EOF
 
 fi
 
-	echo "$as_me:45154: checking for pdcurses_dll_iname" >&5
+	echo "$as_me:45156: 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 45160 "configure"
+#line 45162 "configure"
 #include "confdefs.h"
 #define pdcurses_dll_iname autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -45188,16 +45190,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:45191: \"$ac_link\"") >&5
+if { (eval echo "$as_me:45193: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:45194: \$? = $ac_status" >&5
+  echo "$as_me:45196: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:45197: \"$ac_try\"") >&5
+  { (eval echo "$as_me:45199: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:45200: \$? = $ac_status" >&5
+  echo "$as_me:45202: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_pdcurses_dll_iname=yes
 else
@@ -45207,7 +45209,7 @@ ac_cv_func_pdcurses_dll_iname=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:45210: result: $ac_cv_func_pdcurses_dll_iname" >&5
+echo "$as_me:45212: 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
 
@@ -45224,7 +45226,7 @@ fi
 
 cf_x_athena=${cf_x_athena:-Xaw}
 
-echo "$as_me:45227: checking if you want to link with Xaw 3d library" >&5
+echo "$as_me:45229: 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=
 
@@ -45235,14 +45237,14 @@ if test "${with_Xaw3d+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3d
-	echo "$as_me:45238: result: yes" >&5
+	echo "$as_me:45240: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:45241: result: no" >&5
+	echo "$as_me:45243: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:45245: checking if you want to link with Xaw 3d xft library" >&5
+echo "$as_me:45247: 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=
 
@@ -45253,14 +45255,14 @@ if test "${with_Xaw3dxft+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3dxft
-	echo "$as_me:45256: result: yes" >&5
+	echo "$as_me:45258: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:45259: result: no" >&5
+	echo "$as_me:45261: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:45263: checking if you want to link with neXT Athena library" >&5
+echo "$as_me:45265: 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=
 
@@ -45271,14 +45273,14 @@ if test "${with_neXtaw+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=neXtaw
-	echo "$as_me:45274: result: yes" >&5
+	echo "$as_me:45276: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:45277: result: no" >&5
+	echo "$as_me:45279: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:45281: checking if you want to link with Athena-Plus library" >&5
+echo "$as_me:45283: 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=
 
@@ -45289,10 +45291,10 @@ if test "${with_XawPlus+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=XawPlus
-	echo "$as_me:45292: result: yes" >&5
+	echo "$as_me:45294: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:45295: result: no" >&5
+	echo "$as_me:45297: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -45312,17 +45314,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}:45315: testing found package $cf_athena_pkg ..." 1>&5
+echo "${as_me:-configure}:45317: 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}:45321: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:45323: 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}:45325: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:45327: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -45453,20 +45455,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}:45456: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:45458: testing ..trimmed $LIBS ..." 1>&5
 
 			;;
 		esac
 	done
 
-echo "$as_me:45462: checking for usable $cf_x_athena/Xmu package" >&5
+echo "$as_me:45464: 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 45469 "configure"
+#line 45471 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -45484,16 +45486,16 @@ int check = XmuCompareISOLatin1("big", "small");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:45487: \"$ac_link\"") >&5
+if { (eval echo "$as_me:45489: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:45490: \$? = $ac_status" >&5
+  echo "$as_me:45492: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:45493: \"$ac_try\"") >&5
+  { (eval echo "$as_me:45495: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:45496: \$? = $ac_status" >&5
+  echo "$as_me:45498: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xaw_compat=yes
 else
@@ -45503,7 +45505,7 @@ cf_cv_xaw_compat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:45506: result: $cf_cv_xaw_compat" >&5
+echo "$as_me:45508: result: $cf_cv_xaw_compat" >&5
 echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 
 			if test "$cf_cv_xaw_compat" = no
@@ -45515,7 +45517,7 @@ echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 				(*)
 					test -n "$verbose" && echo "	work around broken package" 1>&6
 
-echo "${as_me:-configure}:45518: testing work around broken package ..." 1>&5
+echo "${as_me:-configure}:45520: testing work around broken package ..." 1>&5
 
 					cf_save_xmu="$LIBS"
 					cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^  *//' -e 's/ .*//'`
@@ -45523,17 +45525,17 @@ echo "${as_me:-configure}:45518: 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}:45526: testing found package xmu ..." 1>&5
+echo "${as_me:-configure}:45528: 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}:45532: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:45534: 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}:45536: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:45538: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -45653,12 +45655,12 @@ LIBS="$cf_add_libs"
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:45656: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:45658: 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}:45661: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:45663: testing ...after  $LIBS ..." 1>&5
 
 else
 	cf_pkgconfig_incs=
@@ -45666,12 +45668,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:45669: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:45671: 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}:45674: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:45676: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -45682,7 +45684,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}:45685: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:45687: testing ..trimmed $LIBS ..." 1>&5
 
 			;;
 		esac
@@ -45707,17 +45709,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}:45710: testing found package Xext ..." 1>&5
+echo "${as_me:-configure}:45712: 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}:45716: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:45718: 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}:45720: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:45722: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -45838,7 +45840,7 @@ else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
 
-	echo "$as_me:45841: checking for XextCreateExtension in -lXext" >&5
+	echo "$as_me:45843: 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
@@ -45846,7 +45848,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 45849 "configure"
+#line 45851 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -45865,16 +45867,16 @@ XextCreateExtension ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:45868: \"$ac_link\"") >&5
+if { (eval echo "$as_me:45870: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:45871: \$? = $ac_status" >&5
+  echo "$as_me:45873: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:45874: \"$ac_try\"") >&5
+  { (eval echo "$as_me:45876: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:45877: \$? = $ac_status" >&5
+  echo "$as_me:45879: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
@@ -45885,7 +45887,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:45888: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:45890: 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
 
@@ -45921,17 +45923,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}:45924: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:45926: 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}:45930: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:45932: 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}:45934: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:45936: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -46051,24 +46053,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:46054: WARNING: unable to find X11 library" >&5
+	{ echo "$as_me:46056: 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}:46061: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:46063: 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}:46067: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:46069: 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}:46071: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:46073: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -46188,24 +46190,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:46191: WARNING: unable to find ICE library" >&5
+	{ echo "$as_me:46193: 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}:46198: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:46200: 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}:46204: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:46206: 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}:46208: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:46210: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -46325,24 +46327,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:46328: WARNING: unable to find SM library" >&5
+	{ echo "$as_me:46330: 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}:46335: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:46337: 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}:46341: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:46343: 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}:46345: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:46347: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -46462,7 +46464,7 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:46465: WARNING: unable to find Xt library" >&5
+	{ echo "$as_me:46467: WARNING: unable to find Xt library" >&5
 echo "$as_me: WARNING: unable to find Xt library" >&2;}
 fi
 
@@ -46475,17 +46477,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}:46478: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:46480: 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}:46484: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:46486: 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}:46488: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:46490: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -46606,14 +46608,14 @@ LIBS="$cf_add_libs"
 		;;
 	(*)
 # we have an "xt" package, but it may omit Xt's dependency on X11
-echo "$as_me:46609: checking for usable X dependency" >&5
+echo "$as_me:46611: 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 46616 "configure"
+#line 46618 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -46633,16 +46635,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:46636: \"$ac_link\"") >&5
+if { (eval echo "$as_me:46638: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:46639: \$? = $ac_status" >&5
+  echo "$as_me:46641: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:46642: \"$ac_try\"") >&5
+  { (eval echo "$as_me:46644: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:46645: \$? = $ac_status" >&5
+  echo "$as_me:46647: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xt_x11_compat=yes
 else
@@ -46652,30 +46654,30 @@ cf_cv_xt_x11_compat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:46655: result: $cf_cv_xt_x11_compat" >&5
+echo "$as_me:46657: 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}:46661: testing work around broken X11 dependency ..." 1>&5
+echo "${as_me:-configure}:46663: 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}:46668: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:46670: 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}:46674: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:46676: 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}:46678: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:46680: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -46798,12 +46800,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:46801: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:46803: 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}:46806: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:46808: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -46811,14 +46813,14 @@ fi
 		;;
 	esac
 
-echo "$as_me:46814: checking for usable X Toolkit package" >&5
+echo "$as_me:46816: 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 46821 "configure"
+#line 46823 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -46834,16 +46836,16 @@ int num = IceConnectionNumber(0); (void) num
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:46837: \"$ac_link\"") >&5
+if { (eval echo "$as_me:46839: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:46840: \$? = $ac_status" >&5
+  echo "$as_me:46842: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:46843: \"$ac_try\"") >&5
+  { (eval echo "$as_me:46845: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:46846: \$? = $ac_status" >&5
+  echo "$as_me:46848: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_xt_ice_compat=yes
 else
@@ -46853,7 +46855,7 @@ cf_cv_xt_ice_compat=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:46856: result: $cf_cv_xt_ice_compat" >&5
+echo "$as_me:46858: result: $cf_cv_xt_ice_compat" >&5
 echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
 
 	if test "$cf_cv_xt_ice_compat" = no
@@ -46867,22 +46869,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}:46870: testing work around broken ICE dependency ..." 1>&5
+echo "${as_me:-configure}:46872: 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}:46875: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:46877: 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}:46881: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:46883: 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}:46885: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:46887: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -47001,17 +47003,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}:47004: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:47006: 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}:47010: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:47012: 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}:47014: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:47016: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -47140,12 +47142,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:47143: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:47145: 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}:47148: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:47150: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -47165,7 +47167,7 @@ else
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:47168: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:47170: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -47250,7 +47252,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}:47253: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:47255: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -47260,7 +47262,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}:47263: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:47265: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -47270,7 +47272,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}:47273: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:47275: 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"
@@ -47279,7 +47281,7 @@ fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 47282 "configure"
+#line 47284 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -47291,16 +47293,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:47294: \"$ac_link\"") >&5
+if { (eval echo "$as_me:47296: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:47297: \$? = $ac_status" >&5
+  echo "$as_me:47299: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:47300: \"$ac_try\"") >&5
+  { (eval echo "$as_me:47302: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:47303: \$? = $ac_status" >&5
+  echo "$as_me:47305: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -47308,12 +47310,12 @@ else
 cat "conftest.$ac_ext" >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:47311: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:47313: 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}:47316: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:47318: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_cflags"
@@ -47321,13 +47323,13 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
-	echo "$as_me:47324: checking for XOpenDisplay" >&5
+	echo "$as_me:47326: 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 47330 "configure"
+#line 47332 "configure"
 #include "confdefs.h"
 #define XOpenDisplay autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -47358,16 +47360,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:47361: \"$ac_link\"") >&5
+if { (eval echo "$as_me:47363: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:47364: \$? = $ac_status" >&5
+  echo "$as_me:47366: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:47367: \"$ac_try\"") >&5
+  { (eval echo "$as_me:47369: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:47370: \$? = $ac_status" >&5
+  echo "$as_me:47372: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_XOpenDisplay=yes
 else
@@ -47377,13 +47379,13 @@ ac_cv_func_XOpenDisplay=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:47380: result: $ac_cv_func_XOpenDisplay" >&5
+echo "$as_me:47382: 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:47386: checking for XOpenDisplay in -lX11" >&5
+	echo "$as_me:47388: 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
@@ -47391,7 +47393,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 47394 "configure"
+#line 47396 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -47410,16 +47412,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:47413: \"$ac_link\"") >&5
+if { (eval echo "$as_me:47415: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:47416: \$? = $ac_status" >&5
+  echo "$as_me:47418: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:47419: \"$ac_try\"") >&5
+  { (eval echo "$as_me:47421: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:47422: \$? = $ac_status" >&5
+  echo "$as_me:47424: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -47430,7 +47432,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:47433: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:47435: 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
 
@@ -47454,13 +47456,13 @@ fi
 
 fi
 
-	echo "$as_me:47457: checking for XtAppInitialize" >&5
+	echo "$as_me:47459: 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 47463 "configure"
+#line 47465 "configure"
 #include "confdefs.h"
 #define XtAppInitialize autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -47491,16 +47493,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:47494: \"$ac_link\"") >&5
+if { (eval echo "$as_me:47496: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:47497: \$? = $ac_status" >&5
+  echo "$as_me:47499: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:47500: \"$ac_try\"") >&5
+  { (eval echo "$as_me:47502: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:47503: \$? = $ac_status" >&5
+  echo "$as_me:47505: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_func_XtAppInitialize=yes
 else
@@ -47510,13 +47512,13 @@ ac_cv_func_XtAppInitialize=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:47513: result: $ac_cv_func_XtAppInitialize" >&5
+echo "$as_me:47515: 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:47519: checking for XtAppInitialize in -lXt" >&5
+	echo "$as_me:47521: 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
@@ -47524,7 +47526,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt  $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 47527 "configure"
+#line 47529 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -47543,16 +47545,16 @@ XtAppInitialize ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:47546: \"$ac_link\"") >&5
+if { (eval echo "$as_me:47548: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:47549: \$? = $ac_status" >&5
+  echo "$as_me:47551: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:47552: \"$ac_try\"") >&5
+  { (eval echo "$as_me:47554: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:47555: \$? = $ac_status" >&5
+  echo "$as_me:47557: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_Xt_XtAppInitialize=yes
 else
@@ -47563,7 +47565,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:47566: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "$as_me:47568: 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
 
@@ -47580,7 +47582,7 @@ fi
 fi
 
 if test "$cf_have_X_LIBS" = no ; then
-	{ echo "$as_me:47583: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+	{ echo "$as_me:47585: 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
@@ -47621,14 +47623,14 @@ done
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}-I$cf_path/include"
 
-			echo "$as_me:47624: checking for $cf_test in $cf_path" >&5
+			echo "$as_me:47626: 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:47627: checking for $cf_test" >&5
+			echo "$as_me:47629: checking for $cf_test" >&5
 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
 		fi
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 47631 "configure"
+#line 47633 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -47642,16 +47644,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:47645: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:47647: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:47648: \$? = $ac_status" >&5
+  echo "$as_me:47650: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:47651: \"$ac_try\"") >&5
+  { (eval echo "$as_me:47653: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:47654: \$? = $ac_status" >&5
+  echo "$as_me:47656: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -47660,7 +47662,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-		echo "$as_me:47663: result: $cf_result" >&5
+		echo "$as_me:47665: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 LIBS="$cf_save_LIBS_CF_X_ATHENA_CPPFLAGS"
@@ -47676,7 +47678,7 @@ CPPFLAGS="$cf_save_CPPFLAGS_CF_X_ATHENA_CPPFLAGS"
 done
 
 if test -z "$cf_x_athena_inc" ; then
-	{ echo "$as_me:47679: WARNING: Unable to find Athena header files" >&5
+	{ echo "$as_me:47681: 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
 
@@ -47741,10 +47743,10 @@ for cf_add_1lib in $cf_add_0lib; do
 done
 LIBS="$cf_add_libs"
 
-		echo "$as_me:47744: checking for $cf_test in $cf_libs" >&5
+		echo "$as_me:47746: 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 47747 "configure"
+#line 47749 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -47761,16 +47763,16 @@ $cf_test((XtAppContext) 0)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:47764: \"$ac_link\"") >&5
+if { (eval echo "$as_me:47766: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:47767: \$? = $ac_status" >&5
+  echo "$as_me:47769: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:47770: \"$ac_try\"") >&5
+  { (eval echo "$as_me:47772: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:47773: \$? = $ac_status" >&5
+  echo "$as_me:47775: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -47779,7 +47781,7 @@ cat "conftest.$ac_ext" >&5
 cf_result=no
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
-		echo "$as_me:47782: result: $cf_result" >&5
+		echo "$as_me:47784: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 LIBS="$cf_save_LIBS_CF_X_ATHENA_LIBS"
@@ -47796,7 +47798,7 @@ CPPFLAGS="$cf_save_CPPFLAGS_CF_X_ATHENA_LIBS"
 done
 
 if test -z "$cf_x_athena_lib" ; then
-	{ { echo "$as_me:47799: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+	{ { echo "$as_me:47801: 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
@@ -47830,7 +47832,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:47833: checking for $ac_word" >&5
+echo "$as_me:47835: 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
@@ -47845,7 +47847,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:47848: found $ac_dir/$ac_word" >&5
+echo "$as_me:47850: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -47853,10 +47855,10 @@ fi
 fi
 XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG
 if test -n "$XCURSES_CONFIG"; then
-  echo "$as_me:47856: result: $XCURSES_CONFIG" >&5
+  echo "$as_me:47858: result: $XCURSES_CONFIG" >&5
 echo "${ECHO_T}$XCURSES_CONFIG" >&6
 else
-  echo "$as_me:47859: result: no" >&5
+  echo "$as_me:47861: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -47869,7 +47871,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:47872: checking for $ac_word" >&5
+echo "$as_me:47874: 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
@@ -47884,7 +47886,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:47887: found $ac_dir/$ac_word" >&5
+echo "$as_me:47889: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -47892,10 +47894,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:47895: result: $ac_ct_XCURSES_CONFIG" >&5
+  echo "$as_me:47897: result: $ac_ct_XCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6
 else
-  echo "$as_me:47898: result: no" >&5
+  echo "$as_me:47900: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -48030,7 +48032,7 @@ LDFLAGS="$LDFLAGS $X_LIBS"
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:48033: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:48035: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -48115,7 +48117,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}:48118: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:48120: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -48125,7 +48127,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}:48128: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:48130: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -48135,7 +48137,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}:48138: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:48140: 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"
@@ -48144,7 +48146,7 @@ fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 48147 "configure"
+#line 48149 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -48156,16 +48158,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:48159: \"$ac_link\"") >&5
+if { (eval echo "$as_me:48161: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:48162: \$? = $ac_status" >&5
+  echo "$as_me:48164: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:48165: \"$ac_try\"") >&5
+  { (eval echo "$as_me:48167: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48168: \$? = $ac_status" >&5
+  echo "$as_me:48170: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   :
 else
@@ -48173,12 +48175,12 @@ else
 cat "conftest.$ac_ext" >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:48176: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:48178: 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}:48181: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:48183: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_cflags"
@@ -48186,7 +48188,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
 
-echo "$as_me:48189: checking for XOpenDisplay in -lX11" >&5
+echo "$as_me:48191: 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
@@ -48194,7 +48196,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 48197 "configure"
+#line 48199 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -48213,16 +48215,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:48216: \"$ac_link\"") >&5
+if { (eval echo "$as_me:48218: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:48219: \$? = $ac_status" >&5
+  echo "$as_me:48221: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:48222: \"$ac_try\"") >&5
+  { (eval echo "$as_me:48224: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48225: \$? = $ac_status" >&5
+  echo "$as_me:48227: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -48233,7 +48235,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:48236: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:48238: 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
 
@@ -48255,7 +48257,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-echo "$as_me:48258: checking for XCurses library" >&5
+echo "$as_me:48260: 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
@@ -48278,7 +48280,7 @@ done
 LIBS="$cf_add_libs"
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 48281 "configure"
+#line 48283 "configure"
 #include "confdefs.h"
 
 #include <xcurses.h>
@@ -48293,16 +48295,16 @@ XCursesExit();
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:48296: \"$ac_link\"") >&5
+if { (eval echo "$as_me:48298: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:48299: \$? = $ac_status" >&5
+  echo "$as_me:48301: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:48302: \"$ac_try\"") >&5
+  { (eval echo "$as_me:48304: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48305: \$? = $ac_status" >&5
+  echo "$as_me:48307: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_lib_XCurses=yes
 else
@@ -48313,7 +48315,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:48316: result: $cf_cv_lib_XCurses" >&5
+echo "$as_me:48318: result: $cf_cv_lib_XCurses" >&5
 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
 
 fi
@@ -48328,23 +48330,23 @@ cat >>confdefs.h <<\EOF
 #define XCURSES 1
 EOF
 
-	echo "$as_me:48331: checking for xcurses.h" >&5
+	echo "$as_me:48333: 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 48337 "configure"
+#line 48339 "configure"
 #include "confdefs.h"
 #include <xcurses.h>
 _ACEOF
-if { (eval echo "$as_me:48341: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:48343: \"$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:48347: \$? = $ac_status" >&5
+  echo "$as_me:48349: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -48363,7 +48365,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:48366: result: $ac_cv_header_xcurses_h" >&5
+echo "$as_me:48368: 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
 
@@ -48374,7 +48376,7 @@ EOF
 fi
 
 else
-	{ { echo "$as_me:48377: error: Cannot link with XCurses" >&5
+	{ { echo "$as_me:48379: error: Cannot link with XCurses" >&5
 echo "$as_me: error: Cannot link with XCurses" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -48383,7 +48385,7 @@ fi
 	esac
 else
 
-echo "$as_me:48386: checking if we can include termio.h with curses" >&5
+echo "$as_me:48388: 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
@@ -48393,7 +48395,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 48396 "configure"
+#line 48398 "configure"
 #include "confdefs.h"
 
 #include <LYCurses.h>
@@ -48407,16 +48409,16 @@ putchar(0x0a)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:48410: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:48412: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:48413: \$? = $ac_status" >&5
+  echo "$as_me:48415: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:48416: \"$ac_try\"") >&5
+  { (eval echo "$as_me:48418: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48419: \$? = $ac_status" >&5
+  echo "$as_me:48421: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_termio_and_curses=yes
 else
@@ -48429,7 +48431,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
     rm -f lynx_cfg.h
 
 fi
-echo "$as_me:48432: result: $cf_cv_termio_and_curses" >&5
+echo "$as_me:48434: result: $cf_cv_termio_and_curses" >&5
 echo "${ECHO_T}$cf_cv_termio_and_curses" >&6
 
 test "$cf_cv_termio_and_curses" = yes &&
@@ -48446,23 +48448,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:48449: checking for $ac_header" >&5
+echo "$as_me:48451: 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 48455 "configure"
+#line 48457 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:48459: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:48461: \"$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:48465: \$? = $ac_status" >&5
+  echo "$as_me:48467: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -48481,7 +48483,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:48484: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:48486: 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
@@ -48493,7 +48495,7 @@ done
 
 	fi
 
-echo "$as_me:48496: checking if curses supports alternate-character set" >&5
+echo "$as_me:48498: 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
@@ -48502,7 +48504,7 @@ else
 for mapname in acs_map _acs_map
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 48505 "configure"
+#line 48507 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -48516,16 +48518,16 @@ chtype x = ${mapname}['l']; ${mapname}['m'] = 0; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:48519: \"$ac_link\"") >&5
+if { (eval echo "$as_me:48521: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:48522: \$? = $ac_status" >&5
+  echo "$as_me:48524: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:48525: \"$ac_try\"") >&5
+  { (eval echo "$as_me:48527: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48528: \$? = $ac_status" >&5
+  echo "$as_me:48530: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_alt_char_set=$mapname
 	 break
@@ -48539,21 +48541,21 @@ done
 
 fi
 
-echo "$as_me:48542: result: $cf_cv_alt_char_set" >&5
+echo "$as_me:48544: 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:48549: checking if curses supports fancy attributes" >&5
+echo "$as_me:48551: 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 48556 "configure"
+#line 48558 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -48571,16 +48573,16 @@ attrset(A_UNDERLINE|A_BOLD|A_REVERSE);
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:48574: \"$ac_link\"") >&5
+if { (eval echo "$as_me:48576: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:48577: \$? = $ac_status" >&5
+  echo "$as_me:48579: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:48580: \"$ac_try\"") >&5
+  { (eval echo "$as_me:48582: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48583: \$? = $ac_status" >&5
+  echo "$as_me:48585: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_fancy_curses=yes
 else
@@ -48592,14 +48594,14 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:48595: result: $cf_cv_fancy_curses" >&5
+echo "$as_me:48597: 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:48602: checking for function curses_version" >&5
+echo "$as_me:48604: 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
@@ -48609,7 +48611,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_curses_version=unknown
 else
   cat >"conftest.$ac_ext" <<_ACEOF
-#line 48612 "configure"
+#line 48614 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -48625,15 +48627,15 @@ int main(void)
 
 _ACEOF
 rm -f "conftest$ac_exeext"
-if { (eval echo "$as_me:48628: \"$ac_link\"") >&5
+if { (eval echo "$as_me:48630: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:48631: \$? = $ac_status" >&5
+  echo "$as_me:48633: \$? = $ac_status" >&5
   (exit "$ac_status"); } && { ac_try='"./conftest$ac_exeext"'
-  { (eval echo "$as_me:48633: \"$ac_try\"") >&5
+  { (eval echo "$as_me:48635: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48636: \$? = $ac_status" >&5
+  echo "$as_me:48638: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_func_curses_version=yes
 
@@ -48648,7 +48650,7 @@ rm -f core ./core.* ./*.core "conftest$ac_exeext" "conftest.$ac_objext" "conftes
 fi
 rm -f core
 fi
-echo "$as_me:48651: result: $cf_cv_func_curses_version" >&5
+echo "$as_me:48653: 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
@@ -48656,14 +48658,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test "$cf_cv_ncurses_version" != no ; then
-echo "$as_me:48659: checking for obsolete/broken version of ncurses" >&5
+echo "$as_me:48661: 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 48666 "configure"
+#line 48668 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -48682,16 +48684,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:48685: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:48687: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:48688: \$? = $ac_status" >&5
+  echo "$as_me:48690: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:48691: \"$ac_try\"") >&5
+  { (eval echo "$as_me:48693: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48694: \$? = $ac_status" >&5
+  echo "$as_me:48696: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_ncurses_broken=no
 else
@@ -48703,10 +48705,10 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:48706: result: $cf_cv_ncurses_broken" >&5
+echo "$as_me:48708: 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:48709: WARNING: hmm... you should get an up-to-date version of ncurses" >&5
+	{ echo "$as_me:48711: 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
@@ -48716,14 +48718,14 @@ EOF
 fi
 fi
 
-echo "$as_me:48719: checking if curses supports color attributes" >&5
+echo "$as_me:48721: 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 48726 "configure"
+#line 48728 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -48744,16 +48746,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:48747: \"$ac_link\"") >&5
+if { (eval echo "$as_me:48749: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:48750: \$? = $ac_status" >&5
+  echo "$as_me:48752: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:48753: \"$ac_try\"") >&5
+  { (eval echo "$as_me:48755: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48756: \$? = $ac_status" >&5
+  echo "$as_me:48758: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_color_curses=yes
 else
@@ -48765,7 +48767,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:48768: result: $cf_cv_color_curses" >&5
+echo "$as_me:48770: result: $cf_cv_color_curses" >&5
 echo "${ECHO_T}$cf_cv_color_curses" >&6
 if test "$cf_cv_color_curses" = yes ; then
 
@@ -48789,23 +48791,23 @@ sys/termio.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:48792: checking for $ac_header" >&5
+echo "$as_me:48794: 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 48798 "configure"
+#line 48800 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:48802: \"$ac_cpp "conftest.$ac_ext"\"") >&5
+if { (eval echo "$as_me:48804: \"$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:48808: \$? = $ac_status" >&5
+  echo "$as_me:48810: \$? = $ac_status" >&5
   (exit "$ac_status"); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -48824,7 +48826,7 @@ else
 fi
 rm -f conftest.err "conftest.$ac_ext"
 fi
-echo "$as_me:48827: result: `eval echo '${'"$as_ac_Header"'}'`" >&5
+echo "$as_me:48829: 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
@@ -48841,10 +48843,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	(*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:48844: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:48846: 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 48847 "configure"
+#line 48849 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -48856,16 +48858,16 @@ struct termios foo; int x = (int)(foo.c_iflag = 1); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:48859: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:48861: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:48862: \$? = $ac_status" >&5
+  echo "$as_me:48864: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:48865: \"$ac_try\"") >&5
+  { (eval echo "$as_me:48867: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48868: \$? = $ac_status" >&5
+  echo "$as_me:48870: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=no
 else
@@ -48873,7 +48875,7 @@ else
 cat "conftest.$ac_ext" >&5
 
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 48876 "configure"
+#line 48878 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -48887,16 +48889,16 @@ struct termios foo; int x = (int)(foo.c_iflag = 2); (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:48890: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:48892: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:48893: \$? = $ac_status" >&5
+  echo "$as_me:48895: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:48896: \"$ac_try\"") >&5
+  { (eval echo "$as_me:48898: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:48899: \$? = $ac_status" >&5
+  echo "$as_me:48901: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   termios_bad=unknown
 else
@@ -48912,12 +48914,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
-	echo "$as_me:48915: result: $termios_bad" >&5
+	echo "$as_me:48917: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:48920: checking declaration of size-change" >&5
+echo "$as_me:48922: 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
@@ -48938,7 +48940,7 @@ do
 
 	fi
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 48941 "configure"
+#line 48943 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -48988,16 +48990,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:48991: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:48993: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:48994: \$? = $ac_status" >&5
+  echo "$as_me:48996: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:48997: \"$ac_try\"") >&5
+  { (eval echo "$as_me:48999: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49000: \$? = $ac_status" >&5
+  echo "$as_me:49002: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_sizechange=yes
 else
@@ -49016,7 +49018,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:49019: result: $cf_cv_sizechange" >&5
+echo "$as_me:49021: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 
@@ -49034,14 +49036,14 @@ EOF
 	esac
 fi
 
-echo "$as_me:49037: checking if ttytype is declared in curses library" >&5
+echo "$as_me:49039: 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 49044 "configure"
+#line 49046 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -49053,16 +49055,16 @@ char *x = &ttytype[1]; *x = 1
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:49056: \"$ac_link\"") >&5
+if { (eval echo "$as_me:49058: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:49059: \$? = $ac_status" >&5
+  echo "$as_me:49061: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:49062: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49064: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49065: \$? = $ac_status" >&5
+  echo "$as_me:49067: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_have_ttytype=yes
 else
@@ -49074,7 +49076,7 @@ rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
 
-echo "$as_me:49077: result: $cf_cv_have_ttytype" >&5
+echo "$as_me:49079: result: $cf_cv_have_ttytype" >&5
 echo "${ECHO_T}$cf_cv_have_ttytype" >&6
 test "$cf_cv_have_ttytype" = yes &&
 cat >>confdefs.h <<\EOF
@@ -49083,14 +49085,14 @@ EOF
 
 	if test "$use_wide_curses" = yes ; then
 
-echo "$as_me:49086: checking if curses supports wide characters" >&5
+echo "$as_me:49088: 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 49093 "configure"
+#line 49095 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -49109,16 +49111,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:49112: \"$ac_link\"") >&5
+if { (eval echo "$as_me:49114: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:49115: \$? = $ac_status" >&5
+  echo "$as_me:49117: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:49118: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49120: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49121: \$? = $ac_status" >&5
+  echo "$as_me:49123: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_widec_curses=yes
 else
@@ -49129,7 +49131,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:49132: result: $cf_cv_widec_curses" >&5
+echo "$as_me:49134: result: $cf_cv_widec_curses" >&5
 echo "${ECHO_T}$cf_cv_widec_curses" >&6
 
 if test "$cf_cv_widec_curses" = yes ; then
@@ -49139,14 +49141,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	# This is needed on Tru64 5.0 to declare mbstate_t
-	echo "$as_me:49142: checking if we must include wchar.h to declare mbstate_t" >&5
+	echo "$as_me:49144: 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 49149 "configure"
+#line 49151 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -49160,23 +49162,23 @@ mbstate_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:49163: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:49165: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:49166: \$? = $ac_status" >&5
+  echo "$as_me:49168: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:49169: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49171: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49172: \$? = $ac_status" >&5
+  echo "$as_me:49174: \$? = $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 49179 "configure"
+#line 49181 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -49191,16 +49193,16 @@ mbstate_t state; (void)state
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:49194: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:49196: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:49197: \$? = $ac_status" >&5
+  echo "$as_me:49199: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:49200: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49202: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49203: \$? = $ac_status" >&5
+  echo "$as_me:49205: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_widec_mbstate=yes
 else
@@ -49212,7 +49214,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
 rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 fi
-echo "$as_me:49215: result: $cf_cv_widec_mbstate" >&5
+echo "$as_me:49217: result: $cf_cv_widec_mbstate" >&5
 echo "${ECHO_T}$cf_cv_widec_mbstate" >&6
 
 if test "$cf_cv_widec_mbstate" = yes ; then
@@ -49235,7 +49237,7 @@ fi
 
 	fi
 
-echo "$as_me:49238: checking definition to turn on extended curses functions" >&5
+echo "$as_me:49240: 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
@@ -49243,7 +49245,7 @@ else
 
 cf_cv_need_xopen_extension=unknown
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 49246 "configure"
+#line 49248 "configure"
 #include "confdefs.h"
 
 $ac_includes_default
@@ -49276,16 +49278,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:49279: \"$ac_link\"") >&5
+if { (eval echo "$as_me:49281: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:49282: \$? = $ac_status" >&5
+  echo "$as_me:49284: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:49285: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49287: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49288: \$? = $ac_status" >&5
+  echo "$as_me:49290: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_xopen_extension=none
 else
@@ -49295,7 +49297,7 @@ cat "conftest.$ac_ext" >&5
 	for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 49298 "configure"
+#line 49300 "configure"
 #include "confdefs.h"
 
 #define $cf_try_xopen_extension 1
@@ -49321,16 +49323,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:49324: \"$ac_link\"") >&5
+if { (eval echo "$as_me:49326: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:49327: \$? = $ac_status" >&5
+  echo "$as_me:49329: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:49330: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49332: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49333: \$? = $ac_status" >&5
+  echo "$as_me:49335: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_need_xopen_extension=$cf_try_xopen_extension; break
 else
@@ -49344,7 +49346,7 @@ fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 
 fi
-echo "$as_me:49347: result: $cf_cv_need_xopen_extension" >&5
+echo "$as_me:49349: result: $cf_cv_need_xopen_extension" >&5
 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
 
 case "$cf_cv_need_xopen_extension" in
@@ -49356,7 +49358,7 @@ case "$cf_cv_need_xopen_extension" in
 	;;
 esac
 
-echo "$as_me:49359: checking for term.h" >&5
+echo "$as_me:49361: 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
@@ -49377,7 +49379,7 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 49380 "configure"
+#line 49382 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -49391,16 +49393,16 @@ WINDOW *x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:49394: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:49396: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:49397: \$? = $ac_status" >&5
+  echo "$as_me:49399: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:49400: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49402: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49403: \$? = $ac_status" >&5
+  echo "$as_me:49405: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_term_header=$cf_header
 	 break
@@ -49419,7 +49421,7 @@ case "$cf_cv_term_header" in
 	for cf_header in ncurses/term.h ncursesw/term.h
 	do
 		cat >"conftest.$ac_ext" <<_ACEOF
-#line 49422 "configure"
+#line 49424 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -49437,16 +49439,16 @@ WINDOW *x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:49440: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:49442: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:49443: \$? = $ac_status" >&5
+  echo "$as_me:49445: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:49446: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49448: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49449: \$? = $ac_status" >&5
+  echo "$as_me:49451: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_term_header=$cf_header
 			 break
@@ -49461,7 +49463,7 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 esac
 
 fi
-echo "$as_me:49464: result: $cf_cv_term_header" >&5
+echo "$as_me:49466: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 case "$cf_cv_term_header" in
@@ -49488,7 +49490,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:49491: checking for unctrl.h" >&5
+echo "$as_me:49493: 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
@@ -49509,7 +49511,7 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >"conftest.$ac_ext" <<_ACEOF
-#line 49512 "configure"
+#line 49514 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -49523,16 +49525,16 @@ WINDOW *x; (void)x
 }
 _ACEOF
 rm -f "conftest.$ac_objext"
-if { (eval echo "$as_me:49526: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:49528: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:49529: \$? = $ac_status" >&5
+  echo "$as_me:49531: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest.$ac_objext"'
-  { (eval echo "$as_me:49532: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49534: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49535: \$? = $ac_status" >&5
+  echo "$as_me:49537: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_cv_unctrl_header=$cf_header
 	 break
@@ -49545,12 +49547,12 @@ rm -f "conftest.$ac_objext" "conftest.$ac_ext"
 done
 
 fi
-echo "$as_me:49548: result: $cf_cv_unctrl_header" >&5
+echo "$as_me:49550: result: $cf_cv_unctrl_header" >&5
 echo "${ECHO_T}$cf_cv_unctrl_header" >&6
 
 case "$cf_cv_unctrl_header" in
 (no)
-	{ echo "$as_me:49553: WARNING: unctrl.h header not found" >&5
+	{ echo "$as_me:49555: WARNING: unctrl.h header not found" >&5
 echo "$as_me: WARNING: unctrl.h header not found" >&2;}
 	;;
 esac
@@ -49606,10 +49608,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:49609: checking for ${cf_func}" >&5
+	echo "$as_me:49611: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me:-configure}:49612: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:49614: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -49618,7 +49620,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >"conftest.$ac_ext" <<_ACEOF
-#line 49621 "configure"
+#line 49623 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -49651,16 +49653,16 @@ if (foo + 1234L > 5678L)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:49654: \"$ac_link\"") >&5
+if { (eval echo "$as_me:49656: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:49657: \$? = $ac_status" >&5
+  echo "$as_me:49659: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:49660: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49662: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49663: \$? = $ac_status" >&5
+  echo "$as_me:49665: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   cf_result=yes
 else
@@ -49676,7 +49678,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:49679: result: $cf_result" >&5
+	echo "$as_me:49681: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test "$cf_result" != no; then
 		cat >>confdefs.h <<EOF
@@ -49693,13 +49695,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:49696: checking for $ac_func" >&5
+echo "$as_me:49698: 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 49702 "configure"
+#line 49704 "configure"
 #include "confdefs.h"
 #define $ac_func autoconf_temporary
 #include <limits.h>	/* least-intrusive standard header which defines gcc2 __stub macros */
@@ -49730,16 +49732,16 @@ main (void)
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:49733: \"$ac_link\"") >&5
+if { (eval echo "$as_me:49735: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:49736: \$? = $ac_status" >&5
+  echo "$as_me:49738: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:49739: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49741: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49742: \$? = $ac_status" >&5
+  echo "$as_me:49744: \$? = $ac_status" >&5
   (exit "$ac_status"); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -49749,7 +49751,7 @@ eval "$as_ac_var=no"
 fi
 rm -f "conftest.$ac_objext" "conftest$ac_exeext" "conftest.$ac_ext"
 fi
-echo "$as_me:49752: result: `eval echo '${'"$as_ac_var"'}'`" >&5
+echo "$as_me:49754: 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
@@ -49763,12 +49765,12 @@ fi
 
 if test "$use_color_style" != no ; then
 	if test .$cf_cv_color_curses != .yes ; then
-		{ { echo "$as_me:49766: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:49768: 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:49771: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:49773: error: Configuration does not support color-styles" >&5
 echo "$as_me: error: Configuration does not support color-styles" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -49776,7 +49778,7 @@ fi
 
 if test "$use_scrollbar" != no ; then
 	if test .$cf_cv_fancy_curses != .yes ; then
-		{ echo "$as_me:49779: WARNING: Configuration does not support ACS_xxx definitions" >&5
+		{ echo "$as_me:49781: WARNING: Configuration does not support ACS_xxx definitions" >&5
 echo "$as_me: WARNING: Configuration does not support ACS_xxx definitions" >&2;}
 	else
 
@@ -49789,7 +49791,7 @@ fi
 
 # use rpath for libraries in unusual places
 
-echo "$as_me:49792: checking if rpath-hack should be disabled" >&5
+echo "$as_me:49794: 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.
@@ -49807,22 +49809,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:49810: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:49812: result: $cf_disable_rpath_hack" >&5
 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 
 if test "$enable_rpath_hack" = yes ; then
 
-echo "$as_me:49815: checking for updated LDFLAGS" >&5
+echo "$as_me:49817: 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:49818: result: maybe" >&5
+	echo "$as_me:49820: 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:49825: checking for $ac_word" >&5
+echo "$as_me:49827: 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
@@ -49837,7 +49839,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:49840: found $ac_dir/$ac_word" >&5
+echo "$as_me:49842: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -49845,10 +49847,10 @@ fi
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:49848: result: $cf_ldd_prog" >&5
+  echo "$as_me:49850: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:49851: result: no" >&5
+  echo "$as_me:49853: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -49862,7 +49864,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
 		cf_rpath_oops=
 
 cat >"conftest.$ac_ext" <<_ACEOF
-#line 49865 "configure"
+#line 49867 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -49874,16 +49876,16 @@ printf("Hello");
 }
 _ACEOF
 rm -f "conftest.$ac_objext" "conftest$ac_exeext"
-if { (eval echo "$as_me:49877: \"$ac_link\"") >&5
+if { (eval echo "$as_me:49879: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:49880: \$? = $ac_status" >&5
+  echo "$as_me:49882: \$? = $ac_status" >&5
   (exit "$ac_status"); } &&
          { ac_try='test -s "conftest$ac_exeext"'
-  { (eval echo "$as_me:49883: \"$ac_try\"") >&5
+  { (eval echo "$as_me:49885: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:49886: \$? = $ac_status" >&5
+  echo "$as_me:49888: \$? = $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`
@@ -49911,7 +49913,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}:49914: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:49916: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
 
 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
 						break
@@ -49923,11 +49925,11 @@ echo "${as_me:-configure}:49914: testing ...adding -L$cf_rpath_dir/lib to LDFLAG
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:49926: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:49928: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:49930: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:49932: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -49964,7 +49966,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:49967: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:49969: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -49977,11 +49979,11 @@ LDFLAGS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:49980: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:49982: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:49984: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:49986: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -50018,7 +50020,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:50021: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:50023: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -50031,14 +50033,14 @@ LIBS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:50034: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:50036: testing ...checked LIBS $LIBS ..." 1>&5
 
 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:50038: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:50040: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 else
-	echo "$as_me:50041: result: no" >&5
+	echo "$as_me:50043: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -50153,7 +50155,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:50156: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:50158: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >"$CONFIG_STATUS" <<_ACEOF
 #! $SHELL
@@ -50288,7 +50290,7 @@ EOF
 
 cat >>"$CONFIG_STATUS" <<EOF
 ac_cs_version="\\
-lynx config.status 2.9.0g
+lynx config.status 2.9.1b
 configured by $0, generated by GNU Autoconf 2.52.20231210,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -50334,7 +50336,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:50337: error: ambiguous option: $1
+    { { echo "$as_me:50339: 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;}
@@ -50353,7 +50355,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:50356: error: unrecognized option: $1
+  -*) { { echo "$as_me:50358: 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;}
@@ -50372,7 +50374,7 @@ cat >&5 << _ACEOF
 ## Running config.status.  ##
 ## ----------------------- ##
 
-This file was extended by $as_me (lynx 2.9.0g) 2.52.20231210, executed with
+This file was extended by $as_me (lynx 2.9.1b) 2.52.20231210, executed with
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
   CONFIG_LINKS    = $CONFIG_LINKS
@@ -50406,7 +50408,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:50409: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:50411: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -50759,7 +50761,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:50762: creating $ac_file" >&5
+    { echo "$as_me:50764: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -50777,7 +50779,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:50780: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:50782: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo "$f";;
@@ -50790,7 +50792,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:50793: error: cannot find input file: $f" >&5
+           { { echo "$as_me:50795: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -50806,7 +50808,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:50809: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:50811: 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;}
@@ -50815,7 +50817,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' "$ac_item"`
       if test -n "$ac_seen"; then
-        { echo "$as_me:50818: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:50820: 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;}
@@ -50860,7 +50862,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:50863: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:50865: 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;}
@@ -50871,7 +50873,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:50874: WARNING: Some variables may not be substituted:
+      { echo "$as_me:50876: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -50920,7 +50922,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:50923: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:50925: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -50931,7 +50933,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:50934: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:50936: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -50944,7 +50946,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo "$srcdir/$f"
          else
            # /dev/null tree
-           { { echo "$as_me:50947: error: cannot find input file: $f" >&5
+           { { echo "$as_me:50949: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -51063,7 +51065,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:51066: $ac_file is unchanged" >&5
+      { echo "$as_me:51068: $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 beef487..8e33d41 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $LynxId: configure.in,v 1.368 2024/04/15 20:53:51 tom Exp $
+dnl $LynxId: configure.in,v 1.374 2024/05/31 22:09:16 tom Exp $
 dnl
 dnl Process this file with autoconf to produce a configure script.
 dnl
@@ -27,10 +27,10 @@ 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
-AC_REVISION($Revision: 1.368 $)
+AC_REVISION($Revision: 1.374 $)
 
 AC_PREREQ(2.52.20231210)
-AC_INIT(lynx,2.9.1,lynx-dev@nongnu.org)
+AC_INIT(lynx,2.9.2,lynx-dev@nongnu.org)
 
 AC_CONFIG_SRCDIR(userdefs.h)
 
diff --git a/lynx.cfg b/lynx.cfg
index 4b2d4dc..10fc6b0 100644
--- a/lynx.cfg
+++ b/lynx.cfg
@@ -1,10 +1,10 @@
-# $LynxId: lynx.cfg,v 1.350 2024/04/15 20:53:51 tom Exp $
+# $LynxId: lynx.cfg,v 1.358 2024/05/31 22:09:16 tom Exp $
 # lynx.cfg file.
 # The default placement for this file is /usr/local/lib/lynx.cfg (Unix)
 #                                     or Lynx_Dir:lynx.cfg (VMS)
 #
-# LYNX_VERSION "2.9.1"
-# LYNX_DATE    "15 Apr 2024"
+# LYNX_VERSION "2.9.2"
+# LYNX_DATE    "31 May 2024"
 #
 # Definition pairs (configuration settings) are of the form
 #	VARIABLE:DEFINITION
diff --git a/lynx.man b/lynx.man
index ae704a3..9d0ba4f 100644
--- a/lynx.man
+++ b/lynx.man
@@ -1,6 +1,6 @@
-.\" $LynxId: lynx.man,v 1.160 2024/04/15 20:53:51 tom Exp $
+.\" $LynxId: lynx.man,v 1.166 2024/05/31 22:09:16 tom Exp $
 .\" **************************************************************************
-.TH LYNX 1 2024-04-15 "Lynx 2.9.1" "Lynx \(en the \fItext\fP web browser"
+.TH LYNX 1 2024-05-31 "Lynx 2.9.2" "Lynx \(en the \fItext\fP web browser"
 .
 .ie \n(.g \{\
 .ds `` \(lq
diff --git a/lynx_help/Lynx_users_guide.html b/lynx_help/Lynx_users_guide.html
index 6815754..78e9e71 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.161 2024/01/15 01:49:05 tom Exp $ -->
+<!-- $LynxId: Lynx_users_guide.html,v 1.163 2024/05/31 22:09:16 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.9.0</title>
+  <title>Lynx Users Guide v2.9.2</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.9.0</h1>
+  <h1>Lynx Users Guide v2.9.2</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.0)</a>
+"example-form_based_options">Options Menu (Lynx Version 2.9.2)</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.9.0 libwww-FM/2.14 SSL-MM/1.4.</a>
+"#optinfo-user_agent">Lynx/2.9.2 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.0)</a>
+"example-key_based_options">Options Menu (Lynx Version 2.9.2)</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.9.0</em> for access to sites which discriminate
+      <em>L_y_n_x/2.9.2</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
diff --git a/makefile.in b/makefile.in
index 651677e..4658ac9 100644
--- a/makefile.in
+++ b/makefile.in
@@ -1,4 +1,4 @@
-# $LynxId: makefile.in,v 1.198 2024/01/15 16:06:06 tom Exp $
+# $LynxId: makefile.in,v 1.200 2024/05/31 23:03:20 tom Exp $
 ##makefile for lynx
 
 SHELL		= @CONFIG_SHELL@
@@ -392,7 +392,7 @@ install-help : htmlized_cfg help_files.sed $(HELPDIR) $(SYSCONFDIR)
 		WD=`pwd` ; \
 		TAIL=`basename "$(helpdir)"` ; \
 		HEAD=`echo "$$WD"|sed -e "s,/$${TAIL}$$,,"` ; \
-		test "x$$WD" != "x$$HEAD" && rm -fr * ; \
+		test "x$$WD" != "x$$HEAD" && find . -type f -exec rm -f {} \; ; \
 		fi';\
 	test -d $(HELPDIR)/keystrokes || mkdir $(HELPDIR)/keystrokes
 	@echo "Translating/copying html files"
diff --git a/src/HTFWriter.c b/src/HTFWriter.c
index b07aa92..6e961e2 100644
--- a/src/HTFWriter.c
+++ b/src/HTFWriter.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTFWriter.c,v 1.126 2024/04/11 20:21:33 tom Exp $
+ * $LynxId: HTFWriter.c,v 1.129 2024/05/27 17:02:24 tom Exp $
  *
  *		FILE WRITER				HTFWrite.h
  *		===========
@@ -45,6 +45,10 @@
 #include <LYCookie.h>
 #endif
 
+#ifdef USE_BROTLI
+#include <brotli/decode.h>
+#endif
+
 /* contains the name of the temp file which is being downloaded into */
 char *WWW_Download_File = NULL;
 BOOLEAN LYCancelDownload = FALSE;	/* exported to HTFormat.c in libWWW */
@@ -186,15 +190,155 @@ static void decompress_gzip(HTStream *me)
 #define FMT "%s %s"
 	const char *program;
 
-	if (LYCopyFile(in_name, copied) == 0) {
+	if ((program = HTGetProgramPath(ppUNCOMPRESS)) == NULL) {
+	    HTAlert(ERROR_UNCOMPRESSING_TEMP);
+	} else if (LYCopyFile(in_name, copied) == 0) {
 	    char expanded[LY_MAXPATH];
 	    char *command = NULL;
 
-	    if ((program = HTGetProgramPath(ppUNCOMPRESS)) != NULL) {
-		HTAddParam(&command, FMT, 1, program);
-		HTAddParam(&command, FMT, 2, copied);
-		HTEndParam(&command, FMT, 2);
+	    HTAddParam(&command, FMT, 1, program);
+	    HTAddParam(&command, FMT, 2, copied);
+	    HTEndParam(&command, FMT, 2);
+	    if (LYSystem(command) == 0) {
+		struct stat stat_buf;
+
+		strcpy(expanded, copied);
+		*strrchr(expanded, '.') = '\0';
+		if (LYRenameFile(expanded, in_name) != 0) {
+		    CTRACE((tfp, "rename failed %s to %s\n", expanded, in_name));
+		} else if (stat(in_name, &stat_buf) != 0) {
+		    CTRACE((tfp, "stat failed for %s\n", in_name));
+		} else {
+		    me->anchor->actual_length = stat_buf.st_size;
+		}
+	    } else {
+		CTRACE((tfp, "command failed: %s\n", command));
 	    }
+	    free(command);
+	    (void) LYRemoveTemp(copied);
+	}
+#undef FMT
+#endif
+    }
+}
+
+static void decompress_br(HTStream *me)
+{
+#undef THIS_FUNC
+#define THIS_FUNC "decompress_br\n"
+    char *in_name = me->anchor->FileCache;
+    char copied[LY_MAXPATH];
+    FILE *fp = LYOpenTemp(copied, ".br", BIN_W);
+
+    if (fp != 0) {
+#ifdef USE_BROTLI
+#define INPUT_BUFFER_SIZE BUFSIZ
+	char *brotli_buffer = NULL;
+	char *normal_buffer = NULL;
+	size_t brotli_size;
+	size_t brotli_limit = 0;
+	size_t brotli_offset;
+	size_t normal_size;
+	size_t normal_limit = 0;
+	BrotliDecoderResult status2 = BROTLI_DECODER_RESULT_ERROR;
+	int status;
+	off_t bytes = 0;
+	FILE *ifp = fopen(in_name, BIN_R);
+
+	if (ifp != NULL) {
+	    CTRACE((tfp, "reading '%s'\n", in_name));
+	    for (;;) {
+		size_t input_chunk = INPUT_BUFFER_SIZE;
+
+		brotli_offset = brotli_limit;
+		brotli_limit += input_chunk;
+		brotli_buffer = realloc(brotli_buffer, brotli_limit);
+		if (brotli_buffer == NULL)
+		    outofmem(__FILE__, THIS_FUNC);
+		status = (int) fread(brotli_buffer + brotli_offset,
+				     sizeof(char),
+				     input_chunk,
+				     ifp);
+
+		if (status <= 0) {	/* EOF or error */
+		    if (status == 0) {
+			break;
+		    }
+		    CTRACE((tfp, THIS_FUNC ": Read error, fread returns %d\n", status));
+		    break;
+		}
+		bytes += status;
+	    }
+	    fclose(ifp);
+
+	    CTRACE((tfp, "decompressing '%s'\n", in_name));
+	    /*
+	     * next, unless we encountered an error (and have no data), try
+	     * decompressing with increasing output buffer sizes until the brotli
+	     * library succeeds.
+	     */
+	    if (bytes > 0) {
+		do {
+		    if (normal_limit == 0)
+			normal_limit = (10 * brotli_limit) + INPUT_BUFFER_SIZE;
+		    else
+			normal_limit *= 2;
+		    normal_buffer = realloc(normal_buffer, normal_limit);
+		    if (normal_buffer == NULL)
+			outofmem(__FILE__, THIS_FUNC);
+		    brotli_size = (size_t) bytes;
+		    normal_size = normal_limit;
+		    status2 = BrotliDecoderDecompress(brotli_size,
+						      (uint8_t *) brotli_buffer,
+						      &normal_size,
+						      (uint8_t *) normal_buffer);
+		    /*
+		     * brotli library should return
+		     *  BROTLI_DECODER_RESULT_NEEDS_MORE_OUTPUT,
+		     * but actually returns
+		     *  BROTLI_DECODER_RESULT_ERROR 
+		     *
+		     * Accommodate possible improvements...
+		     */
+		} while (status2 != BROTLI_DECODER_RESULT_SUCCESS);
+	    }
+
+	    /*
+	     * finally, pump that data into the output stream.
+	     */
+	    if (status2 == BROTLI_DECODER_RESULT_SUCCESS) {
+		CTRACE((tfp, THIS_FUNC ": decompressed %ld -> %ld (1:%.1f)\n",
+			brotli_size, normal_size,
+			(double) normal_size / (double) brotli_size));
+		fwrite(normal_buffer, sizeof(char), normal_size, fp);
+	    }
+	    free(brotli_buffer);
+	    free(normal_buffer);
+
+	    LYCloseTempFP(fp);
+
+	    CTRACE((tfp, "...decompress %" PRI_off_t " to %lu\n",
+		    CAST_off_t (me->anchor->actual_length),
+		    (unsigned long)normal_size));
+	    if (status2 == BROTLI_DECODER_RESULT_SUCCESS) {
+		if (LYRenameFile(copied, in_name) == 0)
+		    me->anchor->actual_length = (off_t) normal_size;
+	    }
+	    (void) LYRemoveTemp(copied);
+	}
+#else
+#define FMT "%s -j -d %s"
+	const char *program;
+
+	if ((program = HTGetProgramPath(ppBROTLI)) == NULL) {
+	    HTAlert(ERROR_UNCOMPRESSING_TEMP);
+	} else if (LYCopyFile(in_name, copied) == 0) {
+	    char expanded[LY_MAXPATH];
+	    char *command = NULL;
+
+	    HTAddParam(&command, FMT, 1, program);
+	    HTAddParam(&command, FMT, 2, copied);
+	    HTEndParam(&command, FMT, 2);
 	    if (LYSystem(command) == 0) {
 		struct stat stat_buf;
 
@@ -252,12 +396,17 @@ static void HTFWriter_free(HTStream *me)
 	 */
 	if (me->anchor->FileCache != NULL
 	    && me->anchor->no_content_encoding == FALSE
-	    && me->input_format == HTAtom_for("application/x-gzip")
+	    && IsCompressionFormat(me->input_format, cftGzip)
 	    && !strcmp(me->anchor->content_encoding, "gzip")) {
 	    decompress_gzip(me);
+	} else if (me->anchor->FileCache != NULL
+		   && me->anchor->no_content_encoding == FALSE
+		   && IsCompressionFormat(me->input_format, cftBrotli)
+		   && !strcmp(me->anchor->content_encoding, "br")) {
+	    decompress_br(me);
 	}
 #ifdef VMS
-	if (0 == strcmp(me->end_command, "SaveVMSBinaryFile")) {
+	else if (0 == strcmp(me->end_command, "SaveVMSBinaryFile")) {
 	    /*
 	     * It's a binary file saved to disk on VMS, which
 	     * we want to convert to fixed records format.  - FM
diff --git a/src/LYCurses.c b/src/LYCurses.c
index d1ad337..a7cf9ec 100644
--- a/src/LYCurses.c
+++ b/src/LYCurses.c
@@ -1,4 +1,4 @@
-/* $LynxId: LYCurses.c,v 1.207 2024/01/09 00:30:44 tom Exp $ */
+/* $LynxId: LYCurses.c,v 1.209 2024/04/16 21:43:44 tom Exp $ */
 #include <HTUtils.h>
 #include <HTAlert.h>
 
@@ -931,14 +931,12 @@ static void delete_screen(SCREEN * screen)
 
 static SCREEN *LYscreen = NULL;
 
-#if defined(USE_DEFAULT_COLORS)
 static void delete_screen(SCREEN * screen)
 {
     delete_fake_win();
     delete_subwindow();
     delscreen(screen);
 }
-#endif
 
 #define LYDELSCR() { \
 CheckScreenSize(); \
diff --git a/src/LYIcon.rc b/src/LYIcon.rc
index 3076d34..6301589 100644
--- a/src/LYIcon.rc
+++ b/src/LYIcon.rc
@@ -1,12 +1,12 @@
-// $LynxId: LYIcon.rc,v 1.66 2024/04/15 20:53:51 tom Exp $
+// $LynxId: LYIcon.rc,v 1.72 2024/05/31 22:09:16 tom Exp $
 
 #include <windows.h>
 
 100	ICON	"../samples/lynx.ico"
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION    2,9,1,0
-PRODUCTVERSION 2,9,1,0
+FILEVERSION    2,9,2,0
+PRODUCTVERSION 2,9,2,0
 FILEFLAGSMASK  VS_FFI_FILEFLAGSMASK
 FILEFLAGS      0
 FILEOS         VOS_NT_WINDOWS32
@@ -19,12 +19,12 @@ BEGIN
     BEGIN
       VALUE "CompanyName",      "https://invisible-island.net/lynx"
       VALUE "FileDescription",  "Lynx - web browser"
-      VALUE "FileVersion",      "2.9.1.0"
+      VALUE "FileVersion",      "2.9.2.0"
       VALUE "InternalName",     "Lynx"
       VALUE "LegalCopyright",   "©1997-2024 Thomas E. Dickey"
       VALUE "OriginalFilename", "lynx.exe"
       VALUE "ProductName",      "Lynx - web browser"
-      VALUE "ProductVersion",   "2.9.1.0"
+      VALUE "ProductVersion",   "2.9.2.0"
     END
   END
   BLOCK "VarFileInfo"
diff --git a/userdefs.h b/userdefs.h
index 4fe6455..8f739f9 100644
--- a/userdefs.h
+++ b/userdefs.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: userdefs.h,v 1.388 2024/04/15 20:53:51 tom Exp $
+ * $LynxId: userdefs.h,v 1.396 2024/05/31 22:09:16 tom Exp $
  *
  * Lynx - Hypertext navigation system
  *
@@ -1451,10 +1451,10 @@
  */
 
 #define LYNX_NAME     "Lynx"
-#define LYNX_VERSION  "2.9.1"
+#define LYNX_VERSION  "2.9.2"
 #define LYNX_WWW_HOME "https://lynx.invisible-island.net/"
 #define LYNX_WWW_DIST "https://lynx.invisible-island.net/current/"
-#define LYNX_DATE     "15 Apr 2024"
+#define LYNX_DATE     "31 May 2024"
 
 #ifdef UNICODE
 #define W32_STRING(s) L##s