[pkg-lynx-commits] [lynx-cur] 01/03: New upstream version 2.8.9dev16

Axel Beckert abe at deuxchevaux.org
Wed Jul 12 06:26:06 UTC 2017


This is an automated email from the git hooks/post-receive script.

abe pushed a commit to branch master
in repository lynx-cur.

commit dc331fdae602169565a639aeb7dcce1752a5cd86
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Wed Jul 12 08:17:22 2017 +0200

    New upstream version 2.8.9dev16
---
 CHANGES                                   |   20 +-
 INSTALLATION                              |   17 +-
 PACKAGE/debian/changelog                  |    4 +-
 PACKAGE/debian/lynx-dev.lintian-overrides |    2 +-
 PACKAGE/lynx.nsi                          |    6 +-
 PACKAGE/lynx.spec                         |    4 +-
 PACKAGE/version.iss                       |    2 +-
 WWW/Library/Implementation/HTUtils.h      |    4 +-
 aclocal.m4                                |  277 +-
 config.hin                                |    4 +-
 configure                                 | 6988 +++++++++++++++--------------
 configure.in                              |   10 +-
 lynx.cfg                                  |   22 +-
 makefile.in                               |    6 +-
 po/da.po                                  |  798 ++--
 po/et.po                                  |  772 ++--
 po/lynx.pot                               |   18 +-
 po/makefile.inn                           |   46 +-
 po/tr.po                                  |  782 ++--
 po/zh_TW.po                               | 1350 +++---
 src/HTML.c                                |   27 +-
 src/LYIcon.rc                             |   10 +-
 userdefs.h                                |   11 +-
 23 files changed, 5722 insertions(+), 5458 deletions(-)

diff --git a/CHANGES b/CHANGES
index ad8382a..feb4d32 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,8 +1,26 @@
--- $LynxId: CHANGES,v 1.908 2017/07/04 22:48:35 tom Exp $
+-- $LynxId: CHANGES,v 1.918 2017/07/11 00:17:59 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
 
+2017-07-10 (2.8.9dev.16)
+* modify configure script to warn if NLS cannot be configured, and disable
+  the feature rather than leaving it partly configured and failing during
+  the build -TD
+* modify configure script to allow pre-set $MSGFMT and $XGETTEXT variables to
+  to used to build the NLS configuration using system's native NLS support -TD
+* convert po/zh_TW.po to UTF-8 to work with Solaris10, which lacks big5 -TD
+* build-fix for OSX Panther, which has PRId64 but not SCNd64 (patch by Martijn
+  Dekker).
+* modify po-makefile to use msgmerge to align with lynx.pot, and also use sed
+  to update some obsolete homepage URLs in translations -TD
+* add a note in the comments for INCLUDE in lynx.cfg regarding the default
+  directory searches LYOpenCFG(), added in 2.8.4dev.20 (Debian #818047) -TD
+* add a check to ensure that HTML_put_string() will not append a chunk onto
+  itself (report by Ned Williamson) -TD
+* update da.po, et.po, tr.po from
+    http://translationproject.org/latest/lynx
+
 2017-07-04 (2.8.9dev.15)
 * add note in lynx.cfg about default values (Debian #408448) -TD
 * amended Backes' change to the COLLAPSE_BR_TAGS feature for compatibility -TD
diff --git a/INSTALLATION b/INSTALLATION
index ed877b1..1f3e2c0 100644
--- a/INSTALLATION
+++ b/INSTALLATION
@@ -501,6 +501,21 @@ II. Compile instructions -- UNIX
   --enable-nls				(several definitions)
 	use Native Language Support (i.e., gettext).
 
+	This relies upon external programs (msgfmt and xgettext) to format
+	the message catalogs:
+	
+	    + Unless you set the environment variables MSGFMT and XGETTEXT to
+	      the full pathnames of these utilities, the configure script will
+	      search for the GNU versions of these utilities.
+	      
+	      It will also search for the GNU version of the corresponding
+	      gettext() runtime function.  On some platforms (such as Solaris),
+	      this search gives misleading results.
+
+	    + If you set those environment variables to full pathnames, the
+	      configure script will warn if they are not the GNU versions of
+	      the utilities.
+
   --enable-nsl-fork			(define NSL_FORK)
 	Disabled by default, this allows interruption of NSL requests,
 	so that `z' will stop the `look-up' phase of a connection.
@@ -1467,4 +1482,4 @@ VIII. Acknowledgment
 
 -- 1999/04/24 - H. Nelson <lynx-admin at irm.nara.kindai.ac.jp>
 -- vile:txtmode
--- $LynxId: INSTALLATION,v 1.126 2015/09/19 17:40:20 tom Exp $
+-- $LynxId: INSTALLATION,v 1.127 2017/07/10 08:55:07 tom Exp $
diff --git a/PACKAGE/debian/changelog b/PACKAGE/debian/changelog
index e19b97f..d3de63c 100644
--- a/PACKAGE/debian/changelog
+++ b/PACKAGE/debian/changelog
@@ -1,8 +1,8 @@
-lynx-dev (2.8.9dev.15) unstable; urgency=low
+lynx-dev (2.8.9dev.16) unstable; urgency=low
 
   * maintenance updates
 
- -- Thomas E. Dickey <dickey at invisible-island.net>  Thu, 11 May 2017 17:22:30 -0400
+ -- Thomas E. Dickey <dickey at invisible-island.net>  Wed, 05 Jul 2017 16:13:35 -0400
 
 lynx-dev (2.8.8dev.16) unstable; urgency=high
 
diff --git a/PACKAGE/debian/lynx-dev.lintian-overrides b/PACKAGE/debian/lynx-dev.lintian-overrides
index 280b562..a2345b7 100644
--- a/PACKAGE/debian/lynx-dev.lintian-overrides
+++ b/PACKAGE/debian/lynx-dev.lintian-overrides
@@ -1,5 +1,5 @@
 # Lynx's version-numbering is not understood by lintian, though legal.
-lynx-dev: rc-version-greater-than-expected-version 2.8.9dev.15 > 2.8.9 (consider using 2.8.9~dev.15)
+lynx-dev: rc-version-greater-than-expected-version
 
 # This is intentional because it is referenced from the documentation.
 lynx-dev: extra-license-file usr/share/doc/lynx-dev/COPYING
diff --git a/PACKAGE/lynx.nsi b/PACKAGE/lynx.nsi
index b7e594b..05a8910 100644
--- a/PACKAGE/lynx.nsi
+++ b/PACKAGE/lynx.nsi
@@ -1,4 +1,4 @@
-; $LynxId: lynx.nsi,v 1.36 2017/05/11 21:22:30 tom Exp $
+; $LynxId: lynx.nsi,v 1.37 2017/07/05 20:13:35 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.
 
@@ -9,8 +9,8 @@
 !define VERSION_EPOCH "2"
 !define VERSION_MAJOR "8"
 !define VERSION_MINOR "9"
-!define VERSION_LEVEL "1015"
-!define VERSION_PATCH "dev.15"
+!define VERSION_LEVEL "1016"
+!define VERSION_PATCH "dev.16"
 
 !define SUBKEY "Lynx"
 
diff --git a/PACKAGE/lynx.spec b/PACKAGE/lynx.spec
index 63dbde3..fe62934 100644
--- a/PACKAGE/lynx.spec
+++ b/PACKAGE/lynx.spec
@@ -1,8 +1,8 @@
-# $LynxId: lynx.spec,v 1.42 2017/05/11 21:22:30 tom Exp $
+# $LynxId: lynx.spec,v 1.43 2017/07/05 20:13:35 tom Exp $
 Summary: A text-based Web browser
 Name: lynx
 Version: 2.8.9
-Release: dev.15
+Release: dev.16
 License: GPLv2
 Group: Applications/Internet
 Source: lynx%{version}%{release}.tgz
diff --git a/PACKAGE/version.iss b/PACKAGE/version.iss
index 588852f..ff5d704 100644
--- a/PACKAGE/version.iss
+++ b/PACKAGE/version.iss
@@ -1,7 +1,7 @@
 ; version used for Inno Setup files.
 
 ; $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$
-#define LYNX_VERSION "2.8.9dev.15"
+#define LYNX_VERSION "2.8.9dev.16"
 
 ; most-recent full release and target
 #define LYNX_RELEASE "2.8.9"
diff --git a/WWW/Library/Implementation/HTUtils.h b/WWW/Library/Implementation/HTUtils.h
index bd6391b..4f2c467 100644
--- a/WWW/Library/Implementation/HTUtils.h
+++ b/WWW/Library/Implementation/HTUtils.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTUtils.h,v 1.124 2017/07/02 20:40:14 tom Exp $
+ * $LynxId: HTUtils.h,v 1.125 2017/07/07 20:49:16 Martijn.Dekker Exp $
  *
  * Utility macros for the W3 code library
  * MACROS FOR GENERAL USE
@@ -585,7 +585,7 @@ extern int WWW_TraceMask;
  * Printing/scanning-formats for "off_t", as well as cast needed to fit.
  */
 #if defined(HAVE_LONG_LONG) && defined(HAVE_INTTYPES_H) && defined(SIZEOF_OFF_T)
-#if (SIZEOF_OFF_T == 8) && defined(PRId64)
+#if (SIZEOF_OFF_T == 8) && defined(PRId64) && defined(SCNd64)
 
 #define PRI_off_t	PRId64
 #define SCN_off_t	SCNd64
diff --git a/aclocal.m4 b/aclocal.m4
index 6d9da01..192e463 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $LynxId: aclocal.m4,v 1.237 2017/07/02 18:31:56 tom Exp $
+dnl $LynxId: aclocal.m4,v 1.243 2017/07/11 08:44:41 tom Exp $
 dnl Macros for auto-configure script.
 dnl by Thomas E. Dickey <dickey at invisible-island.net>
 dnl and Jim Spath <jspath at mail.bcpl.lib.md.us>
@@ -286,7 +286,7 @@ fi
 AC_SUBST($1)dnl
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl AM_WITH_NLS version: 26 updated: 2015/04/15 19:08:48
+dnl AM_WITH_NLS version: 27 updated: 2017/07/10 20:13:33
 dnl -----------
 dnl Inserted as requested by gettext 0.10.40
 dnl File from /usr/share/aclocal
@@ -360,6 +360,8 @@ AC_DEFUN([AM_WITH_NLS],
 
   dnl If we use NLS figure out what method
   if test "$USE_NLS" = "yes"; then
+    dnl We need to process the po/ directory.
+    POSUB=po
     AC_DEFINE(ENABLE_NLS, 1,
       [Define to 1 if translation of program messages to the user's native language
  is requested.])
@@ -373,20 +375,49 @@ AC_DEFUN([AM_WITH_NLS],
     nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
     if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
       dnl User does not insist on using GNU NLS library.  Figure out what
-      dnl to use.  If GNU gettext is available we use this.  Else we have
+      dnl to use.  If GNU gettext is available we use this.  Else we may have
       dnl to fall back to GNU NLS library.
       CATOBJEXT=NONE
 
+      dnl Save these (possibly-set) variables for reference.  If the user
+      dnl overrode these to provide full pathnames, then warn if not actually
+      dnl GNU gettext, but do not override their values.  Also, if they were
+      dnl overridden, suppress the part of the library test which prevents it
+      dnl from finding anything other than GNU gettext.  Doing this also
+      dnl suppresses a bogus search for the intl library.
+      cf_save_msgfmt_path="$MSGFMT"
+      cf_save_xgettext_path="$XGETTEXT"
+
+      dnl Search for GNU msgfmt in the PATH.
+      AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+          [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1], :)
+      AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+      AC_SUBST(MSGFMT)
+
+      dnl Search for GNU xgettext in the PATH.
+      AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+          [$ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1], :)
+
+      cf_save_OPTS_1="$CPPFLAGS"
+      if test "x$cf_save_msgfmt_path" = "x$MSGFMT" && \
+         test "x$cf_save_xgettext_path" = "x$XGETTEXT" ; then
+          CF_ADD_CFLAGS(-DIGNORE_MSGFMT_HACK)
+      fi
+
       cf_save_LIBS_1="$LIBS"
       CF_ADD_LIBS($LIBICONV)
-      AC_CACHE_CHECK([for libintl.h and gettext()], cf_cv_func_gettext,[
-        CF_FIND_LINKAGE(CF__INTL_HEAD,
-        CF__INTL_BODY,
+
+      CF_FIND_LINKAGE(CF__INTL_HEAD,
+        CF__INTL_BODY($2),
         intl,
         cf_cv_func_gettext=yes,
         cf_cv_func_gettext=no)
-      ])
+
+      AC_MSG_CHECKING([for libintl.h and gettext()])
+      AC_MSG_RESULT($cf_cv_func_gettext)
+
       LIBS="$cf_save_LIBS_1"
+      CPPFLAGS="$cf_save_OPTS_1"
 
       if test "$cf_cv_func_gettext" = yes ; then
         AC_DEFINE(HAVE_LIBINTL_H,1,[Define to 1 if we have libintl.h])
@@ -414,161 +445,151 @@ AC_DEFUN([AM_WITH_NLS],
           AC_CHECK_FUNCS(dcgettext)
           LIBS="$gt_save_LIBS"
 
-          dnl Search for GNU msgfmt in the PATH.
-          AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-              [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1], :)
-          AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-
-          dnl Search for GNU xgettext in the PATH.
-          AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-              [$ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1], :)
-
           CATOBJEXT=.gmo
         fi
+      elif test -z "$MSGFMT" || test -z "$XGETTEXT" ; then
+        AC_MSG_WARN(disabling NLS feature)
+        sed -e /ENABLE_NLS/d confdefs.h >confdefs.tmp
+        mv confdefs.tmp confdefs.h
+        ALL_LINGUAS=
+        CATOBJEXT=.ignored
+        MSGFMT=":"
+        GMSGFMT=":"
+        XGETTEXT=":"
+        POSUB=
+        BUILD_INCLUDED_LIBINTL=no
+        USE_INCLUDED_LIBINTL=no
+        USE_NLS=no
+        nls_cv_use_gnu_gettext=no
       fi
 
       if test "$CATOBJEXT" = "NONE"; then
         dnl GNU gettext is not found in the C library.
         dnl Fall back on GNU gettext library.
-        nls_cv_use_gnu_gettext=yes
+        nls_cv_use_gnu_gettext=maybe
       fi
     fi
 
-    if test "$nls_cv_use_gnu_gettext" = "yes"; then
-      if test ! -d $srcdir/intl ; then
-        AC_MSG_ERROR(no NLS library is packaged with this application)
-      fi
-      dnl Mark actions used to generate GNU NLS library.
-      INTLOBJS="\$(GETTOBJS)"
-      AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-          [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1], :)
-      AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-      AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-          [$ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1], :)
-      AC_SUBST(MSGFMT)
-      BUILD_INCLUDED_LIBINTL=yes
-      USE_INCLUDED_LIBINTL=yes
+    if test "$nls_cv_use_gnu_gettext" != "no"; then
       CATOBJEXT=.gmo
-      INTLLIBS="ifelse([$3],[],\$(top_builddir)/intl,[$3])/libintl.ifelse([$1], use-libtool, [l], [])a $LIBICONV"
-      LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
+      if test -f $srcdir/intl/libintl.h ; then
+        dnl Mark actions used to generate GNU NLS library.
+        INTLOBJS="\$(GETTOBJS)"
+        BUILD_INCLUDED_LIBINTL=yes
+        USE_INCLUDED_LIBINTL=yes
+        INTLLIBS="ifelse([$3],[],\$(top_builddir)/intl,[$3])/libintl.ifelse([$1], use-libtool, [l], [])a $LIBICONV"
+        LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
+      elif test "$nls_cv_use_gnu_gettext" = "yes"; then
+        nls_cv_use_gnu_gettext=no
+        AC_MSG_WARN(no NLS library is packaged with this application)
+      fi
     fi
 
-    dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
     dnl Test whether we really found GNU msgfmt.
     if test "$GMSGFMT" != ":"; then
-      dnl If it is no GNU msgfmt we define it as : so that the
-      dnl Makefiles still can work.
       if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then
         : ;
       else
-        AC_MSG_RESULT(
-          [found msgfmt program is not GNU msgfmt; ignore it])
-        GMSGFMT=":"
+        AC_MSG_WARN([found msgfmt program is not GNU msgfmt])
       fi
     fi
 
-    dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
     dnl Test whether we really found GNU xgettext.
     if test "$XGETTEXT" != ":"; then
-        dnl If it is no GNU xgettext we define it as : so that the
-        dnl Makefiles still can work.
       if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then
         : ;
       else
-        AC_MSG_RESULT(
-          [found xgettext program is not GNU xgettext; ignore it])
-        XGETTEXT=":"
+        AC_MSG_WARN([found xgettext program is not GNU xgettext])
       fi
     fi
-
-    dnl We need to process the po/ directory.
-    POSUB=po
   fi
 
-  AC_OUTPUT_COMMANDS(
-   [for ac_file in $CONFIG_FILES; do
-
-      # Support "outfile[:infile[:infile...]]"
-      case "$ac_file" in
-        (*:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-      esac
-
-      # PO directories have a Makefile.in generated from Makefile.inn.
-      case "$ac_file" in
-	  (*/[Mm]akefile.in)
-        # Adjust a relative srcdir.
-        ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
-        ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
-        ac_base=`basename $ac_file .in`
-        # In autoconf-2.13 it is called $ac_given_srcdir.
-        # In autoconf-2.50 it is called $srcdir.
-        test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
-
-        case "$ac_given_srcdir" in
-          (.)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
-          (/*) top_srcdir="$ac_given_srcdir" ;;
-          (*)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
+  if test "$XGETTEXT" != ":"; then
+    AC_OUTPUT_COMMANDS(
+     [for ac_file in $CONFIG_FILES; do
+  
+        # Support "outfile[:infile[:infile...]]"
+        case "$ac_file" in
+          (*:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
         esac
-
-        if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
-          rm -f "$ac_dir/POTFILES"
-          test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-          sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," -e "\$s/\(.*\) \\\\/\1/" < "$ac_given_srcdir/$ac_dir/POTFILES.in" > "$ac_dir/POTFILES"
-          test -n "$as_me" && echo "$as_me: creating $ac_dir/$ac_base" || echo "creating $ac_dir/$ac_base"
-          sed -e "/POTFILES =/r $ac_dir/POTFILES" "$ac_dir/$ac_base.in" > "$ac_dir/$ac_base"
-        fi
-        ;;
-      esac
-    done])
-
-  dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
-  dnl to 'yes' because some of the testsuite requires it.
-  if test "$PACKAGE" = gettext; then
-    BUILD_INCLUDED_LIBINTL=yes
-  fi
-
-  dnl intl/plural.c is generated from intl/plural.y. It requires bison,
-  dnl because plural.y uses bison specific features. It requires at least
-  dnl bison-1.26 because earlier versions generate a plural.c that doesn't
-  dnl compile.
-  dnl bison is only needed for the maintainer (who touches plural.y). But in
-  dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
-  dnl the rule in general Makefile. Now, some people carelessly touch the
-  dnl files or have a broken "make" program, hence the plural.c rule will
-  dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
-  dnl present or too old.
-  if test "$nls_cv_use_gnu_gettext" = "yes"; then
-    AC_CHECK_PROGS([INTLBISON], [bison])
-    if test -z "$INTLBISON"; then
-      ac_verc_fail=yes
-    else
-      dnl Found it, now check the version.
-      AC_MSG_CHECKING([version of bison])
+  
+        # PO directories have a Makefile.in generated from Makefile.inn.
+        case "$ac_file" in
+        (*/[Mm]akefile.in)
+          # Adjust a relative srcdir.
+          ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+          ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+          ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+          ac_base=`basename $ac_file .in`
+          # In autoconf-2.13 it is called $ac_given_srcdir.
+          # In autoconf-2.50 it is called $srcdir.
+          test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
+  
+          case "$ac_given_srcdir" in
+            (.)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+            (/*) top_srcdir="$ac_given_srcdir" ;;
+            (*)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
+          esac
+  
+          if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
+            rm -f "$ac_dir/POTFILES"
+            test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
+            sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," -e "\$s/\(.*\) \\\\/\1/" < "$ac_given_srcdir/$ac_dir/POTFILES.in" > "$ac_dir/POTFILES"
+            test -n "$as_me" && echo "$as_me: creating $ac_dir/$ac_base" || echo "creating $ac_dir/$ac_base"
+            sed -e "/POTFILES =/r $ac_dir/POTFILES" "$ac_dir/$ac_base.in" > "$ac_dir/$ac_base"
+          fi
+          ;;
+        esac
+      done])
+  
+    dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
+    dnl to 'yes' because some of the testsuite requires it.
+    if test "$PACKAGE" = gettext; then
+      BUILD_INCLUDED_LIBINTL=yes
+    fi
+  
+    dnl intl/plural.c is generated from intl/plural.y. It requires bison,
+    dnl because plural.y uses bison specific features. It requires at least
+    dnl bison-1.26 because earlier versions generate a plural.c that doesn't
+    dnl compile.
+    dnl bison is only needed for the maintainer (who touches plural.y). But in
+    dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
+    dnl the rule in general Makefile. Now, some people carelessly touch the
+    dnl files or have a broken "make" program, hence the plural.c rule will
+    dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
+    dnl present or too old.
+    if test "$nls_cv_use_gnu_gettext" = "yes"; then
+      AC_CHECK_PROGS([INTLBISON], [bison])
+      if test -z "$INTLBISON"; then
+        ac_verc_fail=yes
+      else
+        dnl Found it, now check the version.
+        AC_MSG_CHECKING([version of bison])
 changequote(<<,>>)dnl
-      ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
-      case $ac_prog_version in
-        ('') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
-        (1.2[6-9]*|1.[3-9][0-9]*|[2-9].*)
+        ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
+        case $ac_prog_version in
+          ('') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
+          (1.2[6-9]*|1.[3-9][0-9]*|[2-9].*)
 changequote([,])dnl
-           ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-        (*) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
-      esac
-    AC_MSG_RESULT([$ac_prog_version])
-    fi
-    if test $ac_verc_fail = yes; then
-      INTLBISON=:
+             ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
+          (*) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
+        esac
+      AC_MSG_RESULT([$ac_prog_version])
+      fi
+      if test $ac_verc_fail = yes; then
+        INTLBISON=:
+      fi
     fi
+  
+    dnl These rules are solely for the distribution goal.  While doing this
+    dnl we only have to keep exactly one list of the available catalogs
+    dnl in configure.in.
+    for lang in $ALL_LINGUAS; do
+      GMOFILES="$GMOFILES $lang.gmo"
+      POFILES="$POFILES $lang.po"
+    done
   fi
 
-  dnl These rules are solely for the distribution goal.  While doing this
-  dnl we only have to keep exactly one list of the available catalogs
-  dnl in configure.in.
-  for lang in $ALL_LINGUAS; do
-    GMOFILES="$GMOFILES $lang.gmo"
-    POFILES="$POFILES $lang.po"
-  done
-
   dnl Make all variables we use known to autoconf.
   AC_SUBST(BUILD_INCLUDED_LIBINTL)
   AC_SUBST(USE_INCLUDED_LIBINTL)
@@ -7140,7 +7161,7 @@ define([CF__INET_HEAD],[
 #endif
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF__INTL_BODY version: 2 updated: 2015/05/10 19:52:14
+dnl CF__INTL_BODY version: 3 updated: 2017/07/10 20:13:33
 dnl -------------
 dnl Test-code needed for libintl compile-checks
 dnl $1 = parameter 2 from AM_WITH_NLS
@@ -7148,7 +7169,9 @@ define([CF__INTL_BODY],[
 	bindtextdomain ("", "");
 	return (int) gettext ("")
 			ifelse([$1], need-ngettext, [ + (int) ngettext ("", "", 0)], [])
+#ifndef IGNORE_MSGFMT_HACK
 			[ + _nl_msg_cat_cntr]
+#endif
 ])
 dnl ---------------------------------------------------------------------------
 dnl CF__INTL_HEAD version: 1 updated: 2007/07/26 17:35:47
diff --git a/config.hin b/config.hin
index bc2123f..5927e80 100644
--- a/config.hin
+++ b/config.hin
@@ -1,5 +1,5 @@
 /*
- * $LynxId: config.hin,v 1.139 2016/04/16 00:47:08 tom Exp $
+ * $LynxId: config.hin,v 1.140 2017/07/06 00:47:43 tom Exp $
  * vile:cmode
  *
  * The configure script translates "config.hin" into "lynx_cfg.h"
@@ -7,6 +7,8 @@
 #ifndef LYNX_CFG_H
 #define LYNX_CFG_H 1
 
+#undef HOMEPAGE_URL
+
 #undef ALL_CHARSETS		/* AC_ARG_WITH(charsets) */
 #undef ALT_CHAR_SET		/* CF_ALT_CHAR_SET */
 #undef ARCHIVE_ONLY		/* CF_ARG_DISABLE(dired-archive) */
diff --git a/configure b/configure
index 53e0bc9..2797cbf 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in 2.8.9dev.15.
+# From configure.in 2.8.9dev.16.
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20170501.
 #
@@ -1274,7 +1274,7 @@ rm conftest.sed
 
 PACKAGE=lynx
 # $Format: "VERSION=$ProjectVersion$"$
-VERSION=2.8.9dev.15
+VERSION=2.8.9dev.16
 
 echo "$as_me:1279: checking for DESTDIR" >&5
 echo $ECHO_N "checking for DESTDIR... $ECHO_C" >&6
@@ -7890,12 +7890,13 @@ echo "${ECHO_T}$USE_NLS" >&6
   INTLLIBS=
 
     if test "$USE_NLS" = "yes"; then
+        POSUB=po
 
 cat >>confdefs.h <<\EOF
 #define ENABLE_NLS 1
 EOF
 
-    echo "$as_me:7898: checking whether included gettext is requested" >&5
+    echo "$as_me:7899: checking whether included gettext is requested" >&5
 echo $ECHO_N "checking whether included gettext is requested... $ECHO_C" >&6
 
 # Check whether --with-included-gettext or --without-included-gettext was given.
@@ -7905,13 +7906,232 @@ if test "${with_included_gettext+set}" = set; then
 else
   nls_cv_force_use_gnu_gettext=no
 fi;
-    echo "$as_me:7908: result: $nls_cv_force_use_gnu_gettext" >&5
+    echo "$as_me:7909: result: $nls_cv_force_use_gnu_gettext" >&5
 echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6
 
     nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
     if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
                         CATOBJEXT=NONE
 
+                                          cf_save_msgfmt_path="$MSGFMT"
+      cf_save_xgettext_path="$XGETTEXT"
+
+            # Extract the first word of "msgfmt", so it can be a program name with args.
+
+set dummy msgfmt; ac_word=$2
+echo "$as_me:7922: 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
+else
+  case "$MSGFMT" in
+  ([\\/]*|?:[\\/]*)
+  ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
+  ;;
+  (*)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word$ac_exeext; then
+      if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1; then
+	ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exeext"
+	break
+      fi
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"
+  ;;
+esac
+fi
+MSGFMT="$ac_cv_path_MSGFMT"
+if test "$MSGFMT" != ":"; then
+  echo "$as_me:7949: result: $MSGFMT" >&5
+echo "${ECHO_T}$MSGFMT" >&6
+else
+  echo "$as_me:7952: 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:7958: 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
+else
+  case $GMSGFMT in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
+  ;;
+  *)
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  if $as_executable_p "$ac_dir/$ac_word"; then
+   ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
+   echo "$as_me:7975: found $ac_dir/$ac_word" >&5
+   break
+fi
+done
+
+  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
+  ;;
+esac
+fi
+GMSGFMT=$ac_cv_path_GMSGFMT
+
+if test -n "$GMSGFMT"; then
+  echo "$as_me:7987: result: $GMSGFMT" >&5
+echo "${ECHO_T}$GMSGFMT" >&6
+else
+  echo "$as_me:7990: 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:7997: 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
+else
+  case "$XGETTEXT" in
+  ([\\/]*|?:[\\/]*)
+  ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
+  ;;
+  (*)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
+  for ac_dir in $PATH; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word$ac_exeext; then
+      if $ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1; then
+	ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exeext"
+	break
+      fi
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
+  ;;
+esac
+fi
+XGETTEXT="$ac_cv_path_XGETTEXT"
+if test "$XGETTEXT" != ":"; then
+  echo "$as_me:8024: result: $XGETTEXT" >&5
+echo "${ECHO_T}$XGETTEXT" >&6
+else
+  echo "$as_me:8027: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+      cf_save_OPTS_1="$CPPFLAGS"
+      if test "x$cf_save_msgfmt_path" = "x$MSGFMT" && \
+         test "x$cf_save_xgettext_path" = "x$XGETTEXT" ; then
+
+cf_fix_cppflags=no
+cf_new_cflags=
+cf_new_cppflags=
+cf_new_extra_cppflags=
+
+for cf_add_cflags in -DIGNORE_MSGFMT_HACK
+do
+case $cf_fix_cppflags in
+(no)
+	case $cf_add_cflags in
+	(-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C)
+		case $cf_add_cflags in
+		(-D*)
+			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+
+			test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
+				&& test -z "${cf_tst_cflags}" \
+				&& cf_fix_cppflags=yes
+
+			if test $cf_fix_cppflags = yes ; then
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
+				continue
+			elif test "${cf_tst_cflags}" = "\"'" ; then
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
+				continue
+			fi
+			;;
+		esac
+		case "$CPPFLAGS" in
+		(*$cf_add_cflags)
+			;;
+		(*)
+			case $cf_add_cflags in
+			(-D*)
+				cf_tst_cppflags=`echo "x$cf_add_cflags" | sed -e 's/^...//' -e 's/=.*//'`
+
+CPPFLAGS=`echo "$CPPFLAGS" | \
+	sed	-e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ 	]*\)\?[ 	]/ /g' \
+		-e 's/-[UD]'"$cf_tst_cppflags"'\(=[^ 	]*\)\?$//g'`
+
+				;;
+			esac
+
+	test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+	cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+
+			;;
+		esac
+		;;
+	(*)
+
+	test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+	cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+
+		;;
+	esac
+	;;
+(yes)
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
+	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
+
+	test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \
+		&& test -z "${cf_tst_cflags}" \
+		&& cf_fix_cppflags=no
+	;;
+esac
+done
+
+if test -n "$cf_new_cflags" ; then
+
+	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+	CFLAGS="${CFLAGS}$cf_new_cflags"
+
+fi
+
+if test -n "$cf_new_cppflags" ; then
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+
+fi
+
+if test -n "$cf_new_extra_cppflags" ; then
+
+	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+
+fi
+
+      fi
+
       cf_save_LIBS_1="$LIBS"
 
 cf_add_libs="$LIBICONV"
@@ -7930,23 +8150,17 @@ do
 done
 LIBS="$cf_add_libs"
 
-      echo "$as_me:7933: checking for libintl.h and gettext()" >&5
-echo $ECHO_N "checking for libintl.h and gettext()... $ECHO_C" >&6
-if test "${cf_cv_func_gettext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
 # If the linkage is not already in the $CPPFLAGS/$LDFLAGS configuration, these
 # will be set on completion of the AC_TRY_LINK below.
 cf_cv_header_path_intl=
 cf_cv_library_path_intl=
 
-echo "${as_me:-configure}:7944: testing Starting FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me:-configure}:8158: testing Starting FIND_LINKAGE(intl,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 7949 "configure"
+#line 8163 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -7959,23 +8173,25 @@ main (void)
 	bindtextdomain ("", "");
 	return (int) gettext ("")
 
+#ifndef IGNORE_MSGFMT_HACK
 			 + _nl_msg_cat_cntr
+#endif
 
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7969: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8185: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7972: \$? = $ac_status" >&5
+  echo "$as_me:8188: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7975: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8191: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7978: \$? = $ac_status" >&5
+  echo "$as_me:8194: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_intl=yes
@@ -7989,7 +8205,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lintl  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 7992 "configure"
+#line 8208 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -8002,23 +8218,25 @@ main (void)
 	bindtextdomain ("", "");
 	return (int) gettext ("")
 
+#ifndef IGNORE_MSGFMT_HACK
 			 + _nl_msg_cat_cntr
+#endif
 
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8012: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8230: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8015: \$? = $ac_status" >&5
+  echo "$as_me:8233: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8018: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8236: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8021: \$? = $ac_status" >&5
+  echo "$as_me:8239: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_intl=yes
@@ -8035,9 +8253,9 @@ cat conftest.$ac_ext >&5
 
 	test -n "$verbose" && echo "	find linkage for intl library" 1>&6
 
-echo "${as_me:-configure}:8038: testing find linkage for intl library ..." 1>&5
+echo "${as_me:-configure}:8256: testing find linkage for intl library ..." 1>&5
 
-echo "${as_me:-configure}:8040: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me:-configure}:8258: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -8128,11 +8346,11 @@ 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}:8131: testing ... testing $cf_cv_header_path_intl ..." 1>&5
+echo "${as_me:-configure}:8349: testing ... testing $cf_cv_header_path_intl ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_intl"
 			cat >conftest.$ac_ext <<_ACEOF
-#line 8135 "configure"
+#line 8353 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -8145,28 +8363,30 @@ main (void)
 	bindtextdomain ("", "");
 	return (int) gettext ("")
 
+#ifndef IGNORE_MSGFMT_HACK
 			 + _nl_msg_cat_cntr
+#endif
 
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8155: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8375: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8158: \$? = $ac_status" >&5
+  echo "$as_me:8378: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8161: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8381: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8164: \$? = $ac_status" >&5
+  echo "$as_me:8384: \$? = $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}:8169: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5
+echo "${as_me:-configure}:8389: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5
 
 				cf_cv_find_linkage_intl=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -8184,7 +8404,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	if test "$cf_cv_find_linkage_intl" = maybe ; then
 
-echo "${as_me:-configure}:8187: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me:-configure}:8407: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -8259,13 +8479,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}:8262: testing ... testing $cf_cv_library_path_intl ..." 1>&5
+echo "${as_me:-configure}:8482: 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 8268 "configure"
+#line 8488 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -8278,28 +8498,30 @@ main (void)
 	bindtextdomain ("", "");
 	return (int) gettext ("")
 
+#ifndef IGNORE_MSGFMT_HACK
 			 + _nl_msg_cat_cntr
+#endif
 
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8288: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8510: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8291: \$? = $ac_status" >&5
+  echo "$as_me:8513: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8294: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8516: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8297: \$? = $ac_status" >&5
+  echo "$as_me:8519: \$? = $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}:8302: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5
+echo "${as_me:-configure}:8524: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5
 
 					cf_cv_find_linkage_intl=yes
 					cf_cv_library_file_intl="-lintl"
@@ -8338,10 +8560,13 @@ else
 cf_cv_func_gettext=no
 fi
 
-fi
-echo "$as_me:8342: result: $cf_cv_func_gettext" >&5
+      echo "$as_me:8563: checking for libintl.h and gettext()" >&5
+echo $ECHO_N "checking for libintl.h and gettext()... $ECHO_C" >&6
+      echo "$as_me:8565: result: $cf_cv_func_gettext" >&5
 echo "${ECHO_T}$cf_cv_func_gettext" >&6
+
       LIBS="$cf_save_LIBS_1"
+      CPPFLAGS="$cf_save_OPTS_1"
 
       if test "$cf_cv_func_gettext" = yes ; then
 
@@ -8379,7 +8604,7 @@ if test -n "$cf_cv_header_path_intl" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 8382 "configure"
+#line 8607 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8391,16 +8616,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8394: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8619: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8397: \$? = $ac_status" >&5
+  echo "$as_me:8622: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8400: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8625: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8403: \$? = $ac_status" >&5
+  echo "$as_me:8628: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -8417,7 +8642,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}:8420: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:8645: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -8456,7 +8681,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}:8459: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:8684: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				INTLLIBS="-L$cf_add_libdir $INTLLIBS"
 			fi
@@ -8472,13 +8697,13 @@ fi
 for ac_func in dcgettext
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:8475: checking for $ac_func" >&5
+echo "$as_me:8700: 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 8481 "configure"
+#line 8706 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -8509,16 +8734,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8512: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8737: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8515: \$? = $ac_status" >&5
+  echo "$as_me:8740: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8518: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8743: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8521: \$? = $ac_status" >&5
+  echo "$as_me:8746: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -8528,7 +8753,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8531: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:8756: 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
@@ -8540,288 +8765,77 @@ done
 
           LIBS="$gt_save_LIBS"
 
-                    # Extract the first word of "msgfmt", so it can be a program name with args.
-
-set dummy msgfmt; ac_word=$2
-echo "$as_me:8546: 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
-else
-  case "$MSGFMT" in
-  ([\\/]*|?:[\\/]*)
-  ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
-  ;;
-  (*)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word$ac_exeext; then
-      if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1; then
-	ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exeext"
-	break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"
-  ;;
-esac
-fi
-MSGFMT="$ac_cv_path_MSGFMT"
-if test "$MSGFMT" != ":"; then
-  echo "$as_me:8573: result: $MSGFMT" >&5
-echo "${ECHO_T}$MSGFMT" >&6
-else
-  echo "$as_me:8576: 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:8582: 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
-else
-  case $GMSGFMT in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
-  ;;
-  *)
-  ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
-  IFS=$ac_save_IFS
-  test -z "$ac_dir" && ac_dir=.
-  if $as_executable_p "$ac_dir/$ac_word"; then
-   ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
-   echo "$as_me:8599: found $ac_dir/$ac_word" >&5
-   break
-fi
-done
-
-  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-  ;;
-esac
-fi
-GMSGFMT=$ac_cv_path_GMSGFMT
-
-if test -n "$GMSGFMT"; then
-  echo "$as_me:8611: result: $GMSGFMT" >&5
-echo "${ECHO_T}$GMSGFMT" >&6
-else
-  echo "$as_me:8614: 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:8621: 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
-else
-  case "$XGETTEXT" in
-  ([\\/]*|?:[\\/]*)
-  ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
-  ;;
-  (*)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word$ac_exeext; then
-      if $ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1; then
-	ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exeext"
-	break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
-  ;;
-esac
-fi
-XGETTEXT="$ac_cv_path_XGETTEXT"
-if test "$XGETTEXT" != ":"; then
-  echo "$as_me:8648: result: $XGETTEXT" >&5
-echo "${ECHO_T}$XGETTEXT" >&6
-else
-  echo "$as_me:8651: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
           CATOBJEXT=.gmo
         fi
+      elif test -z "$MSGFMT" || test -z "$XGETTEXT" ; then
+        { echo "$as_me:8771: WARNING: disabling NLS feature" >&5
+echo "$as_me: WARNING: disabling NLS feature" >&2;}
+        sed -e /ENABLE_NLS/d confdefs.h >confdefs.tmp
+        mv confdefs.tmp confdefs.h
+        ALL_LINGUAS=
+        CATOBJEXT=.ignored
+        MSGFMT=":"
+        GMSGFMT=":"
+        XGETTEXT=":"
+        POSUB=
+        BUILD_INCLUDED_LIBINTL=no
+        USE_INCLUDED_LIBINTL=no
+        USE_NLS=no
+        nls_cv_use_gnu_gettext=no
       fi
 
       if test "$CATOBJEXT" = "NONE"; then
-                        nls_cv_use_gnu_gettext=yes
+                        nls_cv_use_gnu_gettext=maybe
       fi
     fi
 
-    if test "$nls_cv_use_gnu_gettext" = "yes"; then
-      if test ! -d $srcdir/intl ; then
-        { { echo "$as_me:8666: error: no NLS library is packaged with this application" >&5
-echo "$as_me: error: no NLS library is packaged with this application" >&2;}
-   { (exit 1); exit 1; }; }
-      fi
-            INTLOBJS="\$(GETTOBJS)"
-      # Extract the first word of "msgfmt", so it can be a program name with args.
-
-set dummy msgfmt; ac_word=$2
-echo "$as_me:8674: 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
-else
-  case "$MSGFMT" in
-  ([\\/]*|?:[\\/]*)
-  ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
-  ;;
-  (*)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word$ac_exeext; then
-      if $ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1; then
-	ac_cv_path_MSGFMT="$ac_dir/$ac_word$ac_exeext"
-	break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"
-  ;;
-esac
-fi
-MSGFMT="$ac_cv_path_MSGFMT"
-if test "$MSGFMT" != ":"; then
-  echo "$as_me:8701: result: $MSGFMT" >&5
-echo "${ECHO_T}$MSGFMT" >&6
-else
-  echo "$as_me:8704: 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:8710: 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
-else
-  case $GMSGFMT in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
-  ;;
-  *)
-  ac_save_IFS=$IFS; IFS=$ac_path_separator
-ac_dummy="$PATH"
-for ac_dir in $ac_dummy; do
-  IFS=$ac_save_IFS
-  test -z "$ac_dir" && ac_dir=.
-  if $as_executable_p "$ac_dir/$ac_word"; then
-   ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
-   echo "$as_me:8727: found $ac_dir/$ac_word" >&5
-   break
-fi
-done
-
-  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-  ;;
-esac
-fi
-GMSGFMT=$ac_cv_path_GMSGFMT
-
-if test -n "$GMSGFMT"; then
-  echo "$as_me:8739: result: $GMSGFMT" >&5
-echo "${ECHO_T}$GMSGFMT" >&6
-else
-  echo "$as_me:8742: 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:8749: 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
-else
-  case "$XGETTEXT" in
-  ([\\/]*|?:[\\/]*)
-  ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
-  ;;
-  (*)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word$ac_exeext; then
-      if $ac_dir/$ac_word --omit-header /dev/null >/dev/null 2>&1; then
-	ac_cv_path_XGETTEXT="$ac_dir/$ac_word$ac_exeext"
-	break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
-  ;;
-esac
-fi
-XGETTEXT="$ac_cv_path_XGETTEXT"
-if test "$XGETTEXT" != ":"; then
-  echo "$as_me:8776: result: $XGETTEXT" >&5
-echo "${ECHO_T}$XGETTEXT" >&6
-else
-  echo "$as_me:8779: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-      BUILD_INCLUDED_LIBINTL=yes
-      USE_INCLUDED_LIBINTL=yes
+    if test "$nls_cv_use_gnu_gettext" != "no"; then
       CATOBJEXT=.gmo
-      INTLLIBS="\$(top_builddir)/intl/libintl.a $LIBICONV"
-      LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
+      if test -f $srcdir/intl/libintl.h ; then
+                INTLOBJS="\$(GETTOBJS)"
+        BUILD_INCLUDED_LIBINTL=yes
+        USE_INCLUDED_LIBINTL=yes
+        INTLLIBS="\$(top_builddir)/intl/libintl.a $LIBICONV"
+        LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
+      elif test "$nls_cv_use_gnu_gettext" = "yes"; then
+        nls_cv_use_gnu_gettext=no
+        { echo "$as_me:8802: WARNING: no NLS library is packaged with this application" >&5
+echo "$as_me: WARNING: no NLS library is packaged with this application" >&2;}
+      fi
     fi
 
-            if test "$GMSGFMT" != ":"; then
-                  if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then
+        if test "$GMSGFMT" != ":"; then
+      if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then
         : ;
       else
-        echo "$as_me:8794: result: found msgfmt program is not GNU msgfmt; ignore it" >&5
-echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6
-        GMSGFMT=":"
+        { echo "$as_me:8811: WARNING: found msgfmt program is not GNU msgfmt" >&5
+echo "$as_me: WARNING: found msgfmt program is not GNU msgfmt" >&2;}
       fi
     fi
 
-            if test "$XGETTEXT" != ":"; then
-                      if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then
+        if test "$XGETTEXT" != ":"; then
+      if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then
         : ;
       else
-        echo "$as_me:8804: result: found xgettext program is not GNU xgettext; ignore it" >&5
-echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6
-        XGETTEXT=":"
+        { echo "$as_me:8820: WARNING: found xgettext program is not GNU xgettext" >&5
+echo "$as_me: WARNING: found xgettext program is not GNU xgettext" >&2;}
       fi
     fi
-
-        POSUB=po
   fi
 
-  ac_config_commands="$ac_config_commands default-1"
+  if test "$XGETTEXT" != ":"; then
+    ac_config_commands="$ac_config_commands default-1"
 
-      if test "$PACKAGE" = gettext; then
-    BUILD_INCLUDED_LIBINTL=yes
-  fi
+            if test "$PACKAGE" = gettext; then
+      BUILD_INCLUDED_LIBINTL=yes
+    fi
 
-                      if test "$nls_cv_use_gnu_gettext" = "yes"; then
-    for ac_prog in bison
+                                            if test "$nls_cv_use_gnu_gettext" = "yes"; then
+      for ac_prog in bison
 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:8824: checking for $ac_word" >&5
+echo "$as_me:8838: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_INTLBISON+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8836,7 +8850,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_INTLBISON="$ac_prog"
-echo "$as_me:8839: found $ac_dir/$ac_word" >&5
+echo "$as_me:8853: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -8844,40 +8858,41 @@ fi
 fi
 INTLBISON=$ac_cv_prog_INTLBISON
 if test -n "$INTLBISON"; then
-  echo "$as_me:8847: result: $INTLBISON" >&5
+  echo "$as_me:8861: result: $INTLBISON" >&5
 echo "${ECHO_T}$INTLBISON" >&6
 else
-  echo "$as_me:8850: result: no" >&5
+  echo "$as_me:8864: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
   test -n "$INTLBISON" && break
 done
 
-    if test -z "$INTLBISON"; then
-      ac_verc_fail=yes
-    else
-            echo "$as_me:8860: checking version of bison" >&5
+      if test -z "$INTLBISON"; then
+        ac_verc_fail=yes
+      else
+                echo "$as_me:8874: checking version of bison" >&5
 echo $ECHO_N "checking version of bison... $ECHO_C" >&6
-      ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
-      case $ac_prog_version in
-        ('') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
-        (1.2[6-9]*|1.[3-9][0-9]*|[2-9].*)
-           ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
-        (*) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
-      esac
-    echo "$as_me:8869: result: $ac_prog_version" >&5
+        ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
+        case $ac_prog_version in
+          ('') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
+          (1.2[6-9]*|1.[3-9][0-9]*|[2-9].*)
+             ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
+          (*) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
+        esac
+      echo "$as_me:8883: result: $ac_prog_version" >&5
 echo "${ECHO_T}$ac_prog_version" >&6
+      fi
+      if test $ac_verc_fail = yes; then
+        INTLBISON=:
+      fi
     fi
-    if test $ac_verc_fail = yes; then
-      INTLBISON=:
-    fi
-  fi
 
-        for lang in $ALL_LINGUAS; do
-    GMOFILES="$GMOFILES $lang.gmo"
-    POFILES="$POFILES $lang.po"
-  done
+                for lang in $ALL_LINGUAS; do
+      GMOFILES="$GMOFILES $lang.gmo"
+      POFILES="$POFILES $lang.po"
+    done
+  fi
 
     nls_cv_header_intl=
   nls_cv_header_libgt=
@@ -8892,7 +8907,7 @@ echo "${ECHO_T}$ac_prog_version" >&6
      if test "x$ALL_LINGUAS" = "x"; then
        LINGUAS=
      else
-       echo "$as_me:8895: checking for catalogs to be installed" >&5
+       echo "$as_me:8910: 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
@@ -8912,7 +8927,7 @@ echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
          fi
        done
        LINGUAS=$NEW_LINGUAS
-       echo "$as_me:8915: result: $LINGUAS" >&5
+       echo "$as_me:8930: result: $LINGUAS" >&5
 echo "${ECHO_T}$LINGUAS" >&6
      fi
 
@@ -8948,7 +8963,7 @@ cf_makefile=makefile
 use_our_messages=no
 if test "$USE_NLS" = yes ; then
 if test -d $srcdir/po ; then
-echo "$as_me:8951: checking if we should use included message-library" >&5
+echo "$as_me:8966: 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.
@@ -8959,7 +8974,7 @@ else
   use_our_messages=yes
 fi;
 fi
-echo "$as_me:8962: result: $use_our_messages" >&5
+echo "$as_me:8977: result: $use_our_messages" >&5
 echo "${ECHO_T}$use_our_messages" >&6
 fi
 
@@ -9001,23 +9016,23 @@ else
 for ac_header in libintl.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:9004: checking for $ac_header" >&5
+echo "$as_me:9019: 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 9010 "configure"
+#line 9025 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:9014: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:9029: \"$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:9020: \$? = $ac_status" >&5
+  echo "$as_me:9035: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -9036,7 +9051,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:9039: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:9054: 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
@@ -9122,7 +9137,7 @@ case ".$withval" in
 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:9125: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:9140: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -9131,7 +9146,7 @@ esac
 fi
 eval NLS_DATADIR="$withval"
 
-echo "$as_me:9134: checking if you want full utility pathnames" >&5
+echo "$as_me:9149: 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.
@@ -9148,14 +9163,14 @@ else
 	with_full_paths=yes
 
 fi;
-echo "$as_me:9151: result: $with_full_paths" >&5
+echo "$as_me:9166: 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:9158: checking for system mailer" >&5
+echo "$as_me:9173: 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
@@ -9175,14 +9190,14 @@ else
 
 fi
 
-echo "$as_me:9178: result: $cf_cv_SYSTEM_MAIL" >&5
+echo "$as_me:9193: 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:9185: checking system mail flags" >&5
+echo "$as_me:9200: 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
@@ -9198,7 +9213,7 @@ else
 
 fi
 
-echo "$as_me:9201: result: $cf_cv_system_mail_flags" >&5
+echo "$as_me:9216: result: $cf_cv_system_mail_flags" >&5
 echo "${ECHO_T}$cf_cv_system_mail_flags" >&6
 
 cat >>confdefs.h <<EOF
@@ -9249,14 +9264,14 @@ case $host_os in
 	;;
 (linux*|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin)
 
-echo "$as_me:9252: checking if we must define _GNU_SOURCE" >&5
+echo "$as_me:9267: 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 9259 "configure"
+#line 9274 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -9271,16 +9286,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9274: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9289: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9277: \$? = $ac_status" >&5
+  echo "$as_me:9292: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9280: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9295: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9283: \$? = $ac_status" >&5
+  echo "$as_me:9298: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_gnu_source=no
 else
@@ -9289,7 +9304,7 @@ cat conftest.$ac_ext >&5
 cf_save="$CPPFLAGS"
 	 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 9292 "configure"
+#line 9307 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -9304,16 +9319,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9307: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9322: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9310: \$? = $ac_status" >&5
+  echo "$as_me:9325: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9313: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9328: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9316: \$? = $ac_status" >&5
+  echo "$as_me:9331: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_gnu_source=no
 else
@@ -9328,12 +9343,12 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:9331: result: $cf_cv_gnu_source" >&5
+echo "$as_me:9346: 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:9336: checking if we should also define _DEFAULT_SOURCE" >&5
+echo "$as_me:9351: 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
@@ -9341,7 +9356,7 @@ else
 
 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 9344 "configure"
+#line 9359 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -9356,16 +9371,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9359: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9374: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9362: \$? = $ac_status" >&5
+  echo "$as_me:9377: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9365: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9380: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9368: \$? = $ac_status" >&5
+  echo "$as_me:9383: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_default_source=no
 else
@@ -9376,7 +9391,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:9379: result: $cf_cv_default_source" >&5
+echo "$as_me:9394: result: $cf_cv_default_source" >&5
 echo "${ECHO_T}$cf_cv_default_source" >&6
 test "$cf_cv_default_source" = yes && CPPFLAGS="$CPPFLAGS -D_DEFAULT_SOURCE"
 fi
@@ -9402,16 +9417,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:9405: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:9420: 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}:9411: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:9426: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 9414 "configure"
+#line 9429 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -9426,16 +9441,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9429: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9444: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9432: \$? = $ac_status" >&5
+  echo "$as_me:9447: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9435: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9450: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9438: \$? = $ac_status" >&5
+  echo "$as_me:9453: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -9456,7 +9471,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >conftest.$ac_ext <<_ACEOF
-#line 9459 "configure"
+#line 9474 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -9471,16 +9486,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9474: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9489: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9477: \$? = $ac_status" >&5
+  echo "$as_me:9492: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9480: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9495: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9483: \$? = $ac_status" >&5
+  echo "$as_me:9498: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9491,15 +9506,15 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 	 fi
 
-echo "${as_me:-configure}:9494: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:9509: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:9499: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:9514: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 9502 "configure"
+#line 9517 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -9514,16 +9529,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9517: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9532: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9520: \$? = $ac_status" >&5
+  echo "$as_me:9535: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9523: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9538: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9526: \$? = $ac_status" >&5
+  echo "$as_me:9541: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9539,7 +9554,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:9542: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:9557: 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
@@ -9677,14 +9692,14 @@ fi
 	;;
 (*)
 
-echo "$as_me:9680: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:9695: 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 9687 "configure"
+#line 9702 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -9703,16 +9718,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9706: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9721: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9709: \$? = $ac_status" >&5
+  echo "$as_me:9724: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9712: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9727: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9715: \$? = $ac_status" >&5
+  echo "$as_me:9730: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
@@ -9721,7 +9736,7 @@ cat conftest.$ac_ext >&5
 cf_save="$CPPFLAGS"
 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 9724 "configure"
+#line 9739 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -9740,16 +9755,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9743: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9758: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9746: \$? = $ac_status" >&5
+  echo "$as_me:9761: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9749: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9764: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9752: \$? = $ac_status" >&5
+  echo "$as_me:9767: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
@@ -9764,7 +9779,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:9767: result: $cf_cv_xopen_source" >&5
+echo "$as_me:9782: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -9892,16 +9907,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:9895: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:9910: 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}:9901: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:9916: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 9904 "configure"
+#line 9919 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -9916,16 +9931,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9919: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9934: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9922: \$? = $ac_status" >&5
+  echo "$as_me:9937: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9925: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9940: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9928: \$? = $ac_status" >&5
+  echo "$as_me:9943: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -9946,7 +9961,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >conftest.$ac_ext <<_ACEOF
-#line 9949 "configure"
+#line 9964 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -9961,16 +9976,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9964: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9979: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9967: \$? = $ac_status" >&5
+  echo "$as_me:9982: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9970: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9985: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9973: \$? = $ac_status" >&5
+  echo "$as_me:9988: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9981,15 +9996,15 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 	 fi
 
-echo "${as_me:-configure}:9984: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:9999: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
 
-echo "${as_me:-configure}:9989: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:10004: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 9992 "configure"
+#line 10007 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -10004,16 +10019,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10007: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10022: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10010: \$? = $ac_status" >&5
+  echo "$as_me:10025: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10013: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10028: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10016: \$? = $ac_status" >&5
+  echo "$as_me:10031: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -10029,7 +10044,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:10032: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:10047: 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
@@ -10221,7 +10236,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}:10224: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:10239: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -10231,7 +10246,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}:10234: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:10249: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -10241,7 +10256,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}:10244: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:10259: 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"
@@ -10251,10 +10266,10 @@ fi
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-	echo "$as_me:10254: checking if _XOPEN_SOURCE really is set" >&5
+	echo "$as_me:10269: 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 10257 "configure"
+#line 10272 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -10269,16 +10284,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10272: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10287: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10275: \$? = $ac_status" >&5
+  echo "$as_me:10290: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10278: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10293: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10281: \$? = $ac_status" >&5
+  echo "$as_me:10296: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else
@@ -10287,12 +10302,12 @@ cat conftest.$ac_ext >&5
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-	echo "$as_me:10290: result: $cf_XOPEN_SOURCE_set" >&5
+	echo "$as_me:10305: 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 10295 "configure"
+#line 10310 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -10307,16 +10322,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10310: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10325: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10313: \$? = $ac_status" >&5
+  echo "$as_me:10328: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10316: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10331: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10319: \$? = $ac_status" >&5
+  echo "$as_me:10334: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_XOPEN_SOURCE_set_ok=yes
 else
@@ -10327,19 +10342,19 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 		if test $cf_XOPEN_SOURCE_set_ok = no
 		then
-			{ echo "$as_me:10330: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+			{ echo "$as_me:10345: WARNING: _XOPEN_SOURCE is lower than requested" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
 		fi
 	else
 
-echo "$as_me:10335: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:10350: 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 10342 "configure"
+#line 10357 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -10358,16 +10373,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10361: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10376: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10364: \$? = $ac_status" >&5
+  echo "$as_me:10379: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10367: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10382: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10370: \$? = $ac_status" >&5
+  echo "$as_me:10385: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
@@ -10376,7 +10391,7 @@ cat conftest.$ac_ext >&5
 cf_save="$CPPFLAGS"
 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 10379 "configure"
+#line 10394 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -10395,16 +10410,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10398: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10413: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10401: \$? = $ac_status" >&5
+  echo "$as_me:10416: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10404: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10419: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10407: \$? = $ac_status" >&5
+  echo "$as_me:10422: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
@@ -10419,7 +10434,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:10422: result: $cf_cv_xopen_source" >&5
+echo "$as_me:10437: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -10537,14 +10552,14 @@ fi
 	fi
 fi
 
-echo "$as_me:10540: checking if SIGWINCH is defined" >&5
+echo "$as_me:10555: 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 10547 "configure"
+#line 10562 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -10559,23 +10574,23 @@ int x = SIGWINCH
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10562: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10577: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10565: \$? = $ac_status" >&5
+  echo "$as_me:10580: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10568: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10583: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10571: \$? = $ac_status" >&5
+  echo "$as_me:10586: \$? = $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 10578 "configure"
+#line 10593 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -10593,16 +10608,16 @@ int x = SIGWINCH
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10596: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10611: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10599: \$? = $ac_status" >&5
+  echo "$as_me:10614: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10602: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10617: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10605: \$? = $ac_status" >&5
+  echo "$as_me:10620: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_define_sigwinch=maybe
 else
@@ -10616,11 +10631,11 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:10619: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:10634: 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:10623: checking for actual SIGWINCH definition" >&5
+echo "$as_me:10638: 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
@@ -10631,7 +10646,7 @@ cf_sigwinch=32
 while test $cf_sigwinch != 1
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 10634 "configure"
+#line 10649 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -10653,16 +10668,16 @@ int x = SIGWINCH
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10656: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10671: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10659: \$? = $ac_status" >&5
+  echo "$as_me:10674: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10662: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10677: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10665: \$? = $ac_status" >&5
+  echo "$as_me:10680: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fixup_sigwinch=$cf_sigwinch
 	 break
@@ -10676,7 +10691,7 @@ cf_sigwinch=`expr $cf_sigwinch - 1`
 done
 
 fi
-echo "$as_me:10679: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:10694: result: $cf_cv_fixup_sigwinch" >&5
 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
 
 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
@@ -10688,7 +10703,7 @@ if test -n "$TRY_CFLAGS" ; then
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:10691: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:10706: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -10773,7 +10788,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}:10776: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:10791: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -10783,7 +10798,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}:10786: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:10801: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -10793,7 +10808,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}:10796: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:10811: 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"
@@ -10802,7 +10817,7 @@ fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 10805 "configure"
+#line 10820 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10814,16 +10829,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10817: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10832: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10820: \$? = $ac_status" >&5
+  echo "$as_me:10835: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10823: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10838: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10826: \$? = $ac_status" >&5
+  echo "$as_me:10841: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -10831,12 +10846,12 @@ else
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:10834: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:10849: 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}:10839: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:10854: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_flags"
@@ -10848,7 +10863,7 @@ fi
 
 ### Look for network libraries first, since some functions (such as gethostname)
 ### are used in a lot of places.
-echo "$as_me:10851: checking if you want NSS compatible SSL libraries" >&5
+echo "$as_me:10866: 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
@@ -10863,10 +10878,10 @@ else
 fi;
 
 fi
-echo "$as_me:10866: result: $cf_cv_use_libnss_compat" >&5
+echo "$as_me:10881: result: $cf_cv_use_libnss_compat" >&5
 echo "${ECHO_T}$cf_cv_use_libnss_compat" >&6
 
-echo "$as_me:10869: checking if you want ssl library" >&5
+echo "$as_me:10884: 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
@@ -10881,10 +10896,10 @@ else
 fi;
 
 fi
-echo "$as_me:10884: result: $cf_cv_use_libssl" >&5
+echo "$as_me:10899: result: $cf_cv_use_libssl" >&5
 echo "${ECHO_T}$cf_cv_use_libssl" >&6
 
-echo "$as_me:10887: checking if you want gnutls support" >&5
+echo "$as_me:10902: 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
@@ -10899,11 +10914,11 @@ else
 fi;
 
 fi
-echo "$as_me:10902: result: $cf_cv_use_libgnutls" >&5
+echo "$as_me:10917: 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:10906: checking if you want gnutls-openssl compat" >&5
+echo "$as_me:10921: 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
@@ -10918,10 +10933,10 @@ else
 fi;
 
 fi
-echo "$as_me:10921: result: $cf_cv_gnutls_compat" >&5
+echo "$as_me:10936: result: $cf_cv_gnutls_compat" >&5
 echo "${ECHO_T}$cf_cv_gnutls_compat" >&6
 
-echo "$as_me:10924: checking if you want socks library" >&5
+echo "$as_me:10939: 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
@@ -10936,10 +10951,10 @@ else
 fi;
 
 fi
-echo "$as_me:10939: result: $cf_cv_use_libsocks" >&5
+echo "$as_me:10954: result: $cf_cv_use_libsocks" >&5
 echo "${ECHO_T}$cf_cv_use_libsocks" >&6
 
-echo "$as_me:10942: checking if you want socks5 library" >&5
+echo "$as_me:10957: 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
@@ -10954,7 +10969,7 @@ else
 fi;
 
 fi
-echo "$as_me:10957: result: $cf_cv_use_libsocks5" >&5
+echo "$as_me:10972: result: $cf_cv_use_libsocks5" >&5
 echo "${ECHO_T}$cf_cv_use_libsocks5" >&6
 
 if test "x$cf_cv_use_libsocks" != xno ; then
@@ -10993,7 +11008,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 10996 "configure"
+#line 11011 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11005,16 +11020,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11008: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11023: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11011: \$? = $ac_status" >&5
+  echo "$as_me:11026: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11014: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11029: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11017: \$? = $ac_status" >&5
+  echo "$as_me:11032: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -11031,7 +11046,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}:11034: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11049: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -11074,7 +11089,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 11077 "configure"
+#line 11092 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11086,16 +11101,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11089: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11104: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11092: \$? = $ac_status" >&5
+  echo "$as_me:11107: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11095: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11110: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11098: \$? = $ac_status" >&5
+  echo "$as_me:11113: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -11112,7 +11127,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}:11115: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11130: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -11130,7 +11145,7 @@ echo "${as_me:-configure}:11115: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:11133: error: cannot find socks library under $cf_cv_use_libsocks" >&5
+{ { echo "$as_me:11148: 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
@@ -11155,7 +11170,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}:11158: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:11173: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -11184,7 +11199,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}:11187: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:11202: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -11193,7 +11208,7 @@ echo "${as_me:-configure}:11187: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:11196: error: cannot find socks library under $cf_cv_use_libsocks" >&5
+{ { echo "$as_me:11211: 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
@@ -11207,12 +11222,12 @@ esac
 cf_cv_header_path_socks=
 cf_cv_library_path_socks=
 
-echo "${as_me:-configure}:11210: testing Starting FIND_LINKAGE(socks,) ..." 1>&5
+echo "${as_me:-configure}:11225: testing Starting FIND_LINKAGE(socks,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 11215 "configure"
+#line 11230 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -11228,16 +11243,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11231: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11246: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11234: \$? = $ac_status" >&5
+  echo "$as_me:11249: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11237: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11252: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11240: \$? = $ac_status" >&5
+  echo "$as_me:11255: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_socks=yes
@@ -11251,7 +11266,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lsocks  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 11254 "configure"
+#line 11269 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -11267,16 +11282,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11270: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11285: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11273: \$? = $ac_status" >&5
+  echo "$as_me:11288: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11276: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11291: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11279: \$? = $ac_status" >&5
+  echo "$as_me:11294: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_socks=yes
@@ -11293,9 +11308,9 @@ cat conftest.$ac_ext >&5
 
 	test -n "$verbose" && echo "	find linkage for socks library" 1>&6
 
-echo "${as_me:-configure}:11296: testing find linkage for socks library ..." 1>&5
+echo "${as_me:-configure}:11311: testing find linkage for socks library ..." 1>&5
 
-echo "${as_me:-configure}:11298: testing Searching for headers in FIND_LINKAGE(socks,) ..." 1>&5
+echo "${as_me:-configure}:11313: testing Searching for headers in FIND_LINKAGE(socks,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -11386,11 +11401,11 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d $cf_cv_header_path_socks ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_socks" 1>&6
 
-echo "${as_me:-configure}:11389: testing ... testing $cf_cv_header_path_socks ..." 1>&5
+echo "${as_me:-configure}:11404: testing ... testing $cf_cv_header_path_socks ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_socks"
 			cat >conftest.$ac_ext <<_ACEOF
-#line 11393 "configure"
+#line 11408 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -11406,21 +11421,21 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11409: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11424: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11412: \$? = $ac_status" >&5
+  echo "$as_me:11427: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11415: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11430: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11418: \$? = $ac_status" >&5
+  echo "$as_me:11433: \$? = $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}:11423: testing ... found socks headers in $cf_cv_header_path_socks ..." 1>&5
+echo "${as_me:-configure}:11438: testing ... found socks headers in $cf_cv_header_path_socks ..." 1>&5
 
 				cf_cv_find_linkage_socks=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -11438,7 +11453,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	if test "$cf_cv_find_linkage_socks" = maybe ; then
 
-echo "${as_me:-configure}:11441: testing Searching for socks library in FIND_LINKAGE(socks,) ..." 1>&5
+echo "${as_me:-configure}:11456: testing Searching for socks library in FIND_LINKAGE(socks,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -11513,13 +11528,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}:11516: testing ... testing $cf_cv_library_path_socks ..." 1>&5
+echo "${as_me:-configure}:11531: 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 11522 "configure"
+#line 11537 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -11535,21 +11550,21 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11538: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11553: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11541: \$? = $ac_status" >&5
+  echo "$as_me:11556: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11544: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11559: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11547: \$? = $ac_status" >&5
+  echo "$as_me:11562: \$? = $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}:11552: testing ... found socks library in $cf_cv_library_path_socks ..." 1>&5
+echo "${as_me:-configure}:11567: testing ... found socks library in $cf_cv_library_path_socks ..." 1>&5
 
 					cf_cv_find_linkage_socks=yes
 					cf_cv_library_file_socks="-lsocks"
@@ -11608,7 +11623,7 @@ if test -n "$cf_cv_header_path_socks" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 11611 "configure"
+#line 11626 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11620,16 +11635,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11623: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11638: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11626: \$? = $ac_status" >&5
+  echo "$as_me:11641: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11629: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11644: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11632: \$? = $ac_status" >&5
+  echo "$as_me:11647: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -11646,7 +11661,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}:11649: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11664: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -11682,7 +11697,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}:11685: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:11700: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -11707,7 +11722,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:11710: WARNING: Cannot find socks library" >&5
+{ echo "$as_me:11725: WARNING: Cannot find socks library" >&5
 echo "$as_me: WARNING: Cannot find socks library" >&2;}
 fi
 
@@ -11750,7 +11765,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
   else
-    { { echo "$as_me:11753: error: cannot link with socks library" >&5
+    { { echo "$as_me:11768: error: cannot link with socks library" >&5
 echo "$as_me: error: cannot link with socks library" >&2;}
    { (exit 1); exit 1; }; }
   fi
@@ -11791,7 +11806,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 11794 "configure"
+#line 11809 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11803,16 +11818,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11806: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11821: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11809: \$? = $ac_status" >&5
+  echo "$as_me:11824: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11812: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11827: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11815: \$? = $ac_status" >&5
+  echo "$as_me:11830: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -11829,7 +11844,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}:11832: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11847: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -11872,7 +11887,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 11875 "configure"
+#line 11890 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11884,16 +11899,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11887: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11902: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11890: \$? = $ac_status" >&5
+  echo "$as_me:11905: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11893: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11908: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11896: \$? = $ac_status" >&5
+  echo "$as_me:11911: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -11910,7 +11925,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}:11913: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11928: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -11928,7 +11943,7 @@ echo "${as_me:-configure}:11913: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:11931: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5
+{ { echo "$as_me:11946: 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
@@ -11953,7 +11968,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}:11956: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:11971: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -11982,7 +11997,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}:11985: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:12000: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -11991,7 +12006,7 @@ echo "${as_me:-configure}:11985: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:11994: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5
+{ { echo "$as_me:12009: 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
@@ -12024,11 +12039,11 @@ cat >>confdefs.h <<\EOF
 #define SOCKS 1
 EOF
 
-echo "$as_me:12027: checking if the socks library uses socks4 prefix" >&5
+echo "$as_me:12042: 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 12031 "configure"
+#line 12046 "configure"
 #include "confdefs.h"
 
 #include <socks.h>
@@ -12042,16 +12057,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12045: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12060: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12048: \$? = $ac_status" >&5
+  echo "$as_me:12063: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12051: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12066: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12054: \$? = $ac_status" >&5
+  echo "$as_me:12069: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >>confdefs.h <<\EOF
@@ -12063,7 +12078,7 @@ else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 12066 "configure"
+#line 12081 "configure"
 #include "confdefs.h"
 #include <socks.h>
 int
@@ -12075,29 +12090,29 @@ SOCKSinit((char *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12078: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12093: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12081: \$? = $ac_status" >&5
+  echo "$as_me:12096: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12084: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12099: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12087: \$? = $ac_status" >&5
+  echo "$as_me:12102: \$? = $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:12093: error: Cannot link with socks5 library" >&5
+{ { echo "$as_me:12108: 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:12100: result: $cf_use_socks4" >&5
+echo "$as_me:12115: result: $cf_use_socks4" >&5
 echo "${ECHO_T}$cf_use_socks4" >&6
 
 if test "$cf_use_socks4" = "yes" ; then
@@ -12152,10 +12167,10 @@ EOF
 
 fi
 
-echo "$as_me:12155: checking if socks5p.h is available" >&5
+echo "$as_me:12170: 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 12158 "configure"
+#line 12173 "configure"
 #include "confdefs.h"
 
 #define INCLUDE_PROTOTYPES
@@ -12170,16 +12185,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12173: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12188: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12176: \$? = $ac_status" >&5
+  echo "$as_me:12191: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12179: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12194: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12182: \$? = $ac_status" >&5
+  echo "$as_me:12197: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_use_socks5p_h=yes
 else
@@ -12188,7 +12203,7 @@ cat conftest.$ac_ext >&5
 cf_use_socks5p_h=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:12191: result: $cf_use_socks5p_h" >&5
+echo "$as_me:12206: result: $cf_use_socks5p_h" >&5
 echo "${ECHO_T}$cf_use_socks5p_h" >&6
 
 test "$cf_use_socks5p_h" = yes &&
@@ -12200,14 +12215,14 @@ else
 
 cf_test_netlibs=no
 
-echo "$as_me:12203: checking for network libraries" >&5
+echo "$as_me:12218: 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:12210: result: working..." >&5
+echo "$as_me:12225: result: working..." >&5
 echo "${ECHO_T}working..." >&6
 
 cf_cv_netlibs=""
@@ -12219,23 +12234,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:12222: checking for $ac_header" >&5
+echo "$as_me:12237: 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 12228 "configure"
+#line 12243 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:12232: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:12247: \"$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:12238: \$? = $ac_status" >&5
+  echo "$as_me:12253: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -12254,7 +12269,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:12257: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:12272: 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
@@ -12289,7 +12304,7 @@ done
 LIBS="$cf_add_libs"
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 12292 "configure"
+#line 12307 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_WINDOWS_H
@@ -12316,22 +12331,22 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12319: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12334: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12322: \$? = $ac_status" >&5
+  echo "$as_me:12337: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12325: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12340: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12328: \$? = $ac_status" >&5
+  echo "$as_me:12343: \$? = $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:12334: error: Cannot link against winsock library" >&5
+{ { echo "$as_me:12349: error: Cannot link against winsock library" >&5
 echo "$as_me: error: Cannot link against winsock library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -12344,13 +12359,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:12347: checking for $ac_func" >&5
+echo "$as_me:12362: 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 12353 "configure"
+#line 12368 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -12381,16 +12396,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12384: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12399: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12387: \$? = $ac_status" >&5
+  echo "$as_me:12402: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12390: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12405: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12393: \$? = $ac_status" >&5
+  echo "$as_me:12408: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -12400,7 +12415,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12403: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:12418: 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
@@ -12409,7 +12424,7 @@ EOF
 
 else
 
-echo "$as_me:12412: checking for gethostname in -lnsl" >&5
+echo "$as_me:12427: 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
@@ -12417,7 +12432,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12420 "configure"
+#line 12435 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12436,16 +12451,16 @@ gethostname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12439: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12454: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12442: \$? = $ac_status" >&5
+  echo "$as_me:12457: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12445: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12460: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12448: \$? = $ac_status" >&5
+  echo "$as_me:12463: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostname=yes
 else
@@ -12456,7 +12471,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12459: result: $ac_cv_lib_nsl_gethostname" >&5
+echo "$as_me:12474: 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
 
@@ -12473,7 +12488,7 @@ else
 	ac_cv_func_gethostname=unknown
 	unset ac_cv_func_gethostname 2>/dev/null
 
-echo "$as_me:12476: checking for gethostname in -lsocket" >&5
+echo "$as_me:12491: 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
@@ -12481,7 +12496,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12484 "configure"
+#line 12499 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12500,16 +12515,16 @@ gethostname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12503: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12518: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12506: \$? = $ac_status" >&5
+  echo "$as_me:12521: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12509: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12524: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12512: \$? = $ac_status" >&5
+  echo "$as_me:12527: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_gethostname=yes
 else
@@ -12520,7 +12535,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12523: result: $ac_cv_lib_socket_gethostname" >&5
+echo "$as_me:12538: 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
 
@@ -12544,7 +12559,7 @@ fi
 fi
 done
 
-	echo "$as_me:12547: checking for main in -linet" >&5
+	echo "$as_me:12562: 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
@@ -12552,7 +12567,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-linet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12555 "configure"
+#line 12570 "configure"
 #include "confdefs.h"
 
 int
@@ -12564,16 +12579,16 @@ main ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12567: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12582: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12570: \$? = $ac_status" >&5
+  echo "$as_me:12585: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12573: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12588: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12576: \$? = $ac_status" >&5
+  echo "$as_me:12591: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_inet_main=yes
 else
@@ -12584,7 +12599,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12587: result: $ac_cv_lib_inet_main" >&5
+echo "$as_me:12602: 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"
@@ -12595,13 +12610,13 @@ fi
 for ac_func in socket
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:12598: checking for $ac_func" >&5
+echo "$as_me:12613: 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 12604 "configure"
+#line 12619 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -12632,16 +12647,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12635: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12650: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12638: \$? = $ac_status" >&5
+  echo "$as_me:12653: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12641: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12656: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12644: \$? = $ac_status" >&5
+  echo "$as_me:12659: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -12651,7 +12666,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12654: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:12669: 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
@@ -12660,7 +12675,7 @@ EOF
 
 else
 
-echo "$as_me:12663: checking for socket in -lsocket" >&5
+echo "$as_me:12678: 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
@@ -12668,7 +12683,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12671 "configure"
+#line 12686 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12687,16 +12702,16 @@ socket ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12690: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12705: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12693: \$? = $ac_status" >&5
+  echo "$as_me:12708: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12696: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12711: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12699: \$? = $ac_status" >&5
+  echo "$as_me:12714: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_socket=yes
 else
@@ -12707,7 +12722,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12710: result: $ac_cv_lib_socket_socket" >&5
+echo "$as_me:12725: 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
 
@@ -12724,7 +12739,7 @@ else
 	ac_cv_func_socket=unknown
 	unset ac_cv_func_socket 2>/dev/null
 
-echo "$as_me:12727: checking for socket in -lbsd" >&5
+echo "$as_me:12742: 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
@@ -12732,7 +12747,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12735 "configure"
+#line 12750 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12751,16 +12766,16 @@ socket ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12754: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12769: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12757: \$? = $ac_status" >&5
+  echo "$as_me:12772: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12760: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12775: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12763: \$? = $ac_status" >&5
+  echo "$as_me:12778: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_bsd_socket=yes
 else
@@ -12771,7 +12786,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12774: result: $ac_cv_lib_bsd_socket" >&5
+echo "$as_me:12789: 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
 
@@ -12800,13 +12815,13 @@ done
 for ac_func in gethostbyname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:12803: checking for $ac_func" >&5
+echo "$as_me:12818: 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 12809 "configure"
+#line 12824 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -12837,16 +12852,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12840: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12855: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12843: \$? = $ac_status" >&5
+  echo "$as_me:12858: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12846: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12861: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12849: \$? = $ac_status" >&5
+  echo "$as_me:12864: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -12856,7 +12871,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12859: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:12874: 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
@@ -12865,7 +12880,7 @@ EOF
 
 else
 
-echo "$as_me:12868: checking for gethostbyname in -lnsl" >&5
+echo "$as_me:12883: 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
@@ -12873,7 +12888,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12876 "configure"
+#line 12891 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12892,16 +12907,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12895: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12910: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12898: \$? = $ac_status" >&5
+  echo "$as_me:12913: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12901: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12916: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12904: \$? = $ac_status" >&5
+  echo "$as_me:12919: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -12912,7 +12927,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12915: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:12930: 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
 
@@ -12937,13 +12952,13 @@ done
 for ac_func in inet_ntoa
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:12940: checking for $ac_func" >&5
+echo "$as_me:12955: 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 12946 "configure"
+#line 12961 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -12974,16 +12989,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12977: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12992: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12980: \$? = $ac_status" >&5
+  echo "$as_me:12995: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12983: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12998: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12986: \$? = $ac_status" >&5
+  echo "$as_me:13001: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -12993,7 +13008,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12996: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:13011: 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
@@ -13002,7 +13017,7 @@ EOF
 
 else
 
-echo "$as_me:13005: checking for inet_ntoa in -lnsl" >&5
+echo "$as_me:13020: 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
@@ -13010,7 +13025,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 13013 "configure"
+#line 13028 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13029,16 +13044,16 @@ inet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13032: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13047: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13035: \$? = $ac_status" >&5
+  echo "$as_me:13050: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13038: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13053: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13041: \$? = $ac_status" >&5
+  echo "$as_me:13056: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_inet_ntoa=yes
 else
@@ -13049,7 +13064,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13052: result: $ac_cv_lib_nsl_inet_ntoa" >&5
+echo "$as_me:13067: 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
 
@@ -13074,13 +13089,13 @@ done
 for ac_func in gethostbyname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:13077: checking for $ac_func" >&5
+echo "$as_me:13092: 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 13083 "configure"
+#line 13098 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -13111,16 +13126,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13114: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13129: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13117: \$? = $ac_status" >&5
+  echo "$as_me:13132: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13120: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13135: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13123: \$? = $ac_status" >&5
+  echo "$as_me:13138: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -13130,7 +13145,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:13133: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:13148: 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
@@ -13139,7 +13154,7 @@ EOF
 
 else
 
-echo "$as_me:13142: checking for gethostbyname in -lnetwork" >&5
+echo "$as_me:13157: 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
@@ -13147,7 +13162,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnetwork $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 13150 "configure"
+#line 13165 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13166,16 +13181,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13169: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13184: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13172: \$? = $ac_status" >&5
+  echo "$as_me:13187: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13175: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13190: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13178: \$? = $ac_status" >&5
+  echo "$as_me:13193: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_network_gethostbyname=yes
 else
@@ -13186,7 +13201,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13189: result: $ac_cv_lib_network_gethostbyname" >&5
+echo "$as_me:13204: 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
 
@@ -13211,13 +13226,13 @@ done
 for ac_func in strcasecmp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:13214: checking for $ac_func" >&5
+echo "$as_me:13229: 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 13220 "configure"
+#line 13235 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -13248,16 +13263,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13251: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13266: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13254: \$? = $ac_status" >&5
+  echo "$as_me:13269: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13257: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13272: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13260: \$? = $ac_status" >&5
+  echo "$as_me:13275: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -13267,7 +13282,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:13270: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:13285: 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
@@ -13276,7 +13291,7 @@ EOF
 
 else
 
-echo "$as_me:13279: checking for strcasecmp in -lresolv" >&5
+echo "$as_me:13294: 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
@@ -13284,7 +13299,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 13287 "configure"
+#line 13302 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13303,16 +13318,16 @@ strcasecmp ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13306: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13321: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13309: \$? = $ac_status" >&5
+  echo "$as_me:13324: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13312: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13327: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13315: \$? = $ac_status" >&5
+  echo "$as_me:13330: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_resolv_strcasecmp=yes
 else
@@ -13323,7 +13338,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13326: result: $ac_cv_lib_resolv_strcasecmp" >&5
+echo "$as_me:13341: 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
 
@@ -13380,14 +13395,14 @@ test $cf_test_netlibs = no && echo "$cf_cv_netlibs" >&6
 
 fi
 
-echo "$as_me:13383: checking for inet_aton function" >&5
+echo "$as_me:13398: 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 13390 "configure"
+#line 13405 "configure"
 #include "confdefs.h"
 
 #if defined(__MINGW32__)
@@ -13422,16 +13437,16 @@ inet_aton(0, (struct in_addr *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13425: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13440: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13428: \$? = $ac_status" >&5
+  echo "$as_me:13443: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13431: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13446: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13434: \$? = $ac_status" >&5
+  echo "$as_me:13449: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_inet_aton=yes
 else
@@ -13441,7 +13456,7 @@ cf_cv_have_inet_aton=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:13444: result: $cf_cv_have_inet_aton" >&5
+echo "$as_me:13459: 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
 
@@ -13450,14 +13465,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-    echo "$as_me:13453: checking for inet_addr function" >&5
+    echo "$as_me:13468: 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 13460 "configure"
+#line 13475 "configure"
 #include "confdefs.h"
 
 #if defined(__MINGW32__)
@@ -13492,16 +13507,16 @@ inet_addr(0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13495: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13510: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13498: \$? = $ac_status" >&5
+  echo "$as_me:13513: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13501: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13516: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13504: \$? = $ac_status" >&5
+  echo "$as_me:13519: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_inet_addr=yes
 else
@@ -13511,10 +13526,10 @@ cf_cv_have_inet_addr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:13514: result: $cf_cv_have_inet_addr" >&5
+echo "$as_me:13529: 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:13517: checking for library with inet_addr" >&5
+	echo "$as_me:13532: 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
@@ -13525,7 +13540,7 @@ else
 	    do
 		LIBS="$cf_save_LIBS $cf_inetlib"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 13528 "configure"
+#line 13543 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -13541,16 +13556,16 @@ inet_addr(0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13544: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13559: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13547: \$? = $ac_status" >&5
+  echo "$as_me:13562: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13550: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13565: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13553: \$? = $ac_status" >&5
+  echo "$as_me:13568: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_lib_inet_addr=$cf_inetlib
 else
@@ -13564,7 +13579,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	    done
 
 fi
-echo "$as_me:13567: result: $cf_cv_lib_inet_addr" >&5
+echo "$as_me:13582: 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
 
@@ -13585,13 +13600,13 @@ done
 LIBS="$cf_add_libs"
 
 	else
-	    { echo "$as_me:13588: WARNING: Unable to find library for inet_addr function" >&5
+	    { echo "$as_me:13603: 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:13594: checking if you want to use pkg-config" >&5
+echo "$as_me:13609: 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.
@@ -13601,7 +13616,7 @@ if test "${with_pkg_config+set}" = set; then
 else
   cf_pkg_config=yes
 fi;
-echo "$as_me:13604: result: $cf_pkg_config" >&5
+echo "$as_me:13619: result: $cf_pkg_config" >&5
 echo "${ECHO_T}$cf_pkg_config" >&6
 
 case $cf_pkg_config in
@@ -13613,7 +13628,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:13616: checking for $ac_word" >&5
+echo "$as_me:13631: 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
@@ -13630,7 +13645,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:13633: found $ac_dir/$ac_word" >&5
+   echo "$as_me:13648: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -13641,10 +13656,10 @@ fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:13644: result: $PKG_CONFIG" >&5
+  echo "$as_me:13659: result: $PKG_CONFIG" >&5
 echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  echo "$as_me:13647: result: no" >&5
+  echo "$as_me:13662: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -13653,7 +13668,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:13656: checking for $ac_word" >&5
+echo "$as_me:13671: 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
@@ -13670,7 +13685,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:13673: found $ac_dir/$ac_word" >&5
+   echo "$as_me:13688: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -13682,10 +13697,10 @@ fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 
 if test -n "$ac_pt_PKG_CONFIG"; then
-  echo "$as_me:13685: result: $ac_pt_PKG_CONFIG" >&5
+  echo "$as_me:13700: result: $ac_pt_PKG_CONFIG" >&5
 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
 else
-  echo "$as_me:13688: result: no" >&5
+  echo "$as_me:13703: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -13728,14 +13743,14 @@ case ".$PKG_CONFIG" in
 	PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:13731: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+	{ { echo "$as_me:13746: 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:13738: WARNING: pkg-config is not installed" >&5
+	{ echo "$as_me:13753: WARNING: pkg-config is not installed" >&5
 echo "$as_me: WARNING: pkg-config is not installed" >&2;}
 fi
 
@@ -13780,7 +13795,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 13783 "configure"
+#line 13798 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13792,16 +13807,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13795: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13810: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13798: \$? = $ac_status" >&5
+  echo "$as_me:13813: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13801: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13816: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13804: \$? = $ac_status" >&5
+  echo "$as_me:13819: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -13818,7 +13833,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}:13821: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:13836: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -13861,7 +13876,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 13864 "configure"
+#line 13879 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13873,16 +13888,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13876: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13891: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13879: \$? = $ac_status" >&5
+  echo "$as_me:13894: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13882: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13897: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13885: \$? = $ac_status" >&5
+  echo "$as_me:13900: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -13899,7 +13914,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}:13902: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:13917: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -13917,7 +13932,7 @@ echo "${as_me:-configure}:13902: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:13920: error: cannot find ssl library under $cf_cv_use_libssl" >&5
+{ { echo "$as_me:13935: 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
@@ -13942,7 +13957,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}:13945: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:13960: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -13971,7 +13986,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}:13974: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:13989: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -13980,7 +13995,7 @@ echo "${as_me:-configure}:13974: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:13983: error: cannot find ssl library under $cf_cv_use_libssl" >&5
+{ { echo "$as_me:13998: 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
@@ -13997,15 +14012,15 @@ esac
 			cf_cv_pkg_ssl=
 			for cf_try_package in openssl libssl
 			do
-				echo "$as_me:14000: checking pkg-config for $cf_try_package" >&5
+				echo "$as_me:14015: 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:14004: result: yes" >&5
+					echo "$as_me:14019: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 					break
 				else
-					echo "$as_me:14008: result: no" >&5
+					echo "$as_me:14023: result: no" >&5
 echo "${ECHO_T}no" >&6
 				fi
 			done
@@ -14149,7 +14164,7 @@ fi
 					esac
 					test -n "$verbose" && echo "	adding $cf_libs_ssl to LIBS" 1>&6
 
-echo "${as_me:-configure}:14152: testing adding $cf_libs_ssl to LIBS ..." 1>&5
+echo "${as_me:-configure}:14167: testing adding $cf_libs_ssl to LIBS ..." 1>&5
 
 cf_add_libs="$cf_libs_ssl"
 # Filter out duplicates - this happens with badly-designed ".pc" files...
@@ -14185,7 +14200,7 @@ LIBS="$cf_add_libs"
 			(*-ldl)
 				;;
 			(*)
-				echo "$as_me:14188: checking for dlsym in -ldl" >&5
+				echo "$as_me:14203: 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
@@ -14193,7 +14208,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 14196 "configure"
+#line 14211 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14212,16 +14227,16 @@ dlsym ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14215: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14230: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14218: \$? = $ac_status" >&5
+  echo "$as_me:14233: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14221: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14236: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14224: \$? = $ac_status" >&5
+  echo "$as_me:14239: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dl_dlsym=yes
 else
@@ -14232,7 +14247,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:14235: result: $ac_cv_lib_dl_dlsym" >&5
+echo "$as_me:14250: 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"
@@ -14248,12 +14263,12 @@ fi
 cf_cv_header_path_ssl=
 cf_cv_library_path_ssl=
 
-echo "${as_me:-configure}:14251: testing Starting FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me:-configure}:14266: testing Starting FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 14256 "configure"
+#line 14271 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14282,16 +14297,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14285: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14300: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14288: \$? = $ac_status" >&5
+  echo "$as_me:14303: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14291: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14306: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14294: \$? = $ac_status" >&5
+  echo "$as_me:14309: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_ssl=yes
@@ -14305,7 +14320,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lssl $cf_extra_ssl_libs $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 14308 "configure"
+#line 14323 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14334,16 +14349,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14337: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14352: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14340: \$? = $ac_status" >&5
+  echo "$as_me:14355: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14343: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14358: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14346: \$? = $ac_status" >&5
+  echo "$as_me:14361: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_ssl=yes
@@ -14360,9 +14375,9 @@ cat conftest.$ac_ext >&5
 
 	test -n "$verbose" && echo "	find linkage for ssl library" 1>&6
 
-echo "${as_me:-configure}:14363: testing find linkage for ssl library ..." 1>&5
+echo "${as_me:-configure}:14378: testing find linkage for ssl library ..." 1>&5
 
-echo "${as_me:-configure}:14365: testing Searching for headers in FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me:-configure}:14380: testing Searching for headers in FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -14453,11 +14468,11 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d $cf_cv_header_path_ssl ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_ssl" 1>&6
 
-echo "${as_me:-configure}:14456: testing ... testing $cf_cv_header_path_ssl ..." 1>&5
+echo "${as_me:-configure}:14471: testing ... testing $cf_cv_header_path_ssl ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_ssl"
 			cat >conftest.$ac_ext <<_ACEOF
-#line 14460 "configure"
+#line 14475 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14486,21 +14501,21 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14489: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14504: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14492: \$? = $ac_status" >&5
+  echo "$as_me:14507: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14495: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14510: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14498: \$? = $ac_status" >&5
+  echo "$as_me:14513: \$? = $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}:14503: testing ... found ssl headers in $cf_cv_header_path_ssl ..." 1>&5
+echo "${as_me:-configure}:14518: testing ... found ssl headers in $cf_cv_header_path_ssl ..." 1>&5
 
 				cf_cv_find_linkage_ssl=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -14518,7 +14533,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	if test "$cf_cv_find_linkage_ssl" = maybe ; then
 
-echo "${as_me:-configure}:14521: testing Searching for ssl library in FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me:-configure}:14536: testing Searching for ssl library in FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -14526,7 +14541,7 @@ echo "${as_me:-configure}:14521: 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 14529 "configure"
+#line 14544 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14555,21 +14570,21 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14558: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14573: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14561: \$? = $ac_status" >&5
+  echo "$as_me:14576: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14564: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14579: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14567: \$? = $ac_status" >&5
+  echo "$as_me:14582: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 			test -n "$verbose" && echo "	... found ssl library in system" 1>&6
 
-echo "${as_me:-configure}:14572: testing ... found ssl library in system ..." 1>&5
+echo "${as_me:-configure}:14587: testing ... found ssl library in system ..." 1>&5
 
 			cf_cv_find_linkage_ssl=yes
 else
@@ -14650,13 +14665,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}:14653: testing ... testing $cf_cv_library_path_ssl ..." 1>&5
+echo "${as_me:-configure}:14668: 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 14659 "configure"
+#line 14674 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14685,21 +14700,21 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14688: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14703: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14691: \$? = $ac_status" >&5
+  echo "$as_me:14706: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14694: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14709: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14697: \$? = $ac_status" >&5
+  echo "$as_me:14712: \$? = $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}:14702: testing ... found ssl library in $cf_cv_library_path_ssl ..." 1>&5
+echo "${as_me:-configure}:14717: testing ... found ssl library in $cf_cv_library_path_ssl ..." 1>&5
 
 					cf_cv_find_linkage_ssl=yes
 					cf_cv_library_file_ssl="-lssl"
@@ -14761,7 +14776,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}:14764: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:14779: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -14817,7 +14832,7 @@ if test -n "$cf_cv_header_path_ssl" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 14820 "configure"
+#line 14835 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14829,16 +14844,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14832: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14847: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14835: \$? = $ac_status" >&5
+  echo "$as_me:14850: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14838: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14853: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14841: \$? = $ac_status" >&5
+  echo "$as_me:14856: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -14855,7 +14870,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}:14858: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:14873: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -14888,7 +14903,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}:14891: testing checking ssl header-path $cf_cv_header_path_ssl ..." 1>&5
+echo "${as_me:-configure}:14906: testing checking ssl header-path $cf_cv_header_path_ssl ..." 1>&5
 
 			case $cf_cv_header_path_ssl in
 			(*/openssl)
@@ -14901,10 +14916,10 @@ EOF
 			esac
 		fi
 
-echo "$as_me:14904: checking for X509 support" >&5
+echo "$as_me:14919: checking for X509 support" >&5
 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 14907 "configure"
+#line 14922 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14933,16 +14948,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:14936: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14951: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14939: \$? = $ac_status" >&5
+  echo "$as_me:14954: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14942: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14957: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14945: \$? = $ac_status" >&5
+  echo "$as_me:14960: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_x509_support=yes
 else
@@ -14951,7 +14966,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:14954: result: $cf_x509_support" >&5
+echo "$as_me:14969: result: $cf_x509_support" >&5
 echo "${ECHO_T}$cf_x509_support" >&6
 
 if test "$cf_x509_support" = yes ; then
@@ -15003,7 +15018,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 15006 "configure"
+#line 15021 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -15015,16 +15030,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15018: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15033: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15021: \$? = $ac_status" >&5
+  echo "$as_me:15036: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15024: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15039: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15027: \$? = $ac_status" >&5
+  echo "$as_me:15042: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -15041,7 +15056,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}:15044: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:15059: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -15084,7 +15099,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 15087 "configure"
+#line 15102 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -15096,16 +15111,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15099: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15114: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15102: \$? = $ac_status" >&5
+  echo "$as_me:15117: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15105: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15120: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15108: \$? = $ac_status" >&5
+  echo "$as_me:15123: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -15122,7 +15137,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}:15125: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:15140: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -15140,7 +15155,7 @@ echo "${as_me:-configure}:15125: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:15143: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:15158: 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
@@ -15165,7 +15180,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}:15168: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:15183: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -15194,7 +15209,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}:15197: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:15212: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -15203,7 +15218,7 @@ echo "${as_me:-configure}:15197: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:15206: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:15221: 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
@@ -15221,12 +15236,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}:15224: testing checking pkg-config for $cf_pkg_gnutls ..." 1>&5
+echo "${as_me:-configure}:15239: 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}:15229: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:15244: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_cv_have_gnutls=yes
 				cf_cv_pkg_config_ssl=yes
@@ -15358,7 +15373,7 @@ fi
 					esac
 					test -n "$verbose" && echo "	adding $cf_libs_ssl to LIBS" 1>&6
 
-echo "${as_me:-configure}:15361: testing adding $cf_libs_ssl to LIBS ..." 1>&5
+echo "${as_me:-configure}:15376: testing adding $cf_libs_ssl to LIBS ..." 1>&5
 
 cf_add_libs="$cf_libs_ssl"
 # Filter out duplicates - this happens with badly-designed ".pc" files...
@@ -15380,7 +15395,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}:15383: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:15398: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_pkg_gnutls=none
 			fi
@@ -15400,12 +15415,12 @@ EOF
 cf_cv_header_path_gnutls=
 cf_cv_library_path_gnutls=
 
-echo "${as_me:-configure}:15403: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:15418: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 15408 "configure"
+#line 15423 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -15434,16 +15449,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15437: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15452: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15440: \$? = $ac_status" >&5
+  echo "$as_me:15455: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15443: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15458: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15446: \$? = $ac_status" >&5
+  echo "$as_me:15461: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -15457,7 +15472,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lgnutls  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 15460 "configure"
+#line 15475 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -15486,16 +15501,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15489: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15504: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15492: \$? = $ac_status" >&5
+  echo "$as_me:15507: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15495: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15510: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15498: \$? = $ac_status" >&5
+  echo "$as_me:15513: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -15512,9 +15527,9 @@ cat conftest.$ac_ext >&5
 
 	test -n "$verbose" && echo "	find linkage for gnutls library" 1>&6
 
-echo "${as_me:-configure}:15515: testing find linkage for gnutls library ..." 1>&5
+echo "${as_me:-configure}:15530: testing find linkage for gnutls library ..." 1>&5
 
-echo "${as_me:-configure}:15517: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:15532: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -15605,11 +15620,11 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d $cf_cv_header_path_gnutls ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_gnutls" 1>&6
 
-echo "${as_me:-configure}:15608: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:15623: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_gnutls"
 			cat >conftest.$ac_ext <<_ACEOF
-#line 15612 "configure"
+#line 15627 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -15638,21 +15653,21 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15641: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15656: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15644: \$? = $ac_status" >&5
+  echo "$as_me:15659: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15647: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15662: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15650: \$? = $ac_status" >&5
+  echo "$as_me:15665: \$? = $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}:15655: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:15670: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
 
 				cf_cv_find_linkage_gnutls=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -15670,7 +15685,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	if test "$cf_cv_find_linkage_gnutls" = maybe ; then
 
-echo "${as_me:-configure}:15673: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:15688: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -15745,13 +15760,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}:15748: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:15763: 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 15754 "configure"
+#line 15769 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -15780,21 +15795,21 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15783: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15798: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15786: \$? = $ac_status" >&5
+  echo "$as_me:15801: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15789: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15804: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15792: \$? = $ac_status" >&5
+  echo "$as_me:15807: \$? = $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}:15797: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:15812: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
 
 					cf_cv_find_linkage_gnutls=yes
 					cf_cv_library_file_gnutls="-lgnutls"
@@ -15871,7 +15886,7 @@ if test -n "$cf_cv_header_path_gnutls" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 15874 "configure"
+#line 15889 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -15883,16 +15898,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15886: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15901: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15889: \$? = $ac_status" >&5
+  echo "$as_me:15904: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15892: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15907: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15895: \$? = $ac_status" >&5
+  echo "$as_me:15910: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -15909,7 +15924,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}:15912: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:15927: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -15950,7 +15965,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}:15953: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:15968: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -15979,13 +15994,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:15982: checking for $ac_func" >&5
+echo "$as_me:15997: 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 15988 "configure"
+#line 16003 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -16016,16 +16031,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16019: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16034: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16022: \$? = $ac_status" >&5
+  echo "$as_me:16037: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16025: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16040: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16028: \$? = $ac_status" >&5
+  echo "$as_me:16043: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -16035,7 +16050,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:16038: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:16053: 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
@@ -16045,13 +16060,13 @@ EOF
 fi
 done
 
-		echo "$as_me:16048: checking for gnutls_rnd" >&5
+		echo "$as_me:16063: 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 16054 "configure"
+#line 16069 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gnutls_rnd (); below.  */
@@ -16082,16 +16097,16 @@ f = gnutls_rnd; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16085: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16100: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16088: \$? = $ac_status" >&5
+  echo "$as_me:16103: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16091: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16106: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16094: \$? = $ac_status" >&5
+  echo "$as_me:16109: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_gnutls_rnd=yes
 else
@@ -16101,7 +16116,7 @@ ac_cv_func_gnutls_rnd=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:16104: result: $ac_cv_func_gnutls_rnd" >&5
+echo "$as_me:16119: 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
   cat >>confdefs.h <<\EOF
@@ -16130,10 +16145,10 @@ fi
 
 		EXTRA_OBJS="$EXTRA_OBJS tidy_tls\$o"
 
-echo "$as_me:16133: checking for X509 support" >&5
+echo "$as_me:16148: checking for X509 support" >&5
 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 16136 "configure"
+#line 16151 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16162,16 +16177,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:16165: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16180: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16168: \$? = $ac_status" >&5
+  echo "$as_me:16183: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16171: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16186: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16174: \$? = $ac_status" >&5
+  echo "$as_me:16189: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_x509_support=yes
 else
@@ -16180,7 +16195,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:16183: result: $cf_x509_support" >&5
+echo "$as_me:16198: result: $cf_x509_support" >&5
 echo "${ECHO_T}$cf_x509_support" >&6
 
 if test "$cf_x509_support" = yes ; then
@@ -16231,7 +16246,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 16234 "configure"
+#line 16249 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -16243,16 +16258,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16246: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16261: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16249: \$? = $ac_status" >&5
+  echo "$as_me:16264: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16252: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16267: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16255: \$? = $ac_status" >&5
+  echo "$as_me:16270: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -16269,7 +16284,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}:16272: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:16287: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -16312,7 +16327,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 16315 "configure"
+#line 16330 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -16324,16 +16339,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16327: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16342: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16330: \$? = $ac_status" >&5
+  echo "$as_me:16345: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16333: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16348: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16336: \$? = $ac_status" >&5
+  echo "$as_me:16351: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -16350,7 +16365,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}:16353: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:16368: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -16368,7 +16383,7 @@ echo "${as_me:-configure}:16353: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:16371: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:16386: 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
@@ -16393,7 +16408,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}:16396: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:16411: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -16422,7 +16437,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}:16425: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:16440: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -16431,7 +16446,7 @@ echo "${as_me:-configure}:16425: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:16434: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:16449: 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
@@ -16449,12 +16464,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}:16452: testing checking pkg-config for $cf_pkg_gnutls ..." 1>&5
+echo "${as_me:-configure}:16467: 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}:16457: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:16472: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_cv_have_gnutls=yes
 				cf_cv_pkg_config_ssl=yes
@@ -16586,7 +16601,7 @@ fi
 					esac
 					test -n "$verbose" && echo "	adding $cf_libs_ssl to LIBS" 1>&6
 
-echo "${as_me:-configure}:16589: testing adding $cf_libs_ssl to LIBS ..." 1>&5
+echo "${as_me:-configure}:16604: testing adding $cf_libs_ssl to LIBS ..." 1>&5
 
 cf_add_libs="$cf_libs_ssl"
 # Filter out duplicates - this happens with badly-designed ".pc" files...
@@ -16608,7 +16623,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}:16611: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:16626: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_pkg_gnutls=none
 			fi
@@ -16628,12 +16643,12 @@ EOF
 cf_cv_header_path_gnutls=
 cf_cv_library_path_gnutls=
 
-echo "${as_me:-configure}:16631: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:16646: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 16636 "configure"
+#line 16651 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16662,16 +16677,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16665: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16680: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16668: \$? = $ac_status" >&5
+  echo "$as_me:16683: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16671: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16686: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16674: \$? = $ac_status" >&5
+  echo "$as_me:16689: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -16685,7 +16700,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lgnutls -lgnutls-openssl $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 16688 "configure"
+#line 16703 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16714,16 +16729,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16717: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16732: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16720: \$? = $ac_status" >&5
+  echo "$as_me:16735: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16723: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16738: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16726: \$? = $ac_status" >&5
+  echo "$as_me:16741: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -16740,9 +16755,9 @@ cat conftest.$ac_ext >&5
 
 	test -n "$verbose" && echo "	find linkage for gnutls library" 1>&6
 
-echo "${as_me:-configure}:16743: testing find linkage for gnutls library ..." 1>&5
+echo "${as_me:-configure}:16758: testing find linkage for gnutls library ..." 1>&5
 
-echo "${as_me:-configure}:16745: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:16760: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -16833,11 +16848,11 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d $cf_cv_header_path_gnutls ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_gnutls" 1>&6
 
-echo "${as_me:-configure}:16836: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:16851: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_gnutls"
 			cat >conftest.$ac_ext <<_ACEOF
-#line 16840 "configure"
+#line 16855 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16866,21 +16881,21 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16869: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16884: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16872: \$? = $ac_status" >&5
+  echo "$as_me:16887: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16875: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16890: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16878: \$? = $ac_status" >&5
+  echo "$as_me:16893: \$? = $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}:16883: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:16898: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
 
 				cf_cv_find_linkage_gnutls=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -16898,7 +16913,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	if test "$cf_cv_find_linkage_gnutls" = maybe ; then
 
-echo "${as_me:-configure}:16901: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:16916: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -16973,13 +16988,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}:16976: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:16991: 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 16982 "configure"
+#line 16997 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17008,21 +17023,21 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17011: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17026: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17014: \$? = $ac_status" >&5
+  echo "$as_me:17029: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17017: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17032: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17020: \$? = $ac_status" >&5
+  echo "$as_me:17035: \$? = $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}:17025: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:17040: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
 
 					cf_cv_find_linkage_gnutls=yes
 					cf_cv_library_file_gnutls="-lgnutls"
@@ -17099,7 +17114,7 @@ if test -n "$cf_cv_header_path_gnutls" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 17102 "configure"
+#line 17117 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -17111,16 +17126,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17114: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17129: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17117: \$? = $ac_status" >&5
+  echo "$as_me:17132: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17120: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17135: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17123: \$? = $ac_status" >&5
+  echo "$as_me:17138: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -17137,7 +17152,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}:17140: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:17155: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -17178,7 +17193,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}:17181: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:17196: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -17207,13 +17222,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:17210: checking for $ac_func" >&5
+echo "$as_me:17225: 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 17216 "configure"
+#line 17231 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -17244,16 +17259,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17247: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17262: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17250: \$? = $ac_status" >&5
+  echo "$as_me:17265: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17253: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17268: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17256: \$? = $ac_status" >&5
+  echo "$as_me:17271: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -17263,7 +17278,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:17266: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:17281: 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
@@ -17273,13 +17288,13 @@ EOF
 fi
 done
 
-		echo "$as_me:17276: checking for gnutls_rnd" >&5
+		echo "$as_me:17291: 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 17282 "configure"
+#line 17297 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gnutls_rnd (); below.  */
@@ -17310,16 +17325,16 @@ f = gnutls_rnd; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17313: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17328: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17316: \$? = $ac_status" >&5
+  echo "$as_me:17331: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17319: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17334: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17322: \$? = $ac_status" >&5
+  echo "$as_me:17337: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_gnutls_rnd=yes
 else
@@ -17329,7 +17344,7 @@ ac_cv_func_gnutls_rnd=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:17332: result: $ac_cv_func_gnutls_rnd" >&5
+echo "$as_me:17347: 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
   cat >>confdefs.h <<\EOF
@@ -17357,7 +17372,7 @@ LIBS="$cf_add_libs"
 fi
 
 		if test "$cf_pkg_gnutls" = none ; then
-				echo "$as_me:17360: checking for SSL_connect in -lgnutls-openssl" >&5
+				echo "$as_me:17375: 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
@@ -17365,7 +17380,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnutls-openssl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 17368 "configure"
+#line 17383 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17384,16 +17399,16 @@ SSL_connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17387: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17402: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17390: \$? = $ac_status" >&5
+  echo "$as_me:17405: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17393: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17408: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17396: \$? = $ac_status" >&5
+  echo "$as_me:17411: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gnutls_openssl_SSL_connect=yes
 else
@@ -17404,7 +17419,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17407: result: $ac_cv_lib_gnutls_openssl_SSL_connect" >&5
+echo "$as_me:17422: 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
 
@@ -17425,7 +17440,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-  echo "$as_me:17428: checking for SSL_connect in -lgnutls-extra" >&5
+  echo "$as_me:17443: 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
@@ -17433,7 +17448,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnutls-extra  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 17436 "configure"
+#line 17451 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17452,16 +17467,16 @@ SSL_connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17455: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17470: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17458: \$? = $ac_status" >&5
+  echo "$as_me:17473: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17461: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17476: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17464: \$? = $ac_status" >&5
+  echo "$as_me:17479: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gnutls_extra_SSL_connect=yes
 else
@@ -17472,7 +17487,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17475: result: $ac_cv_lib_gnutls_extra_SSL_connect" >&5
+echo "$as_me:17490: 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
 
@@ -17493,7 +17508,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-  { { echo "$as_me:17496: error: cannot find gnutls openssl functions" >&5
+  { { echo "$as_me:17511: error: cannot find gnutls openssl functions" >&5
 echo "$as_me: error: cannot find gnutls openssl functions" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -17502,10 +17517,10 @@ fi
 
 			fi
 
-echo "$as_me:17505: checking for X509 support" >&5
+echo "$as_me:17520: checking for X509 support" >&5
 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 17508 "configure"
+#line 17523 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17534,16 +17549,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:17537: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17552: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17540: \$? = $ac_status" >&5
+  echo "$as_me:17555: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17543: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17558: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17546: \$? = $ac_status" >&5
+  echo "$as_me:17561: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_x509_support=yes
 else
@@ -17552,7 +17567,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:17555: result: $cf_x509_support" >&5
+echo "$as_me:17570: result: $cf_x509_support" >&5
 echo "${ECHO_T}$cf_x509_support" >&6
 
 if test "$cf_x509_support" = yes ; then
@@ -17584,7 +17599,7 @@ case "$cf_cv_use_libnss_compat" in
 	;;
 (yes)
 
-echo "$as_me:17587: checking for SSL_get_version in -lnss_compat_ossl" >&5
+echo "$as_me:17602: 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
@@ -17592,7 +17607,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnss_compat_ossl -lnss_compat_ossl $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 17595 "configure"
+#line 17610 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17611,16 +17626,16 @@ SSL_get_version ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17614: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17629: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17617: \$? = $ac_status" >&5
+  echo "$as_me:17632: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17620: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17635: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17623: \$? = $ac_status" >&5
+  echo "$as_me:17638: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nss_compat_ossl_SSL_get_version=yes
 else
@@ -17631,7 +17646,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17634: result: $ac_cv_lib_nss_compat_ossl_SSL_get_version" >&5
+echo "$as_me:17649: 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
@@ -17646,11 +17661,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}:17649: testing assume it is in $cf_ssl_root ..." 1>&5
+echo "${as_me:-configure}:17664: 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:17653: error: cannot find NSS compilant libraries" >&5
+			{ { echo "$as_me:17668: error: cannot find NSS compilant libraries" >&5
 echo "$as_me: error: cannot find NSS compilant libraries" >&2;}
    { (exit 1); exit 1; }; }
 		fi
@@ -17665,13 +17680,13 @@ fi
 		elif test -d $cf_cv_use_libnss_compat/../include ; then
 			cf_ssl_root=$cf_cv_use_libnss_compat/..
 		else
-			{ { echo "$as_me:17668: error: cannot find NSS compilant library under $cf_cv_use_libnss_compat" >&5
+			{ { echo "$as_me:17683: error: cannot find NSS compilant library under $cf_cv_use_libnss_compat" >&5
 echo "$as_me: error: cannot find NSS compilant library under $cf_cv_use_libnss_compat" >&2;}
    { (exit 1); exit 1; }; }
 		fi
 		cf_ssl_library="-L$cf_ssl_root/lib $cf_ssl_library"
 	else
-		{ echo "$as_me:17674: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&5
+		{ echo "$as_me:17689: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&5
 echo "$as_me: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&2;}
 	fi
 	;;
@@ -17800,10 +17815,10 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 if test "$cf_ssl_subincs" = yes ; then
-echo "$as_me:17803: checking for NSS compilant include directory" >&5
+echo "$as_me:17818: checking for NSS compilant include directory" >&5
 echo $ECHO_N "checking for NSS compilant include directory... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 17806 "configure"
+#line 17821 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17817,16 +17832,16 @@ SSL_shutdown((SSL *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17820: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17835: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17823: \$? = $ac_status" >&5
+  echo "$as_me:17838: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17826: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17841: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17829: \$? = $ac_status" >&5
+  echo "$as_me:17844: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_ssl_incl=yes
 else
@@ -17835,7 +17850,7 @@ cat conftest.$ac_ext >&5
 cf_ssl_incl=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:17838: result: $cf_ssl_incl" >&5
+echo "$as_me:17853: result: $cf_ssl_incl" >&5
 echo "${ECHO_T}$cf_ssl_incl" >&6
 test "$cf_ssl_incl" = yes &&
 cat >>confdefs.h <<\EOF
@@ -17844,10 +17859,10 @@ EOF
 
 fi
 
-echo "$as_me:17847: checking if we can link to NSS compilant library" >&5
+echo "$as_me:17862: checking if we can link to NSS compilant library" >&5
 echo $ECHO_N "checking if we can link to NSS compilant library... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 17850 "configure"
+#line 17865 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17866,16 +17881,16 @@ SSL_shutdown((SSL *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17869: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17884: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17872: \$? = $ac_status" >&5
+  echo "$as_me:17887: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17875: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17890: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17878: \$? = $ac_status" >&5
+  echo "$as_me:17893: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_ssl_library=yes
 else
@@ -17884,7 +17899,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:17887: result: $cf_ssl_library" >&5
+echo "$as_me:17902: result: $cf_ssl_library" >&5
 echo "${ECHO_T}$cf_ssl_library" >&6
 if test "$cf_ssl_library" = yes ; then
 
@@ -17897,7 +17912,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-	{ { echo "$as_me:17900: error: Cannot link with NSS compilant libraries" >&5
+	{ { echo "$as_me:17915: error: Cannot link with NSS compilant libraries" >&5
 echo "$as_me: error: Cannot link with NSS compilant libraries" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -17905,7 +17920,7 @@ fi
 fi
 
 ### check for ipv6 support
-echo "$as_me:17908: checking whether to enable ipv6" >&5
+echo "$as_me:17923: 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.
@@ -17922,11 +17937,11 @@ EOF
 else
   enableval=no
 fi;
-echo "$as_me:17925: result: $enableval" >&5
+echo "$as_me:17940: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 if test "$enableval" = "yes"; then
 
-echo "$as_me:17929: checking ipv6 stack type" >&5
+echo "$as_me:17944: 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
@@ -17947,7 +17962,7 @@ do
 		;;
 	(inria)
 				cat >conftest.$ac_ext <<_ACEOF
-#line 17950 "configure"
+#line 17965 "configure"
 #include "confdefs.h"
 
 #include <netinet/in.h>
@@ -17964,7 +17979,7 @@ rm -rf conftest*
 		;;
 	(kame)
 				cat >conftest.$ac_ext <<_ACEOF
-#line 17967 "configure"
+#line 17982 "configure"
 #include "confdefs.h"
 
 #include <netinet/in.h>
@@ -17981,7 +17996,7 @@ rm -rf conftest*
 		;;
 	(linux-glibc)
 				cat >conftest.$ac_ext <<_ACEOF
-#line 17984 "configure"
+#line 17999 "configure"
 #include "confdefs.h"
 
 #include <features.h>
@@ -18007,7 +18022,7 @@ rm -rf conftest*
 		;;
 	(toshiba)
 		cat >conftest.$ac_ext <<_ACEOF
-#line 18010 "configure"
+#line 18025 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -18024,7 +18039,7 @@ rm -rf conftest*
 		;;
 	(v6d)
 		cat >conftest.$ac_ext <<_ACEOF
-#line 18027 "configure"
+#line 18042 "configure"
 #include "confdefs.h"
 
 #include </usr/local/v6/include/sys/v6config.h>
@@ -18041,7 +18056,7 @@ rm -rf conftest*
 		;;
 	(zeta)
 		cat >conftest.$ac_ext <<_ACEOF
-#line 18044 "configure"
+#line 18059 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -18063,13 +18078,13 @@ rm -rf conftest*
 done
 
 fi
-echo "$as_me:18066: result: $cf_cv_ipv6type" >&5
+echo "$as_me:18081: result: $cf_cv_ipv6type" >&5
 echo "${ECHO_T}$cf_cv_ipv6type" >&6
 
 cf_ipv6lib=none
 cf_ipv6dir=none
 
-echo "$as_me:18072: checking for IPv6 library if required" >&5
+echo "$as_me:18087: 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)
@@ -18099,13 +18114,13 @@ case $cf_cv_ipv6type in
 	cf_ipv6dir=v6
 	;;
 esac
-echo "$as_me:18102: result: $cf_ipv6lib" >&5
+echo "$as_me:18117: result: $cf_ipv6lib" >&5
 echo "${ECHO_T}$cf_ipv6lib" >&6
 
 if test "$cf_ipv6lib" != "none"; then
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 18108 "configure"
+#line 18123 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -18121,16 +18136,16 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18124: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18139: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18127: \$? = $ac_status" >&5
+  echo "$as_me:18142: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18130: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18145: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18133: \$? = $ac_status" >&5
+  echo "$as_me:18148: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -18248,7 +18263,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 18251 "configure"
+#line 18266 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -18260,16 +18275,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18263: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18278: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18266: \$? = $ac_status" >&5
+  echo "$as_me:18281: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18269: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18284: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18272: \$? = $ac_status" >&5
+  echo "$as_me:18287: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -18286,7 +18301,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}:18289: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:18304: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -18314,13 +18329,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:18317: checking for getaddrinfo" >&5
+	echo "$as_me:18332: 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 18323 "configure"
+#line 18338 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char getaddrinfo (); below.  */
@@ -18351,16 +18366,16 @@ f = getaddrinfo; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18354: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18369: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18357: \$? = $ac_status" >&5
+  echo "$as_me:18372: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18360: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18375: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18363: \$? = $ac_status" >&5
+  echo "$as_me:18378: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_getaddrinfo=yes
 else
@@ -18370,18 +18385,18 @@ ac_cv_func_getaddrinfo=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:18373: result: $ac_cv_func_getaddrinfo" >&5
+echo "$as_me:18388: 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:18380: checking for getaddrinfo in -l$cf_ipv6lib" >&5
+		echo "$as_me:18395: 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 18384 "configure"
+#line 18399 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -18397,25 +18412,25 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18400: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18415: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18403: \$? = $ac_status" >&5
+  echo "$as_me:18418: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18406: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18421: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18409: \$? = $ac_status" >&5
+  echo "$as_me:18424: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:18411: result: yes" >&5
+  echo "$as_me:18426: 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:18418: result: no" >&5
+echo "$as_me:18433: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -18483,11 +18498,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:18486: checking for -l$cf_ipv6lib in $cf_libdir" >&5
+				echo "$as_me:18501: 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 18490 "configure"
+#line 18505 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -18503,25 +18518,25 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18506: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18521: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18509: \$? = $ac_status" >&5
+  echo "$as_me:18524: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18512: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18527: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18515: \$? = $ac_status" >&5
+  echo "$as_me:18530: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:18517: result: yes" >&5
+  echo "$as_me:18532: 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:18524: result: no" >&5
+echo "$as_me:18539: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -18536,7 +18551,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_ipv6lib
 
 	if test $cf_found_library = no ; then
-		{ { echo "$as_me:18539: error: No $cf_ipv6lib library found, cannot continue.  You must fetch lib$cf_ipv6lib.a
+		{ { echo "$as_me:18554: 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;}
@@ -18544,7 +18559,7 @@ from an appropriate IPv6 kit and compile beforehand." >&2;}
 	fi
 fi
 
-echo "$as_me:18547: checking working getaddrinfo" >&5
+echo "$as_me:18562: 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
@@ -18554,7 +18569,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_getaddrinfo=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 18557 "configure"
+#line 18572 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -18634,15 +18649,15 @@ int main(void)
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:18637: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18652: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18640: \$? = $ac_status" >&5
+  echo "$as_me:18655: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:18642: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18657: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18645: \$? = $ac_status" >&5
+  echo "$as_me:18660: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_getaddrinfo=yes
 else
@@ -18655,7 +18670,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:18658: result: $cf_cv_getaddrinfo" >&5
+echo "$as_me:18673: result: $cf_cv_getaddrinfo" >&5
 echo "${ECHO_T}$cf_cv_getaddrinfo" >&6
 if test "$cf_cv_getaddrinfo" = yes ; then
 
@@ -18671,12 +18686,12 @@ fi
 
 if test "$cf_cv_getaddrinfo" != "yes"; then
 	if test "$cf_cv_ipv6type" != "linux"; then
-		{ echo "$as_me:18674: WARNING: You must get working getaddrinfo() function,
+		{ echo "$as_me:18689: 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:18679: WARNING: The getaddrinfo() implementation on your system seems be buggy.
+		{ echo "$as_me:18694: 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.
@@ -18687,7 +18702,7 @@ fi
 
 fi
 
-echo "$as_me:18690: checking for screen type" >&5
+echo "$as_me:18705: 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
@@ -18701,7 +18716,7 @@ case $withval in
 (curses|ncurses*|pdcurses|slang)
 	cf_cv_screen=$withval
 	;;
-(*)	{ { echo "$as_me:18704: error: Unexpected value $withval" >&5
+(*)	{ { echo "$as_me:18719: error: Unexpected value $withval" >&5
 echo "$as_me: error: Unexpected value $withval" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -18710,13 +18725,13 @@ else
   cf_cv_screen=curses
 fi;
 fi
-echo "$as_me:18713: result: $cf_cv_screen" >&5
+echo "$as_me:18728: result: $cf_cv_screen" >&5
 echo "${ECHO_T}$cf_cv_screen" >&6
 
 case $cf_cv_screen in
 (curses|ncurses*)
 
-echo "$as_me:18719: checking for specific curses-directory" >&5
+echo "$as_me:18734: 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.
@@ -18726,7 +18741,7 @@ if test "${with_curses_dir+set}" = set; then
 else
   cf_cv_curses_dir=no
 fi;
-echo "$as_me:18729: result: $cf_cv_curses_dir" >&5
+echo "$as_me:18744: 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" )
@@ -18757,7 +18772,7 @@ case ".$withval" in
 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:18760: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:18775: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -18790,7 +18805,7 @@ if test -n "$cf_cv_curses_dir/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 18793 "configure"
+#line 18808 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -18802,16 +18817,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18805: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18820: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18808: \$? = $ac_status" >&5
+  echo "$as_me:18823: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18811: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18826: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18814: \$? = $ac_status" >&5
+  echo "$as_me:18829: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -18828,7 +18843,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}:18831: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:18846: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -18864,7 +18879,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}:18867: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:18882: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -18883,7 +18898,7 @@ dft_color_style=yes
 case $cf_cv_screen in
 (curses)
 
-echo "$as_me:18886: checking for extra include directories" >&5
+echo "$as_me:18901: 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
@@ -18909,11 +18924,11 @@ case $host_os in
 esac
 
 fi
-echo "$as_me:18912: result: $cf_cv_curses_incdir" >&5
+echo "$as_me:18927: result: $cf_cv_curses_incdir" >&5
 echo "${ECHO_T}$cf_cv_curses_incdir" >&6
 test "$cf_cv_curses_incdir" != no && CPPFLAGS="$CPPFLAGS $cf_cv_curses_incdir"
 
-echo "$as_me:18916: checking if we have identified curses headers" >&5
+echo "$as_me:18931: 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
@@ -18925,7 +18940,7 @@ for cf_header in \
 	curses.h  ncurses/ncurses.h ncurses/curses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 18928 "configure"
+#line 18943 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -18937,16 +18952,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18940: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18955: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18943: \$? = $ac_status" >&5
+  echo "$as_me:18958: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18946: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18961: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18949: \$? = $ac_status" >&5
+  echo "$as_me:18964: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -18957,11 +18972,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:18960: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:18975: 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:18964: error: No curses header-files found" >&5
+	{ { echo "$as_me:18979: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -18971,23 +18986,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:18974: checking for $ac_header" >&5
+echo "$as_me:18989: 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 18980 "configure"
+#line 18995 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18984: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:18999: \"$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:18990: \$? = $ac_status" >&5
+  echo "$as_me:19005: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -19006,7 +19021,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:19009: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:19024: 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
@@ -19016,7 +19031,7 @@ EOF
 fi
 done
 
-echo "$as_me:19019: checking for terminfo header" >&5
+echo "$as_me:19034: 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
@@ -19034,7 +19049,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 19037 "configure"
+#line 19052 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19049,16 +19064,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19052: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19067: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19055: \$? = $ac_status" >&5
+  echo "$as_me:19070: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19058: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19073: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19061: \$? = $ac_status" >&5
+  echo "$as_me:19076: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -19074,7 +19089,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:19077: result: $cf_cv_term_header" >&5
+echo "$as_me:19092: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -19106,7 +19121,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:19109: checking for ncurses version" >&5
+echo "$as_me:19124: 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
@@ -19132,10 +19147,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:19135: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:19150: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:19138: \$? = $ac_status" >&5
+  echo "$as_me:19153: \$? = $ac_status" >&5
   (exit $ac_status); }
 	if test -f conftest.out ; then
 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
@@ -19145,7 +19160,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 19148 "configure"
+#line 19163 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19170,15 +19185,15 @@ int main(void)
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:19173: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19188: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19176: \$? = $ac_status" >&5
+  echo "$as_me:19191: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:19178: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19193: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19181: \$? = $ac_status" >&5
+  echo "$as_me:19196: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -19192,17 +19207,17 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:19195: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:19210: 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:19202: checking if we have identified curses libraries" >&5
+echo "$as_me:19217: 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 19205 "configure"
+#line 19220 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -19214,16 +19229,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19217: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19232: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19220: \$? = $ac_status" >&5
+  echo "$as_me:19235: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19223: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19238: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19226: \$? = $ac_status" >&5
+  echo "$as_me:19241: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -19232,13 +19247,13 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:19235: result: $cf_result" >&5
+echo "$as_me:19250: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 if test "$cf_result" = no ; then
 case $host_os in
 (freebsd*)
-	echo "$as_me:19241: checking for tgoto in -lmytinfo" >&5
+	echo "$as_me:19256: 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
@@ -19246,7 +19261,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 19249 "configure"
+#line 19264 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19265,16 +19280,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19268: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19283: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19271: \$? = $ac_status" >&5
+  echo "$as_me:19286: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19274: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19289: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19277: \$? = $ac_status" >&5
+  echo "$as_me:19292: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -19285,7 +19300,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19288: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:19303: 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
 
@@ -19315,7 +19330,7 @@ fi
 	# term.h) for cur_colr
 	if test "x$cf_cv_screen" = "xcurses_colr"
 	then
-		echo "$as_me:19318: checking for initscr in -lcur_colr" >&5
+		echo "$as_me:19333: 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
@@ -19323,7 +19338,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcur_colr  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 19326 "configure"
+#line 19341 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19342,16 +19357,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19345: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19360: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19348: \$? = $ac_status" >&5
+  echo "$as_me:19363: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19351: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19366: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19354: \$? = $ac_status" >&5
+  echo "$as_me:19369: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_cur_colr_initscr=yes
 else
@@ -19362,7 +19377,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19365: result: $ac_cv_lib_cur_colr_initscr" >&5
+echo "$as_me:19380: 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
 
@@ -19386,7 +19401,7 @@ LIBS="$cf_add_libs"
 
 else
 
-		echo "$as_me:19389: checking for initscr in -lHcurses" >&5
+		echo "$as_me:19404: 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
@@ -19394,7 +19409,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lHcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 19397 "configure"
+#line 19412 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19413,16 +19428,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19416: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19431: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19419: \$? = $ac_status" >&5
+  echo "$as_me:19434: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19422: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19437: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19425: \$? = $ac_status" >&5
+  echo "$as_me:19440: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Hcurses_initscr=yes
 else
@@ -19433,7 +19448,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19436: result: $ac_cv_lib_Hcurses_initscr" >&5
+echo "$as_me:19451: 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
 
@@ -19489,7 +19504,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}:19492: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:19507: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -19518,7 +19533,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}:19521: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:19536: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -19549,7 +19564,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}:19552: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:19567: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -19584,7 +19599,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}:19587: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:19602: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -19628,13 +19643,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:19631: checking for tgoto" >&5
+		echo "$as_me:19646: 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 19637 "configure"
+#line 19652 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char tgoto (); below.  */
@@ -19665,16 +19680,16 @@ f = tgoto; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19668: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19683: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19671: \$? = $ac_status" >&5
+  echo "$as_me:19686: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19674: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19689: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19677: \$? = $ac_status" >&5
+  echo "$as_me:19692: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_tgoto=yes
 else
@@ -19684,7 +19699,7 @@ ac_cv_func_tgoto=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:19687: result: $ac_cv_func_tgoto" >&5
+echo "$as_me:19702: 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
@@ -19693,7 +19708,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:19696: checking for tgoto in -l$cf_term_lib" >&5
+echo "$as_me:19711: 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
@@ -19701,7 +19716,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_term_lib  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 19704 "configure"
+#line 19719 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19720,16 +19735,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19723: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19738: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19726: \$? = $ac_status" >&5
+  echo "$as_me:19741: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19729: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19744: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19732: \$? = $ac_status" >&5
+  echo "$as_me:19747: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -19740,7 +19755,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19743: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:19758: result: `eval echo '${'$as_ac_Lib'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
 if test `eval echo '${'$as_ac_Lib'}'` = yes; then
   break
@@ -19759,7 +19774,7 @@ fi
 		for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown
 		do
 			as_ac_Lib=`echo "ac_cv_lib_$cf_curs_lib''_initscr" | $as_tr_sh`
-echo "$as_me:19762: checking for initscr in -l$cf_curs_lib" >&5
+echo "$as_me:19777: checking for initscr in -l$cf_curs_lib" >&5
 echo $ECHO_N "checking for initscr in -l$cf_curs_lib... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19767,7 +19782,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_curs_lib  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 19770 "configure"
+#line 19785 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19786,16 +19801,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19789: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19804: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19792: \$? = $ac_status" >&5
+  echo "$as_me:19807: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19795: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19810: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19798: \$? = $ac_status" >&5
+  echo "$as_me:19813: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -19806,7 +19821,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19809: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:19824: result: `eval echo '${'$as_ac_Lib'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
 if test `eval echo '${'$as_ac_Lib'}'` = yes; then
   break
@@ -19814,16 +19829,16 @@ fi
 
 		done
 	fi
-	test $cf_curs_lib = unknown && { { echo "$as_me:19817: error: no curses library found" >&5
+	test $cf_curs_lib = unknown && { { echo "$as_me:19832: error: no curses library found" >&5
 echo "$as_me: error: no curses library found" >&2;}
    { (exit 1); exit 1; }; }
 
 	LIBS="-l$cf_curs_lib $cf_save_LIBS"
 	if test "$cf_term_lib" = unknown ; then
-		echo "$as_me:19823: checking if we can link with $cf_curs_lib library" >&5
+		echo "$as_me:19838: 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 19826 "configure"
+#line 19841 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -19835,16 +19850,16 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19838: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19853: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19841: \$? = $ac_status" >&5
+  echo "$as_me:19856: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19844: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19859: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19847: \$? = $ac_status" >&5
+  echo "$as_me:19862: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -19853,18 +19868,18 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-		echo "$as_me:19856: result: $cf_result" >&5
+		echo "$as_me:19871: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
-		test $cf_result = no && { { echo "$as_me:19858: error: Cannot link curses library" >&5
+		test $cf_result = no && { { echo "$as_me:19873: error: Cannot link curses library" >&5
 echo "$as_me: error: Cannot link curses library" >&2;}
    { (exit 1); exit 1; }; }
 	elif test "$cf_curs_lib" = "$cf_term_lib" ; then
 		:
 	elif test "$cf_term_lib" != predefined ; then
-		echo "$as_me:19864: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+		echo "$as_me:19879: 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 19867 "configure"
+#line 19882 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -19876,16 +19891,16 @@ initscr(); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19879: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19894: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19882: \$? = $ac_status" >&5
+  echo "$as_me:19897: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19885: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19900: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19888: \$? = $ac_status" >&5
+  echo "$as_me:19903: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=no
 else
@@ -19894,7 +19909,7 @@ cat conftest.$ac_ext >&5
 
 			LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
 			cat >conftest.$ac_ext <<_ACEOF
-#line 19897 "configure"
+#line 19912 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -19906,16 +19921,16 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19909: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19924: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19912: \$? = $ac_status" >&5
+  echo "$as_me:19927: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19915: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19930: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19918: \$? = $ac_status" >&5
+  echo "$as_me:19933: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -19927,13 +19942,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-		echo "$as_me:19930: result: $cf_result" >&5
+		echo "$as_me:19945: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	fi
 fi
 fi
 
-echo "$as_me:19936: checking for curses performance tradeoff" >&5
+echo "$as_me:19951: 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
@@ -19941,7 +19956,7 @@ else
 
     cf_cv_curs_performance=no
     cat >conftest.$ac_ext <<_ACEOF
-#line 19944 "configure"
+#line 19959 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19960,20 +19975,20 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19963: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19978: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19966: \$? = $ac_status" >&5
+  echo "$as_me:19981: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19969: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19984: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19972: \$? = $ac_status" >&5
+  echo "$as_me:19987: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 19976 "configure"
+#line 19991 "configure"
 #include "confdefs.h"
 
 #define CURS_PERFORMANCE
@@ -19993,16 +20008,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19996: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20011: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19999: \$? = $ac_status" >&5
+  echo "$as_me:20014: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20002: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20017: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20005: \$? = $ac_status" >&5
+  echo "$as_me:20020: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_curs_performance=yes
 else
@@ -20017,21 +20032,21 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:20020: result: $cf_cv_curs_performance" >&5
+echo "$as_me:20035: 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:20027: checking for curses touchline function" >&5
+echo "$as_me:20042: 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 20034 "configure"
+#line 20049 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20044,23 +20059,23 @@ touchline(stdscr, 1,2,3);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20047: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20062: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20050: \$? = $ac_status" >&5
+  echo "$as_me:20065: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20053: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20068: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20056: \$? = $ac_status" >&5
+  echo "$as_me:20071: \$? = $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 20063 "configure"
+#line 20078 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20073,16 +20088,16 @@ touchline(stdscr, 1,2);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20076: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20091: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20079: \$? = $ac_status" >&5
+  echo "$as_me:20094: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20082: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20097: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20085: \$? = $ac_status" >&5
+  echo "$as_me:20100: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_curs_touchline=sysv
 else
@@ -20094,7 +20109,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:20097: result: $cf_cv_curs_touchline" >&5
+echo "$as_me:20112: result: $cf_cv_curs_touchline" >&5
 echo "${ECHO_T}$cf_cv_curs_touchline" >&6
 case "$cf_cv_curs_touchline" in
 (bsd)
@@ -20116,7 +20131,7 @@ esac
 	;;
 (ncursesw*)
 
-echo "$as_me:20119: checking for multibyte character support" >&5
+echo "$as_me:20134: 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
@@ -20124,7 +20139,7 @@ else
 
 	cf_save_LIBS="$LIBS"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 20127 "configure"
+#line 20142 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -20137,16 +20152,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20140: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20155: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20143: \$? = $ac_status" >&5
+  echo "$as_me:20158: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20146: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20161: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20149: \$? = $ac_status" >&5
+  echo "$as_me:20164: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_utf8_lib=yes
 else
@@ -20158,12 +20173,12 @@ cat conftest.$ac_ext >&5
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
-echo "${as_me:-configure}:20161: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:20176: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 20166 "configure"
+#line 20181 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -20176,16 +20191,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20179: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20194: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20182: \$? = $ac_status" >&5
+  echo "$as_me:20197: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20185: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20200: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20188: \$? = $ac_status" >&5
+  echo "$as_me:20203: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -20199,7 +20214,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lutf8  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 20202 "configure"
+#line 20217 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -20212,16 +20227,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20215: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20230: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20218: \$? = $ac_status" >&5
+  echo "$as_me:20233: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20221: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20236: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20224: \$? = $ac_status" >&5
+  echo "$as_me:20239: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -20238,9 +20253,9 @@ cat conftest.$ac_ext >&5
 
 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
 
-echo "${as_me:-configure}:20241: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:20256: testing find linkage for utf8 library ..." 1>&5
 
-echo "${as_me:-configure}:20243: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:20258: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -20331,11 +20346,11 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d $cf_cv_header_path_utf8 ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
 
-echo "${as_me:-configure}:20334: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:20349: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8"
 			cat >conftest.$ac_ext <<_ACEOF
-#line 20338 "configure"
+#line 20353 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -20348,21 +20363,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20351: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20366: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20354: \$? = $ac_status" >&5
+  echo "$as_me:20369: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20357: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20372: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20360: \$? = $ac_status" >&5
+  echo "$as_me:20375: \$? = $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}:20365: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:20380: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
 
 				cf_cv_find_linkage_utf8=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -20380,7 +20395,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
-echo "${as_me:-configure}:20383: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:20398: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -20455,13 +20470,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}:20458: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:20473: 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 20464 "configure"
+#line 20479 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -20474,21 +20489,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20477: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20492: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20480: \$? = $ac_status" >&5
+  echo "$as_me:20495: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20483: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20498: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20486: \$? = $ac_status" >&5
+  echo "$as_me:20501: \$? = $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}:20491: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:20506: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
 
 					cf_cv_find_linkage_utf8=yes
 					cf_cv_library_file_utf8="-lutf8"
@@ -20530,7 +20545,7 @@ fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:20533: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:20548: 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
@@ -20565,7 +20580,7 @@ if test -n "$cf_cv_header_path_utf8" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 20568 "configure"
+#line 20583 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -20577,16 +20592,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20580: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20595: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20583: \$? = $ac_status" >&5
+  echo "$as_me:20598: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20586: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20601: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20589: \$? = $ac_status" >&5
+  echo "$as_me:20604: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -20603,7 +20618,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}:20606: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:20621: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -20639,7 +20654,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}:20642: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:20657: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -20669,13 +20684,13 @@ cf_ncuconfig_root=$cf_cv_screen
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:20672: checking pkg-config for $cf_ncuconfig_root" >&5
+	echo "$as_me:20687: 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:20675: result: yes" >&5
+		echo "$as_me:20690: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:20678: checking if the $cf_ncuconfig_root package files work" >&5
+		echo "$as_me:20693: 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
 
@@ -20701,7 +20716,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 20704 "configure"
+#line 20719 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -20713,37 +20728,37 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20716: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20731: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20719: \$? = $ac_status" >&5
+  echo "$as_me:20734: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20722: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20737: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20725: \$? = $ac_status" >&5
+  echo "$as_me:20740: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 20731 "configure"
+#line 20746 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 				int main(void)
 				{ char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:20738: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20753: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20741: \$? = $ac_status" >&5
+  echo "$as_me:20756: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:20743: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20758: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20746: \$? = $ac_status" >&5
+  echo "$as_me:20761: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -20760,7 +20775,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:20763: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:20778: 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"
@@ -20778,7 +20793,7 @@ EOF
 		fi
 
 	else
-		echo "$as_me:20781: result: no" >&5
+		echo "$as_me:20796: result: no" >&5
 echo "${ECHO_T}no" >&6
 		NCURSES_CONFIG_PKG=none
 	fi
@@ -20794,7 +20809,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:20797: checking for $ac_word" >&5
+echo "$as_me:20812: 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
@@ -20809,7 +20824,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:20812: found $ac_dir/$ac_word" >&5
+echo "$as_me:20827: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -20817,10 +20832,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:20820: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:20835: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:20823: result: no" >&5
+  echo "$as_me:20838: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -20833,7 +20848,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:20836: checking for $ac_word" >&5
+echo "$as_me:20851: 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
@@ -20848,7 +20863,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:20851: found $ac_dir/$ac_word" >&5
+echo "$as_me:20866: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -20856,10 +20871,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:20859: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:20874: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:20862: result: no" >&5
+  echo "$as_me:20877: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -20892,7 +20907,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:20895: checking if we have identified curses headers" >&5
+echo "$as_me:20910: 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
@@ -20904,7 +20919,7 @@ for cf_header in \
 	curses.h $cf_cv_screen/curses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 20907 "configure"
+#line 20922 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -20916,16 +20931,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20919: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20934: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20922: \$? = $ac_status" >&5
+  echo "$as_me:20937: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20925: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20940: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20928: \$? = $ac_status" >&5
+  echo "$as_me:20943: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -20936,11 +20951,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:20939: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:20954: 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:20943: error: No curses header-files found" >&5
+	{ { echo "$as_me:20958: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -20950,23 +20965,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:20953: checking for $ac_header" >&5
+echo "$as_me:20968: 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 20959 "configure"
+#line 20974 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20963: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:20978: \"$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:20969: \$? = $ac_status" >&5
+  echo "$as_me:20984: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20985,7 +21000,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:20988: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:21003: 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
@@ -21038,7 +21053,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 21041 "configure"
+#line 21056 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -21050,16 +21065,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21053: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21068: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21056: \$? = $ac_status" >&5
+  echo "$as_me:21071: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21059: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21074: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21062: \$? = $ac_status" >&5
+  echo "$as_me:21077: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -21076,7 +21091,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}:21079: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:21094: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -21095,7 +21110,7 @@ fi
 
 }
 
-echo "$as_me:21098: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:21113: 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
@@ -21107,7 +21122,7 @@ else
 	do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 21110 "configure"
+#line 21125 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -21131,16 +21146,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21134: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21149: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21137: \$? = $ac_status" >&5
+  echo "$as_me:21152: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21140: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21155: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21143: \$? = $ac_status" >&5
+  echo "$as_me:21158: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -21155,14 +21170,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 	done
 
 fi
-echo "$as_me:21158: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:21173: 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:21165: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:21180: 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
@@ -21280,7 +21295,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 21283 "configure"
+#line 21298 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -21292,16 +21307,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21295: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21310: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21298: \$? = $ac_status" >&5
+  echo "$as_me:21313: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21301: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21316: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21304: \$? = $ac_status" >&5
+  echo "$as_me:21319: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -21318,7 +21333,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}:21321: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:21336: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -21341,7 +21356,7 @@ fi
 		do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 21344 "configure"
+#line 21359 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -21365,16 +21380,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21368: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21383: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21371: \$? = $ac_status" >&5
+  echo "$as_me:21386: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21374: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21389: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21377: \$? = $ac_status" >&5
+  echo "$as_me:21392: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -21395,12 +21410,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:21398: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:21413: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:21403: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:21418: 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%/[^/]*$%%'`
@@ -21433,7 +21448,7 @@ if test -n "$cf_1st_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 21436 "configure"
+#line 21451 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -21445,16 +21460,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21448: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21463: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21451: \$? = $ac_status" >&5
+  echo "$as_me:21466: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21454: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21469: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21457: \$? = $ac_status" >&5
+  echo "$as_me:21472: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -21471,7 +21486,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}:21474: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:21489: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -21519,7 +21534,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:21522: checking for terminfo header" >&5
+echo "$as_me:21537: 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
@@ -21537,7 +21552,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 21540 "configure"
+#line 21555 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -21552,16 +21567,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21555: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21570: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21558: \$? = $ac_status" >&5
+  echo "$as_me:21573: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21561: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21576: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21564: \$? = $ac_status" >&5
+  echo "$as_me:21579: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -21577,7 +21592,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:21580: result: $cf_cv_term_header" >&5
+echo "$as_me:21595: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -21615,7 +21630,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:21618: checking for ncurses version" >&5
+echo "$as_me:21633: 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
@@ -21641,10 +21656,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:21644: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:21659: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:21647: \$? = $ac_status" >&5
+  echo "$as_me:21662: \$? = $ac_status" >&5
   (exit $ac_status); }
 	if test -f conftest.out ; then
 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
@@ -21654,7 +21669,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 21657 "configure"
+#line 21672 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -21679,15 +21694,15 @@ int main(void)
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:21682: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21697: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21685: \$? = $ac_status" >&5
+  echo "$as_me:21700: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:21687: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21702: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21690: \$? = $ac_status" >&5
+  echo "$as_me:21705: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -21701,7 +21716,7 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:21704: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:21719: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -21714,7 +21729,7 @@ cf_nculib_root=$cf_cv_screen
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:21717: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:21732: 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
@@ -21722,7 +21737,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 21725 "configure"
+#line 21740 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21741,16 +21756,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21744: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21759: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21747: \$? = $ac_status" >&5
+  echo "$as_me:21762: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21750: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21765: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21753: \$? = $ac_status" >&5
+  echo "$as_me:21768: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -21761,10 +21776,10 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21764: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:21779: 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:21767: checking for initscr in -lgpm" >&5
+  echo "$as_me:21782: 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
@@ -21772,7 +21787,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 21775 "configure"
+#line 21790 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21791,16 +21806,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21794: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21809: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21797: \$? = $ac_status" >&5
+  echo "$as_me:21812: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21800: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21815: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21803: \$? = $ac_status" >&5
+  echo "$as_me:21818: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -21811,7 +21826,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21814: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:21829: 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"
@@ -21826,7 +21841,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's static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:21829: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:21844: 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
@@ -21834,7 +21849,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 21837 "configure"
+#line 21852 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21853,16 +21868,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21856: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21871: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21859: \$? = $ac_status" >&5
+  echo "$as_me:21874: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21862: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21877: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21865: \$? = $ac_status" >&5
+  echo "$as_me:21880: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -21873,7 +21888,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21876: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:21891: 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"
@@ -21922,13 +21937,13 @@ else
 
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
-	echo "$as_me:21925: checking for initscr" >&5
+	echo "$as_me:21940: 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 21931 "configure"
+#line 21946 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */
@@ -21959,16 +21974,16 @@ f = initscr; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21962: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21977: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21965: \$? = $ac_status" >&5
+  echo "$as_me:21980: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21968: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21983: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21971: \$? = $ac_status" >&5
+  echo "$as_me:21986: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -21978,18 +21993,18 @@ ac_cv_func_initscr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:21981: result: $ac_cv_func_initscr" >&5
+echo "$as_me:21996: 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:21988: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:22003: 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 21992 "configure"
+#line 22007 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -22001,25 +22016,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22004: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22019: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22007: \$? = $ac_status" >&5
+  echo "$as_me:22022: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22010: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22025: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22013: \$? = $ac_status" >&5
+  echo "$as_me:22028: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:22015: result: yes" >&5
+  echo "$as_me:22030: 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:22022: result: no" >&5
+echo "$as_me:22037: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -22087,11 +22102,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:22090: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:22105: 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 22094 "configure"
+#line 22109 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -22103,25 +22118,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22106: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22121: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22109: \$? = $ac_status" >&5
+  echo "$as_me:22124: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22112: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22127: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22115: \$? = $ac_status" >&5
+  echo "$as_me:22130: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:22117: result: yes" >&5
+  echo "$as_me:22132: 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:22124: result: no" >&5
+echo "$as_me:22139: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -22136,7 +22151,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:22139: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:22154: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -22144,7 +22159,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:22147: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:22162: 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
@@ -22154,7 +22169,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >conftest.$ac_ext <<_ACEOF
-#line 22157 "configure"
+#line 22172 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -22166,23 +22181,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22169: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22184: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22172: \$? = $ac_status" >&5
+  echo "$as_me:22187: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22175: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22190: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22178: \$? = $ac_status" >&5
+  echo "$as_me:22193: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:22180: result: yes" >&5
+  echo "$as_me:22195: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:22185: result: no" >&5
+echo "$as_me:22200: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -22208,13 +22223,13 @@ cf_ncuconfig_root=$cf_cv_screen
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:22211: checking pkg-config for $cf_ncuconfig_root" >&5
+	echo "$as_me:22226: 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:22214: result: yes" >&5
+		echo "$as_me:22229: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:22217: checking if the $cf_ncuconfig_root package files work" >&5
+		echo "$as_me:22232: 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
 
@@ -22240,7 +22255,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 22243 "configure"
+#line 22258 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -22252,37 +22267,37 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22255: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22270: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22258: \$? = $ac_status" >&5
+  echo "$as_me:22273: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22261: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22276: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22264: \$? = $ac_status" >&5
+  echo "$as_me:22279: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 22270 "configure"
+#line 22285 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 				int main(void)
 				{ char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:22277: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22292: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22280: \$? = $ac_status" >&5
+  echo "$as_me:22295: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:22282: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22297: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22285: \$? = $ac_status" >&5
+  echo "$as_me:22300: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -22299,7 +22314,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:22302: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:22317: 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"
@@ -22317,7 +22332,7 @@ EOF
 		fi
 
 	else
-		echo "$as_me:22320: result: no" >&5
+		echo "$as_me:22335: result: no" >&5
 echo "${ECHO_T}no" >&6
 		NCURSES_CONFIG_PKG=none
 	fi
@@ -22333,7 +22348,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:22336: checking for $ac_word" >&5
+echo "$as_me:22351: 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
@@ -22348,7 +22363,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:22351: found $ac_dir/$ac_word" >&5
+echo "$as_me:22366: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -22356,10 +22371,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:22359: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:22374: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:22362: result: no" >&5
+  echo "$as_me:22377: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -22372,7 +22387,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:22375: checking for $ac_word" >&5
+echo "$as_me:22390: 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
@@ -22387,7 +22402,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:22390: found $ac_dir/$ac_word" >&5
+echo "$as_me:22405: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -22395,10 +22410,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:22398: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:22413: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:22401: result: no" >&5
+  echo "$as_me:22416: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -22431,7 +22446,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:22434: checking if we have identified curses headers" >&5
+echo "$as_me:22449: 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
@@ -22443,7 +22458,7 @@ for cf_header in \
 	curses.h $cf_cv_screen/curses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 22446 "configure"
+#line 22461 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -22455,16 +22470,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22458: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22473: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22461: \$? = $ac_status" >&5
+  echo "$as_me:22476: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22464: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22479: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22467: \$? = $ac_status" >&5
+  echo "$as_me:22482: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -22475,11 +22490,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:22478: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:22493: 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:22482: error: No curses header-files found" >&5
+	{ { echo "$as_me:22497: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -22489,23 +22504,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:22492: checking for $ac_header" >&5
+echo "$as_me:22507: 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 22498 "configure"
+#line 22513 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22502: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:22517: \"$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:22508: \$? = $ac_status" >&5
+  echo "$as_me:22523: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22524,7 +22539,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:22527: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:22542: 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
@@ -22577,7 +22592,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 22580 "configure"
+#line 22595 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -22589,16 +22604,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22592: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22607: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22595: \$? = $ac_status" >&5
+  echo "$as_me:22610: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22598: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22613: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22601: \$? = $ac_status" >&5
+  echo "$as_me:22616: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -22615,7 +22630,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}:22618: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:22633: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -22634,7 +22649,7 @@ fi
 
 }
 
-echo "$as_me:22637: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:22652: 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
@@ -22646,7 +22661,7 @@ else
 	do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 22649 "configure"
+#line 22664 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -22670,16 +22685,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22673: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22688: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22676: \$? = $ac_status" >&5
+  echo "$as_me:22691: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22679: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22694: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22682: \$? = $ac_status" >&5
+  echo "$as_me:22697: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -22694,14 +22709,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 	done
 
 fi
-echo "$as_me:22697: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:22712: 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:22704: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:22719: 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
@@ -22819,7 +22834,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 22822 "configure"
+#line 22837 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -22831,16 +22846,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22834: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22849: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22837: \$? = $ac_status" >&5
+  echo "$as_me:22852: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22840: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22855: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22843: \$? = $ac_status" >&5
+  echo "$as_me:22858: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -22857,7 +22872,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}:22860: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:22875: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -22880,7 +22895,7 @@ fi
 		do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 22883 "configure"
+#line 22898 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -22904,16 +22919,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22907: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22922: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22910: \$? = $ac_status" >&5
+  echo "$as_me:22925: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22913: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22928: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22916: \$? = $ac_status" >&5
+  echo "$as_me:22931: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -22934,12 +22949,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:22937: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:22952: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:22942: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:22957: 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%/[^/]*$%%'`
@@ -22972,7 +22987,7 @@ if test -n "$cf_1st_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 22975 "configure"
+#line 22990 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -22984,16 +22999,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22987: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23002: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22990: \$? = $ac_status" >&5
+  echo "$as_me:23005: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22993: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23008: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22996: \$? = $ac_status" >&5
+  echo "$as_me:23011: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -23010,7 +23025,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}:23013: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:23028: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -23058,7 +23073,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:23061: checking for terminfo header" >&5
+echo "$as_me:23076: 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
@@ -23076,7 +23091,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 23079 "configure"
+#line 23094 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -23091,16 +23106,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23094: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23109: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23097: \$? = $ac_status" >&5
+  echo "$as_me:23112: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23100: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23115: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23103: \$? = $ac_status" >&5
+  echo "$as_me:23118: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -23116,7 +23131,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:23119: result: $cf_cv_term_header" >&5
+echo "$as_me:23134: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -23154,7 +23169,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:23157: checking for ncurses version" >&5
+echo "$as_me:23172: 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
@@ -23180,10 +23195,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:23183: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:23198: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:23186: \$? = $ac_status" >&5
+  echo "$as_me:23201: \$? = $ac_status" >&5
   (exit $ac_status); }
 	if test -f conftest.out ; then
 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
@@ -23193,7 +23208,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 23196 "configure"
+#line 23211 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -23218,15 +23233,15 @@ int main(void)
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:23221: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23236: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23224: \$? = $ac_status" >&5
+  echo "$as_me:23239: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:23226: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23241: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23229: \$? = $ac_status" >&5
+  echo "$as_me:23244: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -23240,7 +23255,7 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:23243: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:23258: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -23253,7 +23268,7 @@ cf_nculib_root=$cf_cv_screen
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:23256: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:23271: 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
@@ -23261,7 +23276,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 23264 "configure"
+#line 23279 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23280,16 +23295,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23283: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23298: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23286: \$? = $ac_status" >&5
+  echo "$as_me:23301: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23289: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23304: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23292: \$? = $ac_status" >&5
+  echo "$as_me:23307: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -23300,10 +23315,10 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23303: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:23318: 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:23306: checking for initscr in -lgpm" >&5
+  echo "$as_me:23321: 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
@@ -23311,7 +23326,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 23314 "configure"
+#line 23329 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23330,16 +23345,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23333: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23348: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23336: \$? = $ac_status" >&5
+  echo "$as_me:23351: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23339: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23354: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23342: \$? = $ac_status" >&5
+  echo "$as_me:23357: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -23350,7 +23365,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23353: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:23368: 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"
@@ -23365,7 +23380,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's static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:23368: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:23383: 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
@@ -23373,7 +23388,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 23376 "configure"
+#line 23391 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23392,16 +23407,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23395: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23410: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23398: \$? = $ac_status" >&5
+  echo "$as_me:23413: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23401: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23416: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23404: \$? = $ac_status" >&5
+  echo "$as_me:23419: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -23412,7 +23427,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23415: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:23430: 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"
@@ -23461,13 +23476,13 @@ else
 
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
-	echo "$as_me:23464: checking for initscr" >&5
+	echo "$as_me:23479: 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 23470 "configure"
+#line 23485 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */
@@ -23498,16 +23513,16 @@ f = initscr; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23501: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23516: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23504: \$? = $ac_status" >&5
+  echo "$as_me:23519: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23507: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23522: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23510: \$? = $ac_status" >&5
+  echo "$as_me:23525: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -23517,18 +23532,18 @@ ac_cv_func_initscr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:23520: result: $ac_cv_func_initscr" >&5
+echo "$as_me:23535: 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:23527: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:23542: 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 23531 "configure"
+#line 23546 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -23540,25 +23555,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23543: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23558: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23546: \$? = $ac_status" >&5
+  echo "$as_me:23561: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23549: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23564: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23552: \$? = $ac_status" >&5
+  echo "$as_me:23567: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:23554: result: yes" >&5
+  echo "$as_me:23569: 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:23561: result: no" >&5
+echo "$as_me:23576: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -23626,11 +23641,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:23629: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:23644: 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 23633 "configure"
+#line 23648 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -23642,25 +23657,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23645: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23660: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23648: \$? = $ac_status" >&5
+  echo "$as_me:23663: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23651: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23666: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23654: \$? = $ac_status" >&5
+  echo "$as_me:23669: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:23656: result: yes" >&5
+  echo "$as_me:23671: 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:23663: result: no" >&5
+echo "$as_me:23678: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -23675,7 +23690,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:23678: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:23693: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -23683,7 +23698,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:23686: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:23701: 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
@@ -23693,7 +23708,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >conftest.$ac_ext <<_ACEOF
-#line 23696 "configure"
+#line 23711 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -23705,23 +23720,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23708: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23723: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23711: \$? = $ac_status" >&5
+  echo "$as_me:23726: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23714: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23729: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23717: \$? = $ac_status" >&5
+  echo "$as_me:23732: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:23719: result: yes" >&5
+  echo "$as_me:23734: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:23724: result: no" >&5
+echo "$as_me:23739: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -23753,7 +23768,7 @@ fi
 	;;
 (slang)
 
-echo "$as_me:23756: checking for slang header file" >&5
+echo "$as_me:23771: 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
@@ -23761,7 +23776,7 @@ else
 
 	cf_cv_slang_header=no
 	cat >conftest.$ac_ext <<_ACEOF
-#line 23764 "configure"
+#line 23779 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -23773,16 +23788,16 @@ printf("%s\n", SLANG_VERSION)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23776: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23791: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23779: \$? = $ac_status" >&5
+  echo "$as_me:23794: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23782: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23797: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23785: \$? = $ac_status" >&5
+  echo "$as_me:23800: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_header=predefined
 else
@@ -23887,7 +23902,7 @@ cf_search="$cf_search $cf_header_path_list"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:23890: result: $cf_cv_slang_header" >&5
+echo "$as_me:23905: result: $cf_cv_slang_header" >&5
 echo "${ECHO_T}$cf_cv_slang_header" >&6
 
 if test "x$cf_cv_slang_header" != xno
@@ -23928,7 +23943,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 23931 "configure"
+#line 23946 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -23940,16 +23955,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23943: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23958: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23946: \$? = $ac_status" >&5
+  echo "$as_me:23961: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23949: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23964: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23952: \$? = $ac_status" >&5
+  echo "$as_me:23967: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -23966,7 +23981,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}:23969: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:23984: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -23998,7 +24013,7 @@ else
 
 cf_cv_termlib=none
 cat >conftest.$ac_ext <<_ACEOF
-#line 24001 "configure"
+#line 24016 "configure"
 #include "confdefs.h"
 
 int
@@ -24010,19 +24025,19 @@ char *x=(char*)tgoto("",0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24013: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24028: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24016: \$? = $ac_status" >&5
+  echo "$as_me:24031: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24019: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24034: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24022: \$? = $ac_status" >&5
+  echo "$as_me:24037: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 24025 "configure"
+#line 24040 "configure"
 #include "confdefs.h"
 
 int
@@ -24034,16 +24049,16 @@ int x=tigetstr("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24037: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24052: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24040: \$? = $ac_status" >&5
+  echo "$as_me:24055: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24043: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24058: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24046: \$? = $ac_status" >&5
+  echo "$as_me:24061: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termlib=terminfo
 else
@@ -24054,7 +24069,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}:24057: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
+echo "${as_me:-configure}:24072: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
 
 else
   echo "$as_me: failed program was:" >&5
@@ -24069,10 +24084,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:24072: checking for $cf_func in -l$cf_lib" >&5
+			echo "$as_me:24087: 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 24075 "configure"
+#line 24090 "configure"
 #include "confdefs.h"
 
 int
@@ -24084,16 +24099,16 @@ int x=$cf_func("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24087: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24102: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24090: \$? = $ac_status" >&5
+  echo "$as_me:24105: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24093: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24108: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24096: \$? = $ac_status" >&5
+  echo "$as_me:24111: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -24102,7 +24117,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-			echo "$as_me:24105: result: $cf_result" >&5
+			echo "$as_me:24120: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				if test "$cf_func" = tigetstr ; then
@@ -24119,7 +24134,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:24122: checking for initscr in -lcurses" >&5
+	echo "$as_me:24137: 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
@@ -24127,7 +24142,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 24130 "configure"
+#line 24145 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24146,16 +24161,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24149: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24164: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24152: \$? = $ac_status" >&5
+  echo "$as_me:24167: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24155: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24170: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24158: \$? = $ac_status" >&5
+  echo "$as_me:24173: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_curses_initscr=yes
 else
@@ -24166,7 +24181,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24169: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:24184: 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
 
@@ -24188,7 +24203,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-	echo "$as_me:24191: checking for tgoto in -ltermcap" >&5
+	echo "$as_me:24206: 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
@@ -24196,7 +24211,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 24199 "configure"
+#line 24214 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24215,16 +24230,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24218: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24233: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24221: \$? = $ac_status" >&5
+  echo "$as_me:24236: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24224: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24239: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24227: \$? = $ac_status" >&5
+  echo "$as_me:24242: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_termcap_tgoto=yes
 else
@@ -24235,7 +24250,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24238: result: $ac_cv_lib_termcap_tgoto" >&5
+echo "$as_me:24253: 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
 
@@ -24262,20 +24277,20 @@ fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 if test "$cf_cv_termlib" = none; then
-	{ echo "$as_me:24265: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
+	{ echo "$as_me:24280: 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:24272: checking for acos" >&5
+echo "$as_me:24287: 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 24278 "configure"
+#line 24293 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char acos (); below.  */
@@ -24306,16 +24321,16 @@ f = acos; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24309: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24324: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24312: \$? = $ac_status" >&5
+  echo "$as_me:24327: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24315: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24330: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24318: \$? = $ac_status" >&5
+  echo "$as_me:24333: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_acos=yes
 else
@@ -24325,13 +24340,13 @@ ac_cv_func_acos=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:24328: result: $ac_cv_func_acos" >&5
+echo "$as_me:24343: 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:24334: checking for acos in -lm" >&5
+echo "$as_me:24349: 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
@@ -24339,7 +24354,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm $LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 24342 "configure"
+#line 24357 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24358,16 +24373,16 @@ acos ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24361: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24376: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24364: \$? = $ac_status" >&5
+  echo "$as_me:24379: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24367: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24382: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24370: \$? = $ac_status" >&5
+  echo "$as_me:24385: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_m_acos=yes
 else
@@ -24378,7 +24393,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24381: result: $ac_cv_lib_m_acos" >&5
+echo "$as_me:24396: 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
 
@@ -24404,13 +24419,13 @@ case $host_os in
 
 	eval 'cf_cv_have_lib_'video'=no'
 	cf_libdir=""
-	echo "$as_me:24407: checking for v_init" >&5
+	echo "$as_me:24422: 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 24413 "configure"
+#line 24428 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char v_init (); below.  */
@@ -24441,16 +24456,16 @@ f = v_init; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24444: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24459: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24447: \$? = $ac_status" >&5
+  echo "$as_me:24462: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24450: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24465: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24453: \$? = $ac_status" >&5
+  echo "$as_me:24468: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_v_init=yes
 else
@@ -24460,18 +24475,18 @@ ac_cv_func_v_init=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:24463: result: $ac_cv_func_v_init" >&5
+echo "$as_me:24478: 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:24470: checking for v_init in -lvideo" >&5
+		echo "$as_me:24485: 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 24474 "configure"
+#line 24489 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -24483,25 +24498,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24486: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24501: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24489: \$? = $ac_status" >&5
+  echo "$as_me:24504: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24492: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24507: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24495: \$? = $ac_status" >&5
+  echo "$as_me:24510: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:24497: result: yes" >&5
+  echo "$as_me:24512: 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:24504: result: no" >&5
+echo "$as_me:24519: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -24569,11 +24584,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:24572: checking for -lvideo in $cf_libdir" >&5
+				echo "$as_me:24587: 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 24576 "configure"
+#line 24591 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -24585,25 +24600,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24588: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24603: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24591: \$? = $ac_status" >&5
+  echo "$as_me:24606: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24594: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24609: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24597: \$? = $ac_status" >&5
+  echo "$as_me:24612: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:24599: result: yes" >&5
+  echo "$as_me:24614: 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:24606: result: no" >&5
+echo "$as_me:24621: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -24618,7 +24633,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'video
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:24621: error: Cannot link video library" >&5
+	{ { echo "$as_me:24636: error: Cannot link video library" >&5
 echo "$as_me: error: Cannot link video library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -24628,13 +24643,13 @@ esac
 
 	eval 'cf_cv_have_lib_'slang'=no'
 	cf_libdir=""
-	echo "$as_me:24631: checking for SLtt_get_screen_size" >&5
+	echo "$as_me:24646: 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 24637 "configure"
+#line 24652 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char SLtt_get_screen_size (); below.  */
@@ -24665,16 +24680,16 @@ f = SLtt_get_screen_size; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24668: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24683: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24671: \$? = $ac_status" >&5
+  echo "$as_me:24686: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24674: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24689: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24677: \$? = $ac_status" >&5
+  echo "$as_me:24692: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_SLtt_get_screen_size=yes
 else
@@ -24684,18 +24699,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:24687: result: $ac_cv_func_SLtt_get_screen_size" >&5
+echo "$as_me:24702: 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:24694: checking for SLtt_get_screen_size in -lslang" >&5
+		echo "$as_me:24709: 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 24698 "configure"
+#line 24713 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -24707,25 +24722,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24710: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24725: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24713: \$? = $ac_status" >&5
+  echo "$as_me:24728: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24716: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24731: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24719: \$? = $ac_status" >&5
+  echo "$as_me:24734: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:24721: result: yes" >&5
+  echo "$as_me:24736: 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:24728: result: no" >&5
+echo "$as_me:24743: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -24793,11 +24808,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:24796: checking for -lslang in $cf_libdir" >&5
+				echo "$as_me:24811: 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 24800 "configure"
+#line 24815 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -24809,25 +24824,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24812: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24827: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24815: \$? = $ac_status" >&5
+  echo "$as_me:24830: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24818: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24833: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24821: \$? = $ac_status" >&5
+  echo "$as_me:24836: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:24823: result: yes" >&5
+  echo "$as_me:24838: 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:24830: result: no" >&5
+echo "$as_me:24845: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -24842,13 +24857,13 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'slang
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:24845: error: Cannot link slang library" >&5
+	{ { echo "$as_me:24860: 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:24851: checking if we can link slang without termcap" >&5
+echo "$as_me:24866: 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%^.%%'`
@@ -24857,7 +24872,7 @@ else
 fi
 LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s%$cf_exclude%%" -e 's%^.%%'`
 cat >conftest.$ac_ext <<_ACEOF
-#line 24860 "configure"
+#line 24875 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -24869,16 +24884,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24872: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24887: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24875: \$? = $ac_status" >&5
+  echo "$as_me:24890: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24878: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24893: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24881: \$? = $ac_status" >&5
+  echo "$as_me:24896: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -24887,13 +24902,13 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:24890: result: $cf_result" >&5
+echo "$as_me:24905: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 test $cf_result = no && LIBS="$cf_slang_LIBS3"
 
 else
 
-echo "$as_me:24896: checking for slang2 header file" >&5
+echo "$as_me:24911: 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
@@ -24901,7 +24916,7 @@ else
 
 	cf_cv_slang2_header=no
 	cat >conftest.$ac_ext <<_ACEOF
-#line 24904 "configure"
+#line 24919 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -24913,16 +24928,16 @@ printf("%s\n", SLANG_VERSION)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24916: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24931: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24919: \$? = $ac_status" >&5
+  echo "$as_me:24934: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24922: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24937: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24925: \$? = $ac_status" >&5
+  echo "$as_me:24940: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang2_header=predefined
 else
@@ -25027,7 +25042,7 @@ cf_search="$cf_search $cf_header_path_list"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:25030: result: $cf_cv_slang2_header" >&5
+echo "$as_me:25045: result: $cf_cv_slang2_header" >&5
 echo "${ECHO_T}$cf_cv_slang2_header" >&6
 
 if test "x$cf_cv_slang2_header" != xno
@@ -25068,7 +25083,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 25071 "configure"
+#line 25086 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -25080,16 +25095,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25083: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25098: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25086: \$? = $ac_status" >&5
+  echo "$as_me:25101: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25089: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25104: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25092: \$? = $ac_status" >&5
+  echo "$as_me:25107: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -25106,7 +25121,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}:25109: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:25124: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -25138,7 +25153,7 @@ else
 
 cf_cv_termlib=none
 cat >conftest.$ac_ext <<_ACEOF
-#line 25141 "configure"
+#line 25156 "configure"
 #include "confdefs.h"
 
 int
@@ -25150,19 +25165,19 @@ char *x=(char*)tgoto("",0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25153: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25168: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25156: \$? = $ac_status" >&5
+  echo "$as_me:25171: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25159: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25174: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25162: \$? = $ac_status" >&5
+  echo "$as_me:25177: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 25165 "configure"
+#line 25180 "configure"
 #include "confdefs.h"
 
 int
@@ -25174,16 +25189,16 @@ int x=tigetstr("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25177: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25192: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25180: \$? = $ac_status" >&5
+  echo "$as_me:25195: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25183: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25198: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25186: \$? = $ac_status" >&5
+  echo "$as_me:25201: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termlib=terminfo
 else
@@ -25194,7 +25209,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}:25197: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
+echo "${as_me:-configure}:25212: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
 
 else
   echo "$as_me: failed program was:" >&5
@@ -25209,10 +25224,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:25212: checking for $cf_func in -l$cf_lib" >&5
+			echo "$as_me:25227: 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 25215 "configure"
+#line 25230 "configure"
 #include "confdefs.h"
 
 int
@@ -25224,16 +25239,16 @@ int x=$cf_func("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25227: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25242: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25230: \$? = $ac_status" >&5
+  echo "$as_me:25245: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25233: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25248: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25236: \$? = $ac_status" >&5
+  echo "$as_me:25251: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -25242,7 +25257,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-			echo "$as_me:25245: result: $cf_result" >&5
+			echo "$as_me:25260: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				if test "$cf_func" = tigetstr ; then
@@ -25259,7 +25274,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:25262: checking for initscr in -lcurses" >&5
+	echo "$as_me:25277: 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
@@ -25267,7 +25282,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 25270 "configure"
+#line 25285 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -25286,16 +25301,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25289: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25304: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25292: \$? = $ac_status" >&5
+  echo "$as_me:25307: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25295: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25310: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25298: \$? = $ac_status" >&5
+  echo "$as_me:25313: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_curses_initscr=yes
 else
@@ -25306,7 +25321,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:25309: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:25324: 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
 
@@ -25328,7 +25343,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-	echo "$as_me:25331: checking for tgoto in -ltermcap" >&5
+	echo "$as_me:25346: 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
@@ -25336,7 +25351,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 25339 "configure"
+#line 25354 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -25355,16 +25370,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25358: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25373: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25361: \$? = $ac_status" >&5
+  echo "$as_me:25376: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25364: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25379: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25367: \$? = $ac_status" >&5
+  echo "$as_me:25382: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_termcap_tgoto=yes
 else
@@ -25375,7 +25390,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:25378: result: $ac_cv_lib_termcap_tgoto" >&5
+echo "$as_me:25393: 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
 
@@ -25402,20 +25417,20 @@ fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 if test "$cf_cv_termlib" = none; then
-	{ echo "$as_me:25405: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
+	{ echo "$as_me:25420: 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:25412: checking for acos" >&5
+echo "$as_me:25427: 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 25418 "configure"
+#line 25433 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char acos (); below.  */
@@ -25446,16 +25461,16 @@ f = acos; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25449: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25464: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25452: \$? = $ac_status" >&5
+  echo "$as_me:25467: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25455: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25470: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25458: \$? = $ac_status" >&5
+  echo "$as_me:25473: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_acos=yes
 else
@@ -25465,13 +25480,13 @@ ac_cv_func_acos=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:25468: result: $ac_cv_func_acos" >&5
+echo "$as_me:25483: 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:25474: checking for acos in -lm" >&5
+echo "$as_me:25489: 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
@@ -25479,7 +25494,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm $LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 25482 "configure"
+#line 25497 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -25498,16 +25513,16 @@ acos ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25501: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25516: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25504: \$? = $ac_status" >&5
+  echo "$as_me:25519: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25507: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25522: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25510: \$? = $ac_status" >&5
+  echo "$as_me:25525: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_m_acos=yes
 else
@@ -25518,7 +25533,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:25521: result: $ac_cv_lib_m_acos" >&5
+echo "$as_me:25536: 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
 
@@ -25544,13 +25559,13 @@ case $host_os in
 
 	eval 'cf_cv_have_lib_'video'=no'
 	cf_libdir=""
-	echo "$as_me:25547: checking for v_init" >&5
+	echo "$as_me:25562: 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 25553 "configure"
+#line 25568 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char v_init (); below.  */
@@ -25581,16 +25596,16 @@ f = v_init; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25584: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25599: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25587: \$? = $ac_status" >&5
+  echo "$as_me:25602: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25590: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25605: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25593: \$? = $ac_status" >&5
+  echo "$as_me:25608: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_v_init=yes
 else
@@ -25600,18 +25615,18 @@ ac_cv_func_v_init=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:25603: result: $ac_cv_func_v_init" >&5
+echo "$as_me:25618: 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:25610: checking for v_init in -lvideo" >&5
+		echo "$as_me:25625: 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 25614 "configure"
+#line 25629 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -25623,25 +25638,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25626: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25641: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25629: \$? = $ac_status" >&5
+  echo "$as_me:25644: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25632: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25647: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25635: \$? = $ac_status" >&5
+  echo "$as_me:25650: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:25637: result: yes" >&5
+  echo "$as_me:25652: 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:25644: result: no" >&5
+echo "$as_me:25659: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -25709,11 +25724,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:25712: checking for -lvideo in $cf_libdir" >&5
+				echo "$as_me:25727: 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 25716 "configure"
+#line 25731 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -25725,25 +25740,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25728: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25743: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25731: \$? = $ac_status" >&5
+  echo "$as_me:25746: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25734: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25749: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25737: \$? = $ac_status" >&5
+  echo "$as_me:25752: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:25739: result: yes" >&5
+  echo "$as_me:25754: 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:25746: result: no" >&5
+echo "$as_me:25761: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -25758,7 +25773,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'video
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:25761: error: Cannot link video library" >&5
+	{ { echo "$as_me:25776: error: Cannot link video library" >&5
 echo "$as_me: error: Cannot link video library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -25768,13 +25783,13 @@ esac
 
 	eval 'cf_cv_have_lib_'slang2'=no'
 	cf_libdir=""
-	echo "$as_me:25771: checking for SLtt_get_screen_size" >&5
+	echo "$as_me:25786: 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 25777 "configure"
+#line 25792 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char SLtt_get_screen_size (); below.  */
@@ -25805,16 +25820,16 @@ f = SLtt_get_screen_size; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25808: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25823: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25811: \$? = $ac_status" >&5
+  echo "$as_me:25826: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25814: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25829: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25817: \$? = $ac_status" >&5
+  echo "$as_me:25832: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_SLtt_get_screen_size=yes
 else
@@ -25824,18 +25839,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:25827: result: $ac_cv_func_SLtt_get_screen_size" >&5
+echo "$as_me:25842: 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:25834: checking for SLtt_get_screen_size in -lslang2" >&5
+		echo "$as_me:25849: 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 25838 "configure"
+#line 25853 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -25847,25 +25862,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25850: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25865: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25853: \$? = $ac_status" >&5
+  echo "$as_me:25868: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25856: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25871: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25859: \$? = $ac_status" >&5
+  echo "$as_me:25874: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:25861: result: yes" >&5
+  echo "$as_me:25876: 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:25868: result: no" >&5
+echo "$as_me:25883: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -25933,11 +25948,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:25936: checking for -lslang2 in $cf_libdir" >&5
+				echo "$as_me:25951: 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 25940 "configure"
+#line 25955 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -25949,25 +25964,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25952: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25967: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25955: \$? = $ac_status" >&5
+  echo "$as_me:25970: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25958: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25973: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25961: \$? = $ac_status" >&5
+  echo "$as_me:25976: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:25963: result: yes" >&5
+  echo "$as_me:25978: 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:25970: result: no" >&5
+echo "$as_me:25985: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -25982,13 +25997,13 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'slang2
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:25985: error: Cannot link slang2 library" >&5
+	{ { echo "$as_me:26000: 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:25991: checking if we can link slang2 without termcap" >&5
+echo "$as_me:26006: 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%^.%%'`
@@ -25997,7 +26012,7 @@ else
 fi
 LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s%$cf_exclude%%" -e 's%^.%%'`
 cat >conftest.$ac_ext <<_ACEOF
-#line 26000 "configure"
+#line 26015 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -26009,16 +26024,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26012: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26027: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26015: \$? = $ac_status" >&5
+  echo "$as_me:26030: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26018: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26033: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26021: \$? = $ac_status" >&5
+  echo "$as_me:26036: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -26027,12 +26042,12 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:26030: result: $cf_result" >&5
+echo "$as_me:26045: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 test $cf_result = no && LIBS="$cf_slang_LIBS3"
 
 	else
-		{ { echo "$as_me:26035: error: cannot find slang headers" >&5
+		{ { echo "$as_me:26050: error: cannot find slang headers" >&5
 echo "$as_me: error: cannot find slang headers" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -26040,14 +26055,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:26043: checking if we must define UTF8" >&5
+echo "$as_me:26058: 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 26050 "configure"
+#line 26065 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -26059,16 +26074,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26062: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26077: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26065: \$? = $ac_status" >&5
+  echo "$as_me:26080: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26068: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26083: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26071: \$? = $ac_status" >&5
+  echo "$as_me:26086: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_utf8=no
 else
@@ -26076,7 +26091,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 26079 "configure"
+#line 26094 "configure"
 #include "confdefs.h"
 
 #define UTF8
@@ -26090,16 +26105,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26093: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26108: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26096: \$? = $ac_status" >&5
+  echo "$as_me:26111: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26099: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26114: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26102: \$? = $ac_status" >&5
+  echo "$as_me:26117: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_utf8=yes
 else
@@ -26112,7 +26127,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:26115: result: $cf_cv_slang_utf8" >&5
+echo "$as_me:26130: result: $cf_cv_slang_utf8" >&5
 echo "${ECHO_T}$cf_cv_slang_utf8" >&6
 
 if test "$cf_cv_slang_utf8" = yes ; then
@@ -26123,14 +26138,14 @@ EOF
 
 fi
 
-echo "$as_me:26126: checking if we must tell slang this is UNIX" >&5
+echo "$as_me:26141: 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 26133 "configure"
+#line 26148 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -26149,16 +26164,16 @@ SLang_TT_Baud_Rate = 1
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26152: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26167: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26155: \$? = $ac_status" >&5
+  echo "$as_me:26170: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26158: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26173: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26161: \$? = $ac_status" >&5
+  echo "$as_me:26176: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_unix=yes
 else
@@ -26169,20 +26184,20 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:26172: result: $cf_cv_slang_unix" >&5
+echo "$as_me:26187: 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:26179: checking for SLsmg_Color_Type" >&5
+	echo "$as_me:26194: 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 26185 "configure"
+#line 26200 "configure"
 #include "confdefs.h"
 #include <slang.h>
 
@@ -26198,16 +26213,16 @@ if (sizeof (SLsmg_Color_Type))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26201: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26216: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26204: \$? = $ac_status" >&5
+  echo "$as_me:26219: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26207: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26222: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26210: \$? = $ac_status" >&5
+  echo "$as_me:26225: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_SLsmg_Color_Type=yes
 else
@@ -26217,7 +26232,7 @@ ac_cv_type_SLsmg_Color_Type=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:26220: result: $ac_cv_type_SLsmg_Color_Type" >&5
+echo "$as_me:26235: 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
@@ -26233,13 +26248,13 @@ EOF
 
 fi
 
-	echo "$as_me:26236: checking for SLtt_Char_Type" >&5
+	echo "$as_me:26251: 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 26242 "configure"
+#line 26257 "configure"
 #include "confdefs.h"
 #include <slang.h>
 
@@ -26255,16 +26270,16 @@ if (sizeof (SLtt_Char_Type))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26258: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26273: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26261: \$? = $ac_status" >&5
+  echo "$as_me:26276: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26264: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26279: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26267: \$? = $ac_status" >&5
+  echo "$as_me:26282: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_SLtt_Char_Type=yes
 else
@@ -26274,7 +26289,7 @@ ac_cv_type_SLtt_Char_Type=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:26277: result: $ac_cv_type_SLtt_Char_Type" >&5
+echo "$as_me:26292: 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
@@ -26294,14 +26309,14 @@ fi
 	;;
 esac
 
-echo "$as_me:26297: checking for chtype typedef" >&5
+echo "$as_me:26312: 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 26304 "configure"
+#line 26319 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -26313,16 +26328,16 @@ chtype foo
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26316: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26331: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26319: \$? = $ac_status" >&5
+  echo "$as_me:26334: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26322: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26337: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26325: \$? = $ac_status" >&5
+  echo "$as_me:26340: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_chtype_decl=yes
 else
@@ -26332,7 +26347,7 @@ cf_cv_chtype_decl=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:26335: result: $cf_cv_chtype_decl" >&5
+echo "$as_me:26350: result: $cf_cv_chtype_decl" >&5
 echo "${ECHO_T}$cf_cv_chtype_decl" >&6
 if test $cf_cv_chtype_decl = yes ; then
 
@@ -26340,14 +26355,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_TYPE_CHTYPE 1
 EOF
 
-	echo "$as_me:26343: checking if chtype is scalar or struct" >&5
+	echo "$as_me:26358: 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 26350 "configure"
+#line 26365 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -26359,16 +26374,16 @@ chtype foo; long x = foo
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26362: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26377: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26365: \$? = $ac_status" >&5
+  echo "$as_me:26380: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26368: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26383: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26371: \$? = $ac_status" >&5
+  echo "$as_me:26386: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_chtype_type=scalar
 else
@@ -26378,7 +26393,7 @@ cf_cv_chtype_type=struct
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:26381: result: $cf_cv_chtype_type" >&5
+echo "$as_me:26396: result: $cf_cv_chtype_type" >&5
 echo "${ECHO_T}$cf_cv_chtype_type" >&6
 	if test $cf_cv_chtype_type = scalar ; then
 
@@ -26389,7 +26404,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:26392: checking if you want the wide-curses features" >&5
+echo "$as_me:26407: 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.
@@ -26406,10 +26421,10 @@ else
 	use_wide_curses=$cf_wide_curses
 
 fi;
-echo "$as_me:26409: result: $use_wide_curses" >&5
+echo "$as_me:26424: result: $use_wide_curses" >&5
 echo "${ECHO_T}$use_wide_curses" >&6
 
-echo "$as_me:26412: checking if color-style code should be used" >&5
+echo "$as_me:26427: 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.
@@ -26429,7 +26444,7 @@ fi;
 
 case $use_color_style in
 (no)
-	echo "$as_me:26432: result: no" >&5
+	echo "$as_me:26447: result: no" >&5
 echo "${ECHO_T}no" >&6
 	INSTALL_LSS=
 	;;
@@ -26439,10 +26454,10 @@ cat >>confdefs.h <<\EOF
 #define USE_COLOR_STYLE 1
 EOF
 
-	echo "$as_me:26442: result: yes" >&5
+	echo "$as_me:26457: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-	echo "$as_me:26445: checking for location of style-sheet file" >&5
+	echo "$as_me:26460: 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.
@@ -26478,7 +26493,7 @@ case ".$withval" in
 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:26481: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:26496: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -26487,7 +26502,7 @@ esac
 fi
 eval LYNX_LSS_FILE="$withval"
 
-	echo "$as_me:26490: result: $LYNX_LSS_FILE" >&5
+	echo "$as_me:26505: result: $LYNX_LSS_FILE" >&5
 echo "${ECHO_T}$LYNX_LSS_FILE" >&6
 
 	test "$LYNX_LSS_FILE" = no && LYNX_LSS_FILE=
@@ -26500,7 +26515,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:26503: checking for the default configuration-file" >&5
+echo "$as_me:26518: 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.
@@ -26536,7 +26551,7 @@ case ".$withval" in
 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:26539: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:26554: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -26545,7 +26560,7 @@ esac
 fi
 eval LYNX_CFG_FILE="$withval"
 
-echo "$as_me:26548: result: $LYNX_CFG_FILE" >&5
+echo "$as_me:26563: result: $LYNX_CFG_FILE" >&5
 echo "${ECHO_T}$LYNX_CFG_FILE" >&6
 
 test "$LYNX_CFG_FILE" = no && LYNX_CFG_FILE=
@@ -26554,7 +26569,7 @@ cat >>confdefs.h <<EOF
 #define LYNX_CFG_FILE "$LYNX_CFG_FILE"
 EOF
 
-echo "$as_me:26557: checking for the default configuration-path" >&5
+echo "$as_me:26572: 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.
@@ -26590,7 +26605,7 @@ case ".$withval" in
 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:26593: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:26608: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -26599,7 +26614,7 @@ esac
 fi
 eval LYNX_CFG_PATH="$withval"
 
-echo "$as_me:26602: result: $LYNX_CFG_PATH" >&5
+echo "$as_me:26617: result: $LYNX_CFG_PATH" >&5
 echo "${ECHO_T}$LYNX_CFG_PATH" >&6
 
 test -z "$LYNX_CFG_PATH" && `echo "$LYNX_CFG_FILE" | sed -e 's%/[^/]*$%%'`
@@ -26609,7 +26624,7 @@ cat >>confdefs.h <<EOF
 #define LYNX_CFG_PATH "$LYNX_CFG_PATH"
 EOF
 
-echo "$as_me:26612: checking if htmlized lynx.cfg should be built" >&5
+echo "$as_me:26627: 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.
@@ -26626,7 +26641,7 @@ else
 	use_htmlized_cfg=no
 
 fi;
-echo "$as_me:26629: result: $use_htmlized_cfg" >&5
+echo "$as_me:26644: result: $use_htmlized_cfg" >&5
 echo "${ECHO_T}$use_htmlized_cfg" >&6
 
 LYNXCFG_MAKE=''
@@ -26634,7 +26649,7 @@ if test $use_htmlized_cfg = no ; then
 	LYNXCFG_MAKE='#'
 fi
 
-echo "$as_me:26637: checking if local doc directory should be linked to help page" >&5
+echo "$as_me:26652: 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.
@@ -26651,7 +26666,7 @@ else
 	use_local_docs=no
 
 fi;
-echo "$as_me:26654: result: $use_local_docs" >&5
+echo "$as_me:26669: result: $use_local_docs" >&5
 echo "${ECHO_T}$use_local_docs" >&6
 
 LYNXDOC_MAKE=''
@@ -26659,7 +26674,7 @@ if test $use_local_docs = no ; then
 	LYNXDOC_MAKE='#'
 fi
 
-echo "$as_me:26662: checking for MIME library directory" >&5
+echo "$as_me:26677: 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.
@@ -26695,7 +26710,7 @@ case ".$withval" in
 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:26698: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:26713: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -26704,7 +26719,7 @@ esac
 fi
 eval MIME_LIBDIR="$withval"
 
-echo "$as_me:26707: result: $MIME_LIBDIR" >&5
+echo "$as_me:26722: result: $MIME_LIBDIR" >&5
 echo "${ECHO_T}$MIME_LIBDIR" >&6
 MIME_LIBDIR=`echo "$MIME_LIBDIR" | sed -e 's,/$,,' -e 's,$,/,'`
 
@@ -26712,7 +26727,7 @@ cat >>confdefs.h <<EOF
 #define MIME_LIBDIR "$MIME_LIBDIR"
 EOF
 
-echo "$as_me:26715: checking if locale-charset selection logic should be used" >&5
+echo "$as_me:26730: 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.
@@ -26729,7 +26744,7 @@ else
 	use_locale_charset=yes
 
 fi;
-echo "$as_me:26732: result: $use_locale_charset" >&5
+echo "$as_me:26747: result: $use_locale_charset" >&5
 echo "${ECHO_T}$use_locale_charset" >&6
 test $use_locale_charset != no &&
 cat >>confdefs.h <<\EOF
@@ -26738,7 +26753,7 @@ EOF
 
 CHARSET_DEFS=
 
-echo "$as_me:26741: checking if you want only a few charsets" >&5
+echo "$as_me:26756: 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.
@@ -26750,7 +26765,7 @@ else
 fi;
 
 if test -n "$cf_charsets" ; then
-	echo "$as_me:26753: result: yes" >&5
+	echo "$as_me:26768: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 cat >>confdefs.h <<\EOF
@@ -26764,7 +26779,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}:26767: testing using minimal list of charsets: $cf_min_charsets ..." 1>&5
+echo "${as_me:-configure}:26782: 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'`
@@ -26791,28 +26806,28 @@ echo "${as_me:-configure}:26767: testing using minimal list of charsets: $cf_min
 		then
 			test -n "$verbose" && echo "	found $cf_charset" 1>&6
 
-echo "${as_me:-configure}:26794: testing found $cf_charset ..." 1>&5
+echo "${as_me:-configure}:26809: 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}:26800: testing not found $cf_charset ..." 1>&5
+echo "${as_me:-configure}:26815: testing not found $cf_charset ..." 1>&5
 
 		fi
 	done
 else
-	echo "$as_me:26805: result: no" >&5
+	echo "$as_me:26820: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:26809: checking for ANSI C header files" >&5
+echo "$as_me:26824: 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 26815 "configure"
+#line 26830 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -26820,13 +26835,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:26823: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:26838: \"$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:26829: \$? = $ac_status" >&5
+  echo "$as_me:26844: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -26848,7 +26863,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 26851 "configure"
+#line 26866 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -26866,7 +26881,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 26869 "configure"
+#line 26884 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -26887,7 +26902,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 26890 "configure"
+#line 26905 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -26913,15 +26928,15 @@ main (void)
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:26916: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26931: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26919: \$? = $ac_status" >&5
+  echo "$as_me:26934: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:26921: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26936: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26924: \$? = $ac_status" >&5
+  echo "$as_me:26939: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -26934,7 +26949,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:26937: result: $ac_cv_header_stdc" >&5
+echo "$as_me:26952: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -26944,13 +26959,13 @@ EOF
 
 fi
 
-echo "$as_me:26947: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:26962: 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 26953 "configure"
+#line 26968 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -26966,16 +26981,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26969: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26984: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26972: \$? = $ac_status" >&5
+  echo "$as_me:26987: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26975: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26990: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26978: \$? = $ac_status" >&5
+  echo "$as_me:26993: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_header_time=yes
 else
@@ -26985,7 +27000,7 @@ ac_cv_header_time=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:26988: result: $ac_cv_header_time" >&5
+echo "$as_me:27003: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -26998,13 +27013,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:27001: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:27016: 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 27007 "configure"
+#line 27022 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -27019,16 +27034,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27022: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27037: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27025: \$? = $ac_status" >&5
+  echo "$as_me:27040: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27028: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27043: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27031: \$? = $ac_status" >&5
+  echo "$as_me:27046: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -27038,7 +27053,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27041: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:27056: 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
@@ -27051,7 +27066,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:27054: checking for opendir in -ldir" >&5
+  echo "$as_me:27069: 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
@@ -27059,7 +27074,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 27062 "configure"
+#line 27077 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -27078,16 +27093,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27081: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27096: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27084: \$? = $ac_status" >&5
+  echo "$as_me:27099: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27087: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27102: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27090: \$? = $ac_status" >&5
+  echo "$as_me:27105: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -27098,14 +27113,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:27101: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:27116: 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:27108: checking for opendir in -lx" >&5
+  echo "$as_me:27123: 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
@@ -27113,7 +27128,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 27116 "configure"
+#line 27131 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -27132,16 +27147,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27135: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27150: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27138: \$? = $ac_status" >&5
+  echo "$as_me:27153: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27141: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27156: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27144: \$? = $ac_status" >&5
+  echo "$as_me:27159: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -27152,7 +27167,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:27155: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:27170: 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"
@@ -27180,23 +27195,23 @@ for ac_header in \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:27183: checking for $ac_header" >&5
+echo "$as_me:27198: 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 27189 "configure"
+#line 27204 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:27193: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:27208: \"$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:27199: \$? = $ac_status" >&5
+  echo "$as_me:27214: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -27215,7 +27230,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:27218: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:27233: 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
@@ -27225,14 +27240,14 @@ EOF
 fi
 done
 
-echo "$as_me:27228: checking termio.h and termios.h" >&5
+echo "$as_me:27243: 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 27235 "configure"
+#line 27250 "configure"
 #include "confdefs.h"
 
 #if HAVE_TERMIO_H
@@ -27250,16 +27265,16 @@ putchar (0x0a)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27253: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27268: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27256: \$? = $ac_status" >&5
+  echo "$as_me:27271: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27259: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27274: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27262: \$? = $ac_status" >&5
+  echo "$as_me:27277: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termio_and_termios=yes
 else
@@ -27270,21 +27285,21 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:27273: result: $cf_cv_termio_and_termios" >&5
+echo "$as_me:27288: 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:27280: checking for sigaction and structs" >&5
+echo "$as_me:27295: 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 27287 "configure"
+#line 27302 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -27304,16 +27319,16 @@ struct sigaction act;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27307: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27322: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27310: \$? = $ac_status" >&5
+  echo "$as_me:27325: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27313: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27328: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27316: \$? = $ac_status" >&5
+  echo "$as_me:27331: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_func_sigaction=yes
 else
@@ -27324,7 +27339,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:27327: result: $cf_cv_func_sigaction" >&5
+echo "$as_me:27342: result: $cf_cv_func_sigaction" >&5
 echo "${ECHO_T}$cf_cv_func_sigaction" >&6
 test "$cf_cv_func_sigaction" = yes &&
 cat >>confdefs.h <<\EOF
@@ -27334,23 +27349,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:27337: checking for $ac_header" >&5
+echo "$as_me:27352: 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 27343 "configure"
+#line 27358 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:27347: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:27362: \"$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:27353: \$? = $ac_status" >&5
+  echo "$as_me:27368: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -27369,7 +27384,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:27372: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:27387: 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
@@ -27390,23 +27405,23 @@ else
 for ac_header in wait.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:27393: checking for $ac_header" >&5
+echo "$as_me:27408: 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 27399 "configure"
+#line 27414 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:27403: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:27418: \"$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:27409: \$? = $ac_status" >&5
+  echo "$as_me:27424: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -27425,7 +27440,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:27428: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:27443: 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
@@ -27438,23 +27453,23 @@ done
 for ac_header in waitstatus.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:27441: checking for $ac_header" >&5
+echo "$as_me:27456: 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 27447 "configure"
+#line 27462 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:27451: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:27466: \"$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:27457: \$? = $ac_status" >&5
+  echo "$as_me:27472: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -27473,7 +27488,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:27476: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:27491: 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
@@ -27495,14 +27510,14 @@ cf_wait_headers="$cf_wait_headers
 fi
 fi
 
-echo "$as_me:27498: checking for union wait" >&5
+echo "$as_me:27513: 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 27505 "configure"
+#line 27520 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -27518,16 +27533,16 @@ int x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27521: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27536: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27524: \$? = $ac_status" >&5
+  echo "$as_me:27539: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27527: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27542: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27530: \$? = $ac_status" >&5
+  echo "$as_me:27545: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_unionwait=no
 	 echo compiles ok w/o union wait 1>&5
@@ -27537,7 +27552,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 27540 "configure"
+#line 27555 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -27557,16 +27572,16 @@ union wait x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27560: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27575: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27563: \$? = $ac_status" >&5
+  echo "$as_me:27578: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27566: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27581: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27569: \$? = $ac_status" >&5
+  echo "$as_me:27584: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_unionwait=yes
 	 echo compiles ok with union wait and possibly macros too 1>&5
@@ -27581,7 +27596,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:27584: result: $cf_cv_type_unionwait" >&5
+echo "$as_me:27599: result: $cf_cv_type_unionwait" >&5
 echo "${ECHO_T}$cf_cv_type_unionwait" >&6
 test $cf_cv_type_unionwait = yes &&
 cat >>confdefs.h <<\EOF
@@ -27590,14 +27605,14 @@ EOF
 
 if test $cf_cv_type_unionwait = yes; then
 
-	echo "$as_me:27593: checking if union wait can be used as wait-arg" >&5
+	echo "$as_me:27608: 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 27600 "configure"
+#line 27615 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -27609,16 +27624,16 @@ union wait x; wait(&x)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27612: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27627: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27615: \$? = $ac_status" >&5
+  echo "$as_me:27630: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27618: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27633: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27621: \$? = $ac_status" >&5
+  echo "$as_me:27636: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_arg_union_wait=yes
 else
@@ -27630,21 +27645,21 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-	echo "$as_me:27633: result: $cf_cv_arg_union_wait" >&5
+	echo "$as_me:27648: 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:27640: checking if union wait can be used as waitpid-arg" >&5
+	echo "$as_me:27655: 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 27647 "configure"
+#line 27662 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -27656,16 +27671,16 @@ union wait x; waitpid(0, &x, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27659: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27674: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27662: \$? = $ac_status" >&5
+  echo "$as_me:27677: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27665: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27680: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27668: \$? = $ac_status" >&5
+  echo "$as_me:27683: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_arg_union_waitpid=yes
 else
@@ -27677,7 +27692,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-	echo "$as_me:27680: result: $cf_cv_arg_union_waitpid" >&5
+	echo "$as_me:27695: 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
@@ -27686,13 +27701,13 @@ EOF
 
 fi
 
-echo "$as_me:27689: checking for uid_t in sys/types.h" >&5
+echo "$as_me:27704: 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 27695 "configure"
+#line 27710 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -27706,7 +27721,7 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:27709: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:27724: 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
 
@@ -27720,7 +27735,7 @@ EOF
 
 fi
 
-echo "$as_me:27723: checking type of array argument to getgroups" >&5
+echo "$as_me:27738: 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
@@ -27729,7 +27744,7 @@ else
   ac_cv_type_getgroups=cross
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 27732 "configure"
+#line 27747 "configure"
 #include "confdefs.h"
 /* Thanks to Mike Rendell for this test.  */
 #include <sys/types.h>
@@ -27755,15 +27770,15 @@ main (void)
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:27758: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27773: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27761: \$? = $ac_status" >&5
+  echo "$as_me:27776: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:27763: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27778: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27766: \$? = $ac_status" >&5
+  echo "$as_me:27781: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_getgroups=gid_t
 else
@@ -27776,7 +27791,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 if test $ac_cv_type_getgroups = cross; then
         cat >conftest.$ac_ext <<_ACEOF
-#line 27779 "configure"
+#line 27794 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 
@@ -27791,20 +27806,20 @@ rm -rf conftest*
 
 fi
 fi
-echo "$as_me:27794: result: $ac_cv_type_getgroups" >&5
+echo "$as_me:27809: 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:27801: checking for off_t" >&5
+echo "$as_me:27816: 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 27807 "configure"
+#line 27822 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27819,16 +27834,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27822: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27837: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27825: \$? = $ac_status" >&5
+  echo "$as_me:27840: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27828: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27843: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27831: \$? = $ac_status" >&5
+  echo "$as_me:27846: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -27838,7 +27853,7 @@ ac_cv_type_off_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27841: result: $ac_cv_type_off_t" >&5
+echo "$as_me:27856: 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
   :
@@ -27850,13 +27865,13 @@ EOF
 
 fi
 
-echo "$as_me:27853: checking for pid_t" >&5
+echo "$as_me:27868: 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 27859 "configure"
+#line 27874 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27871,16 +27886,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27874: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27889: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27877: \$? = $ac_status" >&5
+  echo "$as_me:27892: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27880: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27895: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27883: \$? = $ac_status" >&5
+  echo "$as_me:27898: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -27890,7 +27905,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27893: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:27908: 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
   :
@@ -27902,13 +27917,13 @@ EOF
 
 fi
 
-echo "$as_me:27905: checking for uid_t in sys/types.h" >&5
+echo "$as_me:27920: 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 27911 "configure"
+#line 27926 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -27922,7 +27937,7 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:27925: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:27940: 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
 
@@ -27936,13 +27951,13 @@ EOF
 
 fi
 
-echo "$as_me:27939: checking for mode_t" >&5
+echo "$as_me:27954: 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 27945 "configure"
+#line 27960 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27957,16 +27972,16 @@ if (sizeof (mode_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27960: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27975: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27963: \$? = $ac_status" >&5
+  echo "$as_me:27978: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27966: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27981: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27969: \$? = $ac_status" >&5
+  echo "$as_me:27984: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_mode_t=yes
 else
@@ -27976,7 +27991,7 @@ ac_cv_type_mode_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27979: result: $ac_cv_type_mode_t" >&5
+echo "$as_me:27994: 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
   :
@@ -27988,13 +28003,13 @@ EOF
 
 fi
 
-	echo "$as_me:27991: checking for ssize_t" >&5
+	echo "$as_me:28006: 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 27997 "configure"
+#line 28012 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28009,16 +28024,16 @@ if (sizeof (ssize_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28012: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28027: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28015: \$? = $ac_status" >&5
+  echo "$as_me:28030: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28018: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28033: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28021: \$? = $ac_status" >&5
+  echo "$as_me:28036: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_ssize_t=yes
 else
@@ -28028,7 +28043,7 @@ ac_cv_type_ssize_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:28031: result: $ac_cv_type_ssize_t" >&5
+echo "$as_me:28046: 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
@@ -28044,13 +28059,13 @@ EOF
 
 fi
 
-	echo "$as_me:28047: checking for socklen_t" >&5
+	echo "$as_me:28062: 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 28053 "configure"
+#line 28068 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -28068,16 +28083,16 @@ if (sizeof (socklen_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28071: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28086: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28074: \$? = $ac_status" >&5
+  echo "$as_me:28089: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28077: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28092: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28080: \$? = $ac_status" >&5
+  echo "$as_me:28095: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_socklen_t=yes
 else
@@ -28087,7 +28102,7 @@ ac_cv_type_socklen_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:28090: result: $ac_cv_type_socklen_t" >&5
+echo "$as_me:28105: 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
@@ -28103,7 +28118,7 @@ EOF
 
 fi
 
-echo "$as_me:28106: checking for long long type" >&5
+echo "$as_me:28121: 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
@@ -28134,7 +28149,7 @@ _CFEOF
 	rm -f conftest*
 
 fi
-echo "$as_me:28137: result: $cf_cv_type_long_long" >&5
+echo "$as_me:28152: 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
@@ -28145,14 +28160,14 @@ EOF
 
 fi
 
-echo "$as_me:28148: checking for tm.tm_gmtoff" >&5
+echo "$as_me:28163: 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 28155 "configure"
+#line 28170 "configure"
 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME
@@ -28177,16 +28192,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28180: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28195: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28183: \$? = $ac_status" >&5
+  echo "$as_me:28198: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28186: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28201: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28189: \$? = $ac_status" >&5
+  echo "$as_me:28204: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_tm_gmtoff=yes
 else
@@ -28197,20 +28212,20 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:28200: result: $cf_cv_tm_gmtoff" >&5
+echo "$as_me:28215: 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:28207: checking for int" >&5
+echo "$as_me:28222: 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 28213 "configure"
+#line 28228 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28225,16 +28240,16 @@ if (sizeof (int))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28228: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28243: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28231: \$? = $ac_status" >&5
+  echo "$as_me:28246: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28234: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28249: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28237: \$? = $ac_status" >&5
+  echo "$as_me:28252: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_int=yes
 else
@@ -28244,10 +28259,10 @@ ac_cv_type_int=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:28247: result: $ac_cv_type_int" >&5
+echo "$as_me:28262: result: $ac_cv_type_int" >&5
 echo "${ECHO_T}$ac_cv_type_int" >&6
 
-echo "$as_me:28250: checking size of int" >&5
+echo "$as_me:28265: 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
@@ -28256,7 +28271,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 28259 "configure"
+#line 28274 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28268,21 +28283,21 @@ int _array_ [1 - 2 * !((sizeof (int)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28271: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28286: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28274: \$? = $ac_status" >&5
+  echo "$as_me:28289: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28277: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28292: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28280: \$? = $ac_status" >&5
+  echo "$as_me:28295: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 28285 "configure"
+#line 28300 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28294,16 +28309,16 @@ int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28297: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28312: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28300: \$? = $ac_status" >&5
+  echo "$as_me:28315: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28303: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28318: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28306: \$? = $ac_status" >&5
+  echo "$as_me:28321: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -28319,7 +28334,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 28322 "configure"
+#line 28337 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28331,16 +28346,16 @@ int _array_ [1 - 2 * !((sizeof (int)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28334: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28349: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28337: \$? = $ac_status" >&5
+  echo "$as_me:28352: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28340: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28355: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28343: \$? = $ac_status" >&5
+  echo "$as_me:28358: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -28356,7 +28371,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 28359 "configure"
+#line 28374 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28368,16 +28383,16 @@ int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28371: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28386: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28374: \$? = $ac_status" >&5
+  echo "$as_me:28389: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28377: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28392: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28380: \$? = $ac_status" >&5
+  echo "$as_me:28395: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -28390,12 +28405,12 @@ done
 ac_cv_sizeof_int=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:28393: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:28408: 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 28398 "configure"
+#line 28413 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28411,15 +28426,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:28414: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28429: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28417: \$? = $ac_status" >&5
+  echo "$as_me:28432: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:28419: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28434: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28422: \$? = $ac_status" >&5
+  echo "$as_me:28437: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_int=`cat conftest.val`
 else
@@ -28435,7 +28450,7 @@ else
   ac_cv_sizeof_int=0
 fi
 fi
-echo "$as_me:28438: result: $ac_cv_sizeof_int" >&5
+echo "$as_me:28453: 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
@@ -28443,23 +28458,23 @@ EOF
 
 if test "${ac_cv_type_int+set}" = set; then
 	if test "${ac_cv_sizeof_int+set}" != set; then
-		{ echo "$as_me:28446: WARNING: using 4 for sizeof int" >&5
+		{ echo "$as_me:28461: 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:28450: WARNING: sizeof int not found, using 4" >&5
+		{ echo "$as_me:28465: 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
 fi
 
-echo "$as_me:28456: checking for long" >&5
+echo "$as_me:28471: 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 28462 "configure"
+#line 28477 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28474,16 +28489,16 @@ if (sizeof (long))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28477: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28492: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28480: \$? = $ac_status" >&5
+  echo "$as_me:28495: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28483: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28498: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28486: \$? = $ac_status" >&5
+  echo "$as_me:28501: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_long=yes
 else
@@ -28493,10 +28508,10 @@ ac_cv_type_long=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:28496: result: $ac_cv_type_long" >&5
+echo "$as_me:28511: result: $ac_cv_type_long" >&5
 echo "${ECHO_T}$ac_cv_type_long" >&6
 
-echo "$as_me:28499: checking size of long" >&5
+echo "$as_me:28514: 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
@@ -28505,7 +28520,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 28508 "configure"
+#line 28523 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28517,21 +28532,21 @@ int _array_ [1 - 2 * !((sizeof (long)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28520: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28535: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28523: \$? = $ac_status" >&5
+  echo "$as_me:28538: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28526: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28541: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28529: \$? = $ac_status" >&5
+  echo "$as_me:28544: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 28534 "configure"
+#line 28549 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28543,16 +28558,16 @@ int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28546: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28561: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28549: \$? = $ac_status" >&5
+  echo "$as_me:28564: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28552: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28567: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28555: \$? = $ac_status" >&5
+  echo "$as_me:28570: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -28568,7 +28583,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 28571 "configure"
+#line 28586 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28580,16 +28595,16 @@ int _array_ [1 - 2 * !((sizeof (long)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28583: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28598: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28586: \$? = $ac_status" >&5
+  echo "$as_me:28601: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28589: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28604: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28592: \$? = $ac_status" >&5
+  echo "$as_me:28607: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -28605,7 +28620,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 28608 "configure"
+#line 28623 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28617,16 +28632,16 @@ int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28620: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28635: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28623: \$? = $ac_status" >&5
+  echo "$as_me:28638: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28626: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28641: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28629: \$? = $ac_status" >&5
+  echo "$as_me:28644: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -28639,12 +28654,12 @@ done
 ac_cv_sizeof_long=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:28642: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:28657: 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 28647 "configure"
+#line 28662 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28660,15 +28675,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:28663: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28678: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28666: \$? = $ac_status" >&5
+  echo "$as_me:28681: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:28668: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28683: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28671: \$? = $ac_status" >&5
+  echo "$as_me:28686: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_long=`cat conftest.val`
 else
@@ -28684,7 +28699,7 @@ else
   ac_cv_sizeof_long=0
 fi
 fi
-echo "$as_me:28687: result: $ac_cv_sizeof_long" >&5
+echo "$as_me:28702: 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
@@ -28692,23 +28707,23 @@ EOF
 
 if test "${ac_cv_type_long+set}" = set; then
 	if test "${ac_cv_sizeof_long+set}" != set; then
-		{ echo "$as_me:28695: WARNING: using 4 for sizeof long" >&5
+		{ echo "$as_me:28710: 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:28699: WARNING: sizeof long not found, using 4" >&5
+		{ echo "$as_me:28714: 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
 fi
 
-echo "$as_me:28705: checking for off_t" >&5
+echo "$as_me:28720: 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 28711 "configure"
+#line 28726 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28723,16 +28738,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28726: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28741: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28729: \$? = $ac_status" >&5
+  echo "$as_me:28744: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28732: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28747: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28735: \$? = $ac_status" >&5
+  echo "$as_me:28750: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -28742,10 +28757,10 @@ ac_cv_type_off_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:28745: result: $ac_cv_type_off_t" >&5
+echo "$as_me:28760: result: $ac_cv_type_off_t" >&5
 echo "${ECHO_T}$ac_cv_type_off_t" >&6
 
-echo "$as_me:28748: checking size of off_t" >&5
+echo "$as_me:28763: 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
@@ -28754,7 +28769,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 28757 "configure"
+#line 28772 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28766,21 +28781,21 @@ int _array_ [1 - 2 * !((sizeof (off_t)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28769: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28784: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28772: \$? = $ac_status" >&5
+  echo "$as_me:28787: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28775: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28790: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28778: \$? = $ac_status" >&5
+  echo "$as_me:28793: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 28783 "configure"
+#line 28798 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28792,16 +28807,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28795: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28810: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28798: \$? = $ac_status" >&5
+  echo "$as_me:28813: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28801: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28816: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28804: \$? = $ac_status" >&5
+  echo "$as_me:28819: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -28817,7 +28832,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 28820 "configure"
+#line 28835 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28829,16 +28844,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28832: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28847: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28835: \$? = $ac_status" >&5
+  echo "$as_me:28850: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28838: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28853: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28841: \$? = $ac_status" >&5
+  echo "$as_me:28856: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -28854,7 +28869,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 28857 "configure"
+#line 28872 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28866,16 +28881,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28869: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28884: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28872: \$? = $ac_status" >&5
+  echo "$as_me:28887: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28875: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28890: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28878: \$? = $ac_status" >&5
+  echo "$as_me:28893: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -28888,12 +28903,12 @@ done
 ac_cv_sizeof_off_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:28891: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:28906: 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 28896 "configure"
+#line 28911 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28909,15 +28924,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:28912: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28927: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28915: \$? = $ac_status" >&5
+  echo "$as_me:28930: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:28917: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28932: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28920: \$? = $ac_status" >&5
+  echo "$as_me:28935: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_off_t=`cat conftest.val`
 else
@@ -28933,7 +28948,7 @@ else
   ac_cv_sizeof_off_t=0
 fi
 fi
-echo "$as_me:28936: result: $ac_cv_sizeof_off_t" >&5
+echo "$as_me:28951: 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
@@ -28941,23 +28956,23 @@ EOF
 
 if test "${ac_cv_type_off_t+set}" = set; then
 	if test "${ac_cv_sizeof_off_t+set}" != set; then
-		{ echo "$as_me:28944: WARNING: using 4 for sizeof off_t" >&5
+		{ echo "$as_me:28959: 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:28948: WARNING: sizeof off_t not found, using 4" >&5
+		{ echo "$as_me:28963: 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
 fi
 
-echo "$as_me:28954: checking for time_t" >&5
+echo "$as_me:28969: 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 28960 "configure"
+#line 28975 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28972,16 +28987,16 @@ if (sizeof (time_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28975: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28990: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28978: \$? = $ac_status" >&5
+  echo "$as_me:28993: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28981: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28996: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28984: \$? = $ac_status" >&5
+  echo "$as_me:28999: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_time_t=yes
 else
@@ -28991,10 +29006,10 @@ ac_cv_type_time_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:28994: result: $ac_cv_type_time_t" >&5
+echo "$as_me:29009: result: $ac_cv_type_time_t" >&5
 echo "${ECHO_T}$ac_cv_type_time_t" >&6
 
-echo "$as_me:28997: checking size of time_t" >&5
+echo "$as_me:29012: 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
@@ -29003,7 +29018,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 29006 "configure"
+#line 29021 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -29015,21 +29030,21 @@ int _array_ [1 - 2 * !((sizeof (time_t)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29018: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29033: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29021: \$? = $ac_status" >&5
+  echo "$as_me:29036: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29024: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29039: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29027: \$? = $ac_status" >&5
+  echo "$as_me:29042: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 29032 "configure"
+#line 29047 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -29041,16 +29056,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29044: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29059: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29047: \$? = $ac_status" >&5
+  echo "$as_me:29062: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29050: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29065: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29053: \$? = $ac_status" >&5
+  echo "$as_me:29068: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -29066,7 +29081,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 29069 "configure"
+#line 29084 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -29078,16 +29093,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29081: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29096: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29084: \$? = $ac_status" >&5
+  echo "$as_me:29099: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29087: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29102: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29090: \$? = $ac_status" >&5
+  echo "$as_me:29105: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -29103,7 +29118,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 29106 "configure"
+#line 29121 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -29115,16 +29130,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29118: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29133: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29121: \$? = $ac_status" >&5
+  echo "$as_me:29136: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29124: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29139: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29127: \$? = $ac_status" >&5
+  echo "$as_me:29142: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -29137,12 +29152,12 @@ done
 ac_cv_sizeof_time_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:29140: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:29155: 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 29145 "configure"
+#line 29160 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -29158,15 +29173,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:29161: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29176: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29164: \$? = $ac_status" >&5
+  echo "$as_me:29179: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:29166: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29181: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29169: \$? = $ac_status" >&5
+  echo "$as_me:29184: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_time_t=`cat conftest.val`
 else
@@ -29182,7 +29197,7 @@ else
   ac_cv_sizeof_time_t=0
 fi
 fi
-echo "$as_me:29185: result: $ac_cv_sizeof_time_t" >&5
+echo "$as_me:29200: 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
@@ -29190,23 +29205,23 @@ EOF
 
 if test "${ac_cv_type_time_t+set}" = set; then
 	if test "${ac_cv_sizeof_time_t+set}" != set; then
-		{ echo "$as_me:29193: WARNING: using 4 for sizeof time_t" >&5
+		{ echo "$as_me:29208: 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:29197: WARNING: sizeof time_t not found, using 4" >&5
+		{ echo "$as_me:29212: 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
 fi
 
-echo "$as_me:29203: checking for intptr_t" >&5
+echo "$as_me:29218: 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 29209 "configure"
+#line 29224 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -29221,16 +29236,16 @@ if (sizeof (intptr_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29224: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29239: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29227: \$? = $ac_status" >&5
+  echo "$as_me:29242: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29230: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29245: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29233: \$? = $ac_status" >&5
+  echo "$as_me:29248: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_intptr_t=yes
 else
@@ -29240,7 +29255,7 @@ ac_cv_type_intptr_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:29243: result: $ac_cv_type_intptr_t" >&5
+echo "$as_me:29258: 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
   :
@@ -29254,13 +29269,13 @@ fi
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo "$as_me:29257: checking for working alloca.h" >&5
+echo "$as_me:29272: 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 29263 "configure"
+#line 29278 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int
@@ -29272,16 +29287,16 @@ char *p = (char *) alloca (2 * sizeof (int));
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29275: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29290: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29278: \$? = $ac_status" >&5
+  echo "$as_me:29293: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29281: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29296: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29284: \$? = $ac_status" >&5
+  echo "$as_me:29299: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_working_alloca_h=yes
 else
@@ -29291,7 +29306,7 @@ ac_cv_working_alloca_h=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:29294: result: $ac_cv_working_alloca_h" >&5
+echo "$as_me:29309: 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
 
@@ -29301,13 +29316,13 @@ EOF
 
 fi
 
-echo "$as_me:29304: checking for alloca" >&5
+echo "$as_me:29319: 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 29310 "configure"
+#line 29325 "configure"
 #include "confdefs.h"
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -29339,16 +29354,16 @@ char *p = (char *) alloca (1);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29342: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29357: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29345: \$? = $ac_status" >&5
+  echo "$as_me:29360: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29348: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29363: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29351: \$? = $ac_status" >&5
+  echo "$as_me:29366: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_alloca_works=yes
 else
@@ -29358,7 +29373,7 @@ ac_cv_func_alloca_works=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:29361: result: $ac_cv_func_alloca_works" >&5
+echo "$as_me:29376: 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
@@ -29379,13 +29394,13 @@ cat >>confdefs.h <<\EOF
 #define C_ALLOCA 1
 EOF
 
-echo "$as_me:29382: checking whether \`alloca.c' needs Cray hooks" >&5
+echo "$as_me:29397: 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 29388 "configure"
+#line 29403 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -29403,18 +29418,18 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:29406: result: $ac_cv_os_cray" >&5
+echo "$as_me:29421: 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:29411: checking for $ac_func" >&5
+echo "$as_me:29426: 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 29417 "configure"
+#line 29432 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -29445,16 +29460,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29448: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29463: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29451: \$? = $ac_status" >&5
+  echo "$as_me:29466: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29454: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29469: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29457: \$? = $ac_status" >&5
+  echo "$as_me:29472: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -29464,7 +29479,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:29467: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:29482: 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
 
@@ -29478,7 +29493,7 @@ fi
   done
 fi
 
-echo "$as_me:29481: checking stack direction for C alloca" >&5
+echo "$as_me:29496: 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
@@ -29487,7 +29502,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 29490 "configure"
+#line 29505 "configure"
 #include "confdefs.h"
 int
 find_stack_direction (void)
@@ -29510,15 +29525,15 @@ main (void)
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:29513: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29528: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29516: \$? = $ac_status" >&5
+  echo "$as_me:29531: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:29518: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29533: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29521: \$? = $ac_status" >&5
+  echo "$as_me:29536: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_stack_direction=1
 else
@@ -29530,7 +29545,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:29533: result: $ac_cv_c_stack_direction" >&5
+echo "$as_me:29548: result: $ac_cv_c_stack_direction" >&5
 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
 cat >>confdefs.h <<EOF
@@ -29542,23 +29557,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:29545: checking for $ac_header" >&5
+echo "$as_me:29560: 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 29551 "configure"
+#line 29566 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:29555: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:29570: \"$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:29561: \$? = $ac_status" >&5
+  echo "$as_me:29576: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -29577,7 +29592,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:29580: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:29595: 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
@@ -29590,13 +29605,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:29593: checking for $ac_func" >&5
+echo "$as_me:29608: 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 29599 "configure"
+#line 29614 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -29627,16 +29642,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29630: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29645: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29633: \$? = $ac_status" >&5
+  echo "$as_me:29648: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29636: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29651: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29639: \$? = $ac_status" >&5
+  echo "$as_me:29654: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -29646,7 +29661,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:29649: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:29664: 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
@@ -29658,7 +29673,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:29661: checking for working fork" >&5
+  echo "$as_me:29676: 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
@@ -29681,15 +29696,15 @@ else
       }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:29684: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29699: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29687: \$? = $ac_status" >&5
+  echo "$as_me:29702: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:29689: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29704: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29692: \$? = $ac_status" >&5
+  echo "$as_me:29707: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -29701,7 +29716,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:29704: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:29719: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -29715,12 +29730,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:29718: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:29733: 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:29723: checking for working vfork" >&5
+  echo "$as_me:29738: 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
@@ -29729,7 +29744,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 29732 "configure"
+#line 29747 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -29826,15 +29841,15 @@ main (void)
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:29829: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29844: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29832: \$? = $ac_status" >&5
+  echo "$as_me:29847: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:29834: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29849: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29837: \$? = $ac_status" >&5
+  echo "$as_me:29852: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -29846,13 +29861,13 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:29849: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:29864: 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:29855: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:29870: 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
 
@@ -29877,14 +29892,14 @@ EOF
 
 fi
 
-echo "$as_me:29880: checking if we should use fcntl or ioctl" >&5
+echo "$as_me:29895: 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 29887 "configure"
+#line 29902 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -29901,16 +29916,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29904: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29919: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29907: \$? = $ac_status" >&5
+  echo "$as_me:29922: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29910: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29925: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29913: \$? = $ac_status" >&5
+  echo "$as_me:29928: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fionbio=ioctl
 else
@@ -29918,7 +29933,7 @@ else
 cat conftest.$ac_ext >&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 29921 "configure"
+#line 29936 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -29940,16 +29955,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29943: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29958: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29946: \$? = $ac_status" >&5
+  echo "$as_me:29961: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29949: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29964: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29952: \$? = $ac_status" >&5
+  echo "$as_me:29967: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fionbio=fcntl
 else
@@ -29962,21 +29977,21 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:29965: result: $cf_cv_fionbio" >&5
+echo "$as_me:29980: 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:29972: checking for broken/missing definition of remove" >&5
+echo "$as_me:29987: 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 29979 "configure"
+#line 29994 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -29988,23 +30003,23 @@ remove("dummy")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29991: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30006: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29994: \$? = $ac_status" >&5
+  echo "$as_me:30009: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29997: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30012: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30000: \$? = $ac_status" >&5
+  echo "$as_me:30015: \$? = $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 30007 "configure"
+#line 30022 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 		int __unlink(name) { return unlink(name); }
@@ -30017,16 +30032,16 @@ remove("dummy")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30020: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30035: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30023: \$? = $ac_status" >&5
+  echo "$as_me:30038: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30026: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30041: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30029: \$? = $ac_status" >&5
+  echo "$as_me:30044: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_baddef_remove=yes
 else
@@ -30041,21 +30056,21 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:30044: result: $cf_cv_baddef_remove" >&5
+echo "$as_me:30059: 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:30051: checking for lstat" >&5
+echo "$as_me:30066: 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 30058 "configure"
+#line 30073 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -30069,16 +30084,16 @@ lstat(".", (struct stat *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30072: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30087: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30075: \$? = $ac_status" >&5
+  echo "$as_me:30090: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30078: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30093: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30081: \$? = $ac_status" >&5
+  echo "$as_me:30096: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_lstat=yes
 else
@@ -30090,7 +30105,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:30093: result: $ac_cv_func_lstat " >&5
+echo "$as_me:30108: result: $ac_cv_func_lstat " >&5
 echo "${ECHO_T}$ac_cv_func_lstat " >&6
 if test $ac_cv_func_lstat = yes; then
 
@@ -30125,13 +30140,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:30128: checking for $ac_func" >&5
+echo "$as_me:30143: 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 30134 "configure"
+#line 30149 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -30162,16 +30177,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30165: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30180: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30168: \$? = $ac_status" >&5
+  echo "$as_me:30183: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30171: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30186: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30174: \$? = $ac_status" >&5
+  echo "$as_me:30189: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -30181,7 +30196,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:30184: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:30199: 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
@@ -30197,13 +30212,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:30200: checking for $ac_func" >&5
+echo "$as_me:30215: 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 30206 "configure"
+#line 30221 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -30234,16 +30249,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30237: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30252: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30240: \$? = $ac_status" >&5
+  echo "$as_me:30255: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30243: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30258: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30246: \$? = $ac_status" >&5
+  echo "$as_me:30261: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -30253,7 +30268,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:30256: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:30271: 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
@@ -30265,7 +30280,7 @@ else
 fi
 done
 
-echo "$as_me:30268: checking for random-integer functions" >&5
+echo "$as_me:30283: 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
@@ -30285,7 +30300,7 @@ do
 	esac
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 30288 "configure"
+#line 30303 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -30304,16 +30319,16 @@ long seed = 1; $cf_srand_func(seed); seed = $cf_rand_func()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30307: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30322: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30310: \$? = $ac_status" >&5
+  echo "$as_me:30325: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30313: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30328: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30316: \$? = $ac_status" >&5
+  echo "$as_me:30331: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_srand_func=$cf_func
  break
@@ -30325,10 +30340,10 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:30328: result: $cf_cv_srand_func" >&5
+echo "$as_me:30343: 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:30331: checking for range of random-integers" >&5
+	echo "$as_me:30346: 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
@@ -30349,7 +30364,7 @@ else
 			;;
 		esac
 		cat >conftest.$ac_ext <<_ACEOF
-#line 30352 "configure"
+#line 30367 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -30368,16 +30383,16 @@ long x = $cf_cv_rand_max
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30371: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30386: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30374: \$? = $ac_status" >&5
+  echo "$as_me:30389: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30377: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30392: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30380: \$? = $ac_status" >&5
+  echo "$as_me:30395: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -30388,15 +30403,15 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:30391: result: $cf_cv_rand_max" >&5
+echo "$as_me:30406: result: $cf_cv_rand_max" >&5
 echo "${ECHO_T}$cf_cv_rand_max" >&6
 
 	case $cf_cv_srand_func in
 	(*/arc4random)
-		echo "$as_me:30396: checking if <bsd/stdlib.h> should be included" >&5
+		echo "$as_me:30411: 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 30399 "configure"
+#line 30414 "configure"
 #include "confdefs.h"
 #include <bsd/stdlib.h>
 int
@@ -30409,23 +30424,23 @@ void *arc4random(int);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30412: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30427: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30415: \$? = $ac_status" >&5
+  echo "$as_me:30430: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30418: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30433: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30421: \$? = $ac_status" >&5
+  echo "$as_me:30436: \$? = $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 30428 "configure"
+#line 30443 "configure"
 #include "confdefs.h"
 #include <bsd/stdlib.h>
 int
@@ -30437,16 +30452,16 @@ unsigned x = arc4random()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30440: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30455: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30443: \$? = $ac_status" >&5
+  echo "$as_me:30458: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30446: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30461: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30449: \$? = $ac_status" >&5
+  echo "$as_me:30464: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_bsd_stdlib_h=yes
 else
@@ -30457,7 +30472,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-	    echo "$as_me:30460: result: $cf_bsd_stdlib_h" >&5
+	    echo "$as_me:30475: result: $cf_bsd_stdlib_h" >&5
 echo "${ECHO_T}$cf_bsd_stdlib_h" >&6
 		if test "$cf_bsd_stdlib_h" = yes
 		then
@@ -30467,10 +30482,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 		else
-			echo "$as_me:30470: checking if <bsd/random.h> should be included" >&5
+			echo "$as_me:30485: 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 30473 "configure"
+#line 30488 "configure"
 #include "confdefs.h"
 #include <bsd/random.h>
 int
@@ -30483,23 +30498,23 @@ void *arc4random(int);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30486: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30501: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30489: \$? = $ac_status" >&5
+  echo "$as_me:30504: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30492: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30507: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30495: \$? = $ac_status" >&5
+  echo "$as_me:30510: \$? = $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 30502 "configure"
+#line 30517 "configure"
 #include "confdefs.h"
 #include <bsd/random.h>
 int
@@ -30511,16 +30526,16 @@ unsigned x = arc4random()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30514: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30529: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30517: \$? = $ac_status" >&5
+  echo "$as_me:30532: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30520: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30535: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30523: \$? = $ac_status" >&5
+  echo "$as_me:30538: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_bsd_random_h=yes
 else
@@ -30531,7 +30546,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-			echo "$as_me:30534: result: $cf_bsd_random_h" >&5
+			echo "$as_me:30549: result: $cf_bsd_random_h" >&5
 echo "${ECHO_T}$cf_bsd_random_h" >&6
 			if test "$cf_bsd_random_h" = yes
 			then
@@ -30541,7 +30556,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 			else
-				{ echo "$as_me:30544: WARNING: no header file found for arc4random" >&5
+				{ echo "$as_me:30559: WARNING: no header file found for arc4random" >&5
 echo "$as_me: WARNING: no header file found for arc4random" >&2;}
 			fi
 		fi
@@ -30576,13 +30591,13 @@ fi
 for ac_func in sleep
 do
 
-echo "$as_me:30579: checking for $ac_func declaration" >&5
+echo "$as_me:30594: 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 30585 "configure"
+#line 30600 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -30603,20 +30618,20 @@ extern	int	$ac_func();
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30606: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30621: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30609: \$? = $ac_status" >&5
+  echo "$as_me:30624: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30612: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30627: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30615: \$? = $ac_status" >&5
+  echo "$as_me:30630: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 30619 "configure"
+#line 30634 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -30637,16 +30652,16 @@ int	(*p)() = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30640: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30655: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30643: \$? = $ac_status" >&5
+  echo "$as_me:30658: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30646: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30661: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30649: \$? = $ac_status" >&5
+  echo "$as_me:30664: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -30667,11 +30682,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:30670: result: yes" >&5
+  echo "$as_me:30685: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:30674: result: no" >&5
+  echo "$as_me:30689: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -30686,13 +30701,13 @@ done
 for ac_func in strstr
 do
 
-echo "$as_me:30689: checking for $ac_func declaration" >&5
+echo "$as_me:30704: 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 30695 "configure"
+#line 30710 "configure"
 #include "confdefs.h"
 #include <string.h>
 int
@@ -30706,20 +30721,20 @@ extern	int	$ac_func();
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30709: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30724: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30712: \$? = $ac_status" >&5
+  echo "$as_me:30727: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30715: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30730: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30718: \$? = $ac_status" >&5
+  echo "$as_me:30733: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 30722 "configure"
+#line 30737 "configure"
 #include "confdefs.h"
 #include <string.h>
 int
@@ -30733,16 +30748,16 @@ int	(*p)() = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30736: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30751: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30739: \$? = $ac_status" >&5
+  echo "$as_me:30754: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30742: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30757: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30745: \$? = $ac_status" >&5
+  echo "$as_me:30760: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -30763,11 +30778,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:30766: result: yes" >&5
+  echo "$as_me:30781: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:30770: result: no" >&5
+  echo "$as_me:30785: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -30782,13 +30797,13 @@ done
 for ac_func in getgrgid getgrnam
 do
 
-echo "$as_me:30785: checking for $ac_func declaration" >&5
+echo "$as_me:30800: 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 30791 "configure"
+#line 30806 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -30804,20 +30819,20 @@ extern	int	$ac_func();
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30807: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30822: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30810: \$? = $ac_status" >&5
+  echo "$as_me:30825: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30813: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30828: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30816: \$? = $ac_status" >&5
+  echo "$as_me:30831: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 30820 "configure"
+#line 30835 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -30833,16 +30848,16 @@ int	(*p)() = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30836: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30851: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30839: \$? = $ac_status" >&5
+  echo "$as_me:30854: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30842: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30857: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30845: \$? = $ac_status" >&5
+  echo "$as_me:30860: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -30863,11 +30878,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:30866: result: yes" >&5
+  echo "$as_me:30881: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:30870: result: no" >&5
+  echo "$as_me:30885: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -30879,14 +30894,14 @@ EOF
 fi
 done
 
-echo "$as_me:30882: checking if TRUE/FALSE are defined" >&5
+echo "$as_me:30897: 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 30889 "configure"
+#line 30904 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -30900,16 +30915,16 @@ int x = TRUE, y = FALSE
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30903: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30918: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30906: \$? = $ac_status" >&5
+  echo "$as_me:30921: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30909: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30924: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30912: \$? = $ac_status" >&5
+  echo "$as_me:30927: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_bool_defs=yes
 else
@@ -30920,7 +30935,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:30923: result: $cf_cv_bool_defs" >&5
+echo "$as_me:30938: result: $cf_cv_bool_defs" >&5
 echo "${ECHO_T}$cf_cv_bool_defs" >&6
 if test "$cf_cv_bool_defs" = no ; then
 
@@ -30934,14 +30949,14 @@ EOF
 
 fi
 
-echo "$as_me:30937: checking if external errno is declared" >&5
+echo "$as_me:30952: 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 30944 "configure"
+#line 30959 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -30959,16 +30974,16 @@ int x = (int) errno
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30962: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30977: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30965: \$? = $ac_status" >&5
+  echo "$as_me:30980: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30968: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30983: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30971: \$? = $ac_status" >&5
+  echo "$as_me:30986: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -30979,7 +30994,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:30982: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:30997: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -30994,14 +31009,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:30997: checking if external errno exists" >&5
+echo "$as_me:31012: 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 31004 "configure"
+#line 31019 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -31016,16 +31031,16 @@ errno = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31019: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31034: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31022: \$? = $ac_status" >&5
+  echo "$as_me:31037: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31025: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31040: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31028: \$? = $ac_status" >&5
+  echo "$as_me:31043: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_errno=yes
 else
@@ -31036,7 +31051,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:31039: result: $cf_cv_have_errno" >&5
+echo "$as_me:31054: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -31049,7 +31064,7 @@ EOF
 
 fi
 
-echo "$as_me:31052: checking if we can set errno" >&5
+echo "$as_me:31067: 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
@@ -31057,7 +31072,7 @@ else
 
 if test "$cross_compiling" = yes; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 31060 "configure"
+#line 31075 "configure"
 #include "confdefs.h"
 #include <errno.h>
 int
@@ -31069,16 +31084,16 @@ errno = 255
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31072: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31087: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31075: \$? = $ac_status" >&5
+  echo "$as_me:31090: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31078: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31093: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31081: \$? = $ac_status" >&5
+  echo "$as_me:31096: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_set_errno=maybe
 else
@@ -31089,7 +31104,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 31092 "configure"
+#line 31107 "configure"
 #include "confdefs.h"
 
 #include <errno.h>
@@ -31100,15 +31115,15 @@ int main(void)
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:31103: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31118: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31106: \$? = $ac_status" >&5
+  echo "$as_me:31121: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:31108: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31123: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31111: \$? = $ac_status" >&5
+  echo "$as_me:31126: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_set_errno=yes
 else
@@ -31121,21 +31136,21 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:31124: result: $cf_cv_set_errno" >&5
+echo "$as_me:31139: 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:31131: checking for setlocale()" >&5
+echo "$as_me:31146: 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 31138 "configure"
+#line 31153 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int
@@ -31147,16 +31162,16 @@ setlocale(LC_ALL, "")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31150: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31165: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31153: \$? = $ac_status" >&5
+  echo "$as_me:31168: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31156: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31171: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31159: \$? = $ac_status" >&5
+  echo "$as_me:31174: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_locale=yes
 else
@@ -31168,7 +31183,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:31171: result: $cf_cv_locale" >&5
+echo "$as_me:31186: result: $cf_cv_locale" >&5
 echo "${ECHO_T}$cf_cv_locale" >&6
 test $cf_cv_locale = yes && {
 cat >>confdefs.h <<\EOF
@@ -31176,14 +31191,14 @@ cat >>confdefs.h <<\EOF
 EOF
  }
 
-echo "$as_me:31179: checking if NGROUPS is defined" >&5
+echo "$as_me:31194: 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 31186 "configure"
+#line 31201 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -31202,23 +31217,23 @@ int x = NGROUPS
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31205: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31220: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31208: \$? = $ac_status" >&5
+  echo "$as_me:31223: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31211: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31226: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31214: \$? = $ac_status" >&5
+  echo "$as_me:31229: \$? = $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 31221 "configure"
+#line 31236 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -31237,16 +31252,16 @@ int x = NGROUPS_MAX
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31240: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31255: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31243: \$? = $ac_status" >&5
+  echo "$as_me:31258: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31246: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31261: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31249: \$? = $ac_status" >&5
+  echo "$as_me:31264: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ngroups=NGROUPS_MAX
 else
@@ -31258,7 +31273,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:31261: result: $cf_cv_ngroups" >&5
+echo "$as_me:31276: result: $cf_cv_ngroups" >&5
 echo "${ECHO_T}$cf_cv_ngroups" >&6
 
 fi
@@ -31276,14 +31291,14 @@ EOF
 
 fi
 
-echo "$as_me:31279: checking if external sys_nerr is declared" >&5
+echo "$as_me:31294: 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 31286 "configure"
+#line 31301 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -31301,16 +31316,16 @@ int x = (int) sys_nerr
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31304: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31319: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31307: \$? = $ac_status" >&5
+  echo "$as_me:31322: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31310: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31325: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31313: \$? = $ac_status" >&5
+  echo "$as_me:31328: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_sys_nerr=yes
 else
@@ -31321,7 +31336,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:31324: result: $cf_cv_dcl_sys_nerr" >&5
+echo "$as_me:31339: 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
@@ -31336,14 +31351,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:31339: checking if external sys_nerr exists" >&5
+echo "$as_me:31354: 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 31346 "configure"
+#line 31361 "configure"
 #include "confdefs.h"
 
 #undef sys_nerr
@@ -31358,16 +31373,16 @@ sys_nerr = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31361: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31376: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31364: \$? = $ac_status" >&5
+  echo "$as_me:31379: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31367: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31382: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31370: \$? = $ac_status" >&5
+  echo "$as_me:31385: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_sys_nerr=yes
 else
@@ -31378,7 +31393,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:31381: result: $cf_cv_have_sys_nerr" >&5
+echo "$as_me:31396: 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
@@ -31391,14 +31406,14 @@ EOF
 
 fi
 
-echo "$as_me:31394: checking if external sys_errlist is declared" >&5
+echo "$as_me:31409: 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 31401 "configure"
+#line 31416 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -31416,16 +31431,16 @@ int x = (int) sys_errlist
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31419: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31434: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31422: \$? = $ac_status" >&5
+  echo "$as_me:31437: \$? = $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:31440: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31428: \$? = $ac_status" >&5
+  echo "$as_me:31443: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_sys_errlist=yes
 else
@@ -31436,7 +31451,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:31439: result: $cf_cv_dcl_sys_errlist" >&5
+echo "$as_me:31454: 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
@@ -31451,14 +31466,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:31454: checking if external sys_errlist exists" >&5
+echo "$as_me:31469: 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 31461 "configure"
+#line 31476 "configure"
 #include "confdefs.h"
 
 #undef sys_errlist
@@ -31473,16 +31488,16 @@ sys_errlist = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31476: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31491: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31479: \$? = $ac_status" >&5
+  echo "$as_me:31494: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31482: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31497: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31485: \$? = $ac_status" >&5
+  echo "$as_me:31500: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_sys_errlist=yes
 else
@@ -31493,7 +31508,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:31496: result: $cf_cv_have_sys_errlist" >&5
+echo "$as_me:31511: 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
@@ -31509,23 +31524,23 @@ fi
 for ac_header in lastlog.h paths.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:31512: checking for $ac_header" >&5
+echo "$as_me:31527: 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 31518 "configure"
+#line 31533 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:31522: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:31537: \"$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:31528: \$? = $ac_status" >&5
+  echo "$as_me:31543: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -31544,7 +31559,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:31547: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:31562: 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
@@ -31554,14 +31569,14 @@ EOF
 fi
 done
 
-echo "$as_me:31557: checking for lastlog path" >&5
+echo "$as_me:31572: 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 31564 "configure"
+#line 31579 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -31581,16 +31596,16 @@ char *path = _PATH_LASTLOG
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31584: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31599: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31587: \$? = $ac_status" >&5
+  echo "$as_me:31602: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31590: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31605: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31593: \$? = $ac_status" >&5
+  echo "$as_me:31608: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_path_lastlog="_PATH_LASTLOG"
 else
@@ -31605,14 +31620,14 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:31608: result: $cf_cv_path_lastlog" >&5
+echo "$as_me:31623: 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:31615: checking for utmp implementation" >&5
+echo "$as_me:31630: 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
@@ -31629,7 +31644,7 @@ cf_utmp_includes="
 #endif
 "
 	cat >conftest.$ac_ext <<_ACEOF
-#line 31632 "configure"
+#line 31647 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -31643,16 +31658,16 @@ struct $cf_header x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31646: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31661: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31649: \$? = $ac_status" >&5
+  echo "$as_me:31664: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31652: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31667: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31655: \$? = $ac_status" >&5
+  echo "$as_me:31670: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -31661,7 +31676,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 31664 "configure"
+#line 31679 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -31675,16 +31690,16 @@ struct $cf_header x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31678: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31693: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31681: \$? = $ac_status" >&5
+  echo "$as_me:31696: \$? = $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:31699: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31687: \$? = $ac_status" >&5
+  echo "$as_me:31702: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -31699,7 +31714,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:31702: result: $cf_cv_have_utmp" >&5
+echo "$as_me:31717: result: $cf_cv_have_utmp" >&5
 echo "${ECHO_T}$cf_cv_have_utmp" >&6
 
 if test $cf_cv_have_utmp != no ; then
@@ -31714,14 +31729,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:31717: checking if ${cf_cv_have_utmp}.ut_host is declared" >&5
+echo "$as_me:31732: 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 31724 "configure"
+#line 31739 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -31735,16 +31750,16 @@ struct $cf_cv_have_utmp x; char *y = &x.ut_host[0]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31738: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31753: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31741: \$? = $ac_status" >&5
+  echo "$as_me:31756: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31744: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31759: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31747: \$? = $ac_status" >&5
+  echo "$as_me:31762: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_host=yes
 else
@@ -31756,7 +31771,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:31759: result: $cf_cv_have_utmp_ut_host" >&5
+echo "$as_me:31774: 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
@@ -31766,14 +31781,14 @@ EOF
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:31769: checking if ${cf_cv_have_utmp}.ut_syslen is declared" >&5
+echo "$as_me:31784: 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 31776 "configure"
+#line 31791 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -31787,16 +31802,16 @@ struct $cf_cv_have_utmp x; int y = x.ut_syslen
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31790: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31805: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31793: \$? = $ac_status" >&5
+  echo "$as_me:31808: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31796: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31811: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31799: \$? = $ac_status" >&5
+  echo "$as_me:31814: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_syslen=yes
 else
@@ -31808,7 +31823,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:31811: result: $cf_cv_have_utmp_ut_syslen" >&5
+echo "$as_me:31826: 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
@@ -31818,7 +31833,7 @@ EOF
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:31821: checking if ${cf_cv_have_utmp}.ut_name is declared" >&5
+echo "$as_me:31836: 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
@@ -31835,7 +31850,7 @@ cf_utmp_includes="
 "
 for cf_header in ut_name ut_user ; do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 31838 "configure"
+#line 31853 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -31849,16 +31864,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31852: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31867: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31855: \$? = $ac_status" >&5
+  echo "$as_me:31870: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31858: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31873: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31861: \$? = $ac_status" >&5
+  echo "$as_me:31876: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_name=$cf_header
 	 break
@@ -31870,12 +31885,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:31873: result: $cf_cv_have_utmp_ut_name" >&5
+echo "$as_me:31888: 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:31878: error: Cannot find declaration for ut.ut_name" >&5
+	{ { echo "$as_me:31893: 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; }; }
 	;;
@@ -31890,7 +31905,7 @@ esac
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:31893: checking for exit-status in $cf_cv_have_utmp" >&5
+echo "$as_me:31908: 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
@@ -31903,7 +31918,7 @@ for cf_result in \
 	ut_exit.ut_exit
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 31906 "configure"
+#line 31921 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -31917,16 +31932,16 @@ struct $cf_cv_have_utmp x; long y = x.$cf_result = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31920: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31935: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31923: \$? = $ac_status" >&5
+  echo "$as_me:31938: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31926: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31941: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31929: \$? = $ac_status" >&5
+  echo "$as_me:31944: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_xstatus=$cf_result
 	 break
@@ -31939,7 +31954,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:31942: result: $cf_cv_have_utmp_ut_xstatus" >&5
+echo "$as_me:31957: 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
 
@@ -31955,14 +31970,14 @@ fi
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:31958: checking if ${cf_cv_have_utmp}.ut_xtime is declared" >&5
+echo "$as_me:31973: 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 31965 "configure"
+#line 31980 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -31976,23 +31991,23 @@ struct $cf_cv_have_utmp x; long y = x.ut_xtime = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31979: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31994: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31982: \$? = $ac_status" >&5
+  echo "$as_me:31997: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31985: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32000: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31988: \$? = $ac_status" >&5
+  echo "$as_me:32003: \$? = $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 31995 "configure"
+#line 32010 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -32006,16 +32021,16 @@ struct $cf_cv_have_utmp x; long y = x.ut_tv.tv_sec
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32009: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32024: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32012: \$? = $ac_status" >&5
+  echo "$as_me:32027: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32015: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32030: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32018: \$? = $ac_status" >&5
+  echo "$as_me:32033: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_xtime=define
 else
@@ -32029,7 +32044,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:32032: result: $cf_cv_have_utmp_ut_xtime" >&5
+echo "$as_me:32047: 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
 
@@ -32048,14 +32063,14 @@ fi
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:32051: checking if ${cf_cv_have_utmp}.ut_session is declared" >&5
+echo "$as_me:32066: 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 32058 "configure"
+#line 32073 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -32069,16 +32084,16 @@ struct $cf_cv_have_utmp x; long y = x.ut_session
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32072: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32087: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32075: \$? = $ac_status" >&5
+  echo "$as_me:32090: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32078: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32093: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32081: \$? = $ac_status" >&5
+  echo "$as_me:32096: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_session=yes
 else
@@ -32089,7 +32104,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:32092: result: $cf_cv_have_utmp_ut_session" >&5
+echo "$as_me:32107: 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
 
@@ -32100,7 +32115,7 @@ EOF
 fi
 fi
 
-echo "$as_me:32103: checking if $cf_cv_have_utmp is SYSV flavor" >&5
+echo "$as_me:32118: 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
@@ -32108,7 +32123,7 @@ else
 
 test "$cf_cv_have_utmp" = "utmp" && cf_prefix="ut" || cf_prefix="utx"
 cat >conftest.$ac_ext <<_ACEOF
-#line 32111 "configure"
+#line 32126 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -32127,16 +32142,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32130: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32145: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32133: \$? = $ac_status" >&5
+  echo "$as_me:32148: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32136: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32151: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32139: \$? = $ac_status" >&5
+  echo "$as_me:32154: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_sysv_utmp=yes
 else
@@ -32147,7 +32162,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:32150: result: $cf_cv_sysv_utmp" >&5
+echo "$as_me:32165: result: $cf_cv_sysv_utmp" >&5
 echo "${ECHO_T}$cf_cv_sysv_utmp" >&6
 test $cf_cv_sysv_utmp = yes &&
 cat >>confdefs.h <<\EOF
@@ -32156,14 +32171,14 @@ EOF
 
 fi
 
-echo "$as_me:32159: checking if external h_errno exists" >&5
+echo "$as_me:32174: 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 32166 "configure"
+#line 32181 "configure"
 #include "confdefs.h"
 
 #undef h_errno
@@ -32178,16 +32193,16 @@ h_errno = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32181: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32196: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32184: \$? = $ac_status" >&5
+  echo "$as_me:32199: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32187: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32202: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32190: \$? = $ac_status" >&5
+  echo "$as_me:32205: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_h_errno=yes
 else
@@ -32198,7 +32213,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:32201: result: $cf_cv_have_h_errno" >&5
+echo "$as_me:32216: 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
@@ -32211,7 +32226,7 @@ EOF
 
 fi
 
-echo "$as_me:32214: checking if bibp: URLs should be supported" >&5
+echo "$as_me:32229: 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.
@@ -32228,14 +32243,14 @@ else
 	use_bibp_urls=yes
 
 fi;
-echo "$as_me:32231: result: $use_bibp_urls" >&5
+echo "$as_me:32246: 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:32238: checking if configuration info should be browsable" >&5
+echo "$as_me:32253: 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.
@@ -32252,14 +32267,14 @@ else
 	use_config_info=yes
 
 fi;
-echo "$as_me:32255: result: $use_config_info" >&5
+echo "$as_me:32270: 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:32262: checking if new-style forms-based options screen should be used" >&5
+echo "$as_me:32277: 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.
@@ -32276,14 +32291,14 @@ else
 	use_forms_options=yes
 
 fi;
-echo "$as_me:32279: result: $use_forms_options" >&5
+echo "$as_me:32294: 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:32286: checking if old-style options menu should be used" >&5
+echo "$as_me:32301: 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.
@@ -32300,14 +32315,14 @@ else
 	use_menu_options=yes
 
 fi;
-echo "$as_me:32303: result: $use_menu_options" >&5
+echo "$as_me:32318: 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:32310: checking if sessions code should be used" >&5
+echo "$as_me:32325: 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.
@@ -32324,7 +32339,7 @@ else
 	use_sessions=yes
 
 fi;
-echo "$as_me:32327: result: $use_sessions" >&5
+echo "$as_me:32342: result: $use_sessions" >&5
 echo "${ECHO_T}$use_sessions" >&6
 if test $use_sessions != no ; then
 
@@ -32335,7 +32350,7 @@ EOF
 	EXTRA_OBJS="$EXTRA_OBJS LYSession\$o"
 fi
 
-echo "$as_me:32338: checking if session-caching code should be used" >&5
+echo "$as_me:32353: 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.
@@ -32352,7 +32367,7 @@ else
 	use_session_cache=yes
 
 fi;
-echo "$as_me:32355: result: $use_session_cache" >&5
+echo "$as_me:32370: result: $use_session_cache" >&5
 echo "${ECHO_T}$use_session_cache" >&6
 if test $use_session_cache != no ; then
 
@@ -32362,7 +32377,7 @@ EOF
 
 fi
 
-echo "$as_me:32365: checking if address-list page should be used" >&5
+echo "$as_me:32380: 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.
@@ -32379,14 +32394,14 @@ else
 	use_addrlist_page=yes
 
 fi;
-echo "$as_me:32382: result: $use_addrlist_page" >&5
+echo "$as_me:32397: 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:32389: checking if experimental CJK logic should be used" >&5
+echo "$as_me:32404: checking if experimental CJK logic should be used" >&5
 echo $ECHO_N "checking if experimental CJK logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-cjk or --disable-cjk was given.
@@ -32403,14 +32418,14 @@ else
 	use_cjk=no
 
 fi;
-echo "$as_me:32406: result: $use_cjk" >&5
+echo "$as_me:32421: result: $use_cjk" >&5
 echo "${ECHO_T}$use_cjk" >&6
 test $use_cjk != no &&
 cat >>confdefs.h <<\EOF
 #define CJK_EX 1
 EOF
 
-echo "$as_me:32413: checking if experimental Japanese UTF-8 logic should be used" >&5
+echo "$as_me:32428: checking if experimental Japanese UTF-8 logic should be used" >&5
 echo $ECHO_N "checking if experimental Japanese UTF-8 logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-japanese-utf8 or --disable-japanese-utf8 was given.
@@ -32427,7 +32442,7 @@ else
 	use_ja_utf8=no
 
 fi;
-echo "$as_me:32430: result: $use_ja_utf8" >&5
+echo "$as_me:32445: result: $use_ja_utf8" >&5
 echo "${ECHO_T}$use_ja_utf8" >&6
 if test $use_ja_utf8 != no ; then
 
@@ -32473,7 +32488,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 32476 "configure"
+#line 32491 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -32485,16 +32500,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32488: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32503: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32491: \$? = $ac_status" >&5
+  echo "$as_me:32506: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32494: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32509: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32497: \$? = $ac_status" >&5
+  echo "$as_me:32512: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -32511,7 +32526,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}:32514: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:32529: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -32554,7 +32569,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 32557 "configure"
+#line 32572 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -32566,16 +32581,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32569: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32584: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32572: \$? = $ac_status" >&5
+  echo "$as_me:32587: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32575: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32590: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32578: \$? = $ac_status" >&5
+  echo "$as_me:32593: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -32592,7 +32607,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}:32595: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:32610: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -32610,7 +32625,7 @@ echo "${as_me:-configure}:32595: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:32613: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:32628: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -32635,7 +32650,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}:32638: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:32653: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -32664,7 +32679,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}:32667: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:32682: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -32673,7 +32688,7 @@ echo "${as_me:-configure}:32667: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:32676: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:32691: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -32684,7 +32699,7 @@ esac
 
 fi;
 
-  echo "$as_me:32687: checking for iconv" >&5
+  echo "$as_me:32702: 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
@@ -32695,12 +32710,12 @@ else
 cf_cv_header_path_iconv=
 cf_cv_library_path_iconv=
 
-echo "${as_me:-configure}:32698: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:32713: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 32703 "configure"
+#line 32718 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -32719,16 +32734,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32722: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32737: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32725: \$? = $ac_status" >&5
+  echo "$as_me:32740: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32728: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32743: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32731: \$? = $ac_status" >&5
+  echo "$as_me:32746: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -32742,7 +32757,7 @@ cat conftest.$ac_ext >&5
 LIBS="-liconv  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 32745 "configure"
+#line 32760 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -32761,16 +32776,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32764: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32779: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32767: \$? = $ac_status" >&5
+  echo "$as_me:32782: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32770: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32785: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32773: \$? = $ac_status" >&5
+  echo "$as_me:32788: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -32787,9 +32802,9 @@ cat conftest.$ac_ext >&5
 
 	test -n "$verbose" && echo "	find linkage for iconv library" 1>&6
 
-echo "${as_me:-configure}:32790: testing find linkage for iconv library ..." 1>&5
+echo "${as_me:-configure}:32805: testing find linkage for iconv library ..." 1>&5
 
-echo "${as_me:-configure}:32792: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:32807: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -32880,11 +32895,11 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d $cf_cv_header_path_iconv ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_iconv" 1>&6
 
-echo "${as_me:-configure}:32883: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:32898: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_iconv"
 			cat >conftest.$ac_ext <<_ACEOF
-#line 32887 "configure"
+#line 32902 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -32903,21 +32918,21 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32906: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32921: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32909: \$? = $ac_status" >&5
+  echo "$as_me:32924: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32912: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32927: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32915: \$? = $ac_status" >&5
+  echo "$as_me:32930: \$? = $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}:32920: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:32935: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
 
 				cf_cv_find_linkage_iconv=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -32935,7 +32950,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	if test "$cf_cv_find_linkage_iconv" = maybe ; then
 
-echo "${as_me:-configure}:32938: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:32953: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -33010,13 +33025,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}:33013: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:33028: 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 33019 "configure"
+#line 33034 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -33035,21 +33050,21 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33038: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33053: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33041: \$? = $ac_status" >&5
+  echo "$as_me:33056: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33044: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33059: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33047: \$? = $ac_status" >&5
+  echo "$as_me:33062: \$? = $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}:33052: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:33067: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
 
 					cf_cv_find_linkage_iconv=yes
 					cf_cv_library_file_iconv="-liconv"
@@ -33089,7 +33104,7 @@ am_cv_func_iconv="no, consider installing GNU libiconv"
 fi
 
 fi
-echo "$as_me:33092: result: $am_cv_func_iconv" >&5
+echo "$as_me:33107: result: $am_cv_func_iconv" >&5
 echo "${ECHO_T}$am_cv_func_iconv" >&6
 
   if test "$am_cv_func_iconv" = yes; then
@@ -33098,14 +33113,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_ICONV 1
 EOF
 
-    echo "$as_me:33101: checking if the declaration of iconv() needs const." >&5
+    echo "$as_me:33116: 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 33108 "configure"
+#line 33123 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -33130,16 +33145,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33133: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33148: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33136: \$? = $ac_status" >&5
+  echo "$as_me:33151: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33139: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33154: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33142: \$? = $ac_status" >&5
+  echo "$as_me:33157: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_proto_iconv_const=no
 else
@@ -33149,7 +33164,7 @@ am_cv_proto_iconv_const=yes
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:33152: result: $am_cv_proto_iconv_const" >&5
+echo "$as_me:33167: 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
@@ -33191,7 +33206,7 @@ if test -n "$cf_cv_header_path_iconv" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 33194 "configure"
+#line 33209 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -33203,16 +33218,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33206: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33221: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33209: \$? = $ac_status" >&5
+  echo "$as_me:33224: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33212: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33227: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33215: \$? = $ac_status" >&5
+  echo "$as_me:33230: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -33229,7 +33244,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}:33232: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:33247: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -33268,7 +33283,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}:33271: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:33286: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -33292,7 +33307,7 @@ case $cf_cv_screen in
 esac
 
 if test "$use_dft_colors" != no ; then
-echo "$as_me:33295: checking if you want to use default-colors" >&5
+echo "$as_me:33310: 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.
@@ -33309,7 +33324,7 @@ else
 	use_dft_colors=no
 
 fi;
-echo "$as_me:33312: result: $use_dft_colors" >&5
+echo "$as_me:33327: result: $use_dft_colors" >&5
 echo "${ECHO_T}$use_dft_colors" >&6
 test $use_dft_colors = "yes" &&
 cat >>confdefs.h <<\EOF
@@ -33318,7 +33333,7 @@ EOF
 
 fi
 
-echo "$as_me:33321: checking if experimental keyboard-layout logic should be used" >&5
+echo "$as_me:33336: 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.
@@ -33335,14 +33350,14 @@ else
 	use_kbd_layout=no
 
 fi;
-echo "$as_me:33338: result: $use_kbd_layout" >&5
+echo "$as_me:33353: 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:33345: checking if experimental nested-table logic should be used" >&5
+echo "$as_me:33360: 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.
@@ -33359,14 +33374,14 @@ else
 	use_nested_tables=no
 
 fi;
-echo "$as_me:33362: result: $use_nested_tables" >&5
+echo "$as_me:33377: 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:33369: checking if alternative line-edit bindings should be used" >&5
+echo "$as_me:33384: 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.
@@ -33383,14 +33398,14 @@ else
 	use_alt_bindings=yes
 
 fi;
-echo "$as_me:33386: result: $use_alt_bindings" >&5
+echo "$as_me:33401: 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:33393: checking if ascii case-conversion should be used" >&5
+echo "$as_me:33408: 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.
@@ -33407,14 +33422,14 @@ else
 	use_ascii_ctypes=yes
 
 fi;
-echo "$as_me:33410: result: $use_ascii_ctypes" >&5
+echo "$as_me:33425: 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:33417: checking if you want to use extended HTML DTD logic" >&5
+echo "$as_me:33432: 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.
@@ -33431,14 +33446,14 @@ else
 	use_ext_htmldtd=yes
 
 fi;
-echo "$as_me:33434: result: $use_ext_htmldtd" >&5
+echo "$as_me:33449: 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:33441: checking if file-upload logic should be used" >&5
+echo "$as_me:33456: 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.
@@ -33455,14 +33470,14 @@ else
 	use_file_upload=yes
 
 fi;
-echo "$as_me:33458: result: $use_file_upload" >&5
+echo "$as_me:33473: 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:33465: checking if IDNA support should be used" >&5
+echo "$as_me:33480: 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.
@@ -33479,7 +33494,7 @@ else
 	use_idna=yes
 
 fi;
-echo "$as_me:33482: result: $use_idna" >&5
+echo "$as_me:33497: result: $use_idna" >&5
 echo "${ECHO_T}$use_idna" >&6
 
 if test "$use_idna" = yes ; then
@@ -33518,7 +33533,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 33521 "configure"
+#line 33536 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -33530,16 +33545,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33533: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33548: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33536: \$? = $ac_status" >&5
+  echo "$as_me:33551: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33539: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33554: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33542: \$? = $ac_status" >&5
+  echo "$as_me:33557: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -33556,7 +33571,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}:33559: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:33574: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -33599,7 +33614,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 33602 "configure"
+#line 33617 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -33611,16 +33626,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33614: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33629: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33617: \$? = $ac_status" >&5
+  echo "$as_me:33632: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33620: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33635: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33623: \$? = $ac_status" >&5
+  echo "$as_me:33638: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -33637,7 +33652,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}:33640: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:33655: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -33655,7 +33670,7 @@ echo "${as_me:-configure}:33640: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:33658: error: cannot find  under $use_idna" >&5
+{ { echo "$as_me:33673: error: cannot find  under $use_idna" >&5
 echo "$as_me: error: cannot find  under $use_idna" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -33680,7 +33695,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}:33683: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:33698: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -33709,7 +33724,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}:33712: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:33727: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -33718,7 +33733,7 @@ echo "${as_me:-configure}:33712: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:33721: error: cannot find  under $use_idna" >&5
+{ { echo "$as_me:33736: error: cannot find  under $use_idna" >&5
 echo "$as_me: error: cannot find  under $use_idna" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -33732,12 +33747,12 @@ esac
 cf_cv_header_path_idn=
 cf_cv_library_path_idn=
 
-echo "${as_me:-configure}:33735: testing Starting FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:33750: testing Starting FIND_LINKAGE(idn,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 33740 "configure"
+#line 33755 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -33755,16 +33770,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33758: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33773: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33761: \$? = $ac_status" >&5
+  echo "$as_me:33776: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33764: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33779: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33767: \$? = $ac_status" >&5
+  echo "$as_me:33782: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_idn=yes
@@ -33778,7 +33793,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lidn $LIBICONV $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 33781 "configure"
+#line 33796 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -33796,16 +33811,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33799: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33814: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33802: \$? = $ac_status" >&5
+  echo "$as_me:33817: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33805: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33820: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33808: \$? = $ac_status" >&5
+  echo "$as_me:33823: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_idn=yes
@@ -33822,9 +33837,9 @@ cat conftest.$ac_ext >&5
 
 	test -n "$verbose" && echo "	find linkage for idn library" 1>&6
 
-echo "${as_me:-configure}:33825: testing find linkage for idn library ..." 1>&5
+echo "${as_me:-configure}:33840: testing find linkage for idn library ..." 1>&5
 
-echo "${as_me:-configure}:33827: testing Searching for headers in FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:33842: testing Searching for headers in FIND_LINKAGE(idn,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -33915,11 +33930,11 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d $cf_cv_header_path_idn ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_idn" 1>&6
 
-echo "${as_me:-configure}:33918: testing ... testing $cf_cv_header_path_idn ..." 1>&5
+echo "${as_me:-configure}:33933: testing ... testing $cf_cv_header_path_idn ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_idn"
 			cat >conftest.$ac_ext <<_ACEOF
-#line 33922 "configure"
+#line 33937 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -33937,21 +33952,21 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33940: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33955: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33943: \$? = $ac_status" >&5
+  echo "$as_me:33958: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33946: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33961: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33949: \$? = $ac_status" >&5
+  echo "$as_me:33964: \$? = $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}:33954: testing ... found idn headers in $cf_cv_header_path_idn ..." 1>&5
+echo "${as_me:-configure}:33969: testing ... found idn headers in $cf_cv_header_path_idn ..." 1>&5
 
 				cf_cv_find_linkage_idn=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -33969,7 +33984,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	if test "$cf_cv_find_linkage_idn" = maybe ; then
 
-echo "${as_me:-configure}:33972: testing Searching for idn library in FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:33987: testing Searching for idn library in FIND_LINKAGE(idn,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -34044,13 +34059,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}:34047: testing ... testing $cf_cv_library_path_idn ..." 1>&5
+echo "${as_me:-configure}:34062: 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 34053 "configure"
+#line 34068 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -34068,21 +34083,21 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34071: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34086: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34074: \$? = $ac_status" >&5
+  echo "$as_me:34089: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:34077: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34092: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34080: \$? = $ac_status" >&5
+  echo "$as_me:34095: \$? = $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}:34085: testing ... found idn library in $cf_cv_library_path_idn ..." 1>&5
+echo "${as_me:-configure}:34100: testing ... found idn library in $cf_cv_library_path_idn ..." 1>&5
 
 					cf_cv_find_linkage_idn=yes
 					cf_cv_library_file_idn="-lidn"
@@ -34141,7 +34156,7 @@ if test -n "$cf_cv_header_path_idn" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 34144 "configure"
+#line 34159 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -34153,16 +34168,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34156: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34171: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34159: \$? = $ac_status" >&5
+  echo "$as_me:34174: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:34162: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34177: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34165: \$? = $ac_status" >&5
+  echo "$as_me:34180: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -34179,7 +34194,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}:34182: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:34197: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -34215,7 +34230,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}:34218: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:34233: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -34240,7 +34255,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:34243: WARNING: Cannot find idn library" >&5
+{ echo "$as_me:34258: WARNING: Cannot find idn library" >&5
 echo "$as_me: WARNING: Cannot find idn library" >&2;}
 fi
 
@@ -34254,7 +34269,7 @@ fi
 
 fi
 
-echo "$as_me:34257: checking if element-justification logic should be used" >&5
+echo "$as_me:34272: 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.
@@ -34271,14 +34286,14 @@ else
 	use_justify_elts=yes
 
 fi;
-echo "$as_me:34274: result: $use_justify_elts" >&5
+echo "$as_me:34289: 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:34281: checking if partial-display should be used" >&5
+echo "$as_me:34296: 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.
@@ -34295,14 +34310,14 @@ else
 	use_partial_display=yes
 
 fi;
-echo "$as_me:34298: result: $use_partial_display" >&5
+echo "$as_me:34313: 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:34305: checking if persistent-cookie logic should be used" >&5
+echo "$as_me:34320: 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.
@@ -34319,14 +34334,14 @@ else
 	use_filed_cookies=yes
 
 fi;
-echo "$as_me:34322: result: $use_filed_cookies" >&5
+echo "$as_me:34337: 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:34329: checking if html source should be colorized" >&5
+echo "$as_me:34344: 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.
@@ -34343,14 +34358,14 @@ else
 	use_prettysrc=yes
 
 fi;
-echo "$as_me:34346: result: $use_prettysrc" >&5
+echo "$as_me:34361: 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:34353: checking if progress-bar code should be used" >&5
+echo "$as_me:34368: 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.
@@ -34367,14 +34382,14 @@ else
 	use_progressbar=yes
 
 fi;
-echo "$as_me:34370: result: $use_progressbar" >&5
+echo "$as_me:34385: 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:34377: checking if read-progress message should show ETA" >&5
+echo "$as_me:34392: 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.
@@ -34391,14 +34406,14 @@ else
 	use_read_eta=yes
 
 fi;
-echo "$as_me:34394: result: $use_read_eta" >&5
+echo "$as_me:34409: 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:34401: checking if source caching should be used" >&5
+echo "$as_me:34416: 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.
@@ -34415,14 +34430,14 @@ else
 	use_source_cache=yes
 
 fi;
-echo "$as_me:34418: result: $use_source_cache" >&5
+echo "$as_me:34433: 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:34425: checking if scrollbar code should be used" >&5
+echo "$as_me:34440: 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.
@@ -34439,10 +34454,10 @@ else
 	use_scrollbar=yes
 
 fi;
-echo "$as_me:34442: result: $use_scrollbar" >&5
+echo "$as_me:34457: result: $use_scrollbar" >&5
 echo "${ECHO_T}$use_scrollbar" >&6
 
-echo "$as_me:34445: checking if charset-selection logic should be used" >&5
+echo "$as_me:34460: 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.
@@ -34459,14 +34474,14 @@ else
 	use_charset_choice=no
 
 fi;
-echo "$as_me:34462: result: $use_charset_choice" >&5
+echo "$as_me:34477: 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:34469: checking if you want to use external commands" >&5
+echo "$as_me:34484: 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.
@@ -34483,7 +34498,7 @@ else
 	use_externs=no
 
 fi;
-echo "$as_me:34486: result: $use_externs" >&5
+echo "$as_me:34501: result: $use_externs" >&5
 echo "${ECHO_T}$use_externs" >&6
 if test $use_externs != "no" ; then
 
@@ -34494,7 +34509,7 @@ EOF
 	EXTRA_OBJS="$EXTRA_OBJS LYExtern\$o"
 fi
 
-echo "$as_me:34497: checking if you want to use setfont support" >&5
+echo "$as_me:34512: 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.
@@ -34511,7 +34526,7 @@ else
 	use_setfont=no
 
 fi;
-echo "$as_me:34514: result: $use_setfont" >&5
+echo "$as_me:34529: result: $use_setfont" >&5
 echo "${ECHO_T}$use_setfont" >&6
 if test $use_setfont = yes ; then
 	case $host_os in
@@ -34522,7 +34537,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:34525: checking for $ac_word" >&5
+echo "$as_me:34540: 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
@@ -34539,7 +34554,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:34542: found $ac_dir/$ac_word" >&5
+   echo "$as_me:34557: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -34550,10 +34565,10 @@ fi
 SETFONT=$ac_cv_path_SETFONT
 
 if test -n "$SETFONT"; then
-  echo "$as_me:34553: result: $SETFONT" >&5
+  echo "$as_me:34568: result: $SETFONT" >&5
 echo "${ECHO_T}$SETFONT" >&6
 else
-  echo "$as_me:34556: result: no" >&5
+  echo "$as_me:34571: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -34612,7 +34627,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:34615: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:34630: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define SETFONT_PATH "$cf_path_prog"
@@ -34630,19 +34645,19 @@ fi
 		SETFONT=built-in
 		test -n "$verbose" && echo "	Assume $host_os has font-switching" 1>&6
 
-echo "${as_me:-configure}:34633: testing Assume $host_os has font-switching ..." 1>&5
+echo "${as_me:-configure}:34648: 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}:34640: testing Assume $host_os has no font-switching ..." 1>&5
+echo "${as_me:-configure}:34655: testing Assume $host_os has no font-switching ..." 1>&5
 
 		;;
 	esac
 	if test -z "$SETFONT" ; then
-		{ echo "$as_me:34645: WARNING: Cannot find a font-setting program" >&5
+		{ echo "$as_me:34660: WARNING: Cannot find a font-setting program" >&5
 echo "$as_me: WARNING: Cannot find a font-setting program" >&2;}
 	elif test "$SETFONT" != unknown ; then
 
@@ -34653,7 +34668,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:34656: checking if you want cgi-link support" >&5
+echo "$as_me:34671: 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.
@@ -34670,10 +34685,10 @@ EOF
 else
   enableval=no
 fi;
-echo "$as_me:34673: result: $enableval" >&5
+echo "$as_me:34688: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:34676: checking if you want change-exec support" >&5
+echo "$as_me:34691: 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.
@@ -34690,14 +34705,14 @@ else
 	use_change_exec=no
 
 fi;
-echo "$as_me:34693: result: $use_change_exec" >&5
+echo "$as_me:34708: 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:34700: checking if you want exec-links support" >&5
+echo "$as_me:34715: 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.
@@ -34714,14 +34729,14 @@ else
 	use_exec_links=$enableval
 
 fi;
-echo "$as_me:34717: result: $use_exec_links" >&5
+echo "$as_me:34732: 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:34724: checking if you want exec-scripts support" >&5
+echo "$as_me:34739: 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.
@@ -34738,14 +34753,14 @@ else
 	use_exec_scripts=$enableval
 
 fi;
-echo "$as_me:34741: result: $use_exec_scripts" >&5
+echo "$as_me:34756: 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:34748: checking if you want internal-links feature" >&5
+echo "$as_me:34763: 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.
@@ -34762,14 +34777,14 @@ else
 	use_internal_links=no
 
 fi;
-echo "$as_me:34765: result: $use_internal_links" >&5
+echo "$as_me:34780: 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:34772: checking if you want to fork NSL requests" >&5
+echo "$as_me:34787: 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.
@@ -34786,7 +34801,7 @@ else
 	use_nsl_fork=no
 
 fi;
-echo "$as_me:34789: result: $use_nsl_fork" >&5
+echo "$as_me:34804: result: $use_nsl_fork" >&5
 echo "${ECHO_T}$use_nsl_fork" >&6
 if test $use_nsl_fork = yes ; then
 	case $host_os in
@@ -34807,7 +34822,7 @@ EOF
 	esac
 fi
 
-echo "$as_me:34810: checking if you want to log URL requests via syslog" >&5
+echo "$as_me:34825: 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.
@@ -34824,14 +34839,14 @@ else
 	use_syslog=no
 
 fi;
-echo "$as_me:34827: result: $use_syslog" >&5
+echo "$as_me:34842: 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:34834: checking if you want to underline links" >&5
+echo "$as_me:34849: 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.
@@ -34848,7 +34863,7 @@ else
 	use_underline=no
 
 fi;
-echo "$as_me:34851: result: $use_underline" >&5
+echo "$as_me:34866: result: $use_underline" >&5
 echo "${ECHO_T}$use_underline" >&6
 test $use_underline = yes &&
 cat >>confdefs.h <<\EOF
@@ -34860,7 +34875,7 @@ cat >>confdefs.h <<\EOF
 #define UNDERLINE_LINKS 0
 EOF
 
-echo "$as_me:34863: checking if help files should be gzip'ed" >&5
+echo "$as_me:34878: 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.
@@ -34877,10 +34892,10 @@ else
 	use_gzip_help=no
 
 fi;
-echo "$as_me:34880: result: $use_gzip_help" >&5
+echo "$as_me:34895: result: $use_gzip_help" >&5
 echo "${ECHO_T}$use_gzip_help" >&6
 
-echo "$as_me:34883: checking if you want to use libbz2 for decompression of some bzip2 files" >&5
+echo "$as_me:34898: 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.
@@ -34890,7 +34905,7 @@ if test "${with_bzlib+set}" = set; then
 else
   use_bzlib=no
 fi;
-echo "$as_me:34893: result: $use_bzlib" >&5
+echo "$as_me:34908: result: $use_bzlib" >&5
 echo "${ECHO_T}$use_bzlib" >&6
 
 if test ".$use_bzlib" != ".no" ; then
@@ -34929,7 +34944,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 34932 "configure"
+#line 34947 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -34941,16 +34956,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34944: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34959: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34947: \$? = $ac_status" >&5
+  echo "$as_me:34962: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:34950: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34965: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34953: \$? = $ac_status" >&5
+  echo "$as_me:34968: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -34967,7 +34982,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}:34970: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:34985: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -35010,7 +35025,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 35013 "configure"
+#line 35028 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -35022,16 +35037,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:35025: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35040: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35028: \$? = $ac_status" >&5
+  echo "$as_me:35043: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:35031: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35046: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35034: \$? = $ac_status" >&5
+  echo "$as_me:35049: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -35048,7 +35063,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}:35051: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:35066: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -35066,7 +35081,7 @@ echo "${as_me:-configure}:35051: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:35069: error: cannot find  under $use_bzlib" >&5
+{ { echo "$as_me:35084: error: cannot find  under $use_bzlib" >&5
 echo "$as_me: error: cannot find  under $use_bzlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -35091,7 +35106,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}:35094: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:35109: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -35120,7 +35135,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}:35123: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:35138: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -35129,7 +35144,7 @@ echo "${as_me:-configure}:35123: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:35132: error: cannot find  under $use_bzlib" >&5
+{ { echo "$as_me:35147: error: cannot find  under $use_bzlib" >&5
 echo "$as_me: error: cannot find  under $use_bzlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -35143,12 +35158,12 @@ esac
 cf_cv_header_path_bz2=
 cf_cv_library_path_bz2=
 
-echo "${as_me:-configure}:35146: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:35161: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 35151 "configure"
+#line 35166 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -35165,16 +35180,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35168: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35183: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35171: \$? = $ac_status" >&5
+  echo "$as_me:35186: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35174: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35189: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35177: \$? = $ac_status" >&5
+  echo "$as_me:35192: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_bz2=yes
@@ -35188,7 +35203,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lbz2  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 35191 "configure"
+#line 35206 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -35205,16 +35220,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35208: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35223: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35211: \$? = $ac_status" >&5
+  echo "$as_me:35226: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35214: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35229: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35217: \$? = $ac_status" >&5
+  echo "$as_me:35232: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_bz2=yes
@@ -35231,9 +35246,9 @@ cat conftest.$ac_ext >&5
 
 	test -n "$verbose" && echo "	find linkage for bz2 library" 1>&6
 
-echo "${as_me:-configure}:35234: testing find linkage for bz2 library ..." 1>&5
+echo "${as_me:-configure}:35249: testing find linkage for bz2 library ..." 1>&5
 
-echo "${as_me:-configure}:35236: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:35251: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -35324,11 +35339,11 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d $cf_cv_header_path_bz2 ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_bz2" 1>&6
 
-echo "${as_me:-configure}:35327: testing ... testing $cf_cv_header_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:35342: testing ... testing $cf_cv_header_path_bz2 ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_bz2"
 			cat >conftest.$ac_ext <<_ACEOF
-#line 35331 "configure"
+#line 35346 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -35345,21 +35360,21 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:35348: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35363: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35351: \$? = $ac_status" >&5
+  echo "$as_me:35366: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:35354: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35369: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35357: \$? = $ac_status" >&5
+  echo "$as_me:35372: \$? = $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}:35362: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:35377: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5
 
 				cf_cv_find_linkage_bz2=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -35377,7 +35392,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	if test "$cf_cv_find_linkage_bz2" = maybe ; then
 
-echo "${as_me:-configure}:35380: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:35395: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -35385,7 +35400,7 @@ echo "${as_me:-configure}:35380: testing Searching for bz2 library in FIND_LINKA
 		CPPFLAGS="$cf_test_CPPFLAGS"
 		LIBS="-lbz2  $cf_save_LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 35388 "configure"
+#line 35403 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -35402,21 +35417,21 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35405: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35420: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35408: \$? = $ac_status" >&5
+  echo "$as_me:35423: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35411: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35426: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35414: \$? = $ac_status" >&5
+  echo "$as_me:35429: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 			test -n "$verbose" && echo "	... found bz2 library in system" 1>&6
 
-echo "${as_me:-configure}:35419: testing ... found bz2 library in system ..." 1>&5
+echo "${as_me:-configure}:35434: testing ... found bz2 library in system ..." 1>&5
 
 			cf_cv_find_linkage_bz2=yes
 else
@@ -35497,13 +35512,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}:35500: testing ... testing $cf_cv_library_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:35515: 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 35506 "configure"
+#line 35521 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -35520,21 +35535,21 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35523: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35538: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35526: \$? = $ac_status" >&5
+  echo "$as_me:35541: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35529: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35544: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35532: \$? = $ac_status" >&5
+  echo "$as_me:35547: \$? = $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}:35537: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:35552: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5
 
 					cf_cv_find_linkage_bz2=yes
 					cf_cv_library_file_bz2="-lbz2"
@@ -35593,7 +35608,7 @@ if test -n "$cf_cv_header_path_bz2" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 35596 "configure"
+#line 35611 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -35605,16 +35620,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:35608: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35623: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35611: \$? = $ac_status" >&5
+  echo "$as_me:35626: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:35614: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35629: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35617: \$? = $ac_status" >&5
+  echo "$as_me:35632: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -35631,7 +35646,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}:35634: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:35649: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -35667,7 +35682,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}:35670: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:35685: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -35692,7 +35707,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:35695: WARNING: Cannot find bz2 library" >&5
+{ echo "$as_me:35710: WARNING: Cannot find bz2 library" >&5
 echo "$as_me: WARNING: Cannot find bz2 library" >&2;}
 fi
 
@@ -35703,7 +35718,7 @@ EOF
 
 fi
 
-echo "$as_me:35706: checking if you want to use zlib for decompression of some gzip files" >&5
+echo "$as_me:35721: 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.
@@ -35713,7 +35728,7 @@ if test "${with_zlib+set}" = set; then
 else
   use_zlib=no
 fi;
-echo "$as_me:35716: result: $use_zlib" >&5
+echo "$as_me:35731: result: $use_zlib" >&5
 echo "${ECHO_T}$use_zlib" >&6
 
 if test ".$use_zlib" != ".no" ; then
@@ -35752,7 +35767,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 35755 "configure"
+#line 35770 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -35764,16 +35779,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:35767: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35782: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35770: \$? = $ac_status" >&5
+  echo "$as_me:35785: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:35773: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35788: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35776: \$? = $ac_status" >&5
+  echo "$as_me:35791: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -35790,7 +35805,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}:35793: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:35808: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -35833,7 +35848,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 35836 "configure"
+#line 35851 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -35845,16 +35860,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:35848: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35863: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35851: \$? = $ac_status" >&5
+  echo "$as_me:35866: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:35854: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35869: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35857: \$? = $ac_status" >&5
+  echo "$as_me:35872: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -35871,7 +35886,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}:35874: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:35889: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -35889,7 +35904,7 @@ echo "${as_me:-configure}:35874: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:35892: error: cannot find  under $use_zlib" >&5
+{ { echo "$as_me:35907: error: cannot find  under $use_zlib" >&5
 echo "$as_me: error: cannot find  under $use_zlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -35914,7 +35929,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}:35917: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:35932: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -35943,7 +35958,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}:35946: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:35961: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -35952,7 +35967,7 @@ echo "${as_me:-configure}:35946: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:35955: error: cannot find  under $use_zlib" >&5
+{ { echo "$as_me:35970: error: cannot find  under $use_zlib" >&5
 echo "$as_me: error: cannot find  under $use_zlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -35966,12 +35981,12 @@ esac
 cf_cv_header_path_z=
 cf_cv_library_path_z=
 
-echo "${as_me:-configure}:35969: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:35984: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 35974 "configure"
+#line 35989 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -35987,16 +36002,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35990: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36005: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35993: \$? = $ac_status" >&5
+  echo "$as_me:36008: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35996: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36011: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35999: \$? = $ac_status" >&5
+  echo "$as_me:36014: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_z=yes
@@ -36010,7 +36025,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lz  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 36013 "configure"
+#line 36028 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -36026,16 +36041,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36029: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36044: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36032: \$? = $ac_status" >&5
+  echo "$as_me:36047: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36035: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36050: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36038: \$? = $ac_status" >&5
+  echo "$as_me:36053: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_z=yes
@@ -36052,9 +36067,9 @@ cat conftest.$ac_ext >&5
 
 	test -n "$verbose" && echo "	find linkage for z library" 1>&6
 
-echo "${as_me:-configure}:36055: testing find linkage for z library ..." 1>&5
+echo "${as_me:-configure}:36070: testing find linkage for z library ..." 1>&5
 
-echo "${as_me:-configure}:36057: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:36072: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -36145,11 +36160,11 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d $cf_cv_header_path_z ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_z" 1>&6
 
-echo "${as_me:-configure}:36148: testing ... testing $cf_cv_header_path_z ..." 1>&5
+echo "${as_me:-configure}:36163: testing ... testing $cf_cv_header_path_z ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_z"
 			cat >conftest.$ac_ext <<_ACEOF
-#line 36152 "configure"
+#line 36167 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -36165,21 +36180,21 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:36168: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36183: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36171: \$? = $ac_status" >&5
+  echo "$as_me:36186: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:36174: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36189: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36177: \$? = $ac_status" >&5
+  echo "$as_me:36192: \$? = $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}:36182: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5
+echo "${as_me:-configure}:36197: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5
 
 				cf_cv_find_linkage_z=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -36197,7 +36212,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	if test "$cf_cv_find_linkage_z" = maybe ; then
 
-echo "${as_me:-configure}:36200: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:36215: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -36205,7 +36220,7 @@ echo "${as_me:-configure}:36200: testing Searching for z library in FIND_LINKAGE
 		CPPFLAGS="$cf_test_CPPFLAGS"
 		LIBS="-lz  $cf_save_LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 36208 "configure"
+#line 36223 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -36221,21 +36236,21 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36224: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36239: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36227: \$? = $ac_status" >&5
+  echo "$as_me:36242: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36230: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36245: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36233: \$? = $ac_status" >&5
+  echo "$as_me:36248: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 			test -n "$verbose" && echo "	... found z library in system" 1>&6
 
-echo "${as_me:-configure}:36238: testing ... found z library in system ..." 1>&5
+echo "${as_me:-configure}:36253: testing ... found z library in system ..." 1>&5
 
 			cf_cv_find_linkage_z=yes
 else
@@ -36316,13 +36331,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}:36319: testing ... testing $cf_cv_library_path_z ..." 1>&5
+echo "${as_me:-configure}:36334: 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 36325 "configure"
+#line 36340 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -36338,21 +36353,21 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36341: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36356: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36344: \$? = $ac_status" >&5
+  echo "$as_me:36359: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36347: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36362: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36350: \$? = $ac_status" >&5
+  echo "$as_me:36365: \$? = $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}:36355: testing ... found z library in $cf_cv_library_path_z ..." 1>&5
+echo "${as_me:-configure}:36370: testing ... found z library in $cf_cv_library_path_z ..." 1>&5
 
 					cf_cv_find_linkage_z=yes
 					cf_cv_library_file_z="-lz"
@@ -36411,7 +36426,7 @@ if test -n "$cf_cv_header_path_z" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 36414 "configure"
+#line 36429 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -36423,16 +36438,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:36426: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36441: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:36429: \$? = $ac_status" >&5
+  echo "$as_me:36444: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:36432: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36447: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36435: \$? = $ac_status" >&5
+  echo "$as_me:36450: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -36449,7 +36464,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}:36452: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:36467: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -36485,7 +36500,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}:36488: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:36503: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -36510,7 +36525,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:36513: WARNING: Cannot find z library" >&5
+{ echo "$as_me:36528: WARNING: Cannot find z library" >&5
 echo "$as_me: WARNING: Cannot find z library" >&2;}
 fi
 
@@ -36519,13 +36534,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:36522: checking for $ac_func" >&5
+echo "$as_me:36537: 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 36528 "configure"
+#line 36543 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -36556,16 +36571,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36559: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36574: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36562: \$? = $ac_status" >&5
+  echo "$as_me:36577: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36565: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36580: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36568: \$? = $ac_status" >&5
+  echo "$as_me:36583: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -36575,7 +36590,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:36578: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:36593: 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
@@ -36592,7 +36607,7 @@ EOF
 
 fi
 
-echo "$as_me:36595: checking if you want to exclude FINGER code" >&5
+echo "$as_me:36610: 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.
@@ -36609,14 +36624,14 @@ else
 	use_finger=no
 
 fi;
-echo "$as_me:36612: result: $use_finger" >&5
+echo "$as_me:36627: 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:36619: checking if you want to exclude GOPHER code" >&5
+echo "$as_me:36634: 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.
@@ -36633,14 +36648,14 @@ else
 	use_gopher=no
 
 fi;
-echo "$as_me:36636: result: $use_gopher" >&5
+echo "$as_me:36651: 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:36643: checking if you want to exclude NEWS code" >&5
+echo "$as_me:36658: 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.
@@ -36657,14 +36672,14 @@ else
 	use_news=no
 
 fi;
-echo "$as_me:36660: result: $use_news" >&5
+echo "$as_me:36675: 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:36667: checking if you want to exclude FTP code" >&5
+echo "$as_me:36682: 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.
@@ -36681,14 +36696,14 @@ else
 	use_ftp=no
 
 fi;
-echo "$as_me:36684: result: $use_ftp" >&5
+echo "$as_me:36699: 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:36691: checking if you want to include WAIS code" >&5
+echo "$as_me:36706: 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.
@@ -36705,13 +36720,13 @@ else
 	use_wais=no
 
 fi;
-echo "$as_me:36708: result: $use_wais" >&5
+echo "$as_me:36723: result: $use_wais" >&5
 echo "${ECHO_T}$use_wais" >&6
 
 MAKE_WAIS="#"
 if test $use_wais != "no"
 then
-	echo "$as_me:36714: checking for fs_free in -lwais" >&5
+	echo "$as_me:36729: 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
@@ -36719,7 +36734,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lwais  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 36722 "configure"
+#line 36737 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -36738,16 +36753,16 @@ fs_free ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36741: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36756: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36744: \$? = $ac_status" >&5
+  echo "$as_me:36759: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36747: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36762: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36750: \$? = $ac_status" >&5
+  echo "$as_me:36765: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_wais_fs_free=yes
 else
@@ -36758,18 +36773,18 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:36761: result: $ac_cv_lib_wais_fs_free" >&5
+echo "$as_me:36776: 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:36765: checking if -lm needed for math functions" >&5
+echo "$as_me:36780: 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 36772 "configure"
+#line 36787 "configure"
 #include "confdefs.h"
 
 	#include <stdio.h>
@@ -36785,16 +36800,16 @@ double x = rand(); printf("result = %g\n", sin(x))
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36788: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36803: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36791: \$? = $ac_status" >&5
+  echo "$as_me:36806: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36794: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36809: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36797: \$? = $ac_status" >&5
+  echo "$as_me:36812: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_libm=no
 else
@@ -36804,7 +36819,7 @@ cf_cv_need_libm=yes
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:36807: result: $cf_cv_need_libm" >&5
+echo "$as_me:36822: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
 if test "$cf_cv_need_libm" = yes
 then
@@ -36846,23 +36861,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:36849: checking for $ac_header" >&5
+echo "$as_me:36864: 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 36855 "configure"
+#line 36870 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:36859: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:36874: \"$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:36865: \$? = $ac_status" >&5
+  echo "$as_me:36880: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -36881,7 +36896,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:36884: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:36899: 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
@@ -36894,7 +36909,7 @@ done
 		MAKE_WAIS=
 
 else
-  { echo "$as_me:36897: WARNING: could not find WAIS library" >&5
+  { echo "$as_me:36912: WARNING: could not find WAIS library" >&5
 echo "$as_me: WARNING: could not find WAIS library" >&2;}
 fi
 
@@ -36902,7 +36917,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:36905: checking if directory-editor code should be used" >&5
+echo "$as_me:36920: 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.
@@ -36919,7 +36934,7 @@ else
 	use_dired=yes
 
 fi;
-echo "$as_me:36922: result: $use_dired" >&5
+echo "$as_me:36937: result: $use_dired" >&5
 echo "${ECHO_T}$use_dired" >&6
 
 if test ".$use_dired" != ".no" ; then
@@ -36929,7 +36944,7 @@ cat >>confdefs.h <<\EOF
 #define DIRED_SUPPORT 1
 EOF
 
-	echo "$as_me:36932: checking if you wish to allow extracting from archives via DirEd" >&5
+	echo "$as_me:36947: 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.
@@ -36946,10 +36961,10 @@ EOF
 else
   enableval=yes
 fi;
-	echo "$as_me:36949: result: $enableval" >&5
+	echo "$as_me:36964: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:36952: checking if DirEd mode should override keys" >&5
+	echo "$as_me:36967: 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.
@@ -36973,10 +36988,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:36976: result: $enableval" >&5
+	echo "$as_me:36991: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:36979: checking if you wish to allow permissions commands via DirEd" >&5
+	echo "$as_me:36994: 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.
@@ -37000,10 +37015,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:37003: result: $enableval" >&5
+	echo "$as_me:37018: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:37006: checking if you wish to allow executable-permission commands via DirEd" >&5
+	echo "$as_me:37021: 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.
@@ -37020,10 +37035,10 @@ EOF
 else
   enableval=yes
 fi;
-	echo "$as_me:37023: result: $enableval" >&5
+	echo "$as_me:37038: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:37026: checking if you wish to allow \"tar\" commands from DirEd" >&5
+	echo "$as_me:37041: 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.
@@ -37047,10 +37062,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:37050: result: $enableval" >&5
+	echo "$as_me:37065: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:37053: checking if you wish to allow \"uudecode\" commands from DirEd" >&5
+	echo "$as_me:37068: 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.
@@ -37074,10 +37089,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:37077: result: $enableval" >&5
+	echo "$as_me:37092: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:37080: checking if you wish to allow \"zip\" and \"unzip\" commands from DirEd" >&5
+	echo "$as_me:37095: 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.
@@ -37101,10 +37116,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:37104: result: $enableval" >&5
+	echo "$as_me:37119: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:37107: checking if you wish to allow \"gzip\" and \"gunzip\" commands from DirEd" >&5
+	echo "$as_me:37122: 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.
@@ -37128,11 +37143,11 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:37131: result: $enableval" >&5
+	echo "$as_me:37146: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 fi
 
-echo "$as_me:37135: checking if you want long-directory listings" >&5
+echo "$as_me:37150: 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.
@@ -37156,10 +37171,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-echo "$as_me:37159: result: $enableval" >&5
+echo "$as_me:37174: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:37162: checking if parent-directory references are permitted" >&5
+echo "$as_me:37177: 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.
@@ -37176,7 +37191,7 @@ EOF
 else
   enableval=yes
 fi;
-echo "$as_me:37179: result: $enableval" >&5
+echo "$as_me:37194: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 test -z "$TELNET" && TELNET=telnet
@@ -37184,7 +37199,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:37187: checking for $ac_word" >&5
+echo "$as_me:37202: 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
@@ -37201,7 +37216,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:37204: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37219: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37212,10 +37227,10 @@ fi
 TELNET=$ac_cv_path_TELNET
 
 if test -n "$TELNET"; then
-  echo "$as_me:37215: result: $TELNET" >&5
+  echo "$as_me:37230: result: $TELNET" >&5
 echo "${ECHO_T}$TELNET" >&6
 else
-  echo "$as_me:37218: result: no" >&5
+  echo "$as_me:37233: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37274,7 +37289,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37277: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37292: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TELNET_PATH "$cf_path_prog"
@@ -37292,7 +37307,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:37295: checking for $ac_word" >&5
+echo "$as_me:37310: 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
@@ -37309,7 +37324,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:37312: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37327: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37320,10 +37335,10 @@ fi
 TN3270=$ac_cv_path_TN3270
 
 if test -n "$TN3270"; then
-  echo "$as_me:37323: result: $TN3270" >&5
+  echo "$as_me:37338: result: $TN3270" >&5
 echo "${ECHO_T}$TN3270" >&6
 else
-  echo "$as_me:37326: result: no" >&5
+  echo "$as_me:37341: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37382,7 +37397,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37385: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37400: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TN3270_PATH "$cf_path_prog"
@@ -37400,7 +37415,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:37403: checking for $ac_word" >&5
+echo "$as_me:37418: 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
@@ -37417,7 +37432,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:37420: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37435: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37428,10 +37443,10 @@ fi
 RLOGIN=$ac_cv_path_RLOGIN
 
 if test -n "$RLOGIN"; then
-  echo "$as_me:37431: result: $RLOGIN" >&5
+  echo "$as_me:37446: result: $RLOGIN" >&5
 echo "${ECHO_T}$RLOGIN" >&6
 else
-  echo "$as_me:37434: result: no" >&5
+  echo "$as_me:37449: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37490,7 +37505,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37493: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37508: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define RLOGIN_PATH "$cf_path_prog"
@@ -37508,7 +37523,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:37511: checking for $ac_word" >&5
+echo "$as_me:37526: 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
@@ -37525,7 +37540,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:37528: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37543: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37536,10 +37551,10 @@ fi
 MV=$ac_cv_path_MV
 
 if test -n "$MV"; then
-  echo "$as_me:37539: result: $MV" >&5
+  echo "$as_me:37554: result: $MV" >&5
 echo "${ECHO_T}$MV" >&6
 else
-  echo "$as_me:37542: result: no" >&5
+  echo "$as_me:37557: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37598,7 +37613,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37601: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37616: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define MV_PATH "$cf_path_prog"
@@ -37616,7 +37631,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:37619: checking for $ac_word" >&5
+echo "$as_me:37634: 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
@@ -37633,7 +37648,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:37636: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37651: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37644,10 +37659,10 @@ fi
 GZIP=$ac_cv_path_GZIP
 
 if test -n "$GZIP"; then
-  echo "$as_me:37647: result: $GZIP" >&5
+  echo "$as_me:37662: result: $GZIP" >&5
 echo "${ECHO_T}$GZIP" >&6
 else
-  echo "$as_me:37650: result: no" >&5
+  echo "$as_me:37665: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37706,7 +37721,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37709: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37724: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define GZIP_PATH "$cf_path_prog"
@@ -37724,7 +37739,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:37727: checking for $ac_word" >&5
+echo "$as_me:37742: 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
@@ -37741,7 +37756,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:37744: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37759: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37752,10 +37767,10 @@ fi
 UNCOMPRESS=$ac_cv_path_UNCOMPRESS
 
 if test -n "$UNCOMPRESS"; then
-  echo "$as_me:37755: result: $UNCOMPRESS" >&5
+  echo "$as_me:37770: result: $UNCOMPRESS" >&5
 echo "${ECHO_T}$UNCOMPRESS" >&6
 else
-  echo "$as_me:37758: result: no" >&5
+  echo "$as_me:37773: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37814,7 +37829,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37817: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37832: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define UNCOMPRESS_PATH "$cf_path_prog"
@@ -37832,7 +37847,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:37835: checking for $ac_word" >&5
+echo "$as_me:37850: 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
@@ -37849,7 +37864,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:37852: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37867: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37860,10 +37875,10 @@ fi
 UNZIP=$ac_cv_path_UNZIP
 
 if test -n "$UNZIP"; then
-  echo "$as_me:37863: result: $UNZIP" >&5
+  echo "$as_me:37878: result: $UNZIP" >&5
 echo "${ECHO_T}$UNZIP" >&6
 else
-  echo "$as_me:37866: result: no" >&5
+  echo "$as_me:37881: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37922,7 +37937,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37925: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37940: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define UNZIP_PATH "$cf_path_prog"
@@ -37940,7 +37955,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:37943: checking for $ac_word" >&5
+echo "$as_me:37958: 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
@@ -37957,7 +37972,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:37960: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37975: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37968,10 +37983,10 @@ fi
 BZIP2=$ac_cv_path_BZIP2
 
 if test -n "$BZIP2"; then
-  echo "$as_me:37971: result: $BZIP2" >&5
+  echo "$as_me:37986: result: $BZIP2" >&5
 echo "${ECHO_T}$BZIP2" >&6
 else
-  echo "$as_me:37974: result: no" >&5
+  echo "$as_me:37989: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -38030,7 +38045,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:38033: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:38048: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define BZIP2_PATH "$cf_path_prog"
@@ -38048,7 +38063,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:38051: checking for $ac_word" >&5
+echo "$as_me:38066: 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
@@ -38065,7 +38080,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:38068: found $ac_dir/$ac_word" >&5
+   echo "$as_me:38083: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -38076,10 +38091,10 @@ fi
 TAR=$ac_cv_path_TAR
 
 if test -n "$TAR"; then
-  echo "$as_me:38079: result: $TAR" >&5
+  echo "$as_me:38094: result: $TAR" >&5
 echo "${ECHO_T}$TAR" >&6
 else
-  echo "$as_me:38082: result: no" >&5
+  echo "$as_me:38097: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -38138,7 +38153,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:38141: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:38156: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TAR_PATH "$cf_path_prog"
@@ -38196,7 +38211,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:38199: checking for $ac_word" >&5
+echo "$as_me:38214: 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
@@ -38213,7 +38228,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:38216: found $ac_dir/$ac_word" >&5
+   echo "$as_me:38231: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -38224,10 +38239,10 @@ fi
 COMPRESS=$ac_cv_path_COMPRESS
 
 if test -n "$COMPRESS"; then
-  echo "$as_me:38227: result: $COMPRESS" >&5
+  echo "$as_me:38242: result: $COMPRESS" >&5
 echo "${ECHO_T}$COMPRESS" >&6
 else
-  echo "$as_me:38230: result: no" >&5
+  echo "$as_me:38245: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -38286,7 +38301,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:38289: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:38304: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define COMPRESS_PATH "$cf_path_prog"
@@ -38304,7 +38319,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:38307: checking for $ac_word" >&5
+echo "$as_me:38322: 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
@@ -38321,7 +38336,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:38324: found $ac_dir/$ac_word" >&5
+   echo "$as_me:38339: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -38332,10 +38347,10 @@ fi
 RM=$ac_cv_path_RM
 
 if test -n "$RM"; then
-  echo "$as_me:38335: result: $RM" >&5
+  echo "$as_me:38350: result: $RM" >&5
 echo "${ECHO_T}$RM" >&6
 else
-  echo "$as_me:38338: result: no" >&5
+  echo "$as_me:38353: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -38394,7 +38409,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:38397: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:38412: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define RM_PATH "$cf_path_prog"
@@ -38412,7 +38427,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:38415: checking for $ac_word" >&5
+echo "$as_me:38430: 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
@@ -38429,7 +38444,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:38432: found $ac_dir/$ac_word" >&5
+   echo "$as_me:38447: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -38440,10 +38455,10 @@ fi
 UUDECODE=$ac_cv_path_UUDECODE
 
 if test -n "$UUDECODE"; then
-  echo "$as_me:38443: result: $UUDECODE" >&5
+  echo "$as_me:38458: result: $UUDECODE" >&5
 echo "${ECHO_T}$UUDECODE" >&6
 else
-  echo "$as_me:38446: result: no" >&5
+  echo "$as_me:38461: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -38502,7 +38517,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:38505: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:38520: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define UUDECODE_PATH "$cf_path_prog"
@@ -38520,7 +38535,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:38523: checking for $ac_word" >&5
+echo "$as_me:38538: 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
@@ -38537,7 +38552,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:38540: found $ac_dir/$ac_word" >&5
+   echo "$as_me:38555: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -38548,10 +38563,10 @@ fi
 ZCAT=$ac_cv_path_ZCAT
 
 if test -n "$ZCAT"; then
-  echo "$as_me:38551: result: $ZCAT" >&5
+  echo "$as_me:38566: result: $ZCAT" >&5
 echo "${ECHO_T}$ZCAT" >&6
 else
-  echo "$as_me:38554: result: no" >&5
+  echo "$as_me:38569: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -38610,7 +38625,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:38613: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:38628: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define ZCAT_PATH "$cf_path_prog"
@@ -38628,7 +38643,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:38631: checking for $ac_word" >&5
+echo "$as_me:38646: 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
@@ -38645,7 +38660,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:38648: found $ac_dir/$ac_word" >&5
+   echo "$as_me:38663: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -38656,10 +38671,10 @@ fi
 ZIP=$ac_cv_path_ZIP
 
 if test -n "$ZIP"; then
-  echo "$as_me:38659: result: $ZIP" >&5
+  echo "$as_me:38674: result: $ZIP" >&5
 echo "${ECHO_T}$ZIP" >&6
 else
-  echo "$as_me:38662: result: no" >&5
+  echo "$as_me:38677: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -38718,7 +38733,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:38721: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:38736: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define ZIP_PATH "$cf_path_prog"
@@ -38746,7 +38761,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:38749: checking for $ac_word" >&5
+echo "$as_me:38764: 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
@@ -38763,7 +38778,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:38766: found $ac_dir/$ac_word" >&5
+   echo "$as_me:38781: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -38774,10 +38789,10 @@ fi
 INSTALL=$ac_cv_path_INSTALL
 
 if test -n "$INSTALL"; then
-  echo "$as_me:38777: result: $INSTALL" >&5
+  echo "$as_me:38792: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 else
-  echo "$as_me:38780: result: no" >&5
+  echo "$as_me:38795: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -38836,7 +38851,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:38839: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:38854: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define INSTALL_PATH "$cf_path_prog"
@@ -38866,7 +38881,7 @@ if test $cf_cv_screen = pdcurses ; then
 	case $host_os in
 	(mingw*)
 
-echo "$as_me:38869: checking for initscr in -lpdcurses" >&5
+echo "$as_me:38884: 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
@@ -38874,7 +38889,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpdcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 38877 "configure"
+#line 38892 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -38893,16 +38908,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38896: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38911: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38899: \$? = $ac_status" >&5
+  echo "$as_me:38914: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38902: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38917: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38905: \$? = $ac_status" >&5
+  echo "$as_me:38920: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_pdcurses_initscr=yes
 else
@@ -38913,7 +38928,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:38916: result: $ac_cv_lib_pdcurses_initscr" >&5
+echo "$as_me:38931: 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
 
@@ -38935,13 +38950,13 @@ LIBS="$cf_add_libs"
 
 	cf_cv_term_header=no
 	cf_cv_unctrl_header=no
-	echo "$as_me:38938: checking for winwstr" >&5
+	echo "$as_me:38953: 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 38944 "configure"
+#line 38959 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char winwstr (); below.  */
@@ -38972,16 +38987,16 @@ f = winwstr; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38975: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38990: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38978: \$? = $ac_status" >&5
+  echo "$as_me:38993: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38981: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38996: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38984: \$? = $ac_status" >&5
+  echo "$as_me:38999: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_winwstr=yes
 else
@@ -38991,7 +39006,7 @@ ac_cv_func_winwstr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:38994: result: $ac_cv_func_winwstr" >&5
+echo "$as_me:39009: result: $ac_cv_func_winwstr" >&5
 echo "${ECHO_T}$ac_cv_func_winwstr" >&6
 if test $ac_cv_func_winwstr = yes; then
   cat >>confdefs.h <<\EOF
@@ -39000,13 +39015,13 @@ EOF
 
 fi
 
-	echo "$as_me:39003: checking for pdcurses_dll_iname" >&5
+	echo "$as_me:39018: 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 39009 "configure"
+#line 39024 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char pdcurses_dll_iname (); below.  */
@@ -39037,16 +39052,16 @@ f = pdcurses_dll_iname; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39040: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39055: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39043: \$? = $ac_status" >&5
+  echo "$as_me:39058: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39046: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39061: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39049: \$? = $ac_status" >&5
+  echo "$as_me:39064: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_pdcurses_dll_iname=yes
 else
@@ -39056,7 +39071,7 @@ ac_cv_func_pdcurses_dll_iname=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:39059: result: $ac_cv_func_pdcurses_dll_iname" >&5
+echo "$as_me:39074: 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
   cat >>confdefs.h <<\EOF
@@ -39069,7 +39084,7 @@ fi
 
 		;;
 	(*)
-		echo "$as_me:39072: checking for X" >&5
+		echo "$as_me:39087: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -39166,17 +39181,17 @@ if test "$ac_x_includes" = no; then
   # Guess where to find include files, by looking for Intrinsic.h.
   # First, try using that file with no special directory specified.
   cat >conftest.$ac_ext <<_ACEOF
-#line 39169 "configure"
+#line 39184 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:39173: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:39188: \"$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:39179: \$? = $ac_status" >&5
+  echo "$as_me:39194: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -39209,7 +39224,7 @@ if test "$ac_x_libraries" = no; then
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >conftest.$ac_ext <<_ACEOF
-#line 39212 "configure"
+#line 39227 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -39221,16 +39236,16 @@ XtMalloc (0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39224: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39239: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39227: \$? = $ac_status" >&5
+  echo "$as_me:39242: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39230: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39245: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39233: \$? = $ac_status" >&5
+  echo "$as_me:39248: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -39268,7 +39283,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:39271: result: $have_x" >&5
+  echo "$as_me:39286: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -39278,7 +39293,7 @@ else
   # Update the cache value to reflect the command line values.
   ac_cv_have_x="have_x=yes \
 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-  echo "$as_me:39281: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:39296: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -39302,11 +39317,11 @@ else
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:39305: checking whether -R must be followed by a space" >&5
+      echo "$as_me:39320: checking whether -R must be followed by a space" >&5
 echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
       ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
       cat >conftest.$ac_ext <<_ACEOF
-#line 39309 "configure"
+#line 39324 "configure"
 #include "confdefs.h"
 
 int
@@ -39318,16 +39333,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39321: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39336: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39324: \$? = $ac_status" >&5
+  echo "$as_me:39339: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39327: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39342: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39330: \$? = $ac_status" >&5
+  echo "$as_me:39345: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_nospace=yes
 else
@@ -39337,13 +39352,13 @@ ac_R_nospace=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
       if test $ac_R_nospace = yes; then
-	echo "$as_me:39340: result: no" >&5
+	echo "$as_me:39355: result: no" >&5
 echo "${ECHO_T}no" >&6
 	X_LIBS="$X_LIBS -R$x_libraries"
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 39346 "configure"
+#line 39361 "configure"
 #include "confdefs.h"
 
 int
@@ -39355,16 +39370,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39358: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39373: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39361: \$? = $ac_status" >&5
+  echo "$as_me:39376: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39364: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39379: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39367: \$? = $ac_status" >&5
+  echo "$as_me:39382: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_space=yes
 else
@@ -39374,11 +39389,11 @@ ac_R_space=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	if test $ac_R_space = yes; then
-	  echo "$as_me:39377: result: yes" >&5
+	  echo "$as_me:39392: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:39381: result: neither works" >&5
+	  echo "$as_me:39396: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -39398,7 +39413,7 @@ echo "${ECHO_T}neither works" >&6
     # the Alpha needs dnet_stub (dnet does not exist).
     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
     cat >conftest.$ac_ext <<_ACEOF
-#line 39401 "configure"
+#line 39416 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -39417,22 +39432,22 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39420: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39435: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39423: \$? = $ac_status" >&5
+  echo "$as_me:39438: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39426: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39441: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39429: \$? = $ac_status" >&5
+  echo "$as_me:39444: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:39435: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:39450: checking for dnet_ntoa in -ldnet" >&5
 echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
 if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -39440,7 +39455,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 39443 "configure"
+#line 39458 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -39459,16 +39474,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39462: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39477: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39465: \$? = $ac_status" >&5
+  echo "$as_me:39480: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39468: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39483: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39471: \$? = $ac_status" >&5
+  echo "$as_me:39486: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -39479,14 +39494,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:39482: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:39497: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
 echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
 if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
 fi
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-      echo "$as_me:39489: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:39504: checking for dnet_ntoa in -ldnet_stub" >&5
 echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
 if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -39494,7 +39509,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 39497 "configure"
+#line 39512 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -39513,16 +39528,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39516: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39531: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39519: \$? = $ac_status" >&5
+  echo "$as_me:39534: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39522: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39537: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39525: \$? = $ac_status" >&5
+  echo "$as_me:39540: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -39533,7 +39548,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:39536: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:39551: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
 echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
 if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
@@ -39552,13 +39567,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     # on Irix 5.2, according to T.E. Dickey.
     # The functions gethostbyname, getservbyname, and inet_addr are
     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-    echo "$as_me:39555: checking for gethostbyname" >&5
+    echo "$as_me:39570: checking for gethostbyname" >&5
 echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
 if test "${ac_cv_func_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 39561 "configure"
+#line 39576 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname (); below.  */
@@ -39589,16 +39604,16 @@ f = gethostbyname; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39592: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39607: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39595: \$? = $ac_status" >&5
+  echo "$as_me:39610: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39598: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39613: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39601: \$? = $ac_status" >&5
+  echo "$as_me:39616: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -39608,11 +39623,11 @@ ac_cv_func_gethostbyname=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:39611: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:39626: result: $ac_cv_func_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
 
     if test $ac_cv_func_gethostbyname = no; then
-      echo "$as_me:39615: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:39630: 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
@@ -39620,7 +39635,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 39623 "configure"
+#line 39638 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -39639,16 +39654,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39642: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39657: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39645: \$? = $ac_status" >&5
+  echo "$as_me:39660: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39648: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39663: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39651: \$? = $ac_status" >&5
+  echo "$as_me:39666: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -39659,14 +39674,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:39662: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:39677: result: $ac_cv_lib_nsl_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
 if test $ac_cv_lib_nsl_gethostbyname = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
 fi
 
       if test $ac_cv_lib_nsl_gethostbyname = no; then
-        echo "$as_me:39669: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:39684: checking for gethostbyname in -lbsd" >&5
 echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
 if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -39674,7 +39689,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 39677 "configure"
+#line 39692 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -39693,16 +39708,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39696: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39711: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39699: \$? = $ac_status" >&5
+  echo "$as_me:39714: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39702: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39717: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39705: \$? = $ac_status" >&5
+  echo "$as_me:39720: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -39713,7 +39728,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:39716: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:39731: result: $ac_cv_lib_bsd_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
 if test $ac_cv_lib_bsd_gethostbyname = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
@@ -39729,13 +39744,13 @@ fi
     # variants that don't use the nameserver (or something).  -lsocket
     # must be given before -lnsl if both are needed.  We assume that
     # if connect needs -lnsl, so does gethostbyname.
-    echo "$as_me:39732: checking for connect" >&5
+    echo "$as_me:39747: checking for connect" >&5
 echo $ECHO_N "checking for connect... $ECHO_C" >&6
 if test "${ac_cv_func_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 39738 "configure"
+#line 39753 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect (); below.  */
@@ -39766,16 +39781,16 @@ f = connect; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39769: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39784: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39772: \$? = $ac_status" >&5
+  echo "$as_me:39787: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39775: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39790: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39778: \$? = $ac_status" >&5
+  echo "$as_me:39793: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_connect=yes
 else
@@ -39785,11 +39800,11 @@ ac_cv_func_connect=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:39788: result: $ac_cv_func_connect" >&5
+echo "$as_me:39803: result: $ac_cv_func_connect" >&5
 echo "${ECHO_T}$ac_cv_func_connect" >&6
 
     if test $ac_cv_func_connect = no; then
-      echo "$as_me:39792: checking for connect in -lsocket" >&5
+      echo "$as_me:39807: checking for connect in -lsocket" >&5
 echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
 if test "${ac_cv_lib_socket_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -39797,7 +39812,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 39800 "configure"
+#line 39815 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -39816,16 +39831,16 @@ connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39819: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39834: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39822: \$? = $ac_status" >&5
+  echo "$as_me:39837: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39825: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39840: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39828: \$? = $ac_status" >&5
+  echo "$as_me:39843: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -39836,7 +39851,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:39839: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:39854: result: $ac_cv_lib_socket_connect" >&5
 echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
 if test $ac_cv_lib_socket_connect = yes; then
   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
@@ -39845,13 +39860,13 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:39848: checking for remove" >&5
+    echo "$as_me:39863: checking for remove" >&5
 echo $ECHO_N "checking for remove... $ECHO_C" >&6
 if test "${ac_cv_func_remove+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 39854 "configure"
+#line 39869 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove (); below.  */
@@ -39882,16 +39897,16 @@ f = remove; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39885: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39900: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39888: \$? = $ac_status" >&5
+  echo "$as_me:39903: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39891: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39906: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39894: \$? = $ac_status" >&5
+  echo "$as_me:39909: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_remove=yes
 else
@@ -39901,11 +39916,11 @@ ac_cv_func_remove=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:39904: result: $ac_cv_func_remove" >&5
+echo "$as_me:39919: result: $ac_cv_func_remove" >&5
 echo "${ECHO_T}$ac_cv_func_remove" >&6
 
     if test $ac_cv_func_remove = no; then
-      echo "$as_me:39908: checking for remove in -lposix" >&5
+      echo "$as_me:39923: checking for remove in -lposix" >&5
 echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
 if test "${ac_cv_lib_posix_remove+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -39913,7 +39928,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 39916 "configure"
+#line 39931 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -39932,16 +39947,16 @@ remove ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39935: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39950: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39938: \$? = $ac_status" >&5
+  echo "$as_me:39953: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39941: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39956: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39944: \$? = $ac_status" >&5
+  echo "$as_me:39959: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -39952,7 +39967,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:39955: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:39970: result: $ac_cv_lib_posix_remove" >&5
 echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
 if test $ac_cv_lib_posix_remove = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
@@ -39961,13 +39976,13 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:39964: checking for shmat" >&5
+    echo "$as_me:39979: checking for shmat" >&5
 echo $ECHO_N "checking for shmat... $ECHO_C" >&6
 if test "${ac_cv_func_shmat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 39970 "configure"
+#line 39985 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat (); below.  */
@@ -39998,16 +40013,16 @@ f = shmat; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40001: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40016: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40004: \$? = $ac_status" >&5
+  echo "$as_me:40019: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40007: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40022: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40010: \$? = $ac_status" >&5
+  echo "$as_me:40025: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -40017,11 +40032,11 @@ ac_cv_func_shmat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:40020: result: $ac_cv_func_shmat" >&5
+echo "$as_me:40035: result: $ac_cv_func_shmat" >&5
 echo "${ECHO_T}$ac_cv_func_shmat" >&6
 
     if test $ac_cv_func_shmat = no; then
-      echo "$as_me:40024: checking for shmat in -lipc" >&5
+      echo "$as_me:40039: checking for shmat in -lipc" >&5
 echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
 if test "${ac_cv_lib_ipc_shmat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -40029,7 +40044,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 40032 "configure"
+#line 40047 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -40048,16 +40063,16 @@ shmat ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40051: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40066: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40054: \$? = $ac_status" >&5
+  echo "$as_me:40069: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40057: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40072: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40060: \$? = $ac_status" >&5
+  echo "$as_me:40075: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -40068,7 +40083,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:40071: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:40086: result: $ac_cv_lib_ipc_shmat" >&5
 echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
 if test $ac_cv_lib_ipc_shmat = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
@@ -40086,7 +40101,7 @@ fi
   # These have to be linked with before -lX11, unlike the other
   # libraries we check for below, so use a different variable.
   # John Interrante, Karl Berry
-  echo "$as_me:40089: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:40104: checking for IceConnectionNumber in -lICE" >&5
 echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
 if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -40094,7 +40109,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 40097 "configure"
+#line 40112 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -40113,16 +40128,16 @@ IceConnectionNumber ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40116: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40131: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40119: \$? = $ac_status" >&5
+  echo "$as_me:40134: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40122: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40137: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40125: \$? = $ac_status" >&5
+  echo "$as_me:40140: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -40133,7 +40148,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:40136: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:40151: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
 echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
 if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
@@ -40145,7 +40160,7 @@ fi
 
 cf_x_athena=${cf_x_athena:-Xaw}
 
-echo "$as_me:40148: checking if you want to link with Xaw 3d library" >&5
+echo "$as_me:40163: 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=
 
@@ -40156,14 +40171,14 @@ if test "${with_Xaw3d+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3d
-	echo "$as_me:40159: result: yes" >&5
+	echo "$as_me:40174: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:40162: result: no" >&5
+	echo "$as_me:40177: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:40166: checking if you want to link with Xaw 3d xft library" >&5
+echo "$as_me:40181: 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=
 
@@ -40174,14 +40189,14 @@ if test "${with_Xaw3dxft+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3dxft
-	echo "$as_me:40177: result: yes" >&5
+	echo "$as_me:40192: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:40180: result: no" >&5
+	echo "$as_me:40195: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:40184: checking if you want to link with neXT Athena library" >&5
+echo "$as_me:40199: 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=
 
@@ -40192,14 +40207,14 @@ if test "${with_neXtaw+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=neXtaw
-	echo "$as_me:40195: result: yes" >&5
+	echo "$as_me:40210: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:40198: result: no" >&5
+	echo "$as_me:40213: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:40202: checking if you want to link with Athena-Plus library" >&5
+echo "$as_me:40217: 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=
 
@@ -40210,10 +40225,10 @@ if test "${with_XawPlus+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=XawPlus
-	echo "$as_me:40213: result: yes" >&5
+	echo "$as_me:40228: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:40216: result: no" >&5
+	echo "$as_me:40231: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -40233,17 +40248,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}:40236: testing found package $cf_athena_pkg ..." 1>&5
+echo "${as_me:-configure}:40251: 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}:40242: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:40257: 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}:40246: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:40261: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -40374,20 +40389,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}:40377: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:40392: testing ..trimmed $LIBS ..." 1>&5
 
 			;;
 		esac
 	done
 
-echo "$as_me:40383: checking for usable $cf_x_athena/Xmu package" >&5
+echo "$as_me:40398: 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 40390 "configure"
+#line 40405 "configure"
 #include "confdefs.h"
 
 #include <X11/Xmu/CharSet.h>
@@ -40403,16 +40418,16 @@ int check = XmuCompareISOLatin1("big", "small")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40406: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40421: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40409: \$? = $ac_status" >&5
+  echo "$as_me:40424: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40412: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40427: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40415: \$? = $ac_status" >&5
+  echo "$as_me:40430: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xaw_compat=yes
 else
@@ -40422,7 +40437,7 @@ cf_cv_xaw_compat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:40425: result: $cf_cv_xaw_compat" >&5
+echo "$as_me:40440: result: $cf_cv_xaw_compat" >&5
 echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 
 			if test "$cf_cv_xaw_compat" = no
@@ -40434,7 +40449,7 @@ echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 				(*)
 					test -n "$verbose" && echo "	work around broken package" 1>&6
 
-echo "${as_me:-configure}:40437: testing work around broken package ..." 1>&5
+echo "${as_me:-configure}:40452: testing work around broken package ..." 1>&5
 
 					cf_save_xmu="$LIBS"
 					cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^  *//' -e 's/ .*//'`
@@ -40442,17 +40457,17 @@ echo "${as_me:-configure}:40437: 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}:40445: testing found package xmu ..." 1>&5
+echo "${as_me:-configure}:40460: 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}:40451: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:40466: 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}:40455: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:40470: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -40572,12 +40587,12 @@ LIBS="$cf_add_libs"
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:40575: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:40590: 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}:40580: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:40595: testing ...after  $LIBS ..." 1>&5
 
 else
 	cf_pkgconfig_incs=
@@ -40585,12 +40600,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:40588: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:40603: 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}:40593: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:40608: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -40601,7 +40616,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}:40604: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:40619: testing ..trimmed $LIBS ..." 1>&5
 
 			;;
 		esac
@@ -40626,17 +40641,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}:40629: testing found package Xext ..." 1>&5
+echo "${as_me:-configure}:40644: 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}:40635: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:40650: 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}:40639: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:40654: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -40757,7 +40772,7 @@ else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
 
-	echo "$as_me:40760: checking for XextCreateExtension in -lXext" >&5
+	echo "$as_me:40775: 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
@@ -40765,7 +40780,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 40768 "configure"
+#line 40783 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -40784,16 +40799,16 @@ XextCreateExtension ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40787: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40802: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40790: \$? = $ac_status" >&5
+  echo "$as_me:40805: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40793: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40808: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40796: \$? = $ac_status" >&5
+  echo "$as_me:40811: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
@@ -40804,7 +40819,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:40807: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:40822: 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
 
@@ -40840,17 +40855,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}:40843: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:40858: 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}:40849: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:40864: 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}:40853: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:40868: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -40970,24 +40985,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:40973: WARNING: unable to find X11 library" >&5
+	{ echo "$as_me:40988: 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}:40980: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:40995: 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}:40986: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:41001: 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}:40990: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:41005: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -41107,24 +41122,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:41110: WARNING: unable to find ICE library" >&5
+	{ echo "$as_me:41125: 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}:41117: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:41132: 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}:41123: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:41138: 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}:41127: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:41142: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -41244,24 +41259,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:41247: WARNING: unable to find SM library" >&5
+	{ echo "$as_me:41262: 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}:41254: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:41269: 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}:41260: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:41275: 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}:41264: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:41279: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -41381,7 +41396,7 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:41384: WARNING: unable to find Xt library" >&5
+	{ echo "$as_me:41399: WARNING: unable to find Xt library" >&5
 echo "$as_me: WARNING: unable to find Xt library" >&2;}
 fi
 
@@ -41392,17 +41407,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}:41395: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:41410: 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}:41401: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:41416: 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}:41405: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:41420: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -41523,14 +41538,14 @@ LIBS="$cf_add_libs"
 		;;
 	(*)
 # we have an "xt" package, but it may omit Xt's dependency on X11
-echo "$as_me:41526: checking for usable X dependency" >&5
+echo "$as_me:41541: 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 41533 "configure"
+#line 41548 "configure"
 #include "confdefs.h"
 
 #include <X11/Xlib.h>
@@ -41549,16 +41564,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:41552: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41567: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41555: \$? = $ac_status" >&5
+  echo "$as_me:41570: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:41558: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41573: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41561: \$? = $ac_status" >&5
+  echo "$as_me:41576: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xt_x11_compat=yes
 else
@@ -41568,30 +41583,30 @@ cf_cv_xt_x11_compat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:41571: result: $cf_cv_xt_x11_compat" >&5
+echo "$as_me:41586: 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}:41577: testing work around broken X11 dependency ..." 1>&5
+echo "${as_me:-configure}:41592: 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}:41584: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:41599: 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}:41590: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:41605: 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}:41594: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:41609: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -41714,12 +41729,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:41717: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:41732: 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}:41722: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:41737: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -41727,14 +41742,14 @@ fi
 		;;
 	esac
 
-echo "$as_me:41730: checking for usable X Toolkit package" >&5
+echo "$as_me:41745: 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 41737 "configure"
+#line 41752 "configure"
 #include "confdefs.h"
 
 #include <X11/Shell.h>
@@ -41749,16 +41764,16 @@ int num = IceConnectionNumber(0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:41752: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41767: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41755: \$? = $ac_status" >&5
+  echo "$as_me:41770: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:41758: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41773: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41761: \$? = $ac_status" >&5
+  echo "$as_me:41776: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xt_ice_compat=yes
 else
@@ -41768,7 +41783,7 @@ cf_cv_xt_ice_compat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:41771: result: $cf_cv_xt_ice_compat" >&5
+echo "$as_me:41786: result: $cf_cv_xt_ice_compat" >&5
 echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
 
 	if test "$cf_cv_xt_ice_compat" = no
@@ -41782,22 +41797,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}:41785: testing work around broken ICE dependency ..." 1>&5
+echo "${as_me:-configure}:41800: 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}:41790: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:41805: 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}:41796: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:41811: 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}:41800: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:41815: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -41916,17 +41931,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}:41919: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:41934: 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}:41925: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:41940: 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}:41929: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:41944: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -42055,12 +42070,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:42058: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:42073: 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}:42063: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:42078: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -42080,7 +42095,7 @@ else
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:42083: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:42098: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -42165,7 +42180,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}:42168: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:42183: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -42175,7 +42190,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}:42178: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:42193: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -42185,7 +42200,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}:42188: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:42203: 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"
@@ -42194,7 +42209,7 @@ fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 42197 "configure"
+#line 42212 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -42206,16 +42221,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42209: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42224: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42212: \$? = $ac_status" >&5
+  echo "$as_me:42227: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42215: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42230: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42218: \$? = $ac_status" >&5
+  echo "$as_me:42233: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -42223,12 +42238,12 @@ else
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:42226: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:42241: 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}:42231: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:42246: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_flags"
@@ -42236,13 +42251,13 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-	echo "$as_me:42239: checking for XOpenDisplay" >&5
+	echo "$as_me:42254: 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 42245 "configure"
+#line 42260 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char XOpenDisplay (); below.  */
@@ -42273,16 +42288,16 @@ f = XOpenDisplay; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42276: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42291: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42279: \$? = $ac_status" >&5
+  echo "$as_me:42294: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42282: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42297: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42285: \$? = $ac_status" >&5
+  echo "$as_me:42300: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_XOpenDisplay=yes
 else
@@ -42292,13 +42307,13 @@ ac_cv_func_XOpenDisplay=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:42295: result: $ac_cv_func_XOpenDisplay" >&5
+echo "$as_me:42310: 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:42301: checking for XOpenDisplay in -lX11" >&5
+	echo "$as_me:42316: 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
@@ -42306,7 +42321,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 42309 "configure"
+#line 42324 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -42325,16 +42340,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42328: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42343: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42331: \$? = $ac_status" >&5
+  echo "$as_me:42346: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42334: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42349: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42337: \$? = $ac_status" >&5
+  echo "$as_me:42352: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -42345,7 +42360,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:42348: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:42363: 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
 
@@ -42369,13 +42384,13 @@ fi
 
 fi
 
-	echo "$as_me:42372: checking for XtAppInitialize" >&5
+	echo "$as_me:42387: 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 42378 "configure"
+#line 42393 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char XtAppInitialize (); below.  */
@@ -42406,16 +42421,16 @@ f = XtAppInitialize; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42409: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42424: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42412: \$? = $ac_status" >&5
+  echo "$as_me:42427: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42415: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42430: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42418: \$? = $ac_status" >&5
+  echo "$as_me:42433: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_XtAppInitialize=yes
 else
@@ -42425,13 +42440,13 @@ ac_cv_func_XtAppInitialize=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:42428: result: $ac_cv_func_XtAppInitialize" >&5
+echo "$as_me:42443: 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:42434: checking for XtAppInitialize in -lXt" >&5
+	echo "$as_me:42449: 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
@@ -42439,7 +42454,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 42442 "configure"
+#line 42457 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -42458,16 +42473,16 @@ XtAppInitialize ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42461: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42476: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42464: \$? = $ac_status" >&5
+  echo "$as_me:42479: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42467: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42482: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42470: \$? = $ac_status" >&5
+  echo "$as_me:42485: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xt_XtAppInitialize=yes
 else
@@ -42478,7 +42493,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:42481: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "$as_me:42496: 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
 
@@ -42495,7 +42510,7 @@ fi
 fi
 
 if test $cf_have_X_LIBS = no ; then
-	{ echo "$as_me:42498: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+	{ echo "$as_me:42513: 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
@@ -42517,14 +42532,14 @@ do
 		cf_test=X11/$cf_x_athena_root/SimpleMenu.h
 		if test $cf_path != default ; then
 			CPPFLAGS="$cf_save -I$cf_path/include"
-			echo "$as_me:42520: checking for $cf_test in $cf_path" >&5
+			echo "$as_me:42535: 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:42523: checking for $cf_test" >&5
+			echo "$as_me:42538: checking for $cf_test" >&5
 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
 		fi
 		cat >conftest.$ac_ext <<_ACEOF
-#line 42527 "configure"
+#line 42542 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -42538,16 +42553,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:42541: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42556: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:42544: \$? = $ac_status" >&5
+  echo "$as_me:42559: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:42547: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42562: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42550: \$? = $ac_status" >&5
+  echo "$as_me:42565: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -42556,7 +42571,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-		echo "$as_me:42559: result: $cf_result" >&5
+		echo "$as_me:42574: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 		if test "$cf_result" = yes ; then
 			cf_x_athena_inc=$cf_path
@@ -42568,7 +42583,7 @@ echo "${ECHO_T}$cf_result" >&6
 done
 
 if test -z "$cf_x_athena_inc" ; then
-	{ echo "$as_me:42571: WARNING: Unable to successfully find Athena header files with test program" >&5
+	{ echo "$as_me:42586: WARNING: Unable to successfully find Athena header files with test program" >&5
 echo "$as_me: WARNING: Unable to successfully find Athena header files with test program" >&2;}
 elif test "$cf_x_athena_inc" != default ; then
 	CPPFLAGS="$CPPFLAGS -I$cf_x_athena_inc"
@@ -42614,7 +42629,7 @@ do
 done
 LIBS="$cf_add_libs"
 
-				echo "$as_me:42617: checking for $cf_libs in $cf_path" >&5
+				echo "$as_me:42632: checking for $cf_libs in $cf_path" >&5
 echo $ECHO_N "checking for $cf_libs in $cf_path... $ECHO_C" >&6
 			else
 
@@ -42634,11 +42649,11 @@ do
 done
 LIBS="$cf_add_libs"
 
-				echo "$as_me:42637: checking for $cf_test in $cf_libs" >&5
+				echo "$as_me:42652: checking for $cf_test in $cf_libs" >&5
 echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6
 			fi
 			cat >conftest.$ac_ext <<_ACEOF
-#line 42641 "configure"
+#line 42656 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -42654,16 +42669,16 @@ $cf_test((XtAppContext) 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42657: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42672: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42660: \$? = $ac_status" >&5
+  echo "$as_me:42675: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42663: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42678: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42666: \$? = $ac_status" >&5
+  echo "$as_me:42681: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -42672,7 +42687,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-			echo "$as_me:42675: result: $cf_result" >&5
+			echo "$as_me:42690: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				cf_x_athena_lib="$cf_libs"
@@ -42686,7 +42701,7 @@ echo "${ECHO_T}$cf_result" >&6
 done
 
 if test -z "$cf_x_athena_lib" ; then
-	{ { echo "$as_me:42689: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+	{ { echo "$as_me:42704: 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
@@ -42704,7 +42719,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:42707: checking for $ac_word" >&5
+echo "$as_me:42722: 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
@@ -42719,7 +42734,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:42722: found $ac_dir/$ac_word" >&5
+echo "$as_me:42737: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -42727,10 +42742,10 @@ fi
 fi
 XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG
 if test -n "$XCURSES_CONFIG"; then
-  echo "$as_me:42730: result: $XCURSES_CONFIG" >&5
+  echo "$as_me:42745: result: $XCURSES_CONFIG" >&5
 echo "${ECHO_T}$XCURSES_CONFIG" >&6
 else
-  echo "$as_me:42733: result: no" >&5
+  echo "$as_me:42748: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -42743,7 +42758,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:42746: checking for $ac_word" >&5
+echo "$as_me:42761: 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
@@ -42758,7 +42773,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:42761: found $ac_dir/$ac_word" >&5
+echo "$as_me:42776: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -42766,10 +42781,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:42769: result: $ac_ct_XCURSES_CONFIG" >&5
+  echo "$as_me:42784: result: $ac_ct_XCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6
 else
-  echo "$as_me:42772: result: no" >&5
+  echo "$as_me:42787: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -42808,7 +42823,7 @@ LDFLAGS="$LDFLAGS $X_LIBS"
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:42811: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:42826: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -42893,7 +42908,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}:42896: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:42911: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
 	CFLAGS="${CFLAGS}$cf_new_cflags"
@@ -42903,7 +42918,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}:42906: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:42921: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
 	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
@@ -42913,7 +42928,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}:42916: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:42931: 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"
@@ -42922,7 +42937,7 @@ fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 42925 "configure"
+#line 42940 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -42934,16 +42949,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42937: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42952: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42940: \$? = $ac_status" >&5
+  echo "$as_me:42955: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42943: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42958: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42946: \$? = $ac_status" >&5
+  echo "$as_me:42961: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -42951,12 +42966,12 @@ else
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:42954: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:42969: 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}:42959: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:42974: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_flags"
@@ -42964,7 +42979,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:42967: checking for XOpenDisplay in -lX11" >&5
+echo "$as_me:42982: 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
@@ -42972,7 +42987,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 42975 "configure"
+#line 42990 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -42991,16 +43006,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42994: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43009: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42997: \$? = $ac_status" >&5
+  echo "$as_me:43012: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:43000: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43015: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43003: \$? = $ac_status" >&5
+  echo "$as_me:43018: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -43011,7 +43026,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:43014: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:43029: 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
 
@@ -43033,7 +43048,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-echo "$as_me:43036: checking for XCurses library" >&5
+echo "$as_me:43051: 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
@@ -43056,7 +43071,7 @@ done
 LIBS="$cf_add_libs"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 43059 "configure"
+#line 43074 "configure"
 #include "confdefs.h"
 
 #include <xcurses.h>
@@ -43071,16 +43086,16 @@ XCursesExit();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:43074: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43089: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43077: \$? = $ac_status" >&5
+  echo "$as_me:43092: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:43080: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43095: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43083: \$? = $ac_status" >&5
+  echo "$as_me:43098: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_lib_XCurses=yes
 else
@@ -43091,7 +43106,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:43094: result: $cf_cv_lib_XCurses" >&5
+echo "$as_me:43109: result: $cf_cv_lib_XCurses" >&5
 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
 
 fi
@@ -43106,23 +43121,23 @@ cat >>confdefs.h <<\EOF
 #define XCURSES 1
 EOF
 
-	echo "$as_me:43109: checking for xcurses.h" >&5
+	echo "$as_me:43124: 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 43115 "configure"
+#line 43130 "configure"
 #include "confdefs.h"
 #include <xcurses.h>
 _ACEOF
-if { (eval echo "$as_me:43119: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:43134: \"$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:43125: \$? = $ac_status" >&5
+  echo "$as_me:43140: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -43141,7 +43156,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:43144: result: $ac_cv_header_xcurses_h" >&5
+echo "$as_me:43159: 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
 
@@ -43152,7 +43167,7 @@ EOF
 fi
 
 else
-	{ { echo "$as_me:43155: error: Cannot link with XCurses" >&5
+	{ { echo "$as_me:43170: error: Cannot link with XCurses" >&5
 echo "$as_me: error: Cannot link with XCurses" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -43161,7 +43176,7 @@ fi
 	esac
 else
 
-echo "$as_me:43164: checking if we can include termio.h with curses" >&5
+echo "$as_me:43179: 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
@@ -43171,7 +43186,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 43174 "configure"
+#line 43189 "configure"
 #include "confdefs.h"
 
 #include <LYCurses.h>
@@ -43185,16 +43200,16 @@ putchar(0x0a)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:43188: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:43203: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:43191: \$? = $ac_status" >&5
+  echo "$as_me:43206: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:43194: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43209: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43197: \$? = $ac_status" >&5
+  echo "$as_me:43212: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termio_and_curses=yes
 else
@@ -43207,7 +43222,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
     rm -f lynx_cfg.h
 
 fi
-echo "$as_me:43210: result: $cf_cv_termio_and_curses" >&5
+echo "$as_me:43225: result: $cf_cv_termio_and_curses" >&5
 echo "${ECHO_T}$cf_cv_termio_and_curses" >&6
 
 test $cf_cv_termio_and_curses = yes &&
@@ -43224,23 +43239,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:43227: checking for $ac_header" >&5
+echo "$as_me:43242: 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 43233 "configure"
+#line 43248 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:43237: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:43252: \"$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:43243: \$? = $ac_status" >&5
+  echo "$as_me:43258: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -43259,7 +43274,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:43262: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:43277: 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
@@ -43271,7 +43286,7 @@ done
 
 	fi
 
-echo "$as_me:43274: checking if curses supports alternate-character set" >&5
+echo "$as_me:43289: 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
@@ -43280,7 +43295,7 @@ else
 for mapname in acs_map _acs_map
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 43283 "configure"
+#line 43298 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -43294,16 +43309,16 @@ chtype x = $mapname['l']; $mapname['m'] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:43297: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43312: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43300: \$? = $ac_status" >&5
+  echo "$as_me:43315: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:43303: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43318: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43306: \$? = $ac_status" >&5
+  echo "$as_me:43321: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_alt_char_set=$mapname
 	 break
@@ -43317,21 +43332,21 @@ done
 
 fi
 
-echo "$as_me:43320: result: $cf_cv_alt_char_set" >&5
+echo "$as_me:43335: 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:43327: checking if curses supports fancy attributes" >&5
+echo "$as_me:43342: 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 43334 "configure"
+#line 43349 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -43349,16 +43364,16 @@ attrset(A_UNDERLINE|A_BOLD|A_REVERSE);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:43352: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43367: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43355: \$? = $ac_status" >&5
+  echo "$as_me:43370: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:43358: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43373: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43361: \$? = $ac_status" >&5
+  echo "$as_me:43376: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fancy_curses=yes
 else
@@ -43370,14 +43385,14 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:43373: result: $cf_cv_fancy_curses" >&5
+echo "$as_me:43388: 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:43380: checking for function curses_version" >&5
+echo "$as_me:43395: 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
@@ -43387,7 +43402,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_curses_version=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 43390 "configure"
+#line 43405 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -43400,15 +43415,15 @@ int main(void)
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:43403: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43418: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43406: \$? = $ac_status" >&5
+  echo "$as_me:43421: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:43408: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43423: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43411: \$? = $ac_status" >&5
+  echo "$as_me:43426: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_func_curses_version=yes
 
@@ -43423,7 +43438,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core
 fi
-echo "$as_me:43426: result: $cf_cv_func_curses_version" >&5
+echo "$as_me:43441: 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
@@ -43431,14 +43446,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test "$cf_cv_ncurses_version" != no ; then
-echo "$as_me:43434: checking for obsolete/broken version of ncurses" >&5
+echo "$as_me:43449: 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 43441 "configure"
+#line 43456 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -43457,16 +43472,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:43460: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:43475: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:43463: \$? = $ac_status" >&5
+  echo "$as_me:43478: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:43466: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43481: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43469: \$? = $ac_status" >&5
+  echo "$as_me:43484: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_broken=no
 else
@@ -43478,10 +43493,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:43481: result: $cf_cv_ncurses_broken" >&5
+echo "$as_me:43496: 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:43484: WARNING: hmm... you should get an up-to-date version of ncurses" >&5
+	{ echo "$as_me:43499: 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
@@ -43491,14 +43506,14 @@ EOF
 fi
 fi
 
-echo "$as_me:43494: checking if curses supports color attributes" >&5
+echo "$as_me:43509: 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 43501 "configure"
+#line 43516 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -43518,16 +43533,16 @@ chtype x = COLOR_BLUE;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:43521: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43536: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43524: \$? = $ac_status" >&5
+  echo "$as_me:43539: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:43527: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43542: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43530: \$? = $ac_status" >&5
+  echo "$as_me:43545: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_color_curses=yes
 else
@@ -43539,7 +43554,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:43542: result: $cf_cv_color_curses" >&5
+echo "$as_me:43557: result: $cf_cv_color_curses" >&5
 echo "${ECHO_T}$cf_cv_color_curses" >&6
 if test $cf_cv_color_curses = yes ; then
 
@@ -43561,23 +43576,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:43564: checking for $ac_header" >&5
+echo "$as_me:43579: 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 43570 "configure"
+#line 43585 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:43574: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:43589: \"$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:43580: \$? = $ac_status" >&5
+  echo "$as_me:43595: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -43596,7 +43611,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:43599: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:43614: 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
@@ -43611,23 +43626,23 @@ if test "$ISC" = yes ; then
 for ac_header in sys/termio.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:43614: checking for $ac_header" >&5
+echo "$as_me:43629: 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 43620 "configure"
+#line 43635 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:43624: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:43639: \"$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:43630: \$? = $ac_status" >&5
+  echo "$as_me:43645: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -43646,7 +43661,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:43649: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:43664: 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
@@ -43664,10 +43679,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	(*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:43667: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:43682: 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 43670 "configure"
+#line 43685 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -43679,16 +43694,16 @@ struct termios foo; int x = foo.c_iflag
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:43682: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:43697: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:43685: \$? = $ac_status" >&5
+  echo "$as_me:43700: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:43688: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43703: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43691: \$? = $ac_status" >&5
+  echo "$as_me:43706: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   termios_bad=no
 else
@@ -43696,7 +43711,7 @@ else
 cat conftest.$ac_ext >&5
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 43699 "configure"
+#line 43714 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -43710,16 +43725,16 @@ struct termios foo; int x = foo.c_iflag
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:43713: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:43728: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:43716: \$? = $ac_status" >&5
+  echo "$as_me:43731: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:43719: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43734: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43722: \$? = $ac_status" >&5
+  echo "$as_me:43737: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   termios_bad=unknown
 else
@@ -43735,12 +43750,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-	echo "$as_me:43738: result: $termios_bad" >&5
+	echo "$as_me:43753: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:43743: checking declaration of size-change" >&5
+echo "$as_me:43758: 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
@@ -43755,7 +43770,7 @@ do
 	CPPFLAGS="$cf_save_CPPFLAGS"
 	test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 43758 "configure"
+#line 43773 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -43799,16 +43814,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:43802: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:43817: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:43805: \$? = $ac_status" >&5
+  echo "$as_me:43820: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:43808: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43823: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43811: \$? = $ac_status" >&5
+  echo "$as_me:43826: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_sizechange=yes
 else
@@ -43827,7 +43842,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:43830: result: $cf_cv_sizechange" >&5
+echo "$as_me:43845: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 
@@ -43845,14 +43860,14 @@ EOF
 	esac
 fi
 
-echo "$as_me:43848: checking if ttytype is declared in curses library" >&5
+echo "$as_me:43863: 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 43855 "configure"
+#line 43870 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -43864,16 +43879,16 @@ char *x = &ttytype[1]; *x = 1
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:43867: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43882: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43870: \$? = $ac_status" >&5
+  echo "$as_me:43885: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:43873: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43888: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43876: \$? = $ac_status" >&5
+  echo "$as_me:43891: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_ttytype=yes
 else
@@ -43885,7 +43900,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:43888: result: $cf_cv_have_ttytype" >&5
+echo "$as_me:43903: result: $cf_cv_have_ttytype" >&5
 echo "${ECHO_T}$cf_cv_have_ttytype" >&6
 test $cf_cv_have_ttytype = yes &&
 cat >>confdefs.h <<\EOF
@@ -43894,14 +43909,14 @@ EOF
 
 	if test "$use_wide_curses" = yes ; then
 
-echo "$as_me:43897: checking if curses supports wide characters" >&5
+echo "$as_me:43912: 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 43904 "configure"
+#line 43919 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -43920,16 +43935,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:43923: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43938: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43926: \$? = $ac_status" >&5
+  echo "$as_me:43941: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:43929: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43944: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43932: \$? = $ac_status" >&5
+  echo "$as_me:43947: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_widec_curses=yes
 else
@@ -43940,7 +43955,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:43943: result: $cf_cv_widec_curses" >&5
+echo "$as_me:43958: result: $cf_cv_widec_curses" >&5
 echo "${ECHO_T}$cf_cv_widec_curses" >&6
 
 if test "$cf_cv_widec_curses" = yes ; then
@@ -43950,14 +43965,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	# This is needed on Tru64 5.0 to declare mbstate_t
-	echo "$as_me:43953: checking if we must include wchar.h to declare mbstate_t" >&5
+	echo "$as_me:43968: 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 43960 "configure"
+#line 43975 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -43971,23 +43986,23 @@ mbstate_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:43974: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:43989: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:43977: \$? = $ac_status" >&5
+  echo "$as_me:43992: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:43980: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43995: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43983: \$? = $ac_status" >&5
+  echo "$as_me:43998: \$? = $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 43990 "configure"
+#line 44005 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -44002,16 +44017,16 @@ mbstate_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:44005: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:44020: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:44008: \$? = $ac_status" >&5
+  echo "$as_me:44023: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:44011: \"$ac_try\"") >&5
+  { (eval echo "$as_me:44026: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:44014: \$? = $ac_status" >&5
+  echo "$as_me:44029: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_widec_mbstate=yes
 else
@@ -44023,7 +44038,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:44026: result: $cf_cv_widec_mbstate" >&5
+echo "$as_me:44041: result: $cf_cv_widec_mbstate" >&5
 echo "${ECHO_T}$cf_cv_widec_mbstate" >&6
 
 if test "$cf_cv_widec_mbstate" = yes ; then
@@ -44046,7 +44061,7 @@ fi
 
 	fi
 
-echo "$as_me:44049: checking definition to turn on extended curses functions" >&5
+echo "$as_me:44064: 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
@@ -44054,7 +44069,7 @@ else
 
 cf_cv_need_xopen_extension=unknown
 cat >conftest.$ac_ext <<_ACEOF
-#line 44057 "configure"
+#line 44072 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -44080,16 +44095,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:44083: \"$ac_link\"") >&5
+if { (eval echo "$as_me:44098: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:44086: \$? = $ac_status" >&5
+  echo "$as_me:44101: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:44089: \"$ac_try\"") >&5
+  { (eval echo "$as_me:44104: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:44092: \$? = $ac_status" >&5
+  echo "$as_me:44107: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_xopen_extension=none
 else
@@ -44099,7 +44114,7 @@ cat conftest.$ac_ext >&5
 	for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
 	do
 		cat >conftest.$ac_ext <<_ACEOF
-#line 44102 "configure"
+#line 44117 "configure"
 #include "confdefs.h"
 
 #define $cf_try_xopen_extension 1
@@ -44121,16 +44136,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:44124: \"$ac_link\"") >&5
+if { (eval echo "$as_me:44139: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:44127: \$? = $ac_status" >&5
+  echo "$as_me:44142: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:44130: \"$ac_try\"") >&5
+  { (eval echo "$as_me:44145: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:44133: \$? = $ac_status" >&5
+  echo "$as_me:44148: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_xopen_extension=$cf_try_xopen_extension; break
 else
@@ -44144,7 +44159,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:44147: result: $cf_cv_need_xopen_extension" >&5
+echo "$as_me:44162: result: $cf_cv_need_xopen_extension" >&5
 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
 
 case $cf_cv_need_xopen_extension in
@@ -44153,7 +44168,7 @@ case $cf_cv_need_xopen_extension in
 	;;
 esac
 
-echo "$as_me:44156: checking for term.h" >&5
+echo "$as_me:44171: 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
@@ -44174,7 +44189,7 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 44177 "configure"
+#line 44192 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -44188,16 +44203,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:44191: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:44206: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:44194: \$? = $ac_status" >&5
+  echo "$as_me:44209: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:44197: \"$ac_try\"") >&5
+  { (eval echo "$as_me:44212: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:44200: \$? = $ac_status" >&5
+  echo "$as_me:44215: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_term_header=$cf_header
 	 break
@@ -44216,7 +44231,7 @@ case $cf_cv_term_header in
 	for cf_header in ncurses/term.h ncursesw/term.h
 	do
 		cat >conftest.$ac_ext <<_ACEOF
-#line 44219 "configure"
+#line 44234 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -44234,16 +44249,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:44237: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:44252: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:44240: \$? = $ac_status" >&5
+  echo "$as_me:44255: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:44243: \"$ac_try\"") >&5
+  { (eval echo "$as_me:44258: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:44246: \$? = $ac_status" >&5
+  echo "$as_me:44261: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_term_header=$cf_header
 			 break
@@ -44258,7 +44273,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 esac
 
 fi
-echo "$as_me:44261: result: $cf_cv_term_header" >&5
+echo "$as_me:44276: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 case $cf_cv_term_header in
@@ -44285,7 +44300,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:44288: checking for unctrl.h" >&5
+echo "$as_me:44303: 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
@@ -44306,7 +44321,7 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 44309 "configure"
+#line 44324 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -44320,16 +44335,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:44323: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:44338: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:44326: \$? = $ac_status" >&5
+  echo "$as_me:44341: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:44329: \"$ac_try\"") >&5
+  { (eval echo "$as_me:44344: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:44332: \$? = $ac_status" >&5
+  echo "$as_me:44347: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_unctrl_header=$cf_header
 	 break
@@ -44342,12 +44357,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:44345: result: $cf_cv_unctrl_header" >&5
+echo "$as_me:44360: result: $cf_cv_unctrl_header" >&5
 echo "${ECHO_T}$cf_cv_unctrl_header" >&6
 
 case $cf_cv_unctrl_header in
 (no)
-	{ echo "$as_me:44350: WARNING: unctrl.h header not found" >&5
+	{ echo "$as_me:44365: WARNING: unctrl.h header not found" >&5
 echo "$as_me: WARNING: unctrl.h header not found" >&2;}
 	;;
 esac
@@ -44403,10 +44418,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:44406: checking for ${cf_func}" >&5
+	echo "$as_me:44421: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me:-configure}:44409: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:44424: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -44415,7 +44430,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >conftest.$ac_ext <<_ACEOF
-#line 44418 "configure"
+#line 44433 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -44448,16 +44463,16 @@ if (foo + 1234 > 5678)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:44451: \"$ac_link\"") >&5
+if { (eval echo "$as_me:44466: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:44454: \$? = $ac_status" >&5
+  echo "$as_me:44469: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:44457: \"$ac_try\"") >&5
+  { (eval echo "$as_me:44472: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:44460: \$? = $ac_status" >&5
+  echo "$as_me:44475: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -44473,7 +44488,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:44476: result: $cf_result" >&5
+	echo "$as_me:44491: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test $cf_result != no; then
 		cat >>confdefs.h <<EOF
@@ -44489,13 +44504,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:44492: checking for $ac_func" >&5
+echo "$as_me:44507: 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 44498 "configure"
+#line 44513 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -44526,16 +44541,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:44529: \"$ac_link\"") >&5
+if { (eval echo "$as_me:44544: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:44532: \$? = $ac_status" >&5
+  echo "$as_me:44547: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:44535: \"$ac_try\"") >&5
+  { (eval echo "$as_me:44550: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:44538: \$? = $ac_status" >&5
+  echo "$as_me:44553: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -44545,7 +44560,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:44548: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:44563: 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
@@ -44559,12 +44574,12 @@ fi
 
 if test $use_color_style != no ; then
 	if test .$cf_cv_color_curses != .yes ; then
-		{ { echo "$as_me:44562: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:44577: 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:44567: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:44582: error: Configuration does not support color-styles" >&5
 echo "$as_me: error: Configuration does not support color-styles" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -44572,7 +44587,7 @@ fi
 
 if test $use_scrollbar != no ; then
 	if test .$cf_cv_fancy_curses != .yes ; then
-		{ echo "$as_me:44575: WARNING: Configuration does not support ACS_xxx definitions" >&5
+		{ echo "$as_me:44590: WARNING: Configuration does not support ACS_xxx definitions" >&5
 echo "$as_me: WARNING: Configuration does not support ACS_xxx definitions" >&2;}
 	else
 
@@ -44586,7 +44601,7 @@ fi
 # use rpath for libraries in unusual places
 
 LD_RPATH_OPT=
-echo "$as_me:44589: checking for an rpath option" >&5
+echo "$as_me:44604: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 case $cf_cv_system_name in
 (irix*)
@@ -44617,12 +44632,12 @@ case $cf_cv_system_name in
 (*)
 	;;
 esac
-echo "$as_me:44620: result: $LD_RPATH_OPT" >&5
+echo "$as_me:44635: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 case "x$LD_RPATH_OPT" in
 (x-R*)
-	echo "$as_me:44625: checking if we need a space after rpath option" >&5
+	echo "$as_me:44640: 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"
 
@@ -44643,7 +44658,7 @@ done
 LIBS="$cf_add_libs"
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 44646 "configure"
+#line 44661 "configure"
 #include "confdefs.h"
 
 int
@@ -44655,16 +44670,16 @@ main (void)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:44658: \"$ac_link\"") >&5
+if { (eval echo "$as_me:44673: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:44661: \$? = $ac_status" >&5
+  echo "$as_me:44676: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:44664: \"$ac_try\"") >&5
+  { (eval echo "$as_me:44679: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:44667: \$? = $ac_status" >&5
+  echo "$as_me:44682: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_rpath_space=no
 else
@@ -44674,13 +44689,13 @@ cf_rpath_space=yes
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	LIBS="$cf_save_LIBS"
-	echo "$as_me:44677: result: $cf_rpath_space" >&5
+	echo "$as_me:44692: result: $cf_rpath_space" >&5
 echo "${ECHO_T}$cf_rpath_space" >&6
 	test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
 	;;
 esac
 
-echo "$as_me:44683: checking if rpath-hack should be disabled" >&5
+echo "$as_me:44698: 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.
@@ -44697,21 +44712,21 @@ else
 	cf_disable_rpath_hack=no
 
 fi;
-echo "$as_me:44700: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:44715: result: $cf_disable_rpath_hack" >&5
 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 if test "$cf_disable_rpath_hack" = no ; then
 
-echo "$as_me:44704: checking for updated LDFLAGS" >&5
+echo "$as_me:44719: 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:44707: result: maybe" >&5
+	echo "$as_me:44722: 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:44714: checking for $ac_word" >&5
+echo "$as_me:44729: 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
@@ -44726,7 +44741,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:44729: found $ac_dir/$ac_word" >&5
+echo "$as_me:44744: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -44734,10 +44749,10 @@ fi
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:44737: result: $cf_ldd_prog" >&5
+  echo "$as_me:44752: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:44740: result: no" >&5
+  echo "$as_me:44755: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44751,7 +44766,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
 		cf_rpath_oops=
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 44754 "configure"
+#line 44769 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -44763,16 +44778,16 @@ printf("Hello");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:44766: \"$ac_link\"") >&5
+if { (eval echo "$as_me:44781: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:44769: \$? = $ac_status" >&5
+  echo "$as_me:44784: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:44772: \"$ac_try\"") >&5
+  { (eval echo "$as_me:44787: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:44775: \$? = $ac_status" >&5
+  echo "$as_me:44790: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
 		 cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
@@ -44800,7 +44815,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}:44803: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:44818: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
 
 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
 						break
@@ -44812,11 +44827,11 @@ echo "${as_me:-configure}:44803: testing ...adding -L$cf_rpath_dir/lib to LDFLAG
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:44815: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:44830: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:44819: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:44834: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -44853,7 +44868,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:44856: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:44871: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -44866,11 +44881,11 @@ LDFLAGS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:44869: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:44884: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:44873: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:44888: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -44907,7 +44922,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:44910: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:44925: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -44920,14 +44935,14 @@ LIBS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:44923: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:44938: testing ...checked LIBS $LIBS ..." 1>&5
 
 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:44927: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:44942: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 else
-	echo "$as_me:44930: result: no" >&5
+	echo "$as_me:44945: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44947,6 +44962,12 @@ if test -n "$srcdir" ; then
 	test "$srcdir" != "." && SRCDIR_CLEAN=""
 fi
 
+HOMEPAGE_URL="http://lynx.invisible-island.net/"
+
+cat >>confdefs.h <<EOF
+#define HOMEPAGE_URL "$HOMEPAGE_URL"
+EOF
+
 ac_config_files="$ac_config_files makefile WWW/Library/Implementation/makefile src/makefile src/chrtrans/makefile $SUB_MAKEFILE"
 ac_config_commands="$ac_config_commands default"
 cat >confcache <<\_ACEOF
@@ -45028,7 +45049,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:45031: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:45052: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -45204,7 +45225,7 @@ cat >>$CONFIG_STATUS <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:45207: error: ambiguous option: $1
+    { { echo "$as_me:45228: 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;}
@@ -45223,7 +45244,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:45226: error: unrecognized option: $1
+  -*) { { echo "$as_me:45247: 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;}
@@ -45276,7 +45297,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:45279: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:45300: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -45495,6 +45516,7 @@ s, at ac_ct_XCURSES_CONFIG@,$ac_ct_XCURSES_CONFIG,;t t
 s, at cf_ldd_prog@,$cf_ldd_prog,;t t
 s, at EXTRA_LDFLAGS@,$EXTRA_LDFLAGS,;t t
 s, at CONFIG_SHELL@,$CONFIG_SHELL,;t t
+s, at HOMEPAGE_URL@,$HOMEPAGE_URL,;t t
 s, at SRCDIR_CLEAN@,$SRCDIR_CLEAN,;t t
 CEOF
 
@@ -45628,7 +45650,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:45631: creating $ac_file" >&5
+    { echo "$as_me:45653: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -45646,7 +45668,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:45649: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:45671: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -45659,7 +45681,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:45662: error: cannot find input file: $f" >&5
+           { { echo "$as_me:45684: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -45675,7 +45697,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:45678: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:45700: 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;}
@@ -45684,7 +45706,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' $ac_item`
       if test -n "$ac_seen"; then
-        { echo "$as_me:45687: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:45709: 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;}
@@ -45721,7 +45743,7 @@ s, at INSTALL@,$ac_INSTALL,;t t
             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:45724: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:45746: 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;}
@@ -45732,7 +45754,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:45735: WARNING: Some variables may not be substituted:
+      { echo "$as_me:45757: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -45781,7 +45803,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:45784: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:45806: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -45792,7 +45814,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:45795: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:45817: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -45805,7 +45827,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:45808: error: cannot find input file: $f" >&5
+           { { echo "$as_me:45830: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -45923,7 +45945,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:45926: $ac_file is unchanged" >&5
+      { echo "$as_me:45948: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -45975,39 +45997,39 @@ for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
   case $ac_dest in
     default-1 ) for ac_file in $CONFIG_FILES; do
 
-      # Support "outfile[:infile[:infile...]]"
-      case "$ac_file" in
-        (*:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-      esac
-
-      # PO directories have a Makefile.in generated from Makefile.inn.
-      case "$ac_file" in
-	  (*/[Mm]akefile.in)
-        # Adjust a relative srcdir.
-        ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
-        ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
-        ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
-        ac_base=`basename $ac_file .in`
-        # In autoconf-2.13 it is called $ac_given_srcdir.
-        # In autoconf-2.50 it is called $srcdir.
-        test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
-
-        case "$ac_given_srcdir" in
-          (.)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
-          (/*) top_srcdir="$ac_given_srcdir" ;;
-          (*)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
+        # Support "outfile[:infile[:infile...]]"
+        case "$ac_file" in
+          (*:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
         esac
 
-        if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
-          rm -f "$ac_dir/POTFILES"
-          test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
-          sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," -e "\$s/\(.*\) \\\\/\1/" < "$ac_given_srcdir/$ac_dir/POTFILES.in" > "$ac_dir/POTFILES"
-          test -n "$as_me" && echo "$as_me: creating $ac_dir/$ac_base" || echo "creating $ac_dir/$ac_base"
-          sed -e "/POTFILES =/r $ac_dir/POTFILES" "$ac_dir/$ac_base.in" > "$ac_dir/$ac_base"
-        fi
-        ;;
-      esac
-    done ;;
+        # PO directories have a Makefile.in generated from Makefile.inn.
+        case "$ac_file" in
+        (*/[Mm]akefile.in)
+          # Adjust a relative srcdir.
+          ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
+          ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
+          ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
+          ac_base=`basename $ac_file .in`
+          # In autoconf-2.13 it is called $ac_given_srcdir.
+          # In autoconf-2.50 it is called $srcdir.
+          test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
+
+          case "$ac_given_srcdir" in
+            (.)  top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
+            (/*) top_srcdir="$ac_given_srcdir" ;;
+            (*)  top_srcdir="$ac_dots$ac_given_srcdir" ;;
+          esac
+
+          if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
+            rm -f "$ac_dir/POTFILES"
+            test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
+            sed -e "/^#/d" -e "/^[ 	]*\$/d" -e "s,.*,     $top_srcdir/& \\\\," -e "\$s/\(.*\) \\\\/\1/" < "$ac_given_srcdir/$ac_dir/POTFILES.in" > "$ac_dir/POTFILES"
+            test -n "$as_me" && echo "$as_me: creating $ac_dir/$ac_base" || echo "creating $ac_dir/$ac_base"
+            sed -e "/POTFILES =/r $ac_dir/POTFILES" "$ac_dir/$ac_base.in" > "$ac_dir/$ac_base"
+          fi
+          ;;
+        esac
+      done ;;
     default )
 	if test "$USE_NLS" = yes ; then
 	if test "$use_our_messages" = yes ; then
diff --git a/configure.in b/configure.in
index 7dbe962..bd80ab9 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $LynxId: configure.in,v 1.290 2017/07/02 18:18:00 tom Exp $
+dnl $LynxId: configure.in,v 1.292 2017/07/06 00:48:30 tom Exp $
 dnl
 dnl Process this file with autoconf to produce a configure script.
 dnl
@@ -29,7 +29,7 @@ dnl ---------------------------------------------------------------------------
 dnl
 dnl ask PRCS to plug-in the project-version for the configure-script.
 dnl $Format: "AC_REVISION($ProjectVersion$)"$
-AC_REVISION(2.8.9dev.15)
+AC_REVISION(2.8.9dev.16)
 
 # Save the original $CFLAGS so we can distinguish whether the user set those
 # in the environment, or whether autoconf added -O and -g options:
@@ -64,7 +64,7 @@ AC_ARG_PROGRAM
 PACKAGE=lynx
 dnl ask PRCS to plug-in the project-version for the packages.
 # $Format: "VERSION=$ProjectVersion$"$
-VERSION=2.8.9dev.15
+VERSION=2.8.9dev.16
 
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
@@ -1561,6 +1561,10 @@ if test -n "$srcdir" ; then
 	test "$srcdir" != "." && SRCDIR_CLEAN=""
 fi
 
+HOMEPAGE_URL="http://lynx.invisible-island.net/"
+AC_DEFINE_UNQUOTED(HOMEPAGE_URL,"$HOMEPAGE_URL",[Define to Lynx homepage URL])
+AC_SUBST(HOMEPAGE_URL)
+
 AC_SUBST(SRCDIR_CLEAN)
 AC_OUTPUT(
 	[makefile \
diff --git a/lynx.cfg b/lynx.cfg
index 5ac2042..e9758bb 100644
--- a/lynx.cfg
+++ b/lynx.cfg
@@ -1,13 +1,13 @@
-# $LynxId: lynx.cfg,v 1.285 2017/07/04 22:57:01 tom Exp $
+# $LynxId: lynx.cfg,v 1.288 2017/07/11 08:45:14 tom Exp $
 # lynx.cfg file.
 # The default placement for this file is /usr/local/lib/lynx.cfg (Unix)
 #                                     or Lynx_Dir:lynx.cfg (VMS)
 #
 # $Format: "#PRCS LYNX_VERSION \"$ProjectVersion$\""$
-#PRCS LYNX_VERSION "2.8.9dev.15"
+#PRCS LYNX_VERSION "2.8.9dev.16"
 #
 # $Format: "#PRCS LYNX_DATE \"$ProjectDate$\""$
-#PRCS LYNX_DATE "Thu, 11 May 2017 17:22:30 -0400"
+#PRCS LYNX_DATE "Tue, 11 Jul 2017 04:45:14 -0400"
 #
 # Definition pairs (configuration settings) are of the form
 #	VARIABLE:DEFINITION
@@ -60,12 +60,18 @@
 #
 #   INCLUDE:/usr/local/lib/lynx.cfg
 #           ^^^^^^^^^^^^^^^^^^^^^^^ or whatever is appropriate on your system
-# and now your own tweaks.
+# and now your own tweaks.  If you omit the directory name, e.g.,
 #
-# Starting with Lynx 2.8.2, the INCLUDE facility is yet more powerful.  You can
-# suppress all but specific settings that will be read from included files.
-# This allows sysadmins to provide users the ability to customize lynx with
-# options that normally do not affect security, such as COLOR, VIEWER, KEYMAP.
+#   INCLUDE:lynx.cfg
+#
+# then lynx first checks if it is in any of the directories listed in the
+# environment variable LYNX_CFG_PATH, then tries the directory of the default
+# config-file.
+#
+# You can also suppress all but specific settings that will be read from
+# included files.  This allows sysadmins to provide users the ability to
+# customize lynx with options that normally do not affect security, such as
+# COLOR, VIEWER, KEYMAP.
 #
 # The syntax is
 #
diff --git a/makefile.in b/makefile.in
index 7bd87c1..0e8f4e2 100644
--- a/makefile.in
+++ b/makefile.in
@@ -1,4 +1,4 @@
-# $LynxId: makefile.in,v 1.162 2017/05/11 21:22:30 tom Exp $
+# $LynxId: makefile.in,v 1.164 2017/07/06 08:46:09 tom Exp $
 ##makefile for lynx
 
 SHELL		= @CONFIG_SHELL@
@@ -46,7 +46,7 @@ TAR_UP		= $(TAR) @TAR_UP_OPTIONS@ @TAR_PIPE_OPTIONS@
 TAR_DOWN	= $(TAR) @TAR_DOWN_OPTIONS@ @TAR_PIPE_OPTIONS@
 
 # $Format: "LYNX_VERSION	= $ProjectVersion$"$
-LYNX_VERSION	= 2.8.9dev.15
+LYNX_VERSION	= 2.8.9dev.16
 
 ## This is the version which we are developing (or, upon release, make this
 ## the same).  Use no dots in the name, since it must work on VMS and MS-DOS.
@@ -347,7 +347,7 @@ install-doc : $(DOCDIR) $(HELPDIR)
 # So we limit sed delimiters to '!' and '%', depending on the expected text.
 FIX_SED = tr '=' '"'
 
-LYNX_URL='http://lynx.invisible-island.net/release/breakout'
+LYNX_URL='@HOMEPAGE_URL at release/breakout'
 LYNXDOCS_URL='$(LYNX_URL)/docs/'
 LYNXHELP_URL='$(LYNX_URL)/lynx_help/'
 
diff --git a/po/da.po b/po/da.po
index be8c4fa..6229ddc 100644
--- a/po/da.po
+++ b/po/da.po
@@ -2,21 +2,21 @@
 # Copyright (C) 2015 Free Software Foundation, Inc.
 # This file is distributed under the same license as the lynx package.
 # Morten Bo Johansen <mbj at spamcop.net>, 2000-2006
-# Joe Hansen <joedalton2 at yahoo.dk>, 2015, 2016.
+# Joe Hansen <joedalton2 at yahoo.dk>, 2015, 2016, 2017.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: lynx 2.8.9-dev7\n"
+"Project-Id-Version: lynx 2.8.9-dev15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-14 20:39-0500\n"
-"PO-Revision-Date: 2016-01-02 21:00+0200\n"
+"POT-Creation-Date: 2017-07-04 16:51-0400\n"
+"PO-Revision-Date: 2017-07-06 21:10+0200\n"
 "Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
 "Language-Team: Danish <dansk at dansk-gruppen.dk>\n"
 "Language: da\n"
-"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 
 #. ******************************************************************
 #. * The following definitions are for status line prompts, messages, or
@@ -193,13 +193,13 @@ msgstr "(Filindtastningsfelt) Anfør filnavn. Pil OP/NED el. TAB forlader feltet
 #: LYMessages.c:84 LYMessages.c:86
 #, c-format
 msgid "(Textfield \"%s\"); Enter text.  Use UP or DOWN arrows or tab to move off."
-msgstr "(Tekstfelt »%s«); Indtast tekst. Pil OP/NED el. TAB forlader feltet."
+msgstr "(Tekstfelt »%s«); indtast tekst. Pil OP/NED el. TAB forlader feltet."
 
 #. #define FORM_LINK_TEXTAREA_ADV_MSG
 #: LYMessages.c:88
 #, c-format
 msgid "(Textarea \"%s\"); Enter text. Use UP/DOWN arrows or TAB to move off."
-msgstr "(Tekstområde »%s«); Indtast tekst. Pil OP/NED el. TAB forlader området."
+msgstr "(Tekstområde »%s«); indtast tekst. Pil OP/NED el. TAB forlader området."
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE
 #: LYMessages.c:90
@@ -210,13 +210,13 @@ msgstr "(Tekstområde) Indtast tekst. Pil OP/NED el. TAB forlader området."
 #: LYMessages.c:92
 #, c-format
 msgid "(Textarea \"%s\"); Enter text. Use UP/DOWN arrows or TAB to move off (%s for editor)."
-msgstr "(Tekstområde »%s«); Indtast tekst. Pil OP/NED el. TAB forlader (%s for editor)."
+msgstr "(Tekstområde »%s«); indtast tekst. Pil OP/NED el. TAB forlader området (%s for editor)."
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE_E
 #: LYMessages.c:94
 #, c-format
 msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off (%s for editor)."
-msgstr "(Tekstområde) Anfør tekst. Pil OP/NED el. TAB forlader (%s for editor)."
+msgstr "(Tekstområde) Indtast tekst. Pil OP/NED el. TAB forlader området (%s for editor)."
 
 #. #define FORM_LINK_TEXT_UNM_MSG
 #: LYMessages.c:96
@@ -268,7 +268,7 @@ msgstr "SKRIVEBESKYTTET adgangskodeformular. Pil OP/NED el. TAB forlader felt."
 #: LYMessages.c:114
 #, c-format
 msgid "(Checkbox \"%s\");   Use right-arrow or <return> to toggle."
-msgstr "(Afkrydsningsboks »%s«); højrepil eller <retur> (de)aktiverer."
+msgstr "(Afkrydsningsfelt »%s«); højrepil eller <retur> (de)aktiverer."
 
 #. #define FORM_LINK_CHECKBOX_MESSAGE
 #: LYMessages.c:116
@@ -278,7 +278,7 @@ msgstr "(Afkrydsningsfelt) Højrepil eller <retur> (de)aktiverer."
 #. #define FORM_LINK_CHECKBOX_UNM_MSG
 #: LYMessages.c:118
 msgid "UNMODIFIABLE form checkbox.  Use UP or DOWN arrows or tab to move off."
-msgstr "SKRIVEBESKYTTET afkrydsningsboks. Pil OP/NED el. TAB forlader boks."
+msgstr "SKRIVEBESKYTTET afkrydsningsfelt. Brug Pil OP/NED el. TAB forlader boks."
 
 #. #define FORM_LINK_RADIO_ADV_MSG
 #: LYMessages.c:120
@@ -2339,7 +2339,7 @@ msgstr "(Ingen navn.)"
 msgid "(No value.)"
 msgstr "(Ingen værdi.)"
 
-#: LYMessages.c:743 src/LYOptions.c:2424
+#: LYMessages.c:743 src/LYOptions.c:2446
 msgid "None"
 msgstr "Ingen"
 
@@ -2865,35 +2865,39 @@ msgstr "Sporing ikke understøttet"
 msgid "\tIndents: first=%.0f others=%.0f, Height=%.1f Desc=%.1f\n"
 msgstr "\tIndryk: først=%.0f andre=%.0f, Højde=%.1f Beskr=%.1f\n"
 
-#.
-#. * Set up the message for the username prompt, and then issue the
-#. * prompt.  The default username is included in the call to the
-#. * prompting function, but the password is NULL-ed and always replaced.
-#. * - FM
-#.
-#: WWW/Library/Implementation/HTAABrow.c:634
+#: WWW/Library/Implementation/HTAABrow.c:569
+#, c-format
+msgid "username for realm %s changed from %s to %s"
+msgstr "Brugernavn for området %s ændret fra %s til %s"
+
+#: WWW/Library/Implementation/HTAABrow.c:585
+#, c-format
+msgid "password for realm %s user %s changed"
+msgstr "adgangskode for området %s bruger %s ændret"
+
+#: WWW/Library/Implementation/HTAABrow.c:697
 #, c-format
 msgid "Username for '%s' at %s '%s%s':"
 msgstr "Brugernavn for '%s' på %s '%s%s':"
 
-#: WWW/Library/Implementation/HTAABrow.c:904
+#: WWW/Library/Implementation/HTAABrow.c:970
 msgid "This client doesn't know how to compose proxy authorization information for scheme"
 msgstr "Denne klient kan ikke danne godkendelsesinformation til proxyvært"
 
-#: WWW/Library/Implementation/HTAABrow.c:983
+#: WWW/Library/Implementation/HTAABrow.c:1047
 msgid "This client doesn't know how to compose authorization information for scheme"
 msgstr "Denne klient kan ikke danne godkendelsesinformation til protokol"
 
-#: WWW/Library/Implementation/HTAABrow.c:1094
+#: WWW/Library/Implementation/HTAABrow.c:1156
 #, c-format
 msgid "Invalid header '%s%s%s%s%s'"
 msgstr "Ugyldigt hoved '%s%s%s%s%s'"
 
-#: WWW/Library/Implementation/HTAABrow.c:1200
+#: WWW/Library/Implementation/HTAABrow.c:1260
 msgid "Proxy authorization required -- retrying"
 msgstr "proxygodkendelse påkrævet - forsøger igen"
 
-#: WWW/Library/Implementation/HTAABrow.c:1256
+#: WWW/Library/Implementation/HTAABrow.c:1316
 msgid "Access without authorization denied -- retrying"
 msgstr "Adgang uden godkendelse nægtet - forsøger igen"
 
@@ -2909,7 +2913,7 @@ msgstr "Dokument med 'POST'-indhold ikke fundet i cache. Genindsend?"
 msgid "Loading failed, use a previous copy."
 msgstr "Indlæsning slog fejl, brug en foregående kopi."
 
-#: WWW/Library/Implementation/HTAccess.c:1056 src/GridText.c:8875
+#: WWW/Library/Implementation/HTAccess.c:1056 src/GridText.c:8865
 msgid "Loading incomplete."
 msgstr "Indlæsning ikke fuldført."
 
@@ -2932,7 +2936,7 @@ msgstr "**** HTAccess: Statustilbagemelding var: %d\n"
 #. * hack: if we fail in HTAccess.c
 #. * avoid duplicating URL, oh.
 #.
-#: WWW/Library/Implementation/HTAccess.c:1096 src/LYMainLoop.c:8074
+#: WWW/Library/Implementation/HTAccess.c:1096 src/LYMainLoop.c:8075
 msgid "Can't Access"
 msgstr "Kan ikke tilgå"
 
@@ -2940,37 +2944,37 @@ msgstr "Kan ikke tilgå"
 msgid "Unable to access document."
 msgstr "Kan ikke tilgå dokument."
 
-#: WWW/Library/Implementation/HTFTP.c:875
+#: WWW/Library/Implementation/HTFTP.c:870
 #, c-format
 msgid "Enter password for user %s@%s:"
 msgstr "Indtast adgangskode for bruger %s@%s:"
 
-#: WWW/Library/Implementation/HTFTP.c:903
+#: WWW/Library/Implementation/HTFTP.c:898
 msgid "Unable to connect to FTP host."
 msgstr "Kan ikke kontakte FTP-vært."
 
-#: WWW/Library/Implementation/HTFTP.c:1142
+#: WWW/Library/Implementation/HTFTP.c:1137
 msgid "close master socket"
 msgstr "luk primær sokkel"
 
-#: WWW/Library/Implementation/HTFTP.c:1204
+#: WWW/Library/Implementation/HTFTP.c:1199
 msgid "socket for master socket"
 msgstr "sokkel til primær sokkel"
 
-#: WWW/Library/Implementation/HTFTP.c:2952
+#: WWW/Library/Implementation/HTFTP.c:2948
 msgid "Receiving FTP directory."
 msgstr "FTP-filkatalog indlæses."
 
-#: WWW/Library/Implementation/HTFTP.c:3090
+#: WWW/Library/Implementation/HTFTP.c:3086
 #, c-format
 msgid "Transferred %d bytes (%5d)"
 msgstr "Overført %d bytes (%5d)"
 
-#: WWW/Library/Implementation/HTFTP.c:3448
+#: WWW/Library/Implementation/HTFTP.c:3444
 msgid "connect for data"
 msgstr "dataforbindelse åben"
 
-#: WWW/Library/Implementation/HTFTP.c:4120
+#: WWW/Library/Implementation/HTFTP.c:4126
 msgid "Receiving FTP file."
 msgstr "Modtager FTP-fil."
 
@@ -3128,8 +3132,8 @@ msgstr "Adresse har en ugyldig port"
 msgid "Address length looks invalid"
 msgstr "Adresselængde forekommer ugyldig"
 
-#: WWW/Library/Implementation/HTTCP.c:1845
-#: WWW/Library/Implementation/HTTCP.c:1863
+#: WWW/Library/Implementation/HTTCP.c:1839
+#: WWW/Library/Implementation/HTTCP.c:1857
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr "Ude af stand til at finde fremmed vært %s."
@@ -3138,142 +3142,147 @@ msgstr "Ude af stand til at finde fremmed vært %s."
 #. * but not HTAlert, because typically there will be other
 #. * alerts from the callers.  - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1860
+#: WWW/Library/Implementation/HTTCP.c:1854
 #: WWW/Library/Implementation/HTTelnet.c:115
 #, c-format
 msgid "Invalid hostname %s"
 msgstr "Ugyldigt værtsnavn %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1874
+#: WWW/Library/Implementation/HTTCP.c:1868
 #, c-format
 msgid "Making %s connection to %s"
 msgstr "Opretter %s-forbindelse til %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1885
+#: WWW/Library/Implementation/HTTCP.c:1879
 msgid "socket failed."
 msgstr "sokkel fejlede."
 
-#: WWW/Library/Implementation/HTTCP.c:1899
+#: WWW/Library/Implementation/HTTCP.c:1893
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
 msgstr "sokkel fejlede: familie %d adr. %s port %s."
 
-#: WWW/Library/Implementation/HTTCP.c:1923
+#: WWW/Library/Implementation/HTTCP.c:1917
 msgid "Could not make connection non-blocking."
 msgstr "Kunne ikke oprette en ikke-blokerende forbindelse."
 
-#: WWW/Library/Implementation/HTTCP.c:1991
+#: WWW/Library/Implementation/HTTCP.c:1985
 msgid "Connection failed (too many retries)."
 msgstr "Forbindelse opgivet (for mange forsøg)."
 
-#: WWW/Library/Implementation/HTTCP.c:2180
+#: WWW/Library/Implementation/HTTCP.c:2174
 msgid "Could not restore socket to blocking."
 msgstr "Kunne ikke få sokkel til at blokere."
 
-#: WWW/Library/Implementation/HTTCP.c:2248
+#: WWW/Library/Implementation/HTTCP.c:2242
 msgid "Socket read failed (too many tries)."
 msgstr "Sokkellæsning mislykkedes (for mange forsøg)."
 
-#: WWW/Library/Implementation/HTTP.c:136
+#: WWW/Library/Implementation/HTTP.c:134
 #, c-format
 msgid "SSL callback:%s, preverify_ok=%d, ssl_okay=%d"
 msgstr "SSL-tilbagekald:%s, preverify_ok=%d, ssl_okay=%d"
 
-#: WWW/Library/Implementation/HTTP.c:516
+#: WWW/Library/Implementation/HTTP.c:629
+#, c-format
+msgid "User/password contains only punctuation: %s"
+msgstr "Bruger/adgangskode indeholder kun tegnsætning: %s"
+
+#: WWW/Library/Implementation/HTTP.c:633
 #, c-format
-msgid "Address contains a username: %s"
-msgstr "Adresse indeholder et brugernavn: %s"
+msgid "User/password may be confused with hostname: '%s' (e.g, '%s')"
+msgstr "Bruger/adgangskode kan forveksles med værtsnavn: »%s« (f.eks. »%s«)"
 
-#: WWW/Library/Implementation/HTTP.c:570
+#: WWW/Library/Implementation/HTTP.c:694
 #, c-format
 msgid "Certificate issued by: %s"
 msgstr "Certifikat udstedt af: %s"
 
-#: WWW/Library/Implementation/HTTP.c:757
+#: WWW/Library/Implementation/HTTP.c:881
 msgid "This client does not contain support for HTTPS URLs."
 msgstr "Denne klient kan ikke bruge HTTPS-adresser."
 
-#: WWW/Library/Implementation/HTTP.c:782
+#: WWW/Library/Implementation/HTTP.c:906
 msgid "Unable to connect to remote host."
 msgstr "Kan ikke forbinde til fremmed vært."
 
-#: WWW/Library/Implementation/HTTP.c:825
+#: WWW/Library/Implementation/HTTP.c:953
 msgid "Retrying connection without TLS."
 msgstr "Forsøger at genetablere forbindelsen uden TLS."
 
-#: WWW/Library/Implementation/HTTP.c:877
+#: WWW/Library/Implementation/HTTP.c:1005
 msgid "GnuTLS error when trying to verify certificate."
 msgstr "GnuTLS-fejl under forsøg på at verificere certifikat."
 
-#: WWW/Library/Implementation/HTTP.c:889
+#: WWW/Library/Implementation/HTTP.c:1018
 msgid "the certificate has no known issuer"
 msgstr "certifikatet har ingen kendt udsteder"
 
-#: WWW/Library/Implementation/HTTP.c:891
+#: WWW/Library/Implementation/HTTP.c:1020
 msgid "no issuer was found"
 msgstr "ingen udsteder fundet"
 
 # CA = Certification Authority
-#: WWW/Library/Implementation/HTTP.c:893
+#: WWW/Library/Implementation/HTTP.c:1022
 msgid "issuer is not a CA"
 msgstr "udsteder er ikke en certificeringsmyndighed"
 
-#: WWW/Library/Implementation/HTTP.c:895
+#: WWW/Library/Implementation/HTTP.c:1024
 msgid "the certificate has been revoked"
 msgstr "certifikatet er blevet tilbagekaldt"
 
-#: WWW/Library/Implementation/HTTP.c:897
+#: WWW/Library/Implementation/HTTP.c:1026
 msgid "the certificate is not trusted"
 msgstr "certifikatet er ikke troværdigt"
 
-#: WWW/Library/Implementation/HTTP.c:972
+#: WWW/Library/Implementation/HTTP.c:1101
 #, c-format
 msgid "Verified connection to %s (cert=%s)"
 msgstr "Verificerede forbindelse til %s (cert=%s)"
 
-#: WWW/Library/Implementation/HTTP.c:1022
-#: WWW/Library/Implementation/HTTP.c:1064
+#: WWW/Library/Implementation/HTTP.c:1151
+#: WWW/Library/Implementation/HTTP.c:1193
 #, c-format
 msgid "Verified connection to %s (subj=%s)"
 msgstr "Verificeret forbindelse til %s (subj=%s)"
 
-#: WWW/Library/Implementation/HTTP.c:1094
+#: WWW/Library/Implementation/HTTP.c:1223
 msgid "Can't find common name in certificate"
 msgstr "Kan ikke finde fælles navn i certifikat"
 
-#: WWW/Library/Implementation/HTTP.c:1097
+#: WWW/Library/Implementation/HTTP.c:1226
 #, c-format
 msgid "SSL error:host(%s)!=cert(%s)-Continue?"
 msgstr "SSL-fejl:vært(%s)!=cert(%s) - fortsæt?"
 
-#: WWW/Library/Implementation/HTTP.c:1104
+#: WWW/Library/Implementation/HTTP.c:1233
 msgid "SSL error"
 msgstr "SSL-fejl"
 
-#: WWW/Library/Implementation/HTTP.c:1112
+#: WWW/Library/Implementation/HTTP.c:1241
 #, c-format
 msgid "UNVERIFIED connection to %s (cert=%s)"
 msgstr "UVERIFICERET forbindelse til %s (cert=%s)"
 
-#: WWW/Library/Implementation/HTTP.c:1121
+#: WWW/Library/Implementation/HTTP.c:1250
 #, c-format
 msgid "Secure %d-bit %s (%s) HTTP connection"
 msgstr "Sikker %d-bit %s (%s) HTTP-forbindelse"
 
-#: WWW/Library/Implementation/HTTP.c:1584
+#: WWW/Library/Implementation/HTTP.c:1718
 msgid "Sending HTTP request."
 msgstr "Sender HTTP-anmodning."
 
-#: WWW/Library/Implementation/HTTP.c:1626
+#: WWW/Library/Implementation/HTTP.c:1760
 msgid "Unexpected network write error; connection aborted."
 msgstr "Uventet skrivningsfejl i netværk; forbindelse afbrudt."
 
-#: WWW/Library/Implementation/HTTP.c:1632
+#: WWW/Library/Implementation/HTTP.c:1766
 msgid "HTTP request sent; waiting for response."
 msgstr "HTTP-anmodning sendt; venter på svar."
 
-#: WWW/Library/Implementation/HTTP.c:1705
-#: WWW/Library/Implementation/HTTP.c:1715
+#: WWW/Library/Implementation/HTTP.c:1839
+#: WWW/Library/Implementation/HTTP.c:1849
 msgid "Unexpected network read error; connection aborted."
 msgstr "Uventet læsningsfejl i netværk; forbindelse afbrudt"
 
@@ -3286,7 +3295,7 @@ msgstr "Uventet læsningsfejl i netværk; forbindelse afbrudt"
 #. * line and possibly other headers, so we'll deal with them by
 #. * showing the full header to the user as text/plain.  - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1917
+#: WWW/Library/Implementation/HTTP.c:2051
 msgid "Got unexpected Informational Status."
 msgstr "Modtog uventet \"Informational Status\"."
 
@@ -3296,7 +3305,7 @@ msgstr "Modtog uventet \"Informational Status\"."
 #. * content.  We'll instruct the user to do that, and
 #. * restore the current document.  - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1951
+#: WWW/Library/Implementation/HTTP.c:2085
 msgid "Request fulfilled.  Reset Content."
 msgstr "Anmodning imødekommet. Nulstil indhold."
 
@@ -3306,27 +3315,27 @@ msgstr "Anmodning imødekommet. Nulstil indhold."
 #. * status is inappropriate.  We'll deal with it by showing
 #. * the full header to the user as text/plain.  - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:2066
+#: WWW/Library/Implementation/HTTP.c:2202
 msgid "Got unexpected 304 Not Modified status."
 msgstr "Modtog uventet 304 \"Not Modified status\"."
 
-#: WWW/Library/Implementation/HTTP.c:2129
+#: WWW/Library/Implementation/HTTP.c:2265
 msgid "Redirection of POST content requires user approval."
 msgstr "Omdirigering af POST-indhold kræver brugers godkendelse."
 
-#: WWW/Library/Implementation/HTTP.c:2144
+#: WWW/Library/Implementation/HTTP.c:2280
 msgid "Have POST content.  Treating Permanent Redirection as Temporary.\n"
 msgstr "Har POST-indhold. Behandler varig omdirigering som midlertidig.\n"
 
-#: WWW/Library/Implementation/HTTP.c:2188
+#: WWW/Library/Implementation/HTTP.c:2326
 msgid "Retrying with access authorization information."
 msgstr "Prøver igen med oplysning om adgangstilladelse."
 
-#: WWW/Library/Implementation/HTTP.c:2200
+#: WWW/Library/Implementation/HTTP.c:2338
 msgid "Show the 401 message body?"
 msgstr "Vis indhold af 401-meddelelse?"
 
-#: WWW/Library/Implementation/HTTP.c:2244
+#: WWW/Library/Implementation/HTTP.c:2382
 msgid "Show the 407 message body?"
 msgstr "Vis indhold af 407-meddelelse?"
 
@@ -3334,7 +3343,7 @@ msgstr "Vis indhold af 407-meddelelse?"
 #. * Bad or unknown server_status number.  Take a chance and hope
 #. * there is something to display.  - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:2344
+#: WWW/Library/Implementation/HTTP.c:2482
 msgid "Unknown status reply from server!"
 msgstr "Ukendt statussvar fra server!"
 
@@ -3530,98 +3539,98 @@ msgstr "Hukommelse opbrugt, fremvisning afbrudt!"
 msgid "Memory exhausted, will interrupt transfer!"
 msgstr "Hukommelse opbrugt, vil afbryde overførsel!"
 
-#: src/GridText.c:3674
+#: src/GridText.c:3666
 msgid " *** MEMORY EXHAUSTED ***"
 msgstr " *** HUKOMMELSE OPBRUGT ***"
 
-#: src/GridText.c:6152
+#: src/GridText.c:6144
 msgid "text entry field"
 msgstr "indtast tekst"
 
-#: src/GridText.c:6155
+#: src/GridText.c:6147
 msgid "password entry field"
 msgstr "indtast adgangskode"
 
-#: src/GridText.c:6158
+#: src/GridText.c:6150
 msgid "checkbox"
-msgstr "afkrydsningsboks"
+msgstr "afkrydsningsfelt"
 
-#: src/GridText.c:6161
+#: src/GridText.c:6153
 msgid "radio button"
 msgstr "radioknap"
 
-#: src/GridText.c:6164
+#: src/GridText.c:6156
 msgid "submit button"
 msgstr "indsendelsesknap"
 
-#: src/GridText.c:6167
+#: src/GridText.c:6159
 msgid "reset button"
 msgstr "nulstillingsknap"
 
-#: src/GridText.c:6170
+#: src/GridText.c:6162
 msgid "script button"
 msgstr "script-knap"
 
-#: src/GridText.c:6173
+#: src/GridText.c:6165
 msgid "popup menu"
 msgstr "pop up-menu"
 
-#: src/GridText.c:6176
+#: src/GridText.c:6168
 msgid "hidden form field"
 msgstr "skjult formularfelt"
 
-#: src/GridText.c:6179
+#: src/GridText.c:6171
 msgid "text entry area"
 msgstr "indtast tekst"
 
-#: src/GridText.c:6182
+#: src/GridText.c:6174
 msgid "range entry field"
 msgstr "angiv interval"
 
-#: src/GridText.c:6185
+#: src/GridText.c:6177
 msgid "file entry field"
 msgstr "angiv fil"
 
-#: src/GridText.c:6188
+#: src/GridText.c:6180
 msgid "text-submit field"
 msgstr "tekstindsendelsesfelt"
 
-#: src/GridText.c:6191
+#: src/GridText.c:6183
 msgid "image-submit button"
 msgstr "Billedindsendelsesknap"
 
-#: src/GridText.c:6194
+#: src/GridText.c:6186
 msgid "keygen field"
 msgstr "nøglegen-felt"
 
-#: src/GridText.c:6197
+#: src/GridText.c:6189
 msgid "unknown form field"
 msgstr "ukendt formularfelt"
 
-#: src/GridText.c:6217 src/GridText.c:6224 src/LYList.c:249
+#: src/GridText.c:6209 src/GridText.c:6216 src/LYList.c:249
 msgid "unknown field or link"
 msgstr "ukendt felt eller link"
 
-#: src/GridText.c:10650
+#: src/GridText.c:10633
 msgid "Can't open file for uploading"
 msgstr "Kan ikke åbne fil til upload"
 
-#: src/GridText.c:11843
+#: src/GridText.c:11821
 #, c-format
 msgid "Submitting %s"
 msgstr "Indsender %s"
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12919
+#: src/GridText.c:12891
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr "Program hænger: TextAnchor-struktur ødelagt - det er bedst at afbryde!"
 
 #. don't show previous state
-#: src/GridText.c:13083
+#: src/GridText.c:13050
 msgid "Wrap lines to fit displayed area?"
 msgstr "Ombryd linjer så de passer til det viste område?"
 
-#: src/GridText.c:13719
+#: src/GridText.c:13680
 msgid "Very long lines have been truncated!"
 msgstr "Meget lange linjer er blevet afkortet!"
 
@@ -3711,27 +3720,27 @@ msgstr "nej"
 #. * (Y/N/Always/neVer)              - English (original)
 #. * (O/N/Toujours/Jamais)           - French
 #.
-#: src/HTAlert.c:940
+#: src/HTAlert.c:938
 msgid "Y/N/A/V"
 msgstr "J/N/A/I"
 
-#: src/HTML.c:5931
+#: src/HTML.c:5932
 msgid "Description:"
 msgstr "Beskrivelse:"
 
-#: src/HTML.c:5936
+#: src/HTML.c:5937
 msgid "(none)"
 msgstr "(ingen)"
 
-#: src/HTML.c:5940
+#: src/HTML.c:5941
 msgid "Filepath:"
 msgstr "Filsti:"
 
-#: src/HTML.c:5946
+#: src/HTML.c:5947
 msgid "(unknown)"
 msgstr "(ukendt)"
 
-#: src/HTML.c:7386
+#: src/HTML.c:7387
 msgid "Document has only hidden links.  Use the 'l'ist command."
 msgstr "Dokument har kun skjulte links. Brug 'l'istekommandoen."
 
@@ -3800,7 +3809,7 @@ msgstr ""
 msgid "File may be recoverable from %s during this session"
 msgstr "Fil kan måske genskabes fra %s under denne session"
 
-#: src/LYCgi.c:162
+#: src/LYCgi.c:161
 #, c-format
 msgid "Do you want to execute \"%s\"?"
 msgstr "Vil du udføre \"%s\"?"
@@ -3809,23 +3818,23 @@ msgstr "Vil du udføre \"%s\"?"
 #. * Neither the path as given nor any components examined by backing up
 #. * were stat()able.  - kw
 #.
-#: src/LYCgi.c:277
+#: src/LYCgi.c:276
 msgid "Unable to access cgi script"
 msgstr "Kan ikke få adgang til cgi-program"
 
-#: src/LYCgi.c:711 src/LYCgi.c:714
+#: src/LYCgi.c:709 src/LYCgi.c:712
 msgid "Good Advice"
 msgstr "Godt råd"
 
-#: src/LYCgi.c:718
+#: src/LYCgi.c:716
 msgid "An excellent http server for VMS is available via"
 msgstr "En fortrinlig HTTP-server for VMS kan findes via"
 
-#: src/LYCgi.c:725
+#: src/LYCgi.c:723
 msgid "this link"
 msgstr "dette link"
 
-#: src/LYCgi.c:729
+#: src/LYCgi.c:727
 msgid "It provides state of the art CGI script support.\n"
 msgstr "Den tilbyder upåklagelig understøttelse af CGI-programmer\n"
 
@@ -3833,19 +3842,19 @@ msgstr "Den tilbyder upåklagelig understøttelse af CGI-programmer\n"
 msgid "Exiting via interrupt:"
 msgstr "Afslutter via interrupt:"
 
-#: src/LYCookie.c:2541
+#: src/LYCookie.c:2537
 msgid "(from a previous session)"
 msgstr "(fra en foregående session)"
 
-#: src/LYCookie.c:2602
+#: src/LYCookie.c:2598
 msgid "Maximum Gobble Date:"
 msgstr "Udløbsdato for cookie:"
 
-#: src/LYCookie.c:2641
+#: src/LYCookie.c:2637
 msgid "Internal"
 msgstr "Intern"
 
-#: src/LYCookie.c:2642
+#: src/LYCookie.c:2638
 msgid "cookie_domain_flag_set error, aborting program"
 msgstr "'cookie_domain_set_flag'-fejl, afbryder program"
 
@@ -3857,27 +3866,27 @@ msgstr "Ny klargøring af terminal slog fejl - ukendt terminaltype?"
 msgid "Terminal initialisation failed - unknown terminal type?"
 msgstr "Klargøring af terminal slog fejl - ukendt terminaltype?"
 
-#: src/LYCurses.c:1863
+#: src/LYCurses.c:1869
 msgid "Terminal ="
 msgstr "Terminal ="
 
-#: src/LYCurses.c:1867
+#: src/LYCurses.c:1873
 msgid "You must use a vt100, 200, etc. terminal with this program."
 msgstr "Du skal bruge en vt100, 200, etc. terminal med dette program."
 
-#: src/LYCurses.c:1916
+#: src/LYCurses.c:1922
 msgid "Your Terminal type is unknown!"
 msgstr "Din terminaltype er ukendt!"
 
-#: src/LYCurses.c:1917
+#: src/LYCurses.c:1923
 msgid "Enter a terminal type:"
 msgstr "Anfør en terminaltype:"
 
-#: src/LYCurses.c:1931
+#: src/LYCurses.c:1937
 msgid "TERMINAL TYPE IS SET TO"
 msgstr "TERMINAL-TYPE SAT TIL"
 
-#: src/LYCurses.c:2483
+#: src/LYCurses.c:2491
 #, c-format
 msgid ""
 "\n"
@@ -3886,7 +3895,7 @@ msgstr ""
 "\n"
 "Der opstod en kritisk fejl i %s Ver. %s\n"
 
-#: src/LYCurses.c:2486
+#: src/LYCurses.c:2494
 #, c-format
 msgid ""
 "\n"
@@ -3955,31 +3964,31 @@ msgstr "Egne tilføjelser:"
 msgid "No Name Given"
 msgstr "Intet navn givet"
 
-#: src/LYHistory.c:680
+#: src/LYHistory.c:676
 msgid "You selected:"
 msgstr "Du valgte:"
 
-#: src/LYHistory.c:704 src/LYHistory.c:933
+#: src/LYHistory.c:700 src/LYHistory.c:929
 msgid "(no address)"
 msgstr "(ingen adresse)"
 
-#: src/LYHistory.c:708
+#: src/LYHistory.c:704
 msgid " (internal)"
 msgstr " (intern)"
 
-#: src/LYHistory.c:710
+#: src/LYHistory.c:706
 msgid " (was internal)"
 msgstr " (var intern)"
 
-#: src/LYHistory.c:808
+#: src/LYHistory.c:804
 msgid " (From History)"
 msgstr " (Fra historik)"
 
-#: src/LYHistory.c:853
+#: src/LYHistory.c:849
 msgid "You visited (POSTs, bookmark, menu and list files excluded):"
 msgstr "Du har besøgt: ('POSTs', bogmærke-, menu- og listefiler undtaget)"
 
-#: src/LYHistory.c:1155
+#: src/LYHistory.c:1151
 msgid "(No messages yet)"
 msgstr "(Ingen meddelelser endnu)"
 
@@ -4319,7 +4328,7 @@ msgstr "Står allerede i målkataloget: %s"
 msgid "Installation complete"
 msgstr "Installering fuldført"
 
-#: src/LYLocal.c:2680
+#: src/LYLocal.c:2678
 msgid "Temporary URL or list would be too long."
 msgstr "Midlertidig adresse eller listen ville blive for lang."
 
@@ -4358,19 +4367,19 @@ msgstr "Denne meddelelse blev automatisk lavet af"
 msgid "No system mailer configured"
 msgstr "Systemets postprogram er ikke sat op"
 
-#: src/LYMain.c:1071
+#: src/LYMain.c:1074
 msgid "No Winsock found, sorry."
 msgstr "Ingen \"Winsock\" fundet, beklager."
 
-#: src/LYMain.c:1262
+#: src/LYMain.c:1265
 msgid "You MUST define a valid TMP or TEMP area!"
 msgstr "Du SKAL definere et gyldigt TMP- eller TEMP-område!"
 
-#: src/LYMain.c:1315 src/LYMainLoop.c:5283
+#: src/LYMain.c:1318 src/LYMainLoop.c:5284
 msgid "No such directory"
 msgstr "Intet sådant filkatalog"
 
-#: src/LYMain.c:1509
+#: src/LYMain.c:1512
 #, c-format
 msgid ""
 "\n"
@@ -4381,7 +4390,7 @@ msgstr ""
 "Opsætningsfil \"%s\" er ikke tilgængelig.\n"
 "\n"
 
-#: src/LYMain.c:1519
+#: src/LYMain.c:1522
 #, c-format
 msgid ""
 "\n"
@@ -4392,66 +4401,67 @@ msgstr ""
 "Lynx' tegnsæt er ikke angivet.\n"
 "\n"
 
-#: src/LYMain.c:1675
+#: src/LYMain.c:1678
 #, c-format
 msgid "Ignored %d characters from standard input.\n"
 msgstr "Ignorerede %d tegn fra standardind.\n"
 
-#: src/LYMain.c:1677
+#: src/LYMain.c:1680
 #, c-format
 msgid "Use \"-stdin\" or \"-\" to tell how to handle piped input.\n"
 msgstr "Brug \"-stdin\" eller \"-\" til at fortælle hvordan inddata i datakanal skal håndteres.\n"
 
-#: src/LYMain.c:1835
+#: src/LYMain.c:1838
 msgid "Warning:"
 msgstr "Advarsel:"
 
-#: src/LYMain.c:2405
+#: src/LYMain.c:2408
 msgid "persistent cookies state will be changed in next session only."
 msgstr "Ændring for varige cookier vil kun gælde næste session."
 
-#: src/LYMain.c:2642 src/LYMain.c:2687
+#: src/LYMain.c:2645 src/LYMain.c:2690
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr "Lynx: Ignorerer ukendt tegnsæt=%s\n"
 
-#: src/LYMain.c:3206
+#: src/LYMain.c:3209
 #, c-format
 msgid "%s Version %s (%s)"
 msgstr "%s Version %s (%s)"
 
-#: src/LYMain.c:3247
+# Vi ved ikke om det er dato, platform eller begge dele.  Gerne "Bygget: %s%s"
+#: src/LYMain.c:3250
 #, c-format
 msgid "Built on %s%s.\n"
-msgstr "Bygget på %s%s.\n"
+msgstr "Bygget: %s%s.\n"
 
-#: src/LYMain.c:3261
+#: src/LYMain.c:3264
 msgid "Copyrights held by the Lynx Developers Group,"
 msgstr "Ophavsret ejet af Lynx Developers Group,"
 
-#: src/LYMain.c:3262
+#: src/LYMain.c:3265
 msgid "the University of Kansas, CERN, and other contributors."
 msgstr "Kansas' Universitet, CERN og andre bidragydere."
 
-#: src/LYMain.c:3263
+#: src/LYMain.c:3266
 msgid "Distributed under the GNU General Public License (Version 2)."
 msgstr "Distribueret under GNU General Public License (version 2)."
 
-#: src/LYMain.c:3264
+#: src/LYMain.c:3267
 msgid "See http://lynx.invisible-island.net/ and the online help for more information."
 msgstr "Se http://lynx.invisible-island.net/ og online-hjælpen for flere oplysninger."
 
-#: src/LYMain.c:4107
+#: src/LYMain.c:4118
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "BRUG: %s [valgmuligheder] [fil]\n"
 
-#: src/LYMain.c:4108
+#: src/LYMain.c:4119
 #, c-format
 msgid "Options are:\n"
 msgstr "Valgmuligheder er:\n"
 
-#: src/LYMain.c:4411
+#: src/LYMain.c:4422
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr "%s: Ugyldig indstilling: %s\n"
@@ -4461,7 +4471,7 @@ msgstr "%s: Ugyldig indstilling: %s\n"
 msgid "Internal error: Invalid mouse link %d!"
 msgstr "Intern fejl: Ugyldigt muselink %d!"
 
-#: src/LYMainLoop.c:693 src/LYMainLoop.c:5305
+#: src/LYMainLoop.c:693 src/LYMainLoop.c:5306
 msgid "A URL specified by the user"
 msgstr "En adresse angivet af brugeren"
 
@@ -4480,89 +4490,89 @@ msgstr "Hjælpeskærm"
 msgid "System Index"
 msgstr "Systemfortegnelse"
 
-#: src/LYMainLoop.c:3575
+#: src/LYMainLoop.c:3576
 #, c-format
 msgid "Query parameter %d: "
 msgstr "Forespørgselsparameter %d:"
 
-#: src/LYMainLoop.c:3804 src/LYMainLoop.c:5581
+#: src/LYMainLoop.c:3805 src/LYMainLoop.c:5582
 msgid "Entry into main screen"
 msgstr "Indgang til hovedskærm"
 
-#: src/LYMainLoop.c:4062
+#: src/LYMainLoop.c:4063
 msgid "No next document present"
 msgstr "Ingen yderligere dokumenter"
 
-#: src/LYMainLoop.c:4357
+#: src/LYMainLoop.c:4358
 msgid "charset for this document specified explicitly, sorry..."
 msgstr "dette dokuments tegnsæt er udtrykkeligt angivet, beklager ..."
 
-#: src/LYMainLoop.c:5263
+#: src/LYMainLoop.c:5264
 msgid "cd to:"
 msgstr "cd til: "
 
-#: src/LYMainLoop.c:5286
+#: src/LYMainLoop.c:5287
 msgid "A component of path is not a directory"
 msgstr "En del af stien er ikke et filkatalog"
 
-#: src/LYMainLoop.c:5289
+#: src/LYMainLoop.c:5290
 msgid "failed to change directory"
 msgstr "kunne ikke skifte filkatalog."
 
-#: src/LYMainLoop.c:6515
+#: src/LYMainLoop.c:6516
 msgid "Reparsing document under current settings..."
 msgstr "Genfortolker dokument under nuværende indstillinger ..."
 
-#: src/LYMainLoop.c:6809
+#: src/LYMainLoop.c:6810
 #, c-format
 msgid "Fatal error - could not open output file %s\n"
 msgstr "Kritisk fejl - kunne ikke åbne uddatafil %s\n"
 
-#: src/LYMainLoop.c:7151
+#: src/LYMainLoop.c:7152
 msgid "TABLE center enable."
 msgstr "TABEL-centrering slået til."
 
-#: src/LYMainLoop.c:7154
+#: src/LYMainLoop.c:7155
 msgid "TABLE center disable."
 msgstr "TABEL-centrering slået fra."
 
-#: src/LYMainLoop.c:7234
+#: src/LYMainLoop.c:7235
 msgid "Current URL is empty."
 msgstr "Aktuelle adresse er tom."
 
-#: src/LYMainLoop.c:7236 src/LYUtils.c:1917
+#: src/LYMainLoop.c:7237 src/LYUtils.c:1915
 msgid "Copy to clipboard failed."
 msgstr "Kopiering til klippebord slog fejl."
 
-#: src/LYMainLoop.c:7238
+#: src/LYMainLoop.c:7239
 msgid "Document URL put to clipboard."
 msgstr "Dokumentets adresse overført til klippebord."
 
-#: src/LYMainLoop.c:7240
+#: src/LYMainLoop.c:7241
 msgid "Link URL put to clipboard."
 msgstr "Linkets adresse overført til klippebord."
 
-#: src/LYMainLoop.c:7267
+#: src/LYMainLoop.c:7268
 msgid "No URL in the clipboard."
 msgstr "Ingen adresse ligger på klippebord."
 
-#: src/LYMainLoop.c:7960 src/LYMainLoop.c:8131
+#: src/LYMainLoop.c:7961 src/LYMainLoop.c:8132
 msgid "-index-"
 msgstr "-indeks-"
 
-#: src/LYMainLoop.c:8069
+#: src/LYMainLoop.c:8070
 msgid "lynx: Can't access startfile"
 msgstr "lynx: Kan ikke få adgang til startfil"
 
-#: src/LYMainLoop.c:8081
+#: src/LYMainLoop.c:8082
 msgid "lynx: Start file could not be found or is not text/html or text/plain"
 msgstr "lynx: startfil fandtes ikke eller er ikke i text/html, text/plain format"
 
-#: src/LYMainLoop.c:8082
+#: src/LYMainLoop.c:8083
 msgid "      Exiting..."
 msgstr "      Afslutter ..."
 
-#: src/LYMainLoop.c:8125
+#: src/LYMainLoop.c:8126
 msgid "-more-"
 msgstr "-mere-"
 
@@ -4634,375 +4644,393 @@ msgstr "gennemse/rediger B)ogmærkefiler"
 msgid "B)ookmark file: "
 msgstr "B)ogmærkefil: "
 
-#: src/LYOptions.c:2123 src/LYOptions.c:2130
+#: src/LYOptions.c:2127 src/LYOptions.c:2134
 msgid "ON"
 msgstr "SLÅET TIL"
 
 #. verbose_img variable
-#: src/LYOptions.c:2124 src/LYOptions.c:2129 src/LYOptions.c:2302
-#: src/LYOptions.c:2313
+#. LYCollapseBRs variable
+#. LYtrimBlankLines variable
+#: src/LYOptions.c:2128 src/LYOptions.c:2133 src/LYOptions.c:2306
+#: src/LYOptions.c:2315 src/LYOptions.c:2324 src/LYOptions.c:2335
 msgid "OFF"
 msgstr "SLÅET FRA"
 
-#: src/LYOptions.c:2125
+#: src/LYOptions.c:2129
 msgid "NEVER"
 msgstr "ALDRIG"
 
-#: src/LYOptions.c:2126
+#: src/LYOptions.c:2130
 msgid "ALWAYS"
 msgstr "ALTID"
 
-#: src/LYOptions.c:2142 src/LYOptions.c:2294
+#: src/LYOptions.c:2146 src/LYOptions.c:2298
 msgid "ignore"
 msgstr "ignorér"
 
-#: src/LYOptions.c:2143
+#: src/LYOptions.c:2147
 msgid "ask user"
 msgstr "spørg bruger"
 
-#: src/LYOptions.c:2144
+#: src/LYOptions.c:2148
 msgid "accept all"
 msgstr "godtag alle"
 
-#: src/LYOptions.c:2156
+#: src/LYOptions.c:2160
 msgid "ALWAYS OFF"
 msgstr "ALTID SLÅET FRA"
 
-#: src/LYOptions.c:2157
+#: src/LYOptions.c:2161
 msgid "FOR LOCAL FILES ONLY"
 msgstr "KUN FOR LOKALE FILER"
 
-#: src/LYOptions.c:2159
+#: src/LYOptions.c:2163
 msgid "ALWAYS ON"
 msgstr "ALTID SLÅET TIL"
 
-#: src/LYOptions.c:2171
+#: src/LYOptions.c:2175
 msgid "Numbers act as arrows"
 msgstr "Pile på numerisk tastatur aktive"
 
-#: src/LYOptions.c:2173
+#: src/LYOptions.c:2177
 msgid "Links are numbered"
 msgstr "Links er nummererede"
 
-#: src/LYOptions.c:2176
+#: src/LYOptions.c:2180
 msgid "Links and form fields are numbered"
 msgstr "Links og formularfelter er nummererede"
 
-#: src/LYOptions.c:2179
+#: src/LYOptions.c:2183
 msgid "Form fields are numbered"
 msgstr "Formularfelter er nummererede"
 
-#: src/LYOptions.c:2194
+#: src/LYOptions.c:2198
 msgid "Case insensitive"
 msgstr "Ikke versalfølsom"
 
-#: src/LYOptions.c:2195
+#: src/LYOptions.c:2199
 msgid "Case sensitive"
 msgstr "Versalfølsom"
 
-#: src/LYOptions.c:2229
+#: src/LYOptions.c:2233
 msgid "prompt normally"
 msgstr "normal prompt"
 
-#: src/LYOptions.c:2230
+#: src/LYOptions.c:2234
 msgid "force yes-response"
 msgstr "gennemtving bekræftende svar"
 
-#: src/LYOptions.c:2231
+#: src/LYOptions.c:2235
 msgid "force no-response"
 msgstr "gennemtving benægtende svar"
 
-#: src/LYOptions.c:2249
+#: src/LYOptions.c:2253
 msgid "Novice"
 msgstr "Begynder"
 
-#: src/LYOptions.c:2250
+#: src/LYOptions.c:2254
 msgid "Intermediate"
 msgstr "Videregående"
 
-#: src/LYOptions.c:2251
+#: src/LYOptions.c:2255
 msgid "Advanced"
 msgstr "Avanceret"
 
-#: src/LYOptions.c:2260
+#: src/LYOptions.c:2264
 msgid "By First Visit"
 msgstr "Ved første besøg"
 
-#: src/LYOptions.c:2262
+#: src/LYOptions.c:2266
 msgid "By First Visit Reversed"
 msgstr "Ved første besøg, i omvendt orden"
 
-#: src/LYOptions.c:2263
+#: src/LYOptions.c:2267
 msgid "As Visit Tree"
 msgstr "Som træstruktur over besøg"
 
-#: src/LYOptions.c:2264
+#: src/LYOptions.c:2268
 msgid "By Last Visit"
 msgstr "Efter sidste besøg"
 
-#: src/LYOptions.c:2266
+#: src/LYOptions.c:2270
 msgid "By Last Visit Reversed"
 msgstr "Efter sidste besøg, i omvendt orden"
 
 #. Old_DTD variable
-#: src/LYOptions.c:2277
+#: src/LYOptions.c:2281
 msgid "relaxed (TagSoup mode)"
 msgstr "afslappet (TagSoup-tilstand)"
 
-#: src/LYOptions.c:2278
+#: src/LYOptions.c:2282
 msgid "strict (SortaSGML mode)"
 msgstr "striks (SortaSGML-tilstand)"
 
-#: src/LYOptions.c:2285
+#: src/LYOptions.c:2289
 msgid "Ignore"
 msgstr "Ignorér"
 
-#: src/LYOptions.c:2286
+#: src/LYOptions.c:2290
 msgid "Add to trace-file"
 msgstr "Tilføj til sporingsfil"
 
-#: src/LYOptions.c:2287
+#: src/LYOptions.c:2291
 msgid "Add to LYNXMESSAGES"
 msgstr "Tilføj til LYNXMESSAGES"
 
-#: src/LYOptions.c:2288
+#: src/LYOptions.c:2292
 msgid "Warn, point to trace-file"
 msgstr "Advar, peg på sporingsfil"
 
-#: src/LYOptions.c:2295
+#: src/LYOptions.c:2299
 msgid "as labels"
 msgstr "som etiketter"
 
-#: src/LYOptions.c:2296
+#: src/LYOptions.c:2300
 msgid "as links"
 msgstr "som links"
 
-#: src/LYOptions.c:2303
+#: src/LYOptions.c:2307
 msgid "show filename"
 msgstr "vis filnavn"
 
-#: src/LYOptions.c:2314
+#: src/LYOptions.c:2316
+msgid "collapse"
+msgstr "saml"
+
+#: src/LYOptions.c:2325
+msgid "trim-lines"
+msgstr "trim-linjer"
+
+#: src/LYOptions.c:2336
 msgid "STANDARD"
 msgstr "STANDARD"
 
-#: src/LYOptions.c:2315
+#: src/LYOptions.c:2337
 msgid "ADVANCED"
 msgstr "AVANCERET"
 
-#: src/LYOptions.c:2349
+#: src/LYOptions.c:2371
 msgid "Directories first"
 msgstr "Filkataloger først"
 
-#: src/LYOptions.c:2350
+#: src/LYOptions.c:2372
 msgid "Files first"
 msgstr "Filer først"
 
-#: src/LYOptions.c:2351
+#: src/LYOptions.c:2373
 msgid "Mixed style"
 msgstr "Blandet stil"
 
-#: src/LYOptions.c:2359 src/LYOptions.c:2379
+#: src/LYOptions.c:2381 src/LYOptions.c:2401
 msgid "By Name"
 msgstr "Efter navn"
 
-#: src/LYOptions.c:2360 src/LYOptions.c:2380
+#: src/LYOptions.c:2382 src/LYOptions.c:2402
 msgid "By Type"
 msgstr "Efter type"
 
-#: src/LYOptions.c:2361 src/LYOptions.c:2381
+#: src/LYOptions.c:2383 src/LYOptions.c:2403
 msgid "By Size"
 msgstr "Efter størrelse"
 
-#: src/LYOptions.c:2362 src/LYOptions.c:2382
+#: src/LYOptions.c:2384 src/LYOptions.c:2404
 msgid "By Date"
 msgstr "Efter dato"
 
-#: src/LYOptions.c:2363
+#: src/LYOptions.c:2385
 msgid "By Mode"
 msgstr "Efter tilstand"
 
-#: src/LYOptions.c:2365
+#: src/LYOptions.c:2387
 msgid "By User"
 msgstr "Efter bruger"
 
-#: src/LYOptions.c:2366
+#: src/LYOptions.c:2388
 msgid "By Group"
 msgstr "Efter gruppe"
 
-#: src/LYOptions.c:2391
+#: src/LYOptions.c:2413
 msgid "Do not show rate"
 msgstr "Vis ikke overførselshastighed"
 
-#: src/LYOptions.c:2392 src/LYOptions.c:2393
+#: src/LYOptions.c:2414 src/LYOptions.c:2415
 #, c-format
 msgid "Show %s/sec rate"
 msgstr "Vis hastighed i %s/sek "
 
-#: src/LYOptions.c:2395 src/LYOptions.c:2396
+#: src/LYOptions.c:2417 src/LYOptions.c:2418
 #, c-format
 msgid "Show %s/sec, ETA"
 msgstr "Vis %s/sek, ETA"
 
-#: src/LYOptions.c:2397 src/LYOptions.c:2398
+#: src/LYOptions.c:2419 src/LYOptions.c:2420
 #, c-format
 msgid "Show %s/sec (2-digits), ETA"
 msgstr "Vis %s/sek (2-cifre), EAT"
 
-#: src/LYOptions.c:2401
+#: src/LYOptions.c:2423
 msgid "Show progressbar"
 msgstr "Vis statusbjælke"
 
 # types = mime-types
-#: src/LYOptions.c:2413
+#: src/LYOptions.c:2435
 msgid "Accept lynx's internal types"
 msgstr "Godtag Lynx' indbyggede MIME-typer"
 
-#: src/LYOptions.c:2414
+#: src/LYOptions.c:2436
 msgid "Also accept lynx.cfg's types"
 msgstr "Godtag også MIME-typer i lynx.cfg"
 
-#: src/LYOptions.c:2415
+#: src/LYOptions.c:2437
 msgid "Also accept user's types"
 msgstr "Godtag også brugerens MIME-typer"
 
-#: src/LYOptions.c:2416
+#: src/LYOptions.c:2438
 msgid "Also accept system's types"
 msgstr "Godtag også systemets MIME-typer"
 
-#: src/LYOptions.c:2417
+#: src/LYOptions.c:2439
 msgid "Accept all types"
 msgstr "Godtag alle MIME-typer"
 
-#: src/LYOptions.c:2426
+#: src/LYOptions.c:2448
 msgid "gzip"
 msgstr "gzip"
 
-#: src/LYOptions.c:2427
+#: src/LYOptions.c:2449
 msgid "deflate"
 msgstr "deflate"
 
-#: src/LYOptions.c:2430
+#: src/LYOptions.c:2452
 msgid "compress"
 msgstr "compress"
 
-#: src/LYOptions.c:2433
+#: src/LYOptions.c:2455
 msgid "bzip2"
 msgstr "bzip2"
 
-#: src/LYOptions.c:2435
+#: src/LYOptions.c:2457
 msgid "All"
 msgstr "Alle"
 
-#: src/LYOptions.c:2801 src/LYOptions.c:2830
+#: src/LYOptions.c:2467
+msgid "HTTP 1.0"
+msgstr "HTTP 1.0"
+
+#: src/LYOptions.c:2468
+msgid "HTTP 1.1"
+msgstr "HTTP 1.1"
+
+#: src/LYOptions.c:2827 src/LYOptions.c:2856
 #, c-format
 msgid "Use %s to invoke the Options menu!"
 msgstr "Brug %s for at aktivere menu over valgmuligheder!"
 
-#: src/LYOptions.c:3688
+#: src/LYOptions.c:3739
 msgid "(options marked with (!) will not be saved)"
 msgstr "(indstillinger markeret med (!) vil ikke blive gemt)"
 
-#: src/LYOptions.c:3696
+#: src/LYOptions.c:3747
 msgid "General Preferences"
 msgstr "Generelle indstillinger"
 
 #. ***************************************************************
 #. User Mode: SELECT
-#: src/LYOptions.c:3700
+#: src/LYOptions.c:3751
 msgid "User mode"
 msgstr "Brugertilstand"
 
 #. Editor: INPUT
-#: src/LYOptions.c:3706
+#: src/LYOptions.c:3757
 msgid "Editor"
 msgstr "Editor"
 
 #. Search Type: SELECT
-#: src/LYOptions.c:3711
+#: src/LYOptions.c:3762
 msgid "Type of Search"
 msgstr "Søgningstype"
 
-#: src/LYOptions.c:3716
+#: src/LYOptions.c:3767
 msgid "Security and Privacy"
 msgstr "Sikkerhed og beskyttelse af persondata"
 
 #. ***************************************************************
 #. Cookies: SELECT
-#: src/LYOptions.c:3720
+#: src/LYOptions.c:3771
 msgid "Cookies"
 msgstr "Cookier"
 
 #. Cookie Prompting: SELECT
-#: src/LYOptions.c:3734
+#: src/LYOptions.c:3785
 msgid "Invalid-Cookie Prompting"
 msgstr "Prompt ved ugyldig cookie"
 
 #. SSL Prompting: SELECT
-#: src/LYOptions.c:3741
+#: src/LYOptions.c:3792
 msgid "SSL Prompting"
 msgstr "Prompt ved SSL"
 
-#: src/LYOptions.c:3746
+#: src/LYOptions.c:3797
 msgid "SSL client certificate file"
 msgstr "SSL-klientcertifikatfil"
 
-#: src/LYOptions.c:3750
+#: src/LYOptions.c:3801
 msgid "SSL client key file"
 msgstr "SSL-klientnøglefil"
 
-#: src/LYOptions.c:3756
+#: src/LYOptions.c:3807
 msgid "Keyboard Input"
 msgstr "Tastatur-inddata"
 
 #. ***************************************************************
 #. Keypad Mode: SELECT
-#: src/LYOptions.c:3760
+#: src/LYOptions.c:3811
 msgid "Keypad mode"
 msgstr "Numerisk tastaturtilstand"
 
 #. Emacs keys: ON/OFF
-#: src/LYOptions.c:3766
+#: src/LYOptions.c:3817
 msgid "Emacs keys"
 msgstr "Emacs-taster"
 
 #. VI Keys: ON/OFF
-#: src/LYOptions.c:3772
+#: src/LYOptions.c:3823
 msgid "VI keys"
 msgstr "VI-taster"
 
 #. Line edit style: SELECT
 #. well, at least 2 line edit styles available
-#: src/LYOptions.c:3779
+#: src/LYOptions.c:3830
 msgid "Line edit style"
 msgstr "Linjeredigeringsstil"
 
 #. Keyboard layout: SELECT
-#: src/LYOptions.c:3791
+#: src/LYOptions.c:3842
 msgid "Keyboard layout"
 msgstr "Tastaturudlægning"
 
 #.
 #. * Display and Character Set
 #.
-#: src/LYOptions.c:3805
+#: src/LYOptions.c:3856
 msgid "Display and Character Set"
 msgstr "Skærm og tegnsæt"
 
 #. Use locale-based character set: ON/OFF
-#: src/LYOptions.c:3810
+#: src/LYOptions.c:3861
 msgid "Use locale-based character set"
 msgstr "Brug tegnsæt baseret på lokaliseringsindstillinger"
 
-#: src/LYOptions.c:3817
+#: src/LYOptions.c:3868
 msgid "Use HTML5 charset replacements"
 msgstr "Brug erstatninger for HTML5-tegnsæt"
 
 #. Display Character Set: SELECT
-#: src/LYOptions.c:3823
+#: src/LYOptions.c:3874
 msgid "Display character set"
 msgstr "Skærmtegnsæt"
 
-#: src/LYOptions.c:3854
+#: src/LYOptions.c:3905
 msgid "Assumed document character set"
 msgstr "Formodet dokumenttegnsæt"
 
@@ -5011,212 +5039,227 @@ msgstr "Formodet dokumenttegnsæt"
 #. * we split the header to make it more readable:
 #. * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others.
 #.
-#: src/LYOptions.c:3874
+#: src/LYOptions.c:3925
 msgid "CJK mode"
 msgstr "CJK-tilstand"
 
-#: src/LYOptions.c:3876
+#: src/LYOptions.c:3927
 msgid "Raw 8-bit"
 msgstr "Rå 8-bit"
 
 #. X Display: INPUT
-#: src/LYOptions.c:3884
+#: src/LYOptions.c:3935
 msgid "X Display"
 msgstr "X-skærm"
 
 #.
 #. * Document Appearance
 #.
-#: src/LYOptions.c:3890
+#: src/LYOptions.c:3941
 msgid "Document Appearance"
 msgstr "Udseende af dokument"
 
-#: src/LYOptions.c:3896
+#: src/LYOptions.c:3947
 msgid "Show color"
 msgstr "Vis farver"
 
 #. Color style: ON/OFF
-#: src/LYOptions.c:3921
+#: src/LYOptions.c:3972
 msgid "Color style"
 msgstr "Farvestil"
 
-#: src/LYOptions.c:3930
+#: src/LYOptions.c:3981
 msgid "Default colors"
 msgstr "Standardfarver"
 
 #. Show cursor: ON/OFF
-#: src/LYOptions.c:3938
+#: src/LYOptions.c:3989
 msgid "Show cursor"
 msgstr "Vis markør"
 
 #. Underline links: ON/OFF
-#: src/LYOptions.c:3944
+#: src/LYOptions.c:3995
 msgid "Underline links"
 msgstr "Understreg links"
 
 #. Show scrollbar: ON/OFF
-#: src/LYOptions.c:3951
+#: src/LYOptions.c:4002
 msgid "Show scrollbar"
 msgstr "Vis rullebjælke"
 
 #. Select Popups: ON/OFF
-#: src/LYOptions.c:3958
+#: src/LYOptions.c:4009
 msgid "Popups for select fields"
 msgstr "Pop op-vinduer for valgte felter"
 
 #. HTML error recovery: SELECT
-#: src/LYOptions.c:3964
+#: src/LYOptions.c:4015
 msgid "HTML error recovery"
 msgstr "HTML-fejlgenopretning"
 
 #. Bad HTML messages: SELECT
-#: src/LYOptions.c:3970
+#: src/LYOptions.c:4021
 msgid "Bad HTML messages"
 msgstr "Ugyldige HTML-beskeder"
 
 #. Show Images: SELECT
-#: src/LYOptions.c:3976
+#: src/LYOptions.c:4027
 msgid "Show images"
 msgstr "Vis billeder"
 
 #. Verbose Images: ON/OFF
-#: src/LYOptions.c:3990
+#: src/LYOptions.c:4041
 msgid "Verbose images"
 msgstr "Billedtekst"
 
+#. Collapse BR Tags: ON/OFF
+#: src/LYOptions.c:4047
+msgid "Collapse BR tags"
+msgstr "Saml BR-angivelser"
+
+#. Trim blank lines: ON/OFF
+#: src/LYOptions.c:4053
+msgid "Trim blank lines"
+msgstr "Trim tomme linjer"
+
 #.
 #. * Headers Transferred to Remote Servers
 #.
-#: src/LYOptions.c:3998
+#: src/LYOptions.c:4061
 msgid "Headers Transferred to Remote Servers"
 msgstr "Information til fremmede servere"
 
 #. ***************************************************************
 #. Mail Address: INPUT
-#: src/LYOptions.c:4002
+#: src/LYOptions.c:4065
 msgid "Personal mail address"
 msgstr "Personlig e-post-adresse"
 
-#: src/LYOptions.c:4007
+#: src/LYOptions.c:4070
 msgid "Personal name for mail"
 msgstr "Personlig navn for post"
 
-#: src/LYOptions.c:4014
+#: src/LYOptions.c:4077
 msgid "Password for anonymous ftp"
 msgstr "Adgangskode til anonymous ftp"
 
 # media type refererer til content-type headeren, eks: image/xyz
 #. Preferred media type: SELECT
-#: src/LYOptions.c:4020
+#: src/LYOptions.c:4083
 msgid "Preferred media type"
 msgstr "Foretrukket medietype"
 
 #. Preferred encoding: SELECT
-#: src/LYOptions.c:4026
+#: src/LYOptions.c:4089
 msgid "Preferred encoding"
 msgstr "Foretrukket kodning"
 
 #. Preferred Document Character Set: INPUT
-#: src/LYOptions.c:4032
+#: src/LYOptions.c:4095
 msgid "Preferred document character set"
 msgstr "Foretrukket dokumenttegnsæt"
 
 #. Preferred Document Language: INPUT
-#: src/LYOptions.c:4037
+#: src/LYOptions.c:4100
 msgid "Preferred document language"
 msgstr "Foretrukket dokumentsprog"
 
-#: src/LYOptions.c:4043
+#. HTTP protocol SELECT
+#: src/LYOptions.c:4105
+msgid "HTTP protocol"
+msgstr "HTTP-protokol"
+
+#: src/LYOptions.c:4112
 msgid "Send User-Agent header"
 msgstr "Send User-Agent-teksthoved"
 
-#: src/LYOptions.c:4045
+#: src/LYOptions.c:4114
 msgid "User-Agent header"
 msgstr "User-Agent-linje"
 
 #.
 #. * Listing and Accessing Files
 #.
-#: src/LYOptions.c:4053
+#: src/LYOptions.c:4122
 msgid "Listing and Accessing Files"
 msgstr "Filoversigt og Filadgang"
 
 #. FTP sort: SELECT
-#: src/LYOptions.c:4058
+#: src/LYOptions.c:4127
 msgid "Use Passive FTP"
 msgstr "Brug passiv FTP"
 
 #. FTP sort: SELECT
-#: src/LYOptions.c:4064
+#: src/LYOptions.c:4133
 msgid "FTP sort criteria"
 msgstr "FTP-sorteringskriterie"
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:4072
+#: src/LYOptions.c:4141
 msgid "Local directory sort criteria"
 msgstr "Sortering af lokale filkataloger"
 
 #. Local Directory Order: SELECT
-#: src/LYOptions.c:4078
+#: src/LYOptions.c:4147
 msgid "Local directory sort order"
 msgstr "Sortering af lokale filkataloger"
 
-#: src/LYOptions.c:4087
+#: src/LYOptions.c:4156
 msgid "Show dot files"
 msgstr "Vis punktumfiler"
 
-#: src/LYOptions.c:4095
+#: src/LYOptions.c:4164
 msgid "Execution links"
 msgstr "Links til programafvikling"
 
-#: src/LYOptions.c:4113
+#: src/LYOptions.c:4182
 msgid "Pause when showing message"
 msgstr "Pause når besked vises"
 
 #. Show transfer rate: SELECT
-#: src/LYOptions.c:4120
+#: src/LYOptions.c:4189
 msgid "Show transfer rate"
 msgstr "Vis overførselshastighed"
 
 #.
 #. * Special Files and Screens
 #.
-#: src/LYOptions.c:4140
+#: src/LYOptions.c:4209
 msgid "Special Files and Screens"
 msgstr "Særlige filer og skærmbilleder"
 
-#: src/LYOptions.c:4145
+#: src/LYOptions.c:4214
 msgid "Multi-bookmarks"
 msgstr "Multi-bogmærker"
 
-#: src/LYOptions.c:4153
+#: src/LYOptions.c:4222
 msgid "Review/edit Bookmarks files"
 msgstr "Gennemse/ret bogmærkefiler"
 
-#: src/LYOptions.c:4156
+#: src/LYOptions.c:4225
 msgid "Goto multi-bookmark menu"
 msgstr "Gå til multi-bogmærkemenu"
 
-#: src/LYOptions.c:4158
+#: src/LYOptions.c:4227
 msgid "Bookmarks file"
 msgstr "Bogmærkefil"
 
 #. Auto Session: ON/OFF
-#: src/LYOptions.c:4165
+#: src/LYOptions.c:4234
 msgid "Auto Session"
 msgstr "Automatisk session"
 
 #. Session File Menu: INPUT
-#: src/LYOptions.c:4171
+#: src/LYOptions.c:4240
 msgid "Session file"
 msgstr "Sessionsfil"
 
 #. Visited Pages: SELECT
-#: src/LYOptions.c:4177
+#: src/LYOptions.c:4246
 msgid "Visited Pages"
 msgstr "Besøgte sider"
 
-#: src/LYOptions.c:4182
+#: src/LYOptions.c:4251
 msgid "View the file "
 msgstr "Vis filen "
 
@@ -5281,7 +5324,7 @@ msgstr "Udskriv til skærm"
 msgid "Print out on a printer attached to your vt100 terminal"
 msgstr "Udskriv på printer tilknyttet en vt100-terminal"
 
-#: src/LYReadCFG.c:441
+#: src/LYReadCFG.c:437
 #, c-format
 msgid ""
 "Syntax Error parsing COLOR in configuration file:\n"
@@ -5298,76 +5341,76 @@ msgstr ""
 "Her skal FORGRUND og BAGGRUND være en af:\n"
 "de særlige betegnelser 'nocolor' eller 'default', eller\n"
 
-#: src/LYReadCFG.c:454
+#: src/LYReadCFG.c:450
 msgid "Offending line:"
 msgstr "Problemskabende linje:"
 
-#: src/LYReadCFG.c:769
+#: src/LYReadCFG.c:764
 #, c-format
 msgid "key remapping of %s to %s for %s failed\n"
 msgstr "Omtildeling af tasten %s til %s i %s slog fejl\n"
 
-#: src/LYReadCFG.c:776
+#: src/LYReadCFG.c:771
 #, c-format
 msgid "key remapping of %s to %s failed\n"
 msgstr "Omtildeling af tasten %s til %s slog fejl\n"
 
-#: src/LYReadCFG.c:797
+#: src/LYReadCFG.c:792
 #, c-format
 msgid "invalid line-editor selection %s for key %s, selecting all\n"
 msgstr "ugyldigt linje-editorvalg %s for taste %s, vælger alle\n"
 
-#: src/LYReadCFG.c:822 src/LYReadCFG.c:834
+#: src/LYReadCFG.c:817 src/LYReadCFG.c:829
 #, c-format
 msgid "setting of line-editor binding for key %s (0x%x) to 0x%x for %s failed\n"
 msgstr "tildeling af taste %s (0x%x) til 0x%x for %s i linje-editor slog fejl\n"
 
-#: src/LYReadCFG.c:838
+#: src/LYReadCFG.c:833
 #, c-format
 msgid "setting of line-editor binding for key %s (0x%x) for %s failed\n"
 msgstr "tildeling af tasten %s (0x%x) til %s i linje-editor slog fejl\n"
 
-#: src/LYReadCFG.c:934
+#: src/LYReadCFG.c:929
 #, c-format
 msgid "Lynx: cannot start, CERN rules file %s is not available\n"
 msgstr "Lynx: Kan ikke starte op, CERN-regelfil %s findes ikke\n"
 
-#: src/LYReadCFG.c:935
+#: src/LYReadCFG.c:930
 msgid "(no name)"
 msgstr "(intet navn)"
 
-#: src/LYReadCFG.c:2075
+#: src/LYReadCFG.c:2070
 #, c-format
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
 msgstr "Flere end %d inkluderingsfiler i lynx.cfg - måske en sløjfe!?\n"
 
-#: src/LYReadCFG.c:2077
+#: src/LYReadCFG.c:2072
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr "Sidste inkluderingsfil der forsøgtes indlæst var '%s',\n"
 
-#: src/LYReadCFG.c:2078
+#: src/LYReadCFG.c:2073
 #, c-format
 msgid "included from '%s'.\n"
 msgstr "inkluderet fra '%s'.\n"
 
-#: src/LYReadCFG.c:2481 src/LYReadCFG.c:2494 src/LYReadCFG.c:2552
+#: src/LYReadCFG.c:2476 src/LYReadCFG.c:2489 src/LYReadCFG.c:2547
 msgid "The following is read from your lynx.cfg file."
 msgstr "Følgende er læst fra din lynx.cfg-fil."
 
-#: src/LYReadCFG.c:2482 src/LYReadCFG.c:2495
+#: src/LYReadCFG.c:2477 src/LYReadCFG.c:2490
 msgid "Please read the distribution"
 msgstr "Læs venligst distributionen"
 
-#: src/LYReadCFG.c:2488 src/LYReadCFG.c:2498
+#: src/LYReadCFG.c:2483 src/LYReadCFG.c:2493
 msgid "for more comments."
 msgstr "for flere kommentarer."
 
-#: src/LYReadCFG.c:2534
+#: src/LYReadCFG.c:2529
 msgid "RELOAD THE CHANGES"
 msgstr "GENINDLÆS ÆNDRINGERNE"
 
-#: src/LYReadCFG.c:2542
+#: src/LYReadCFG.c:2537
 msgid "Your primary configuration"
 msgstr "Din primære opsætning"
 
@@ -5586,7 +5629,7 @@ msgstr "Ingen links på denne side"
 msgid "Server Headers:"
 msgstr "Server-info:"
 
-#: src/LYStyle.c:338
+#: src/LYStyle.c:339
 #, c-format
 msgid ""
 "Syntax Error parsing style in lss file:\n"
@@ -5603,7 +5646,7 @@ msgstr ""
 "hvor OBJECT er en af EM,STRONG,B,I,U,BLINK etc.\n"
 "\n"
 
-#: src/LYStyle.c:933
+#: src/LYStyle.c:948
 #, c-format
 msgid ""
 "\n"
@@ -5646,33 +5689,33 @@ msgstr "Upload til:"
 msgid "Upload options:"
 msgstr "Valgmuligheder for uploads:"
 
-#: src/LYUtils.c:1919
+#: src/LYUtils.c:1917
 msgid "Download document URL put to clipboard."
 msgstr "Hjemtag dokument fra adressen på klippebord."
 
-#: src/LYUtils.c:2666
+#: src/LYUtils.c:2664
 msgid "Unexpected access protocol for this URL scheme."
 msgstr "Uventet adgangsprotokol for denne adressetype."
 
-#: src/LYUtils.c:3571
+#: src/LYUtils.c:3569
 msgid "Too many tempfiles"
 msgstr "For mange midlertidige filer"
 
-#: src/LYUtils.c:3871
+#: src/LYUtils.c:3869
 msgid "unknown restriction"
 msgstr "ukendt begrænsning"
 
-#: src/LYUtils.c:3902
+#: src/LYUtils.c:3900
 #, c-format
 msgid "No restrictions set.\n"
 msgstr "Ingen begrænsninger sat.\n"
 
-#: src/LYUtils.c:3905
+#: src/LYUtils.c:3903
 #, c-format
 msgid "Restrictions set:\n"
 msgstr "Begrænsninger sat:\n"
 
-#: src/LYUtils.c:5279
+#: src/LYUtils.c:5278
 msgid "Cannot find HOME directory"
 msgstr "Kan ikke finde HOME-katalog"
 
@@ -5680,7 +5723,7 @@ msgstr "Kan ikke finde HOME-katalog"
 msgid "Normally disabled.  See ENABLE_LYNXRC in lynx.cfg\n"
 msgstr "Normalt slået fra. Se ENABLE_LYNXRC i lynx.cfg\n"
 
-#: src/LYrcFile.c:327
+#: src/LYrcFile.c:349
 msgid ""
 "accept_all_cookies allows the user to tell Lynx to automatically\n"
 "accept all cookies if desired.  The default is \"FALSE\" which will\n"
@@ -5692,7 +5735,7 @@ msgstr ""
 "blive ledsaget af et spørgsmål om den skal accepteres eller ej. Sæt\n"
 "accept_all_cookies\" til \"TRUE\" for at acceptere alle cookier.\n"
 
-#: src/LYrcFile.c:335
+#: src/LYrcFile.c:357
 msgid ""
 "anonftp_password allows the user to tell Lynx to use the personal\n"
 "email address as the password for anonymous ftp.  If no value is given,\n"
@@ -5704,7 +5747,7 @@ msgstr ""
 "en værdi, vil Lynx bruge den personlige e-post-adresse. Sæt anonftp_password\n"
 "til en anden værdi hvis du ønsker det.\n"
 
-#: src/LYrcFile.c:344
+#: src/LYrcFile.c:366
 msgid ""
 "bookmark_file specifies the name and location of the default bookmark\n"
 "file into which the user can paste links for easy access at a later\n"
@@ -5714,7 +5757,7 @@ msgstr ""
 "hvori brugeren kan indsætte de links som der ønskes let adgang til\n"
 "på et senere tidspunkt.\n"
 
-#: src/LYrcFile.c:349
+#: src/LYrcFile.c:371
 msgid ""
 "If case_sensitive_searching is \"on\" then when the user invokes a search\n"
 "using the 's' or '/' keys, the search performed will be case sensitive\n"
@@ -5724,7 +5767,7 @@ msgstr ""
 "mellem store og små bogstaver ved søgninger afgivet med 's' og '/'\n"
 "tasterne. Det normale er \"off\".\n"
 
-#: src/LYrcFile.c:354
+#: src/LYrcFile.c:376
 msgid ""
 "The character_set definition controls the representation of 8 bit\n"
 "characters for your terminal.  If 8 bit characters do not show up\n"
@@ -5737,7 +5780,7 @@ msgstr ""
 "andet 8-bit-tegnsæt eller bruge 7-bit tegntilnærmelser. Aktuelt gyldige\n"
 "tegnsæt er:\n"
 
-#: src/LYrcFile.c:361
+#: src/LYrcFile.c:384
 msgid ""
 "cookie_accept_domains and cookie_reject_domains are comma-delimited\n"
 "lists of domains from which Lynx should automatically accept or reject\n"
@@ -5751,7 +5794,7 @@ msgstr ""
 "afvisningen have forrang. Parameteren \"accept_all_cookies\" vil\n"
 "tilsidesætte begge disse indstillinger.\n"
 
-#: src/LYrcFile.c:369
+#: src/LYrcFile.c:392
 msgid ""
 "cookie_file specifies the file from which to read persistent cookies.\n"
 "The default is ~/"
@@ -5759,7 +5802,7 @@ msgstr ""
 "cookie_file angiver den fil som varige cookier skal læses fra.\n"
 "Standarden er ~/"
 
-#: src/LYrcFile.c:374
+#: src/LYrcFile.c:397
 msgid ""
 "cookie_loose_invalid_domains, cookie_strict_invalid_domains, and\n"
 "cookie_query_invalid_domains are comma-delimited lists of which domains\n"
@@ -5777,7 +5820,7 @@ msgstr ""
 "cookier med en ugyldig sti eller domæneattribut. Alle domæner vil som\n"
 "standard spørge brugeren om en ugyldig sti eller domæne.\n"
 
-#: src/LYrcFile.c:388
+#: src/LYrcFile.c:411
 msgid ""
 "dir_list_order specifies the directory list order under DIRED_SUPPORT\n"
 "(if implemented).  The default is \"ORDER_BY_NAME\"\n"
@@ -5785,7 +5828,7 @@ msgstr ""
 "dir_list_order angiver katalogsortering under DIRED_SUPPORT\n"
 "(hvis implementeret). Standarden er \"ORDER_BY_NAME\"\n"
 
-#: src/LYrcFile.c:393
+#: src/LYrcFile.c:416
 msgid ""
 "dir_list_styles specifies the directory list style under DIRED_SUPPORT\n"
 "(if implemented).  The default is \"MIXED_STYLE\", which sorts both\n"
@@ -5798,7 +5841,7 @@ msgstr ""
 "oplister filer først og \"DIRECTORIES_FIRST\" oplister filkataloger\n"
 "først.\n"
 
-#: src/LYrcFile.c:401
+#: src/LYrcFile.c:424
 msgid ""
 "If emacs_keys is to \"on\" then the normal EMACS movement keys:\n"
 "  ^N = down    ^P = up\n"
@@ -5810,7 +5853,7 @@ msgstr ""
 "  ^B = venstre    ^F = højre\n"
 "være aktive.\n"
 
-#: src/LYrcFile.c:407
+#: src/LYrcFile.c:430
 msgid ""
 "file_editor specifies the editor to be invoked when editing local files\n"
 "or sending mail.  If no editor is specified, then file editing is disabled\n"
@@ -5823,7 +5866,7 @@ msgstr ""
 "kommandolinjen. Den indbyggede linje-editor vil blive brugt ved afsendelse\n"
 "af post.\n"
 
-#: src/LYrcFile.c:414
+#: src/LYrcFile.c:437
 msgid ""
 "The file_sorting_method specifies which value to sort on when viewing\n"
 "file lists such as FTP directories.  The options are:\n"
@@ -5839,7 +5882,7 @@ msgstr ""
 "   BY_SIZE     -- sorterer efter filstørrelse\n"
 "   BY_DATE     -- sorterer efter fildato\n"
 
-#: src/LYrcFile.c:437
+#: src/LYrcFile.c:462
 msgid ""
 "lineedit_mode specifies the key binding used for inputting strings in\n"
 "prompts and forms.  If lineedit_mode is set to \"Default Binding\" then\n"
@@ -5866,7 +5909,7 @@ msgstr ""
 "\n"
 "Aktuelle tilstande ved linjeredigering er:\n"
 
-#: src/LYrcFile.c:455
+#: src/LYrcFile.c:480
 msgid ""
 "The following allow you to define sub-bookmark files and descriptions.\n"
 "The format is multi_bookmark<capital_letter>=<filename>,<description>\n"
@@ -5879,7 +5922,7 @@ msgstr ""
 "er tilladt. Vi begynder med \"multi_bookmarkB\", idet \"A\" er standard (se\n"
 "ovenfor).\n"
 
-#: src/LYrcFile.c:461
+#: src/LYrcFile.c:486
 msgid ""
 "personal_mail_address specifies your personal mail address.  The\n"
 "address will be sent during HTTP file transfers for authorization and\n"
@@ -5897,7 +5940,7 @@ msgstr ""
 "Du kan også lade dette felt stå tomt, men så vil din e-post-adresse ikke\n"
 "blive medtaget i de kommentarer du sender i e-post.\n"
 
-#: src/LYrcFile.c:470
+#: src/LYrcFile.c:495
 msgid ""
 "personal_mail_name specifies your personal name, for mail.  The\n"
 "name is sent for mailed comments.  Lynx will prompt for this,\n"
@@ -5917,7 +5960,7 @@ msgstr ""
 "sideeffekt af at sende e-post. For at opdatere standardværdien, så\n"
 "skal du bruge opsætningsmenuen, eller ændre denne fil direkte.\n"
 
-#: src/LYrcFile.c:480
+#: src/LYrcFile.c:505
 msgid ""
 "preferred_charset specifies the character set in MIME notation (e.g.,\n"
 "ISO-8859-2, ISO-8859-5) which Lynx will indicate you prefer in requests\n"
@@ -5945,7 +5988,7 @@ msgstr ""
 "en fejlmeddelelse, omend afgivelse af et ikke-acceptabelt svar også er\n"
 "tilladt.\n"
 
-#: src/LYrcFile.c:496
+#: src/LYrcFile.c:521
 msgid ""
 "preferred_language specifies the language in MIME notation (e.g., en,\n"
 "fr, may be a comma-separated list in decreasing preference)\n"
@@ -5959,7 +6002,7 @@ msgstr ""
 "HTTP-servere. Hvis en fil på dette sprog er tilgængelig, vil serveren\n"
 "returnere den. I modsat fald vil den returnere filen på sit standardsprog.\n"
 
-#: src/LYrcFile.c:507
+#: src/LYrcFile.c:532
 msgid ""
 "If run_all_execution_links is set \"on\" then all local execution links\n"
 "will be executed when they are selected.\n"
@@ -5982,7 +6025,7 @@ msgstr ""
 "           sættes til \"on\", hvis du kigger på oplysninger fra kilder\n"
 "           som du kan stole på.\n"
 
-#: src/LYrcFile.c:518
+#: src/LYrcFile.c:543
 msgid ""
 "If run_execution_links_on_local_files is set \"on\" then all local\n"
 "execution links that are found in LOCAL files will be executed when they\n"
@@ -6011,7 +6054,7 @@ msgstr ""
 "           Denne indstilling skal kun sættes til \"on\", hvis du har fuld\n"
 "           tillid til den kilde hvorfra informationen stammer.\n"
 
-#: src/LYrcFile.c:536
+#: src/LYrcFile.c:561
 msgid ""
 "select_popups specifies whether the OPTIONs in a SELECT block which\n"
 "lacks a MULTIPLE attribute are presented as a vertical list of radio\n"
@@ -6025,12 +6068,12 @@ msgstr ""
 "MULTIPLE\"-attribut bliver præsenteret som en lodret liste af radioknapper\n"
 "eller via en pop op-menu. Bemærk at hvis MULTIPLE\"-attributten er til stede\n"
 "i \"SELECT start tag\", vil Lynx altid oprette en lodret liste af\n"
-"afkrydsningsbokse for VALGMULIGHEDERne.  En værdi af \"on\" vil sætte pop\n"
+"afkrydsningsfelter for VALGMULIGHEDERne. En værdi af \"on\" vil sætte pop\n"
 "op-menuer som standard, medens en værdi af \"off\" vil sætte brugen af\n"
 "radiobokse. Den forvalgte værdi kan ændres med kommandolinje-parameteret\n"
 "-popup.\n"
 
-#: src/LYrcFile.c:547
+#: src/LYrcFile.c:572
 msgid ""
 "show_color specifies how to set the color mode at startup.  A value of\n"
 "\"never\" will force color mode off (treat the terminal as monochrome)\n"
@@ -6064,7 +6107,7 @@ msgstr ""
 "indstillingerne er gemt, vil farveindstilingerne blive opfattet som\n"
 "\"default\".\n"
 
-#: src/LYrcFile.c:564
+#: src/LYrcFile.c:589
 msgid ""
 "show_cursor specifies whether to 'hide' the cursor to the right (and\n"
 "bottom, if possible) of the screen, or to place it to the left of the\n"
@@ -6087,7 +6130,7 @@ msgstr ""
 "en værdi af \"off\" vil skjule markøren.  Standarden kan tilsidesættes\n"
 "med kommandolinje-parameteret \"-show-cursur\".\n"
 
-#: src/LYrcFile.c:575
+#: src/LYrcFile.c:600
 msgid ""
 "show_dotfiles specifies that the directory listing should include\n"
 "\"hidden\" (dot) files/directories.  If set \"on\", this will be\n"
@@ -6102,7 +6145,7 @@ msgstr ""
 "slået fra (off), vil man heller ikke kunne oprette sådanne skjulte filer\n"
 "eller filkataloger i Lynx.\n"
 
-#: src/LYrcFile.c:586
+#: src/LYrcFile.c:611
 msgid ""
 "If sub_bookmarks is not turned \"off\", and multiple bookmarks have\n"
 "been defined (see below), then all bookmark operations will first\n"
@@ -6124,7 +6167,7 @@ msgstr ""
 "intermediate. Når denne indstilling er sat til default, vil menuen\n"
 "fremkomme uanset brugertilstand.\n"
 
-#: src/LYrcFile.c:600
+#: src/LYrcFile.c:626
 msgid ""
 "user_mode specifies the users level of knowledge with Lynx.  The\n"
 "default is \"NOVICE\" which displays two extra lines of help at the\n"
@@ -6140,7 +6183,7 @@ msgstr ""
 "ekstra oplysninger fra, Brug ADVANCED for at se adressen på det\n"
 "aktuelt valgte link i bunden af skærmen.\n"
 
-#: src/LYrcFile.c:609
+#: src/LYrcFile.c:635
 msgid ""
 "If verbose_images is \"on\", lynx will print the name of the image\n"
 "source file in place of [INLINE], [LINK] or [IMAGE]\n"
@@ -6150,7 +6193,7 @@ msgstr ""
 "kildefilen til et billedlink i stedet for [INLINE], [LINK] eller [IMAGE].\n"
 "Se også VERBOSE_IMAGES i lynx.cfg\n"
 
-#: src/LYrcFile.c:614
+#: src/LYrcFile.c:640
 msgid ""
 "If vi_keys is set to \"on\", then the normal VI movement keys:\n"
 "  j = down    k = up\n"
@@ -6166,7 +6209,7 @@ msgstr ""
 "Stort H, J og K vil stadig aktivere henholdsvis hjælp,\n"
 "hop-genveje og oversigt over tastebindinger.\n"
 
-#: src/LYrcFile.c:622
+#: src/LYrcFile.c:648
 msgid ""
 "The visited_links setting controls how Lynx organizes the information\n"
 "in the Visited Links Page.\n"
@@ -6174,7 +6217,7 @@ msgstr ""
 "visited_links styrer hvorledes Lynx organiserer oplysningerne i siden\n"
 "over besøgte links.\n"
 
-#: src/LYrcFile.c:863
+#: src/LYrcFile.c:890
 msgid ""
 "If keypad_mode is set to \"NUMBERS_AS_ARROWS\", then the numbers on\n"
 "your keypad when the numlock is on will act as arrow keys:\n"
@@ -6192,7 +6235,7 @@ msgstr ""
 "og de tilsvarende numeriske taster på tastaturet vil virke som piletaster,\n"
 "uanset om numlock er slået til eller ej\n"
 
-#: src/LYrcFile.c:872
+#: src/LYrcFile.c:899
 msgid ""
 "If keypad_mode is set to \"LINKS_ARE_NUMBERED\", then numbers will\n"
 "appear next to each link and numbers are used to select links.\n"
@@ -6200,7 +6243,7 @@ msgstr ""
 "Hvis keypad_mode er sat til LINKS_ARE_NUMBERED, vil ethvert link\n"
 "være ledsaget af et nummer som kan bruges til at aktivere linkene.\n"
 
-#: src/LYrcFile.c:876
+#: src/LYrcFile.c:903
 msgid ""
 "If keypad_mode is set to \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\", then\n"
 "numbers will appear next to each link and visible form input field.\n"
@@ -6219,7 +6262,7 @@ msgstr ""
 "op-menu selvom denne ikke er synlig på skærmen. Oversigter over links og\n"
 "uddata fra \"list\"-kommandoen bliver også nummererede.\n"
 
-#: src/LYrcFile.c:885
+#: src/LYrcFile.c:912
 msgid ""
 "NOTE: Some fixed format documents may look disfigured when\n"
 "\"LINKS_ARE_NUMBERED\" or \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\" are\n"
@@ -6229,7 +6272,7 @@ msgstr ""
 "LINKS_ARE_NUMBERED eller LINKS_AND_FORM_FIELDS_ARE_NUMBERED er\n"
 "aktiveret.\n"
 
-#: src/LYrcFile.c:917
+#: src/LYrcFile.c:944
 msgid ""
 "Lynx User Defaults File\n"
 "\n"
@@ -6237,7 +6280,7 @@ msgstr ""
 "Lynxfil for brugers standardindstilinger\n"
 "\n"
 
-#: src/LYrcFile.c:926
+#: src/LYrcFile.c:953
 msgid ""
 "This file contains options saved from the Lynx Options Screen (normally\n"
 "with the 'o' key).  To save options with that screen, you must select the\n"
@@ -6245,17 +6288,17 @@ msgid ""
 msgstr ""
 "Denne fil indeholder tilvalg gemt fra Lynx' opsætningsmenu (normalt gemt\n"
 "med tasten \"o\"). For at gemme opsætningen med den menu skal du vælge\n"
-"afkrydsningsboksen:\n"
+"afkrydsningsfeltet:\n"
 
-#: src/LYrcFile.c:933
+#: src/LYrcFile.c:960
 msgid ""
 "You must then save the settings using the link on the line above the\n"
 "checkbox:\n"
 msgstr ""
 "Du skal så gemme opsætningen via henvisningen på linjen over\n"
-"afkrydsningsboksen:\n"
+"afkrydsningsfeltet:\n"
 
-#: src/LYrcFile.c:940
+#: src/LYrcFile.c:967
 msgid ""
 "You may also use the command-line option \"-forms_options\", which displays\n"
 "the simpler Options Menu instead.  Save options with that using the '>' key.\n"
@@ -6265,7 +6308,7 @@ msgstr ""
 "den mere simple opsætningsmenu i stedet for. Gem opsætningen med den via\n"
 "tasten \">\".\n"
 
-#: src/LYrcFile.c:947
+#: src/LYrcFile.c:974
 msgid ""
 "This file contains options saved from the Lynx Options Screen (normally\n"
 "with the '>' key).\n"
@@ -6274,7 +6317,7 @@ msgstr ""
 "Denne fil indeholder opsætningen gemt fra Lynx' opsætningsmenu (normalt\n"
 "med tasten \">\").\n"
 
-#: src/LYrcFile.c:954
+#: src/LYrcFile.c:981
 msgid ""
 "There is normally no need to edit this file manually, since the defaults\n"
 "here can be controlled from the Options Screen, and the next time options\n"
@@ -6293,6 +6336,9 @@ msgstr ""
 "Hvis du er ude efter en almen opsætningsfil - så hedder den sædvanligvis\n"
 "lynx.cfg. Den har et andet indhold og format. Det er ikke denne fil.\n"
 
+#~ msgid "Address contains a username: %s"
+#~ msgstr "Adresse indeholder et brugernavn: %s"
+
 #~ msgid ""
 #~ "\n"
 #~ "Lynx edit map not declared.\n"
diff --git a/po/et.po b/po/et.po
index 60b1b4b..b8274ed 100644
--- a/po/et.po
+++ b/po/et.po
@@ -1,21 +1,21 @@
 # This file is distributed under the same license as the lynx package.
 # Estonian translations for lynx
 # Copyright (C) 2001 Free Software Foundation, Inc.
-# Toomas Soome <tsoome at me.com>, 2015.
+# Toomas Soome <tsoome at me.com>, 2017.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: lynx 2.8.9-dev7\n"
+"Project-Id-Version: lynx 2.8.9-dev15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-14 20:39-0500\n"
-"PO-Revision-Date: 2015-12-19 19:43+0200\n"
+"POT-Creation-Date: 2017-07-04 16:51-0400\n"
+"PO-Revision-Date: 2017-07-05 13:20+0300\n"
 "Last-Translator: Toomas Soome <tsoome at me.com>\n"
 "Language-Team: Estonian <linux-ee at lists.eenet.ee>\n"
 "Language: et\n"
-"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 
 #. ******************************************************************
 #. * The following definitions are for status line prompts, messages, or
@@ -2330,7 +2330,7 @@ msgstr "(Nimeta.)"
 msgid "(No value.)"
 msgstr "(Väärtuseta.)"
 
-#: LYMessages.c:743 src/LYOptions.c:2424
+#: LYMessages.c:743 src/LYOptions.c:2446
 msgid "None"
 msgstr "Puudub"
 
@@ -2856,35 +2856,39 @@ msgstr "Trasseerimine ei ole toetatud"
 msgid "\tIndents: first=%.0f others=%.0f, Height=%.1f Desc=%.1f\n"
 msgstr "\tTaanded: esimene=%.0f teised=%.0f, Kõrgus=%.1f Kirj=%.1f\n"
 
-#.
-#. * Set up the message for the username prompt, and then issue the
-#. * prompt.  The default username is included in the call to the
-#. * prompting function, but the password is NULL-ed and always replaced.
-#. * - FM
-#.
-#: WWW/Library/Implementation/HTAABrow.c:634
+#: WWW/Library/Implementation/HTAABrow.c:569
+#, c-format
+msgid "username for realm %s changed from %s to %s"
+msgstr "realmi %s kasutajanimi oli %s, uus on %s"
+
+#: WWW/Library/Implementation/HTAABrow.c:585
+#, c-format
+msgid "password for realm %s user %s changed"
+msgstr "realmi %s kasutaja %s parool on muudetud"
+
+#: WWW/Library/Implementation/HTAABrow.c:697
 #, c-format
 msgid "Username for '%s' at %s '%s%s':"
 msgstr "Kasutajanimi '%s' kasutamiseks, %s '%s%s':"
 
-#: WWW/Library/Implementation/HTAABrow.c:904
+#: WWW/Library/Implementation/HTAABrow.c:970
 msgid "This client doesn't know how to compose proxy authorization information for scheme"
 msgstr "See klient ei tea, kuidas koostada proksi autoriseerimise infot skeemile"
 
-#: WWW/Library/Implementation/HTAABrow.c:983
+#: WWW/Library/Implementation/HTAABrow.c:1047
 msgid "This client doesn't know how to compose authorization information for scheme"
 msgstr "See klient ei tea, kuidas koostada autoriseerimise infot skeemile"
 
-#: WWW/Library/Implementation/HTAABrow.c:1094
+#: WWW/Library/Implementation/HTAABrow.c:1156
 #, c-format
 msgid "Invalid header '%s%s%s%s%s'"
 msgstr "Vigane päis '%s%s%s%s%s'"
 
-#: WWW/Library/Implementation/HTAABrow.c:1200
+#: WWW/Library/Implementation/HTAABrow.c:1260
 msgid "Proxy authorization required -- retrying"
 msgstr "Nõutakse proksi autentimist -- proovin uuesti"
 
-#: WWW/Library/Implementation/HTAABrow.c:1256
+#: WWW/Library/Implementation/HTAABrow.c:1316
 msgid "Access without authorization denied -- retrying"
 msgstr "Autoriseerimata ei lubata kasutada -- proovin uuesti"
 
@@ -2900,7 +2904,7 @@ msgstr "POST sisuga dokument puudub puhvrist. Postitan uuesti?"
 msgid "Loading failed, use a previous copy."
 msgstr "laadimine ebaõnnestus, kasuta eelmist koopiat."
 
-#: WWW/Library/Implementation/HTAccess.c:1056 src/GridText.c:8875
+#: WWW/Library/Implementation/HTAccess.c:1056 src/GridText.c:8865
 msgid "Loading incomplete."
 msgstr "Mittetäielik laadimine."
 
@@ -2923,7 +2927,7 @@ msgstr "**** HTAccess: Tagastatud olek oli: %d\n"
 #. * hack: if we fail in HTAccess.c
 #. * avoid duplicating URL, oh.
 #.
-#: WWW/Library/Implementation/HTAccess.c:1096 src/LYMainLoop.c:8074
+#: WWW/Library/Implementation/HTAccess.c:1096 src/LYMainLoop.c:8075
 msgid "Can't Access"
 msgstr "Ei saa kasutada"
 
@@ -2931,37 +2935,37 @@ msgstr "Ei saa kasutada"
 msgid "Unable to access document."
 msgstr "Dokumenti ei saa kasutada."
 
-#: WWW/Library/Implementation/HTFTP.c:875
+#: WWW/Library/Implementation/HTFTP.c:870
 #, c-format
 msgid "Enter password for user %s@%s:"
 msgstr "Sisestage kasutaja %s@%s parool:"
 
-#: WWW/Library/Implementation/HTFTP.c:903
+#: WWW/Library/Implementation/HTFTP.c:898
 msgid "Unable to connect to FTP host."
 msgstr "Ei õnnestu luua ühendust FTP serveriga."
 
-#: WWW/Library/Implementation/HTFTP.c:1142
+#: WWW/Library/Implementation/HTFTP.c:1137
 msgid "close master socket"
 msgstr "ülem pistiku sulgemine"
 
-#: WWW/Library/Implementation/HTFTP.c:1204
+#: WWW/Library/Implementation/HTFTP.c:1199
 msgid "socket for master socket"
 msgstr "pistik ülem pistikule"
 
-#: WWW/Library/Implementation/HTFTP.c:2952
+#: WWW/Library/Implementation/HTFTP.c:2948
 msgid "Receiving FTP directory."
 msgstr "Laen FTP kataloogi."
 
-#: WWW/Library/Implementation/HTFTP.c:3090
+#: WWW/Library/Implementation/HTFTP.c:3086
 #, c-format
 msgid "Transferred %d bytes (%5d)"
 msgstr "Üle kantud %d baiti (%5d)"
 
-#: WWW/Library/Implementation/HTFTP.c:3448
+#: WWW/Library/Implementation/HTFTP.c:3444
 msgid "connect for data"
 msgstr "loon andmekanalit"
 
-#: WWW/Library/Implementation/HTFTP.c:4120
+#: WWW/Library/Implementation/HTFTP.c:4126
 msgid "Receiving FTP file."
 msgstr "Laen FTP faili."
 
@@ -3120,8 +3124,8 @@ msgstr "Aadressis on vigane port"
 msgid "Address length looks invalid"
 msgstr "Aadressi pikkus tundub vigane"
 
-#: WWW/Library/Implementation/HTTCP.c:1845
-#: WWW/Library/Implementation/HTTCP.c:1863
+#: WWW/Library/Implementation/HTTCP.c:1839
+#: WWW/Library/Implementation/HTTCP.c:1857
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr "Ei leia serverit %s."
@@ -3130,141 +3134,146 @@ msgstr "Ei leia serverit %s."
 #. * but not HTAlert, because typically there will be other
 #. * alerts from the callers.  - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1860
+#: WWW/Library/Implementation/HTTCP.c:1854
 #: WWW/Library/Implementation/HTTelnet.c:115
 #, c-format
 msgid "Invalid hostname %s"
 msgstr "Vigane serveri nimi %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1874
+#: WWW/Library/Implementation/HTTCP.c:1868
 #, c-format
 msgid "Making %s connection to %s"
 msgstr "Loon %s ühendust serveriga %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1885
+#: WWW/Library/Implementation/HTTCP.c:1879
 msgid "socket failed."
 msgstr "socket ebaõnnestus."
 
-#: WWW/Library/Implementation/HTTCP.c:1899
+#: WWW/Library/Implementation/HTTCP.c:1893
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
 msgstr "socket ebaõnnestus: perekond %d aadress %s port %s."
 
-#: WWW/Library/Implementation/HTTCP.c:1923
+#: WWW/Library/Implementation/HTTCP.c:1917
 msgid "Could not make connection non-blocking."
 msgstr "Ei õnnestu muuta ühendust mitte-blokeerivaks."
 
-#: WWW/Library/Implementation/HTTCP.c:1991
+#: WWW/Library/Implementation/HTTCP.c:1985
 msgid "Connection failed (too many retries)."
 msgstr "Ühendus ebaõnnestus (looga palju katseid)."
 
-#: WWW/Library/Implementation/HTTCP.c:2180
+#: WWW/Library/Implementation/HTTCP.c:2174
 msgid "Could not restore socket to blocking."
 msgstr "Pistikul ei õnnestu taastada blokeerivat moodi."
 
-#: WWW/Library/Implementation/HTTCP.c:2248
+#: WWW/Library/Implementation/HTTCP.c:2242
 msgid "Socket read failed (too many tries)."
 msgstr "Pistikust lugemine ebaõnnestus (liiga palju katseid)."
 
-#: WWW/Library/Implementation/HTTP.c:136
+#: WWW/Library/Implementation/HTTP.c:134
 #, c-format
 msgid "SSL callback:%s, preverify_ok=%d, ssl_okay=%d"
 msgstr "SSL callback:%s, preverify_ok=%d, ssl_okay=%d"
 
-#: WWW/Library/Implementation/HTTP.c:516
+#: WWW/Library/Implementation/HTTP.c:629
+#, c-format
+msgid "User/password contains only punctuation: %s"
+msgstr "Kasutaja/parool sisaldab ainult punktuatsioone: %s"
+
+#: WWW/Library/Implementation/HTTP.c:633
 #, c-format
-msgid "Address contains a username: %s"
-msgstr "Aadress sisaldab kasutajanime: %s"
+msgid "User/password may be confused with hostname: '%s' (e.g, '%s')"
+msgstr "Kasutaja/parool võib olla hosti nimega vahetuses: '%s' (n. '%s')"
 
-#: WWW/Library/Implementation/HTTP.c:570
+#: WWW/Library/Implementation/HTTP.c:694
 #, c-format
 msgid "Certificate issued by: %s"
 msgstr "Sertifikaadi väljastaja: %s"
 
-#: WWW/Library/Implementation/HTTP.c:757
+#: WWW/Library/Implementation/HTTP.c:881
 msgid "This client does not contain support for HTTPS URLs."
 msgstr "See klient ei toeta HTTPS URLe."
 
-#: WWW/Library/Implementation/HTTP.c:782
+#: WWW/Library/Implementation/HTTP.c:906
 msgid "Unable to connect to remote host."
 msgstr "Serveriga ühenduse loomine ebaõnnestus."
 
-#: WWW/Library/Implementation/HTTP.c:825
+#: WWW/Library/Implementation/HTTP.c:953
 msgid "Retrying connection without TLS."
 msgstr "Üritan ühendust uuesti luua TLS kasutamata."
 
-#: WWW/Library/Implementation/HTTP.c:877
+#: WWW/Library/Implementation/HTTP.c:1005
 msgid "GnuTLS error when trying to verify certificate."
 msgstr "GnuTLS viga sertifikaadi kontrollimisel."
 
-#: WWW/Library/Implementation/HTTP.c:889
+#: WWW/Library/Implementation/HTTP.c:1018
 msgid "the certificate has no known issuer"
 msgstr "sertifikaadil puudub tuntud väljaandja"
 
-#: WWW/Library/Implementation/HTTP.c:891
+#: WWW/Library/Implementation/HTTP.c:1020
 msgid "no issuer was found"
 msgstr "väljaandja puudub"
 
-#: WWW/Library/Implementation/HTTP.c:893
+#: WWW/Library/Implementation/HTTP.c:1022
 msgid "issuer is not a CA"
 msgstr "väljaandja pole CA"
 
-#: WWW/Library/Implementation/HTTP.c:895
+#: WWW/Library/Implementation/HTTP.c:1024
 msgid "the certificate has been revoked"
 msgstr "sertifikaat on kehtivuse kaotanud"
 
-#: WWW/Library/Implementation/HTTP.c:897
+#: WWW/Library/Implementation/HTTP.c:1026
 msgid "the certificate is not trusted"
 msgstr "sertifikaat pole usaldusväärne"
 
-#: WWW/Library/Implementation/HTTP.c:972
+#: WWW/Library/Implementation/HTTP.c:1101
 #, c-format
 msgid "Verified connection to %s (cert=%s)"
 msgstr "Kontrollitud ühendus serveriga %s (sertifikaat=%s)"
 
-#: WWW/Library/Implementation/HTTP.c:1022
-#: WWW/Library/Implementation/HTTP.c:1064
+#: WWW/Library/Implementation/HTTP.c:1151
+#: WWW/Library/Implementation/HTTP.c:1193
 #, c-format
 msgid "Verified connection to %s (subj=%s)"
 msgstr "Kontrollitud ühendus serveriga %s (subj=%s)"
 
-#: WWW/Library/Implementation/HTTP.c:1094
+#: WWW/Library/Implementation/HTTP.c:1223
 msgid "Can't find common name in certificate"
 msgstr "Sertifikaadis puudub ühine nimi"
 
-#: WWW/Library/Implementation/HTTP.c:1097
+#: WWW/Library/Implementation/HTTP.c:1226
 #, c-format
 msgid "SSL error:host(%s)!=cert(%s)-Continue?"
 msgstr "SSL viga:host(%s)!=sert(%s)-Jätkan?"
 
-#: WWW/Library/Implementation/HTTP.c:1104
+#: WWW/Library/Implementation/HTTP.c:1233
 msgid "SSL error"
 msgstr "SSL viga"
 
-#: WWW/Library/Implementation/HTTP.c:1112
+#: WWW/Library/Implementation/HTTP.c:1241
 #, c-format
 msgid "UNVERIFIED connection to %s (cert=%s)"
 msgstr "KONTROLLIMATA ühendus serveriga %s (sertifikaat=%s)"
 
-#: WWW/Library/Implementation/HTTP.c:1121
+#: WWW/Library/Implementation/HTTP.c:1250
 #, c-format
 msgid "Secure %d-bit %s (%s) HTTP connection"
 msgstr "Turvaline %d-bitti %s (%s) HTTP ühendus"
 
-#: WWW/Library/Implementation/HTTP.c:1584
+#: WWW/Library/Implementation/HTTP.c:1718
 msgid "Sending HTTP request."
 msgstr "Saadan HTTP päringu."
 
-#: WWW/Library/Implementation/HTTP.c:1626
+#: WWW/Library/Implementation/HTTP.c:1760
 msgid "Unexpected network write error; connection aborted."
 msgstr "Ootamatu tõrge võrku kirjutamisel; ühendus katkestati."
 
-#: WWW/Library/Implementation/HTTP.c:1632
+#: WWW/Library/Implementation/HTTP.c:1766
 msgid "HTTP request sent; waiting for response."
 msgstr "HTTP päring on saadetud; ootan vastust."
 
-#: WWW/Library/Implementation/HTTP.c:1705
-#: WWW/Library/Implementation/HTTP.c:1715
+#: WWW/Library/Implementation/HTTP.c:1839
+#: WWW/Library/Implementation/HTTP.c:1849
 msgid "Unexpected network read error; connection aborted."
 msgstr "Ootamatu tõrge võrgust lugemisel; ühendus katkestati."
 
@@ -3277,7 +3286,7 @@ msgstr "Ootamatu tõrge võrgust lugemisel; ühendus katkestati."
 #. * line and possibly other headers, so we'll deal with them by
 #. * showing the full header to the user as text/plain.  - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1917
+#: WWW/Library/Implementation/HTTP.c:2051
 msgid "Got unexpected Informational Status."
 msgstr "Sain ootamatu informatiivse oleku."
 
@@ -3287,7 +3296,7 @@ msgstr "Sain ootamatu informatiivse oleku."
 #. * content.  We'll instruct the user to do that, and
 #. * restore the current document.  - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1951
+#: WWW/Library/Implementation/HTTP.c:2085
 msgid "Request fulfilled.  Reset Content."
 msgstr "Päring täidetud. Algväärtusta sisu."
 
@@ -3297,27 +3306,27 @@ msgstr "Päring täidetud. Algväärtusta sisu."
 #. * status is inappropriate.  We'll deal with it by showing
 #. * the full header to the user as text/plain.  - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:2066
+#: WWW/Library/Implementation/HTTP.c:2202
 msgid "Got unexpected 304 Not Modified status."
 msgstr "Sain ootamatu oleku, 304 Pole muudetud."
 
-#: WWW/Library/Implementation/HTTP.c:2129
+#: WWW/Library/Implementation/HTTP.c:2265
 msgid "Redirection of POST content requires user approval."
 msgstr "POST sisu ümbersuunamine nõuab kasutaja kinnitust."
 
-#: WWW/Library/Implementation/HTTP.c:2144
+#: WWW/Library/Implementation/HTTP.c:2280
 msgid "Have POST content.  Treating Permanent Redirection as Temporary.\n"
 msgstr "Oman POST sisu. Käsitlen püsivat ümbersuunamist ajutisena.\n"
 
-#: WWW/Library/Implementation/HTTP.c:2188
+#: WWW/Library/Implementation/HTTP.c:2326
 msgid "Retrying with access authorization information."
 msgstr "Proovin uuesti kasutades autoriseerimise infot."
 
-#: WWW/Library/Implementation/HTTP.c:2200
+#: WWW/Library/Implementation/HTTP.c:2338
 msgid "Show the 401 message body?"
 msgstr "Näitan teate 401 keha?"
 
-#: WWW/Library/Implementation/HTTP.c:2244
+#: WWW/Library/Implementation/HTTP.c:2382
 msgid "Show the 407 message body?"
 msgstr "Näitan teate 407 keha?"
 
@@ -3325,7 +3334,7 @@ msgstr "Näitan teate 407 keha?"
 #. * Bad or unknown server_status number.  Take a chance and hope
 #. * there is something to display.  - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:2344
+#: WWW/Library/Implementation/HTTP.c:2482
 msgid "Unknown status reply from server!"
 msgstr "Tundmatu oleku vastus serverilt!"
 
@@ -3521,98 +3530,98 @@ msgstr "Mälu on otsas, esitus katkestati!"
 msgid "Memory exhausted, will interrupt transfer!"
 msgstr "Mälu on otsas, katkestan ülekande!"
 
-#: src/GridText.c:3674
+#: src/GridText.c:3666
 msgid " *** MEMORY EXHAUSTED ***"
 msgstr " *** MÄLU ON OTSAS ***"
 
-#: src/GridText.c:6152
+#: src/GridText.c:6144
 msgid "text entry field"
 msgstr "teksti väli"
 
-#: src/GridText.c:6155
+#: src/GridText.c:6147
 msgid "password entry field"
 msgstr "parooli väli"
 
-#: src/GridText.c:6158
+#: src/GridText.c:6150
 msgid "checkbox"
 msgstr "märkeruut"
 
-#: src/GridText.c:6161
+#: src/GridText.c:6153
 msgid "radio button"
 msgstr "raadionupp"
 
-#: src/GridText.c:6164
+#: src/GridText.c:6156
 msgid "submit button"
 msgstr "postitamise nupp"
 
-#: src/GridText.c:6167
+#: src/GridText.c:6159
 msgid "reset button"
 msgstr "algväärtustamise nupp"
 
-#: src/GridText.c:6170
+#: src/GridText.c:6162
 msgid "script button"
 msgstr "skripti nupp"
 
-#: src/GridText.c:6173
+#: src/GridText.c:6165
 msgid "popup menu"
 msgstr "hüpikmenüü"
 
-#: src/GridText.c:6176
+#: src/GridText.c:6168
 msgid "hidden form field"
 msgstr "peidetud vormi väli"
 
-#: src/GridText.c:6179
+#: src/GridText.c:6171
 msgid "text entry area"
 msgstr "tekstiala"
 
-#: src/GridText.c:6182
+#: src/GridText.c:6174
 msgid "range entry field"
 msgstr "vahemiku väli"
 
-#: src/GridText.c:6185
+#: src/GridText.c:6177
 msgid "file entry field"
 msgstr "faili väli"
 
-#: src/GridText.c:6188
+#: src/GridText.c:6180
 msgid "text-submit field"
 msgstr "teksti postitamise väli"
 
-#: src/GridText.c:6191
+#: src/GridText.c:6183
 msgid "image-submit button"
 msgstr "pildi postitamise nupp"
 
-#: src/GridText.c:6194
+#: src/GridText.c:6186
 msgid "keygen field"
 msgstr "võtme loomise väli"
 
-#: src/GridText.c:6197
+#: src/GridText.c:6189
 msgid "unknown form field"
 msgstr "tundmatu vormi väli"
 
-#: src/GridText.c:6217 src/GridText.c:6224 src/LYList.c:249
+#: src/GridText.c:6209 src/GridText.c:6216 src/LYList.c:249
 msgid "unknown field or link"
 msgstr "tundmatu väli või viide"
 
-#: src/GridText.c:10650
+#: src/GridText.c:10633
 msgid "Can't open file for uploading"
 msgstr "Faili ei õnnestu üleslaadimiseks avada"
 
-#: src/GridText.c:11843
+#: src/GridText.c:11821
 #, c-format
 msgid "Submitting %s"
 msgstr "Postitan %s"
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12919
+#: src/GridText.c:12891
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr "Tuvastati hangumine: TextAnchor struktuur on vigane - soovitan katkestada!"
 
 #. don't show previous state
-#: src/GridText.c:13083
+#: src/GridText.c:13050
 msgid "Wrap lines to fit displayed area?"
 msgstr "Murran read et mahtuda ekraanile?"
 
-#: src/GridText.c:13719
+#: src/GridText.c:13680
 msgid "Very long lines have been truncated!"
 msgstr "Väga pikad read on lõigatud!"
 
@@ -3702,27 +3711,27 @@ msgstr "ei"
 #. * (Y/N/Always/neVer)              - English (original)
 #. * (O/N/Toujours/Jamais)           - French
 #.
-#: src/HTAlert.c:940
+#: src/HTAlert.c:938
 msgid "Y/N/A/V"
 msgstr "J/E/A/M"
 
-#: src/HTML.c:5931
+#: src/HTML.c:5932
 msgid "Description:"
 msgstr "Kirjeldus:"
 
-#: src/HTML.c:5936
+#: src/HTML.c:5937
 msgid "(none)"
 msgstr "(puudub)"
 
-#: src/HTML.c:5940
+#: src/HTML.c:5941
 msgid "Filepath:"
 msgstr "Failitee:"
 
-#: src/HTML.c:5946
+#: src/HTML.c:5947
 msgid "(unknown)"
 msgstr "(tundmatu)"
 
-#: src/HTML.c:7386
+#: src/HTML.c:7387
 msgid "Document has only hidden links.  Use the 'l'ist command."
 msgstr "Dokumendis on ainult peidetud viited. Kasuta käsklust 'l'ist."
 
@@ -3790,7 +3799,7 @@ msgstr ""
 msgid "File may be recoverable from %s during this session"
 msgstr "Fail võib selle sessiooni jooksul olla taastatav failist %s"
 
-#: src/LYCgi.c:162
+#: src/LYCgi.c:161
 #, c-format
 msgid "Do you want to execute \"%s\"?"
 msgstr "Kas soovite \"%s\" käivitada?"
@@ -3799,23 +3808,23 @@ msgstr "Kas soovite \"%s\" käivitada?"
 #. * Neither the path as given nor any components examined by backing up
 #. * were stat()able.  - kw
 #.
-#: src/LYCgi.c:277
+#: src/LYCgi.c:276
 msgid "Unable to access cgi script"
 msgstr "Cgi skripti ei saa kasutada"
 
-#: src/LYCgi.c:711 src/LYCgi.c:714
+#: src/LYCgi.c:709 src/LYCgi.c:712
 msgid "Good Advice"
 msgstr "Hea soovitus"
 
-#: src/LYCgi.c:718
+#: src/LYCgi.c:716
 msgid "An excellent http server for VMS is available via"
 msgstr "Suurepärane http server VMS süsteemile on saadav"
 
-#: src/LYCgi.c:725
+#: src/LYCgi.c:723
 msgid "this link"
 msgstr "sellelt viitelt"
 
-#: src/LYCgi.c:729
+#: src/LYCgi.c:727
 msgid "It provides state of the art CGI script support.\n"
 msgstr "See pakub korralikku CGI skriptide tuge.\n"
 
@@ -3823,19 +3832,19 @@ msgstr "See pakub korralikku CGI skriptide tuge.\n"
 msgid "Exiting via interrupt:"
 msgstr "Lõpetan katkestuse tõttu:"
 
-#: src/LYCookie.c:2541
+#: src/LYCookie.c:2537
 msgid "(from a previous session)"
 msgstr "(eelmisest sessioonist)"
 
-#: src/LYCookie.c:2602
+#: src/LYCookie.c:2598
 msgid "Maximum Gobble Date:"
 msgstr "Maksimaalne söömise aeg: "
 
-#: src/LYCookie.c:2641
+#: src/LYCookie.c:2637
 msgid "Internal"
 msgstr "Sisemine"
 
-#: src/LYCookie.c:2642
+#: src/LYCookie.c:2638
 msgid "cookie_domain_flag_set error, aborting program"
 msgstr "cookie_domain_flag_set viga, katkestan programmi töö"
 
@@ -3847,27 +3856,27 @@ msgstr "Terminali uuesti initsialiseerimine ebaõnnestus - tundmatu terminali t
 msgid "Terminal initialisation failed - unknown terminal type?"
 msgstr "Terminali initsialiseerimine ebaõnnestus - tundmatu terminali tüüp?"
 
-#: src/LYCurses.c:1863
+#: src/LYCurses.c:1869
 msgid "Terminal ="
 msgstr "Terminal ="
 
-#: src/LYCurses.c:1867
+#: src/LYCurses.c:1873
 msgid "You must use a vt100, 200, etc. terminal with this program."
 msgstr "Selle programmiga peate kasutama vt100, 200 vms terminali."
 
-#: src/LYCurses.c:1916
+#: src/LYCurses.c:1922
 msgid "Your Terminal type is unknown!"
 msgstr "Teie terminali tüüp on tundmatu!"
 
-#: src/LYCurses.c:1917
+#: src/LYCurses.c:1923
 msgid "Enter a terminal type:"
 msgstr "Sisestage terminali tüüp:"
 
-#: src/LYCurses.c:1931
+#: src/LYCurses.c:1937
 msgid "TERMINAL TYPE IS SET TO"
 msgstr "TERMINALI TÜÜBIKS ON SEATUD"
 
-#: src/LYCurses.c:2483
+#: src/LYCurses.c:2491
 #, c-format
 msgid ""
 "\n"
@@ -3876,7 +3885,7 @@ msgstr ""
 "\n"
 "Fataalne viga tekkis programmis %s Ver. %s\n"
 
-#: src/LYCurses.c:2486
+#: src/LYCurses.c:2494
 #, c-format
 msgid ""
 "\n"
@@ -3943,31 +3952,31 @@ msgstr "Lokaalsed lisad:"
 msgid "No Name Given"
 msgstr "Nimi puudub"
 
-#: src/LYHistory.c:680
+#: src/LYHistory.c:676
 msgid "You selected:"
 msgstr "Teie valik:"
 
-#: src/LYHistory.c:704 src/LYHistory.c:933
+#: src/LYHistory.c:700 src/LYHistory.c:929
 msgid "(no address)"
 msgstr "(aadress puudub)"
 
-#: src/LYHistory.c:708
+#: src/LYHistory.c:704
 msgid " (internal)"
 msgstr " (sisemine)"
 
-#: src/LYHistory.c:710
+#: src/LYHistory.c:706
 msgid " (was internal)"
 msgstr " (oli sisemine)"
 
-#: src/LYHistory.c:808
+#: src/LYHistory.c:804
 msgid " (From History)"
 msgstr " (Ajaloost)"
 
-#: src/LYHistory.c:853
+#: src/LYHistory.c:849
 msgid "You visited (POSTs, bookmark, menu and list files excluded):"
 msgstr "Teie külastused (v.a. POST, järjed, menüü ja listingu failid):"
 
-#: src/LYHistory.c:1155
+#: src/LYHistory.c:1151
 msgid "(No messages yet)"
 msgstr "(Teateid pole veel)"
 
@@ -4307,7 +4316,7 @@ msgstr "On juba sihtkataloogis: %s"
 msgid "Installation complete"
 msgstr "Installeerimine on valmis"
 
-#: src/LYLocal.c:2680
+#: src/LYLocal.c:2678
 msgid "Temporary URL or list would be too long."
 msgstr "Ajutine URL või loend oleks liiga pikk."
 
@@ -4346,19 +4355,19 @@ msgstr "See teade on automaatselt loodud"
 msgid "No system mailer configured"
 msgstr "Süsteemset e-posti programmi ei ole seadistatud"
 
-#: src/LYMain.c:1071
+#: src/LYMain.c:1074
 msgid "No Winsock found, sorry."
 msgstr "Winsock puudub, kahju."
 
-#: src/LYMain.c:1262
+#: src/LYMain.c:1265
 msgid "You MUST define a valid TMP or TEMP area!"
 msgstr "Te PEATE defineerima kehtiva TMP või TEMP piirkonna!"
 
-#: src/LYMain.c:1315 src/LYMainLoop.c:5283
+#: src/LYMain.c:1318 src/LYMainLoop.c:5284
 msgid "No such directory"
 msgstr "Sellist kataloogi ei ole"
 
-#: src/LYMain.c:1509
+#: src/LYMain.c:1512
 #, c-format
 msgid ""
 "\n"
@@ -4369,7 +4378,7 @@ msgstr ""
 "Seadete faili \"%s\" ei ole.\n"
 "\n"
 
-#: src/LYMain.c:1519
+#: src/LYMain.c:1522
 #, c-format
 msgid ""
 "\n"
@@ -4380,66 +4389,66 @@ msgstr ""
 "Lynx kooditabeleid ei ole deklareeritud.\n"
 "\n"
 
-#: src/LYMain.c:1675
+#: src/LYMain.c:1678
 #, c-format
 msgid "Ignored %d characters from standard input.\n"
 msgstr "Ignoreerisin %d sümbolit standard sisendist.\n"
 
-#: src/LYMain.c:1677
+#: src/LYMain.c:1680
 #, c-format
 msgid "Use \"-stdin\" or \"-\" to tell how to handle piped input.\n"
 msgstr "Toruga suunatud sisendi määramiseks kasutage \"-stdin\" või \"-\".\n"
 
-#: src/LYMain.c:1835
+#: src/LYMain.c:1838
 msgid "Warning:"
 msgstr "Hoiatus:"
 
-#: src/LYMain.c:2405
+#: src/LYMain.c:2408
 msgid "persistent cookies state will be changed in next session only."
 msgstr "püsivate präänikute olekut muudetakse alles järgmise sessiooniga."
 
-#: src/LYMain.c:2642 src/LYMain.c:2687
+#: src/LYMain.c:2645 src/LYMain.c:2690
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr "Lynx: ignoreerin tundmatut kooditabelit %s\n"
 
-#: src/LYMain.c:3206
+#: src/LYMain.c:3209
 #, c-format
 msgid "%s Version %s (%s)"
 msgstr "%s Versioon %s (%s)"
 
-#: src/LYMain.c:3247
+#: src/LYMain.c:3250
 #, c-format
 msgid "Built on %s%s.\n"
 msgstr "Ehitatud %s%s.\n"
 
-#: src/LYMain.c:3261
+#: src/LYMain.c:3264
 msgid "Copyrights held by the Lynx Developers Group,"
 msgstr "Autoriõiguseid hoiavad Lynx Developers Group,"
 
-#: src/LYMain.c:3262
+#: src/LYMain.c:3265
 msgid "the University of Kansas, CERN, and other contributors."
 msgstr "University of Kansas, CERN ja teised."
 
-#: src/LYMain.c:3263
+#: src/LYMain.c:3266
 msgid "Distributed under the GNU General Public License (Version 2)."
 msgstr "Levitatakse GNU üldise avaliku litsensiga (Versioon 2)."
 
-#: src/LYMain.c:3264
+#: src/LYMain.c:3267
 msgid "See http://lynx.invisible-island.net/ and the online help for more information."
 msgstr "Abi ja muud infot leiate aadressil http://lynx.invisible-island.net/."
 
-#: src/LYMain.c:4107
+#: src/LYMain.c:4118
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "KASUTAMINE: %s [võtmed] [fail]\n"
 
-#: src/LYMain.c:4108
+#: src/LYMain.c:4119
 #, c-format
 msgid "Options are:\n"
 msgstr "Võtmed on:\n"
 
-#: src/LYMain.c:4411
+#: src/LYMain.c:4422
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr "%s: Vigane võti: %s\n"
@@ -4449,7 +4458,7 @@ msgstr "%s: Vigane võti: %s\n"
 msgid "Internal error: Invalid mouse link %d!"
 msgstr "Sisemine viga: Vigane hiire viide %d!"
 
-#: src/LYMainLoop.c:693 src/LYMainLoop.c:5305
+#: src/LYMainLoop.c:693 src/LYMainLoop.c:5306
 msgid "A URL specified by the user"
 msgstr "Kasutaja poolt antud URL"
 
@@ -4468,89 +4477,89 @@ msgstr "Abiinfo ekraan"
 msgid "System Index"
 msgstr "Süsteemi indeks"
 
-#: src/LYMainLoop.c:3575
+#: src/LYMainLoop.c:3576
 #, c-format
 msgid "Query parameter %d: "
 msgstr "Päringu parameeter %d: "
 
-#: src/LYMainLoop.c:3804 src/LYMainLoop.c:5581
+#: src/LYMainLoop.c:3805 src/LYMainLoop.c:5582
 msgid "Entry into main screen"
 msgstr "Sisenemine põhiekraanile"
 
-#: src/LYMainLoop.c:4062
+#: src/LYMainLoop.c:4063
 msgid "No next document present"
 msgstr "Järgmist dokumenti pole"
 
-#: src/LYMainLoop.c:4357
+#: src/LYMainLoop.c:4358
 msgid "charset for this document specified explicitly, sorry..."
 msgstr "kahjuks on selle dokumendi kooditabel üheselt määratud..."
 
-#: src/LYMainLoop.c:5263
+#: src/LYMainLoop.c:5264
 msgid "cd to:"
 msgstr "mine kataloogi:"
 
-#: src/LYMainLoop.c:5286
+#: src/LYMainLoop.c:5287
 msgid "A component of path is not a directory"
 msgstr "Tee komponent ei ole kataloog"
 
-#: src/LYMainLoop.c:5289
+#: src/LYMainLoop.c:5290
 msgid "failed to change directory"
 msgstr "kataloogi ei õnnestu vahetada"
 
-#: src/LYMainLoop.c:6515
+#: src/LYMainLoop.c:6516
 msgid "Reparsing document under current settings..."
 msgstr "Parsin dokumendi uuesti jooksvate seadetega..."
 
-#: src/LYMainLoop.c:6809
+#: src/LYMainLoop.c:6810
 #, c-format
 msgid "Fatal error - could not open output file %s\n"
 msgstr "Fataalne viga - ei õnnestu avada väljundfaili %s\n"
 
-#: src/LYMainLoop.c:7151
+#: src/LYMainLoop.c:7152
 msgid "TABLE center enable."
 msgstr "TABELI tsentreerimine lubatud."
 
-#: src/LYMainLoop.c:7154
+#: src/LYMainLoop.c:7155
 msgid "TABLE center disable."
 msgstr "TABELI tsentreerimine blokeeritud."
 
-#: src/LYMainLoop.c:7234
+#: src/LYMainLoop.c:7235
 msgid "Current URL is empty."
 msgstr "Jooksev URL on tühi."
 
-#: src/LYMainLoop.c:7236 src/LYUtils.c:1917
+#: src/LYMainLoop.c:7237 src/LYUtils.c:1915
 msgid "Copy to clipboard failed."
 msgstr "Lõikepuhvrisse kopeerimine ebaõnnestus."
 
-#: src/LYMainLoop.c:7238
+#: src/LYMainLoop.c:7239
 msgid "Document URL put to clipboard."
 msgstr "Panin dokumendi URLi lõikepuhvrisse."
 
-#: src/LYMainLoop.c:7240
+#: src/LYMainLoop.c:7241
 msgid "Link URL put to clipboard."
 msgstr "Panin viite URLi lõikepuhvrisse."
 
-#: src/LYMainLoop.c:7267
+#: src/LYMainLoop.c:7268
 msgid "No URL in the clipboard."
 msgstr "Lõikepuhvris URLe ei ole."
 
-#: src/LYMainLoop.c:7960 src/LYMainLoop.c:8131
+#: src/LYMainLoop.c:7961 src/LYMainLoop.c:8132
 msgid "-index-"
 msgstr "-indeks-"
 
-#: src/LYMainLoop.c:8069
+#: src/LYMainLoop.c:8070
 msgid "lynx: Can't access startfile"
 msgstr "lynx: Ei õnnestu laadida esilehte"
 
-#: src/LYMainLoop.c:8081
+#: src/LYMainLoop.c:8082
 msgid "lynx: Start file could not be found or is not text/html or text/plain"
 msgstr "lynx: Esilehte pole või ei ole text/html ega text/plain tüüpi"
 
-#: src/LYMainLoop.c:8082
+#: src/LYMainLoop.c:8083
 msgid "      Exiting..."
 msgstr "      Lõpetan..."
 
-#: src/LYMainLoop.c:8125
+#: src/LYMainLoop.c:8126
 msgid "-more-"
 msgstr "-veel-"
 
@@ -4622,374 +4631,392 @@ msgstr "vaara/toimeta B=järgede faile"
 msgid "B)ookmark file: "
 msgstr "B=järgede fail: "
 
-#: src/LYOptions.c:2123 src/LYOptions.c:2130
+#: src/LYOptions.c:2127 src/LYOptions.c:2134
 msgid "ON"
 msgstr "SEES"
 
 #. verbose_img variable
-#: src/LYOptions.c:2124 src/LYOptions.c:2129 src/LYOptions.c:2302
-#: src/LYOptions.c:2313
+#. LYCollapseBRs variable
+#. LYtrimBlankLines variable
+#: src/LYOptions.c:2128 src/LYOptions.c:2133 src/LYOptions.c:2306
+#: src/LYOptions.c:2315 src/LYOptions.c:2324 src/LYOptions.c:2335
 msgid "OFF"
 msgstr "VÄLJAS"
 
-#: src/LYOptions.c:2125
+#: src/LYOptions.c:2129
 msgid "NEVER"
 msgstr "MITTE KUNAGI"
 
-#: src/LYOptions.c:2126
+#: src/LYOptions.c:2130
 msgid "ALWAYS"
 msgstr "ALATI"
 
-#: src/LYOptions.c:2142 src/LYOptions.c:2294
+#: src/LYOptions.c:2146 src/LYOptions.c:2298
 msgid "ignore"
 msgstr "ignoreeri"
 
-#: src/LYOptions.c:2143
+#: src/LYOptions.c:2147
 msgid "ask user"
 msgstr "küsi kasutajalt"
 
-#: src/LYOptions.c:2144
+#: src/LYOptions.c:2148
 msgid "accept all"
 msgstr "luba kõik"
 
-#: src/LYOptions.c:2156
+#: src/LYOptions.c:2160
 msgid "ALWAYS OFF"
 msgstr "ALATI VÄLJAS"
 
-#: src/LYOptions.c:2157
+#: src/LYOptions.c:2161
 msgid "FOR LOCAL FILES ONLY"
 msgstr "AINULT KOHALIKELE FAILIDELE"
 
-#: src/LYOptions.c:2159
+#: src/LYOptions.c:2163
 msgid "ALWAYS ON"
 msgstr "ALATI SEES"
 
-#: src/LYOptions.c:2171
+#: src/LYOptions.c:2175
 msgid "Numbers act as arrows"
 msgstr "numbrid käituvad nooltena"
 
-#: src/LYOptions.c:2173
+#: src/LYOptions.c:2177
 msgid "Links are numbered"
 msgstr "Viited on nummerdatud"
 
-#: src/LYOptions.c:2176
+#: src/LYOptions.c:2180
 msgid "Links and form fields are numbered"
 msgstr "Viited ja vormide väljad on nummerdatud"
 
-#: src/LYOptions.c:2179
+#: src/LYOptions.c:2183
 msgid "Form fields are numbered"
 msgstr "Vormide väljad on nummerdatud"
 
-#: src/LYOptions.c:2194
+#: src/LYOptions.c:2198
 msgid "Case insensitive"
 msgstr "Tõstutundetu"
 
-#: src/LYOptions.c:2195
+#: src/LYOptions.c:2199
 msgid "Case sensitive"
 msgstr "Tõstutundlik"
 
-#: src/LYOptions.c:2229
+#: src/LYOptions.c:2233
 msgid "prompt normally"
 msgstr "küsi tavapäraselt"
 
-#: src/LYOptions.c:2230
+#: src/LYOptions.c:2234
 msgid "force yes-response"
 msgstr "paku jah-vastus"
 
-#: src/LYOptions.c:2231
+#: src/LYOptions.c:2235
 msgid "force no-response"
 msgstr "paku ei-vastus"
 
-#: src/LYOptions.c:2249
+#: src/LYOptions.c:2253
 msgid "Novice"
 msgstr "Algaja"
 
-#: src/LYOptions.c:2250
+#: src/LYOptions.c:2254
 msgid "Intermediate"
 msgstr "Vahepealne"
 
-#: src/LYOptions.c:2251
+#: src/LYOptions.c:2255
 msgid "Advanced"
 msgstr "Edasijõudnud"
 
-#: src/LYOptions.c:2260
+#: src/LYOptions.c:2264
 msgid "By First Visit"
 msgstr "Esmase külastuse järgi"
 
-#: src/LYOptions.c:2262
+#: src/LYOptions.c:2266
 msgid "By First Visit Reversed"
 msgstr "Pööratud esmase külastuse järgi"
 
-#: src/LYOptions.c:2263
+#: src/LYOptions.c:2267
 msgid "As Visit Tree"
 msgstr "Külastuste puu"
 
-#: src/LYOptions.c:2264
+#: src/LYOptions.c:2268
 msgid "By Last Visit"
 msgstr "Viimase külastuse järgi"
 
-#: src/LYOptions.c:2266
+#: src/LYOptions.c:2270
 msgid "By Last Visit Reversed"
 msgstr "Pööratud viimase külastuse järgi"
 
 #. Old_DTD variable
-#: src/LYOptions.c:2277
+#: src/LYOptions.c:2281
 msgid "relaxed (TagSoup mode)"
 msgstr "lõtv (TagSoup mood)"
 
-#: src/LYOptions.c:2278
+#: src/LYOptions.c:2282
 msgid "strict (SortaSGML mode)"
 msgstr "range (SortaSGML mood)"
 
-#: src/LYOptions.c:2285
+#: src/LYOptions.c:2289
 msgid "Ignore"
 msgstr "Ignoreeri"
 
-#: src/LYOptions.c:2286
+#: src/LYOptions.c:2290
 msgid "Add to trace-file"
 msgstr "Lisa trasseerimise faili"
 
-#: src/LYOptions.c:2287
+#: src/LYOptions.c:2291
 msgid "Add to LYNXMESSAGES"
 msgstr "Lisa LYNXMESSAGES"
 
-#: src/LYOptions.c:2288
+#: src/LYOptions.c:2292
 msgid "Warn, point to trace-file"
 msgstr "Hoiatus, osutab trasserimise failile"
 
-#: src/LYOptions.c:2295
+#: src/LYOptions.c:2299
 msgid "as labels"
 msgstr "kui märgendid"
 
-#: src/LYOptions.c:2296
+#: src/LYOptions.c:2300
 msgid "as links"
 msgstr "kui viited"
 
-#: src/LYOptions.c:2303
+#: src/LYOptions.c:2307
 msgid "show filename"
 msgstr "näita failinime"
 
-#: src/LYOptions.c:2314
+#: src/LYOptions.c:2316
+msgid "collapse"
+msgstr "kollaps"
+
+#: src/LYOptions.c:2325
+msgid "trim-lines"
+msgstr "vähenda-ridu"
+
+#: src/LYOptions.c:2336
 msgid "STANDARD"
 msgstr "STANDARD"
 
-#: src/LYOptions.c:2315
+#: src/LYOptions.c:2337
 msgid "ADVANCED"
 msgstr "LAIENDATUD"
 
-#: src/LYOptions.c:2349
+#: src/LYOptions.c:2371
 msgid "Directories first"
 msgstr "Esmalt kataloogid"
 
-#: src/LYOptions.c:2350
+#: src/LYOptions.c:2372
 msgid "Files first"
 msgstr "Esimalt failid"
 
-#: src/LYOptions.c:2351
+#: src/LYOptions.c:2373
 msgid "Mixed style"
 msgstr "Segastiil"
 
-#: src/LYOptions.c:2359 src/LYOptions.c:2379
+#: src/LYOptions.c:2381 src/LYOptions.c:2401
 msgid "By Name"
 msgstr "Nime järgi"
 
-#: src/LYOptions.c:2360 src/LYOptions.c:2380
+#: src/LYOptions.c:2382 src/LYOptions.c:2402
 msgid "By Type"
 msgstr "Tüübi järgi"
 
-#: src/LYOptions.c:2361 src/LYOptions.c:2381
+#: src/LYOptions.c:2383 src/LYOptions.c:2403
 msgid "By Size"
 msgstr "Mahu järgi"
 
-#: src/LYOptions.c:2362 src/LYOptions.c:2382
+#: src/LYOptions.c:2384 src/LYOptions.c:2404
 msgid "By Date"
 msgstr "Kuupäeva järgi"
 
-#: src/LYOptions.c:2363
+#: src/LYOptions.c:2385
 msgid "By Mode"
 msgstr "moodi järgi"
 
-#: src/LYOptions.c:2365
+#: src/LYOptions.c:2387
 msgid "By User"
 msgstr "Kasutaja järgi"
 
-#: src/LYOptions.c:2366
+#: src/LYOptions.c:2388
 msgid "By Group"
 msgstr "Grupi järgi"
 
-#: src/LYOptions.c:2391
+#: src/LYOptions.c:2413
 msgid "Do not show rate"
 msgstr "Ära näita kiirust"
 
-#: src/LYOptions.c:2392 src/LYOptions.c:2393
+#: src/LYOptions.c:2414 src/LYOptions.c:2415
 #, c-format
 msgid "Show %s/sec rate"
 msgstr "Näita %s/sek kiirust"
 
-#: src/LYOptions.c:2395 src/LYOptions.c:2396
+#: src/LYOptions.c:2417 src/LYOptions.c:2418
 #, c-format
 msgid "Show %s/sec, ETA"
 msgstr "Näita %s/sek, ETA"
 
-#: src/LYOptions.c:2397 src/LYOptions.c:2398
+#: src/LYOptions.c:2419 src/LYOptions.c:2420
 #, c-format
 msgid "Show %s/sec (2-digits), ETA"
 msgstr "Näita %s/sek (2-numbrit), ETA"
 
-#: src/LYOptions.c:2401
+#: src/LYOptions.c:2423
 msgid "Show progressbar"
 msgstr "Näita progressiriba"
 
-#: src/LYOptions.c:2413
+#: src/LYOptions.c:2435
 msgid "Accept lynx's internal types"
 msgstr "Luba lynxi sisemised tüübid"
 
-#: src/LYOptions.c:2414
+#: src/LYOptions.c:2436
 msgid "Also accept lynx.cfg's types"
 msgstr "Luba ka lynx.cfg tüübid"
 
-#: src/LYOptions.c:2415
+#: src/LYOptions.c:2437
 msgid "Also accept user's types"
 msgstr "Luba ka kasutaja tüübid"
 
-#: src/LYOptions.c:2416
+#: src/LYOptions.c:2438
 msgid "Also accept system's types"
 msgstr "Luba ka süsteemsed tüübid"
 
-#: src/LYOptions.c:2417
+#: src/LYOptions.c:2439
 msgid "Accept all types"
 msgstr "Luba kõik tüübid"
 
-#: src/LYOptions.c:2426
+#: src/LYOptions.c:2448
 msgid "gzip"
 msgstr "gzip"
 
-#: src/LYOptions.c:2427
+#: src/LYOptions.c:2449
 msgid "deflate"
 msgstr "kahanda"
 
-#: src/LYOptions.c:2430
+#: src/LYOptions.c:2452
 msgid "compress"
 msgstr "compress"
 
-#: src/LYOptions.c:2433
+#: src/LYOptions.c:2455
 msgid "bzip2"
 msgstr "bzip2"
 
-#: src/LYOptions.c:2435
+#: src/LYOptions.c:2457
 msgid "All"
 msgstr "Kõik"
 
-#: src/LYOptions.c:2801 src/LYOptions.c:2830
+#: src/LYOptions.c:2467
+msgid "HTTP 1.0"
+msgstr "HTTP 1.0"
+
+#: src/LYOptions.c:2468
+msgid "HTTP 1.1"
+msgstr "HTTP 1.1"
+
+#: src/LYOptions.c:2827 src/LYOptions.c:2856
 #, c-format
 msgid "Use %s to invoke the Options menu!"
 msgstr "Seadete menüü saamiseks kasutage %s!"
 
-#: src/LYOptions.c:3688
+#: src/LYOptions.c:3739
 msgid "(options marked with (!) will not be saved)"
 msgstr "((!) märgitud seadeid ei salvestata)"
 
-#: src/LYOptions.c:3696
+#: src/LYOptions.c:3747
 msgid "General Preferences"
 msgstr "Üldised seaded"
 
 #. ***************************************************************
 #. User Mode: SELECT
-#: src/LYOptions.c:3700
+#: src/LYOptions.c:3751
 msgid "User mode"
 msgstr "Kasutaja mood"
 
 #. Editor: INPUT
-#: src/LYOptions.c:3706
+#: src/LYOptions.c:3757
 msgid "Editor"
 msgstr "Toimeti"
 
 #. Search Type: SELECT
-#: src/LYOptions.c:3711
+#: src/LYOptions.c:3762
 msgid "Type of Search"
 msgstr "Otsingutüüp"
 
-#: src/LYOptions.c:3716
+#: src/LYOptions.c:3767
 msgid "Security and Privacy"
 msgstr "Turvalisus ja privaatsus"
 
 #. ***************************************************************
 #. Cookies: SELECT
-#: src/LYOptions.c:3720
+#: src/LYOptions.c:3771
 msgid "Cookies"
 msgstr "Präänikud"
 
 #. Cookie Prompting: SELECT
-#: src/LYOptions.c:3734
+#: src/LYOptions.c:3785
 msgid "Invalid-Cookie Prompting"
 msgstr "Vigase prääniku küsimine"
 
 #. SSL Prompting: SELECT
-#: src/LYOptions.c:3741
+#: src/LYOptions.c:3792
 msgid "SSL Prompting"
 msgstr "SSL küsimine"
 
-#: src/LYOptions.c:3746
+#: src/LYOptions.c:3797
 msgid "SSL client certificate file"
 msgstr "SSL kliendi sertifikaadi fail"
 
-#: src/LYOptions.c:3750
+#: src/LYOptions.c:3801
 msgid "SSL client key file"
 msgstr "SSL kliendi võtme fail"
 
-#: src/LYOptions.c:3756
+#: src/LYOptions.c:3807
 msgid "Keyboard Input"
 msgstr "Sisend klaviatuurilt"
 
 #. ***************************************************************
 #. Keypad Mode: SELECT
-#: src/LYOptions.c:3760
+#: src/LYOptions.c:3811
 msgid "Keypad mode"
 msgstr "Klahvistiku mood"
 
 #. Emacs keys: ON/OFF
-#: src/LYOptions.c:3766
+#: src/LYOptions.c:3817
 msgid "Emacs keys"
 msgstr "Emacs klahvid"
 
 #. VI Keys: ON/OFF
-#: src/LYOptions.c:3772
+#: src/LYOptions.c:3823
 msgid "VI keys"
 msgstr "VI klahvid"
 
 #. Line edit style: SELECT
 #. well, at least 2 line edit styles available
-#: src/LYOptions.c:3779
+#: src/LYOptions.c:3830
 msgid "Line edit style"
 msgstr "Reatoimeti mood"
 
 #. Keyboard layout: SELECT
-#: src/LYOptions.c:3791
+#: src/LYOptions.c:3842
 msgid "Keyboard layout"
 msgstr "Klaviatuuri asetus"
 
 #.
 #. * Display and Character Set
 #.
-#: src/LYOptions.c:3805
+#: src/LYOptions.c:3856
 msgid "Display and Character Set"
 msgstr "Ekraan ja kooditabel"
 
 #. Use locale-based character set: ON/OFF
-#: src/LYOptions.c:3810
+#: src/LYOptions.c:3861
 msgid "Use locale-based character set"
 msgstr "Kasuta lokaadi põhist kooditabelit"
 
-#: src/LYOptions.c:3817
+#: src/LYOptions.c:3868
 msgid "Use HTML5 charset replacements"
 msgstr "Kasuta HTML5 tähestiku asendusi"
 
 #. Display Character Set: SELECT
-#: src/LYOptions.c:3823
+#: src/LYOptions.c:3874
 msgid "Display character set"
 msgstr "Ekraani kooditabel"
 
-#: src/LYOptions.c:3854
+#: src/LYOptions.c:3905
 msgid "Assumed document character set"
 msgstr "Eeldatav dokumendi kooditabel"
 
@@ -4998,211 +5025,226 @@ msgstr "Eeldatav dokumendi kooditabel"
 #. * we split the header to make it more readable:
 #. * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others.
 #.
-#: src/LYOptions.c:3874
+#: src/LYOptions.c:3925
 msgid "CJK mode"
 msgstr "CJK mood"
 
-#: src/LYOptions.c:3876
+#: src/LYOptions.c:3927
 msgid "Raw 8-bit"
 msgstr "Puhas 8-bitti"
 
 #. X Display: INPUT
-#: src/LYOptions.c:3884
+#: src/LYOptions.c:3935
 msgid "X Display"
 msgstr "X Ekraan"
 
 #.
 #. * Document Appearance
 #.
-#: src/LYOptions.c:3890
+#: src/LYOptions.c:3941
 msgid "Document Appearance"
 msgstr "Dokumendi esitamine"
 
-#: src/LYOptions.c:3896
+#: src/LYOptions.c:3947
 msgid "Show color"
 msgstr "Näita värve"
 
 #. Color style: ON/OFF
-#: src/LYOptions.c:3921
+#: src/LYOptions.c:3972
 msgid "Color style"
 msgstr "Värvi stiil"
 
-#: src/LYOptions.c:3930
+#: src/LYOptions.c:3981
 msgid "Default colors"
 msgstr "Vaikimisi värvid"
 
 #. Show cursor: ON/OFF
-#: src/LYOptions.c:3938
+#: src/LYOptions.c:3989
 msgid "Show cursor"
 msgstr "Näita kursorit"
 
 #. Underline links: ON/OFF
-#: src/LYOptions.c:3944
+#: src/LYOptions.c:3995
 msgid "Underline links"
 msgstr "Jooni viited"
 
 #. Show scrollbar: ON/OFF
-#: src/LYOptions.c:3951
+#: src/LYOptions.c:4002
 msgid "Show scrollbar"
 msgstr "Näita kerimisriba"
 
 #. Select Popups: ON/OFF
-#: src/LYOptions.c:3958
+#: src/LYOptions.c:4009
 msgid "Popups for select fields"
 msgstr "Hüpikud valikuväljadele"
 
 #. HTML error recovery: SELECT
-#: src/LYOptions.c:3964
+#: src/LYOptions.c:4015
 msgid "HTML error recovery"
 msgstr "HTML veatöötlus"
 
 #. Bad HTML messages: SELECT
-#: src/LYOptions.c:3970
+#: src/LYOptions.c:4021
 msgid "Bad HTML messages"
 msgstr "Halvad HTML teated"
 
 #. Show Images: SELECT
-#: src/LYOptions.c:3976
+#: src/LYOptions.c:4027
 msgid "Show images"
 msgstr "Näita pilte"
 
 #. Verbose Images: ON/OFF
-#: src/LYOptions.c:3990
+#: src/LYOptions.c:4041
 msgid "Verbose images"
 msgstr "Verbaalsed pildid"
 
+#. Collapse BR Tags: ON/OFF
+#: src/LYOptions.c:4047
+msgid "Collapse BR tags"
+msgstr "BR tagide kollaps"
+
+#. Trim blank lines: ON/OFF
+#: src/LYOptions.c:4053
+msgid "Trim blank lines"
+msgstr "Vähenda tühje ridu"
+
 #.
 #. * Headers Transferred to Remote Servers
 #.
-#: src/LYOptions.c:3998
+#: src/LYOptions.c:4061
 msgid "Headers Transferred to Remote Servers"
 msgstr "Serverile saadetavad päised"
 
 #. ***************************************************************
 #. Mail Address: INPUT
-#: src/LYOptions.c:4002
+#: src/LYOptions.c:4065
 msgid "Personal mail address"
 msgstr "Isiklik e-posti aadress"
 
-#: src/LYOptions.c:4007
+#: src/LYOptions.c:4070
 msgid "Personal name for mail"
 msgstr "Teie nimi e-postituses"
 
-#: src/LYOptions.c:4014
+#: src/LYOptions.c:4077
 msgid "Password for anonymous ftp"
 msgstr "Anonüümse ftp parool"
 
 #. Preferred media type: SELECT
-#: src/LYOptions.c:4020
+#: src/LYOptions.c:4083
 msgid "Preferred media type"
 msgstr "Eelistatud meedia tüüp"
 
 #. Preferred encoding: SELECT
-#: src/LYOptions.c:4026
+#: src/LYOptions.c:4089
 msgid "Preferred encoding"
 msgstr "Eelistatud kodeering"
 
 #. Preferred Document Character Set: INPUT
-#: src/LYOptions.c:4032
+#: src/LYOptions.c:4095
 msgid "Preferred document character set"
 msgstr "Eelistatuim dokumendi kooditabel"
 
 #. Preferred Document Language: INPUT
-#: src/LYOptions.c:4037
+#: src/LYOptions.c:4100
 msgid "Preferred document language"
 msgstr "Eelistatuim dokumendi keel"
 
-#: src/LYOptions.c:4043
+#. HTTP protocol SELECT
+#: src/LYOptions.c:4105
+msgid "HTTP protocol"
+msgstr "HTTP protokoll"
+
+#: src/LYOptions.c:4112
 msgid "Send User-Agent header"
 msgstr "Saada User-Agent päis"
 
-#: src/LYOptions.c:4045
+#: src/LYOptions.c:4114
 msgid "User-Agent header"
 msgstr "User-Agent päis"
 
 #.
 #. * Listing and Accessing Files
 #.
-#: src/LYOptions.c:4053
+#: src/LYOptions.c:4122
 msgid "Listing and Accessing Files"
 msgstr "Failide näitamine ja kasutamine"
 
 #. FTP sort: SELECT
-#: src/LYOptions.c:4058
+#: src/LYOptions.c:4127
 msgid "Use Passive FTP"
 msgstr "Kasuta Passive FTP"
 
 #. FTP sort: SELECT
-#: src/LYOptions.c:4064
+#: src/LYOptions.c:4133
 msgid "FTP sort criteria"
 msgstr "FTP järjestamine"
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:4072
+#: src/LYOptions.c:4141
 msgid "Local directory sort criteria"
 msgstr "Lokaalse kataloogi järjestamine"
 
 #. Local Directory Order: SELECT
-#: src/LYOptions.c:4078
+#: src/LYOptions.c:4147
 msgid "Local directory sort order"
 msgstr "Lokaalse kataloogi järjestamine"
 
-#: src/LYOptions.c:4087
+#: src/LYOptions.c:4156
 msgid "Show dot files"
 msgstr "Näita punktiga faile"
 
-#: src/LYOptions.c:4095
+#: src/LYOptions.c:4164
 msgid "Execution links"
 msgstr "Täidetavad viited"
 
-#: src/LYOptions.c:4113
+#: src/LYOptions.c:4182
 msgid "Pause when showing message"
 msgstr "Peatu teate näitamisel"
 
 #. Show transfer rate: SELECT
-#: src/LYOptions.c:4120
+#: src/LYOptions.c:4189
 msgid "Show transfer rate"
 msgstr "Näita laadimise kiirust"
 
 #.
 #. * Special Files and Screens
 #.
-#: src/LYOptions.c:4140
+#: src/LYOptions.c:4209
 msgid "Special Files and Screens"
 msgstr "Spetsiaalfailid ja ekraanid"
 
-#: src/LYOptions.c:4145
+#: src/LYOptions.c:4214
 msgid "Multi-bookmarks"
 msgstr "Järgede failid"
 
-#: src/LYOptions.c:4153
+#: src/LYOptions.c:4222
 msgid "Review/edit Bookmarks files"
 msgstr "vaata/toimeta järgede faile"
 
-#: src/LYOptions.c:4156
+#: src/LYOptions.c:4225
 msgid "Goto multi-bookmark menu"
 msgstr "Mine mitme-järje menüüsse"
 
-#: src/LYOptions.c:4158
+#: src/LYOptions.c:4227
 msgid "Bookmarks file"
 msgstr "Järgede fail"
 
 #. Auto Session: ON/OFF
-#: src/LYOptions.c:4165
+#: src/LYOptions.c:4234
 msgid "Auto Session"
 msgstr "Auto Sessioon"
 
 #. Session File Menu: INPUT
-#: src/LYOptions.c:4171
+#: src/LYOptions.c:4240
 msgid "Session file"
 msgstr "Sessiooni fail"
 
 #. Visited Pages: SELECT
-#: src/LYOptions.c:4177
+#: src/LYOptions.c:4246
 msgid "Visited Pages"
 msgstr "Külastatud lehed"
 
-#: src/LYOptions.c:4182
+#: src/LYOptions.c:4251
 msgid "View the file "
 msgstr "Vaata faili"
 
@@ -5267,7 +5309,7 @@ msgstr "Väljasta ekraanile"
 msgid "Print out on a printer attached to your vt100 terminal"
 msgstr "Trüki vt100 terminaliga ühendatud printerile"
 
-#: src/LYReadCFG.c:441
+#: src/LYReadCFG.c:437
 #, c-format
 msgid ""
 "Syntax Error parsing COLOR in configuration file:\n"
@@ -5284,76 +5326,76 @@ msgstr ""
 "ESIPLAAN ja TAUST peab olema üks järgnevaist:\n"
 "Sõne 'nocolor' või 'default', või\n"
 
-#: src/LYReadCFG.c:454
+#: src/LYReadCFG.c:450
 msgid "Offending line:"
 msgstr "Vigane rida:"
 
-#: src/LYReadCFG.c:769
+#: src/LYReadCFG.c:764
 #, c-format
 msgid "key remapping of %s to %s for %s failed\n"
 msgstr "klahvi %s -> %s ümbermääramine %s jaoks ebaõnnestus\n"
 
-#: src/LYReadCFG.c:776
+#: src/LYReadCFG.c:771
 #, c-format
 msgid "key remapping of %s to %s failed\n"
 msgstr "klahvi %s -> %s ümbermääramine ebaõnnestus\n"
 
-#: src/LYReadCFG.c:797
+#: src/LYReadCFG.c:792
 #, c-format
 msgid "invalid line-editor selection %s for key %s, selecting all\n"
 msgstr "vigane rea-toimeti valik %s klahvile %s, valik kõik\n"
 
-#: src/LYReadCFG.c:822 src/LYReadCFG.c:834
+#: src/LYReadCFG.c:817 src/LYReadCFG.c:829
 #, c-format
 msgid "setting of line-editor binding for key %s (0x%x) to 0x%x for %s failed\n"
 msgstr "rea-toimeti klahviseose seadmine %s (0x%x) -> 0x%x %s jaoks ebaõnnestus\n"
 
-#: src/LYReadCFG.c:838
+#: src/LYReadCFG.c:833
 #, c-format
 msgid "setting of line-editor binding for key %s (0x%x) for %s failed\n"
 msgstr "rea-toimeti klahviseose seadmine klahv %s (0x%x) %s jaoks ebaõnnestus\n"
 
-#: src/LYReadCFG.c:934
+#: src/LYReadCFG.c:929
 #, c-format
 msgid "Lynx: cannot start, CERN rules file %s is not available\n"
 msgstr "Lynx: ei saa startida, CERN reeglite fail %s ei ole kasutatav\n"
 
-#: src/LYReadCFG.c:935
+#: src/LYReadCFG.c:930
 msgid "(no name)"
 msgstr "(nimetu)"
 
-#: src/LYReadCFG.c:2075
+#: src/LYReadCFG.c:2070
 #, c-format
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
 msgstr "Rohkem kui %d lynx.cfg kaasamist -- vahest on tekkinud tsükkel?!?\n"
 
-#: src/LYReadCFG.c:2077
+#: src/LYReadCFG.c:2072
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr "Viimane kaasata üritatud fail oli '%s',\n"
 
-#: src/LYReadCFG.c:2078
+#: src/LYReadCFG.c:2073
 #, c-format
 msgid "included from '%s'.\n"
 msgstr "kaasatud failist '%s'.\n"
 
-#: src/LYReadCFG.c:2481 src/LYReadCFG.c:2494 src/LYReadCFG.c:2552
+#: src/LYReadCFG.c:2476 src/LYReadCFG.c:2489 src/LYReadCFG.c:2547
 msgid "The following is read from your lynx.cfg file."
 msgstr "Järgnev on loetud teie lynx.cfg failist."
 
-#: src/LYReadCFG.c:2482 src/LYReadCFG.c:2495
+#: src/LYReadCFG.c:2477 src/LYReadCFG.c:2490
 msgid "Please read the distribution"
 msgstr "Lisainfo jaoks lugege palun"
 
-#: src/LYReadCFG.c:2488 src/LYReadCFG.c:2498
+#: src/LYReadCFG.c:2483 src/LYReadCFG.c:2493
 msgid "for more comments."
 msgstr "paketis olevat faili."
 
-#: src/LYReadCFG.c:2534
+#: src/LYReadCFG.c:2529
 msgid "RELOAD THE CHANGES"
 msgstr "MUUTUSTE LAADIMINE"
 
-#: src/LYReadCFG.c:2542
+#: src/LYReadCFG.c:2537
 msgid "Your primary configuration"
 msgstr "Teie primaarsed seaded"
 
@@ -5572,7 +5614,7 @@ msgstr "Jooksval lehel ei ole viiteid"
 msgid "Server Headers:"
 msgstr "Serveri päised:"
 
-#: src/LYStyle.c:338
+#: src/LYStyle.c:339
 #, c-format
 msgid ""
 "Syntax Error parsing style in lss file:\n"
@@ -5589,7 +5631,7 @@ msgstr ""
 "kus OBJEKT on üks järgnevaist EM,STRONG,B,I,U,BLINK jne.\n"
 "\n"
 
-#: src/LYStyle.c:933
+#: src/LYStyle.c:948
 #, c-format
 msgid ""
 "\n"
@@ -5632,33 +5674,33 @@ msgstr "Lae üles:"
 msgid "Upload options:"
 msgstr "Üleslaadimise seaded:"
 
-#: src/LYUtils.c:1919
+#: src/LYUtils.c:1917
 msgid "Download document URL put to clipboard."
 msgstr "Panin dokumendi allalaadimise URLi lõikepuhvrisse."
 
-#: src/LYUtils.c:2666
+#: src/LYUtils.c:2664
 msgid "Unexpected access protocol for this URL scheme."
 msgstr "Selle URL skeemiga kasutatakse ootamatut kasutamise protokolli."
 
-#: src/LYUtils.c:3571
+#: src/LYUtils.c:3569
 msgid "Too many tempfiles"
 msgstr "Liiga palju ajutisi faile"
 
-#: src/LYUtils.c:3871
+#: src/LYUtils.c:3869
 msgid "unknown restriction"
 msgstr "tundmatu piirang"
 
-#: src/LYUtils.c:3902
+#: src/LYUtils.c:3900
 #, c-format
 msgid "No restrictions set.\n"
 msgstr "Piiranguid pole.\n"
 
-#: src/LYUtils.c:3905
+#: src/LYUtils.c:3903
 #, c-format
 msgid "Restrictions set:\n"
 msgstr "Seatud piirangud:\n"
 
-#: src/LYUtils.c:5279
+#: src/LYUtils.c:5278
 msgid "Cannot find HOME directory"
 msgstr "Ei leie HOME kataloogi"
 
@@ -5666,7 +5708,7 @@ msgstr "Ei leie HOME kataloogi"
 msgid "Normally disabled.  See ENABLE_LYNXRC in lynx.cfg\n"
 msgstr "Tavaliselt blokeeritud. Vaadake lynx.cfg failis ENABLE_LYNXRC kohta\n"
 
-#: src/LYrcFile.c:327
+#: src/LYrcFile.c:349
 msgid ""
 "accept_all_cookies allows the user to tell Lynx to automatically\n"
 "accept all cookies if desired.  The default is \"FALSE\" which will\n"
@@ -5678,7 +5720,7 @@ msgstr ""
 "tähendab, et iga prääniku korral küsitakse kasutaja nõusolekut.\n"
 "Kõikide präänikute vastu võtmiseks kasutage väärtust \"TRUE\".\n"
 
-#: src/LYrcFile.c:335
+#: src/LYrcFile.c:357
 msgid ""
 "anonftp_password allows the user to tell Lynx to use the personal\n"
 "email address as the password for anonymous ftp.  If no value is given,\n"
@@ -5689,7 +5731,7 @@ msgstr ""
 "isiklik e-posti aadress. Kui väärtust ei anta, kasutab Lynx isiklikku\n"
 "e-posti aadressi. Vajadusel saab kasutada ka mingit muud e-posti aadressi.\n"
 
-#: src/LYrcFile.c:344
+#: src/LYrcFile.c:366
 msgid ""
 "bookmark_file specifies the name and location of the default bookmark\n"
 "file into which the user can paste links for easy access at a later\n"
@@ -5698,7 +5740,7 @@ msgstr ""
 "bookmark_file määrab vaikimisi järgede faili nime ja asukoha, kuhu\n"
 "kasutaja saab salvestada viiteid hilisemaks kasutamiseks.\n"
 
-#: src/LYrcFile.c:349
+#: src/LYrcFile.c:371
 msgid ""
 "If case_sensitive_searching is \"on\" then when the user invokes a search\n"
 "using the 's' or '/' keys, the search performed will be case sensitive\n"
@@ -5708,7 +5750,7 @@ msgstr ""
 "'s' või '/' antud otsing tõstutundlikult. Väärtuse \"off\" korral on otsing\n"
 "tõstutundetu. Vaikimisi on tavaliselt \"off\".\n"
 
-#: src/LYrcFile.c:354
+#: src/LYrcFile.c:376
 msgid ""
 "The character_set definition controls the representation of 8 bit\n"
 "characters for your terminal.  If 8 bit characters do not show up\n"
@@ -5722,7 +5764,7 @@ msgstr ""
 "lähendusi.\n"
 "Lubatud kooditabelid on:\n"
 
-#: src/LYrcFile.c:361
+#: src/LYrcFile.c:384
 msgid ""
 "cookie_accept_domains and cookie_reject_domains are comma-delimited\n"
 "lists of domains from which Lynx should automatically accept or reject\n"
@@ -5736,7 +5778,7 @@ msgstr ""
 "eelistatakse tagasi lükkamist. accept_all_cookies parameeter käib\n"
 "siinsetest määrangutest üle.\n"
 
-#: src/LYrcFile.c:369
+#: src/LYrcFile.c:392
 msgid ""
 "cookie_file specifies the file from which to read persistent cookies.\n"
 "The default is ~/"
@@ -5744,7 +5786,7 @@ msgstr ""
 "cookie_file määrab faili, millest loetakse püsivad präänikud.\n"
 "Vaikeväärtus on ~/"
 
-#: src/LYrcFile.c:374
+#: src/LYrcFile.c:397
 msgid ""
 "cookie_loose_invalid_domains, cookie_strict_invalid_domains, and\n"
 "cookie_query_invalid_domains are comma-delimited lists of which domains\n"
@@ -5761,7 +5803,7 @@ msgstr ""
 "lubatakse seada vigase tee või doomeni atribuudiga präänikuid. Kõikide\n"
 "doomenite korral küsitakse vigase tee või doomeni korral luba kasutajalt.\n"
 
-#: src/LYrcFile.c:388
+#: src/LYrcFile.c:411
 msgid ""
 "dir_list_order specifies the directory list order under DIRED_SUPPORT\n"
 "(if implemented).  The default is \"ORDER_BY_NAME\"\n"
@@ -5769,7 +5811,7 @@ msgstr ""
 "dir_list_order määrab kataloogi esituse järjestuse DIRED_SUPPORT sees\n"
 "(kui on realiseeritud).  Vaikimisi on \"ORDER_BY_NAME\"\n"
 
-#: src/LYrcFile.c:393
+#: src/LYrcFile.c:416
 msgid ""
 "dir_list_styles specifies the directory list style under DIRED_SUPPORT\n"
 "(if implemented).  The default is \"MIXED_STYLE\", which sorts both\n"
@@ -5782,7 +5824,7 @@ msgstr ""
 "järjestab esimesteks failid ja \"DIRECTORIES_FIRST\" järjestab esimesteks\n"
 "kataloogid.\n"
 
-#: src/LYrcFile.c:401
+#: src/LYrcFile.c:424
 msgid ""
 "If emacs_keys is to \"on\" then the normal EMACS movement keys:\n"
 "  ^N = down    ^P = up\n"
@@ -5794,7 +5836,7 @@ msgstr ""
 "  ^N = alla     ^P = üles\n"
 "  ^B = vasakule ^F = paremale\n"
 
-#: src/LYrcFile.c:407
+#: src/LYrcFile.c:430
 msgid ""
 "file_editor specifies the editor to be invoked when editing local files\n"
 "or sending mail.  If no editor is specified, then file editing is disabled\n"
@@ -5806,7 +5848,7 @@ msgstr ""
 "failide toimetamine on blokeeritud, välja arvatud juhul, kui toimeti\n"
 "on määratud käsureal, ja kirjade saatmisel kasutatakse sisemist toimetit. \n"
 
-#: src/LYrcFile.c:414
+#: src/LYrcFile.c:437
 msgid ""
 "The file_sorting_method specifies which value to sort on when viewing\n"
 "file lists such as FTP directories.  The options are:\n"
@@ -5822,7 +5864,7 @@ msgstr ""
 "   BY_SIZE     -- järjestab failide suuruste järgi\n"
 "   BY_DATE     -- järjestab failide aegade järgi\n"
 
-#: src/LYrcFile.c:437
+#: src/LYrcFile.c:462
 msgid ""
 "lineedit_mode specifies the key binding used for inputting strings in\n"
 "prompts and forms.  If lineedit_mode is set to \"Default Binding\" then\n"
@@ -5848,7 +5890,7 @@ msgstr ""
 "\n"
 "Current lineedit modes are:\n"
 
-#: src/LYrcFile.c:455
+#: src/LYrcFile.c:480
 msgid ""
 "The following allow you to define sub-bookmark files and descriptions.\n"
 "The format is multi_bookmark<capital_letter>=<filename>,<description>\n"
@@ -5861,7 +5903,7 @@ msgstr ""
 "Alustatakse seadega \"multi_bookmarkB\", kuna 'A' on vaikeväärtus\n"
 "(vaadake ülaltpoolt).\n"
 
-#: src/LYrcFile.c:461
+#: src/LYrcFile.c:486
 msgid ""
 "personal_mail_address specifies your personal mail address.  The\n"
 "address will be sent during HTTP file transfers for authorization and\n"
@@ -5878,7 +5920,7 @@ msgstr ""
 "väärtuseks TRUE või kasutage -nofrom käsurea võtit. Selle välja võib\n"
 "jätta ka tühjaks, kuid siis ei kasutata seda ka kommentaaride saatmisel.\n"
 
-#: src/LYrcFile.c:470
+#: src/LYrcFile.c:495
 msgid ""
 "personal_mail_name specifies your personal name, for mail.  The\n"
 "name is sent for mailed comments.  Lynx will prompt for this,\n"
@@ -5896,7 +5938,7 @@ msgstr ""
 "E-kirja saatmisel antud nime ei salvestata, nime muutmiseks tuleb seda teha kas\n"
 "seadistuste menüüs või siin failis.\n"
 
-#: src/LYrcFile.c:480
+#: src/LYrcFile.c:505
 msgid ""
 "preferred_charset specifies the character set in MIME notation (e.g.,\n"
 "ISO-8859-2, ISO-8859-5) which Lynx will indicate you prefer in requests\n"
@@ -5922,7 +5964,7 @@ msgstr ""
 "veateatega, lubatud on aga ka vastata mittesoovitud kooditabelit kasutava\n"
 "failiga.\n"
 
-#: src/LYrcFile.c:496
+#: src/LYrcFile.c:521
 msgid ""
 "preferred_language specifies the language in MIME notation (e.g., en,\n"
 "fr, may be a comma-separated list in decreasing preference)\n"
@@ -5936,7 +5978,7 @@ msgstr ""
 "Kui fail antud keeles on olemas, server saadab selle. Kui pole,\n"
 "saadab faili oma vaikimisi keeles.\n"
 
-#: src/LYrcFile.c:507
+#: src/LYrcFile.c:532
 msgid ""
 "If run_all_execution_links is set \"on\" then all local execution links\n"
 "will be executed when they are selected.\n"
@@ -5957,7 +5999,7 @@ msgstr ""
 "          ohustada teie süsteemi muul moel. Väärtust \"on\" võib kasutada\n"
 "          ainult juhul, kui vaatate usaldatavatest allikatest pärit infot.\n"
 
-#: src/LYrcFile.c:518
+#: src/LYrcFile.c:543
 msgid ""
 "If run_execution_links_on_local_files is set \"on\" then all local\n"
 "execution links that are found in LOCAL files will be executed when they\n"
@@ -5983,7 +6025,7 @@ msgstr ""
 "          ohustada teie süsteemi muul moel. Väärtust \"on\" võib kasutada\n"
 "          ainult juhul, kui vaatate usaldatavatest allikatest pärit infot.\n"
 
-#: src/LYrcFile.c:536
+#: src/LYrcFile.c:561
 msgid ""
 "select_popups specifies whether the OPTIONs in a SELECT block which\n"
 "lacks a MULTIPLE attribute are presented as a vertical list of radio\n"
@@ -6000,7 +6042,7 @@ msgstr ""
 "vaikeväärtuse hüpikmenüü ja väärtus \"off\" määrab raadionuppude loendi\n"
 "kasutamise. Vaikeväärtust saab üle määrata käsurea lülitiga -popup.\n"
 
-#: src/LYrcFile.c:547
+#: src/LYrcFile.c:572
 msgid ""
 "show_color specifies how to set the color mode at startup.  A value of\n"
 "\"never\" will force color mode off (treat the terminal as monochrome)\n"
@@ -6034,7 +6076,7 @@ msgstr ""
 "seadega. Kui seaded salvestatakse, käsitletakse \"Näita värve\" omaduse\n"
 "väärtusi \"on\" ja \"off\" kui väärtust \"default\".\n"
 
-#: src/LYrcFile.c:564
+#: src/LYrcFile.c:589
 msgid ""
 "show_cursor specifies whether to 'hide' the cursor to the right (and\n"
 "bottom, if possible) of the screen, or to place it to the left of the\n"
@@ -6054,7 +6096,7 @@ msgstr ""
 "vasakule ja on vaikeväärtus ning \"off\" määrab kursori 'peitmise'.\n"
 "vaikeväärtust saab ümber määrata käsurea lülitiga -show_cursor.\n"
 
-#: src/LYrcFile.c:575
+#: src/LYrcFile.c:600
 msgid ""
 "show_dotfiles specifies that the directory listing should include\n"
 "\"hidden\" (dot) files/directories.  If set \"on\", this will be\n"
@@ -6069,7 +6111,7 @@ msgstr ""
 "Kui punktiga algavate failide näitamine on keelatud, ei lubata neid\n"
 "ka Lynx vahenditega luua.\n"
 
-#: src/LYrcFile.c:586
+#: src/LYrcFile.c:611
 msgid ""
 "If sub_bookmarks is not turned \"off\", and multiple bookmarks have\n"
 "been defined (see below), then all bookmark operations will first\n"
@@ -6089,7 +6131,7 @@ msgstr ""
 "kasutab 'v'aata järgi käsklus menüü asemel olekurea viipa. Kui selle\n"
 "seade väärtus on \"standard\", näidatakse alati menüüd.\n"
 
-#: src/LYrcFile.c:600
+#: src/LYrcFile.c:626
 msgid ""
 "user_mode specifies the users level of knowledge with Lynx.  The\n"
 "default is \"NOVICE\" which displays two extra lines of help at the\n"
@@ -6105,7 +6147,7 @@ msgstr ""
 "\"ADVANCED\" korral näidatakse ekraani alaosas parajasti vaadeldava\n"
 "viite URLi.\n"
 
-#: src/LYrcFile.c:609
+#: src/LYrcFile.c:635
 msgid ""
 "If verbose_images is \"on\", lynx will print the name of the image\n"
 "source file in place of [INLINE], [LINK] or [IMAGE]\n"
@@ -6115,7 +6157,7 @@ msgstr ""
 "[INLINE], [LINK] või [IMAGE] asemel.\n"
 "Vaadake ka lynx.cfg failis VERBOSE_IMAGES seadet.\n"
 
-#: src/LYrcFile.c:614
+#: src/LYrcFile.c:640
 msgid ""
 "If vi_keys is set to \"on\", then the normal VI movement keys:\n"
 "  j = down    k = up\n"
@@ -6131,7 +6173,7 @@ msgstr ""
 "Suured 'H', 'J' ja 'K' aktiveerivad ikka vastavalt abiinfo, hüpped\n"
 "ja klahvitabeli ekraani.\n"
 
-#: src/LYrcFile.c:622
+#: src/LYrcFile.c:648
 msgid ""
 "The visited_links setting controls how Lynx organizes the information\n"
 "in the Visited Links Page.\n"
@@ -6139,7 +6181,7 @@ msgstr ""
 "visited_links seade kontrollib, kuidas Lynx organiseerib infot külastatud\n"
 "viidete lehel.\n"
 
-#: src/LYrcFile.c:863
+#: src/LYrcFile.c:890
 msgid ""
 "If keypad_mode is set to \"NUMBERS_AS_ARROWS\", then the numbers on\n"
 "your keypad when the numlock is on will act as arrow keys:\n"
@@ -6157,7 +6199,7 @@ msgstr ""
 "ning ka vastavad klaviatuuri numbrid toimivad nooltena sõltumata\n"
 "numlock seadest.\n"
 
-#: src/LYrcFile.c:872
+#: src/LYrcFile.c:899
 msgid ""
 "If keypad_mode is set to \"LINKS_ARE_NUMBERED\", then numbers will\n"
 "appear next to each link and numbers are used to select links.\n"
@@ -6165,7 +6207,7 @@ msgstr ""
 "Kui keypad_mode väärtus on \"LINKS_ARE_NUMBERED\", ilmuvad iga viite\n"
 "kõrvale numbrid ja viidete valimiseks kasutatakse numbreid.\n"
 
-#: src/LYrcFile.c:876
+#: src/LYrcFile.c:903
 msgid ""
 "If keypad_mode is set to \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\", then\n"
 "numbers will appear next to each link and visible form input field.\n"
@@ -6184,7 +6226,7 @@ msgstr ""
 "Viidete nimekirjad ja loendikäskude väljundid nummerdavad samuti\n"
 "vormide sisendeid.\n"
 
-#: src/LYrcFile.c:885
+#: src/LYrcFile.c:912
 msgid ""
 "NOTE: Some fixed format documents may look disfigured when\n"
 "\"LINKS_ARE_NUMBERED\" or \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\" are\n"
@@ -6194,7 +6236,7 @@ msgstr ""
 "\"LINKS_ARE_NUMBERED\" või \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\"\n"
 "kasutamisel segane.\n"
 
-#: src/LYrcFile.c:917
+#: src/LYrcFile.c:944
 msgid ""
 "Lynx User Defaults File\n"
 "\n"
@@ -6202,7 +6244,7 @@ msgstr ""
 "Lynx Kasutaja Seadete Fail\n"
 "\n"
 
-#: src/LYrcFile.c:926
+#: src/LYrcFile.c:953
 msgid ""
 "This file contains options saved from the Lynx Options Screen (normally\n"
 "with the 'o' key).  To save options with that screen, you must select the\n"
@@ -6211,13 +6253,13 @@ msgstr ""
 "See fail sisaldab seadeid Lynx seadete ekraanilt (tavaliselt klahviga 'o').\n"
 "Selle ekraaniga määratud seadete salvestamiseks valige:\n"
 
-#: src/LYrcFile.c:933
+#: src/LYrcFile.c:960
 msgid ""
 "You must then save the settings using the link on the line above the\n"
 "checkbox:\n"
 msgstr "Seejärel peate salvestama seaded kasutades viidet valikukasti kohal:\n"
 
-#: src/LYrcFile.c:940
+#: src/LYrcFile.c:967
 msgid ""
 "You may also use the command-line option \"-forms_options\", which displays\n"
 "the simpler Options Menu instead.  Save options with that using the '>' key.\n"
@@ -6227,7 +6269,7 @@ msgstr ""
 "seadete menüüd. Seadete salvestamiseks seal kasutage klahvi '>'.\n"
 "\n"
 
-#: src/LYrcFile.c:947
+#: src/LYrcFile.c:974
 msgid ""
 "This file contains options saved from the Lynx Options Screen (normally\n"
 "with the '>' key).\n"
@@ -6237,7 +6279,7 @@ msgstr ""
 "salvestatud klahviga '>').\n"
 "\n"
 
-#: src/LYrcFile.c:954
+#: src/LYrcFile.c:981
 msgid ""
 "There is normally no need to edit this file manually, since the defaults\n"
 "here can be controlled from the Options Screen, and the next time options\n"
diff --git a/po/lynx.pot b/po/lynx.pot
index 1880a1b..2b447b0 100644
--- a/po/lynx.pot
+++ b/po/lynx.pot
@@ -1,9 +1,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: lynx 2.8.9dev.15\n"
+"Project-Id-Version: lynx 2.8.9dev.16\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-04 16:51-0400\n"
+"POT-Creation-Date: 2017-07-06 04:38-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -3693,31 +3693,31 @@ msgstr ""
 msgid "Y/N/A/V"
 msgstr ""
 
-#: src/HTML.c:5932
+#: src/HTML.c:5943
 msgid "Description:"
 msgstr ""
 
-#: src/HTML.c:5937
+#: src/HTML.c:5948
 msgid "(none)"
 msgstr ""
 
-#: src/HTML.c:5941
+#: src/HTML.c:5952
 msgid "Filepath:"
 msgstr ""
 
-#: src/HTML.c:5947
+#: src/HTML.c:5958
 msgid "(unknown)"
 msgstr ""
 
-#: src/HTML.c:7387
+#: src/HTML.c:7398
 msgid "Document has only hidden links.  Use the 'l'ist command."
 msgstr ""
 
-#: src/HTML.c:7885
+#: src/HTML.c:7896
 msgid "Source cache error - disk full?"
 msgstr ""
 
-#: src/HTML.c:7898
+#: src/HTML.c:7909
 msgid "Source cache error - not enough memory!"
 msgstr ""
 
diff --git a/po/makefile.inn b/po/makefile.inn
index 55887e1..fc53c52 100644
--- a/po/makefile.inn
+++ b/po/makefile.inn
@@ -1,4 +1,4 @@
-# $LynxId: makefile.inn,v 1.22 2015/10/02 11:12:57 tom Exp $
+# $LynxId: makefile.inn,v 1.28 2017/07/08 19:04:06 tom Exp $
 #
 # Makefile for program source directory in GNU NLS utilities package.
 # Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper at gnu.ai.mit.edu>
@@ -74,6 +74,7 @@ INSTOBJ		= $(NLS_TEXTDOMAIN)$(INSTOBJEXT)
 .SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
 
 .c.o:
+	@RULE_CC@
 	$(COMPILE) $<
 
 .po.pox:
@@ -81,14 +82,34 @@ INSTOBJ		= $(NLS_TEXTDOMAIN)$(INSTOBJEXT)
 	$(MSGMERGE) -w 132 $< $(srcdir)/$(PACKAGE).pot -o $*.pox
 
 .po.mo:
-	$(MSGFMT) -o $@ $<
+	@echo "translating $< to $@"
+	@ECHO_CC@$(MSGFMT) -o $@ $<
 
 .po.gmo:
-	file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
-	  && rm -f $$file && $(GMSGFMT) -o $$file $<
+	@echo "translating $< to $@"
+	@$(SHELL) -c 'LC_ALL=C \
+	sed	-e s,http://lynx.browser.org/,@HOMEPAGE_URL@,g \
+		-e s,http://lynx.isc.org/,@HOMEPAGE_URL@,g $< >pass1.tmp;\
+	if cmp -s $< pass1.tmp; \
+	then \
+		echo ...no change made to homepage URL; \
+	else \
+		echo ...updated homepage URL;\
+	fi; \
+	if $(MSGMERGE) -w 132 pass1.tmp $(srcdir)/$(PACKAGE).pot -o pass2.tmp; \
+	then \
+		echo "...merged against $(srcdir)/$(PACKAGE).pot";\
+	else \
+		echo "...workaround without merging against $(srcdir)/$(PACKAGE).pot";\
+		cat  $< >pass2.tmp; \
+	fi '
+	@ECHO_CC at file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
+	  && rm -f $$file && $(GMSGFMT) -o $$file pass2.tmp
+	@-rm -f pass*.tmp
 
 .po.cat:
-	sed -f ../intl/po2msg.sed < $< > $*.msg \
+	@echo "translating $< to $@"
+	@ECHO_CC at sed -f ../intl/po2msg.sed < $< > $*.msg \
 	  && rm -f $@ && $(GENCAT) $@ $*.msg
 
 
@@ -97,9 +118,9 @@ all: all- at USE_NLS@
 all-yes: $(SOURCES) $(CATALOGS)
 all-no:
 
-en.po :	
+en.po :
 	msginit --no-translator -l en -i $(PACKAGE).pot
-	# cygwin's msginit 1.19.3 creates "en_US.po" rather than "en.po"...
+# cygwin's msginit 1.19.3 creates "en_US.po" rather than "en.po"...
 	@$(SHELL) -c 'for n in en*.po; \
 		do \
 		if test -f $$n; \
@@ -110,8 +131,12 @@ en.po :
 		done'
 
 $(srcdir)/$(PACKAGE).pot: $(POTFILES)
-	$(XGETTEXT) --default-domain=$(NLS_TEXTDOMAIN) --directory=$(top_srcdir) \
-	  --add-comments --keyword=_ --keyword=N_ \
+	$(XGETTEXT) \
+	  --default-domain=$(NLS_TEXTDOMAIN) \
+	  --directory=$(top_srcdir) \
+	  --add-comments \
+	  --keyword=_ \
+	  --keyword=N_ \
 	  --files-from=$(srcdir)/POTFILES.in \
 	&& test ! -f $(PACKAGE).po \
 	   || ( rm -f $(srcdir)/$(PACKAGE).pot \
@@ -201,12 +226,13 @@ dvi info tags TAGS ID:
 
 mostlyclean:
 	rm -f core core.* *.pox $(PACKAGE).po en.po *.old.po cat-id-tbl.tmp
+	rm -f *.gmo *.mo *.tmp
 	rm -fr *.o
 
 clean: mostlyclean
 
 distclean: clean
-	rm -f cat-id-tbl.c stamp-cat-id *.gmo *.mo
+	rm -f cat-id-tbl.c stamp-cat-id
 	rm -f makefile makefile.in POTFILES *.mo *.msg *.cat *.cat.m
 
 maintainer-clean: distclean
diff --git a/po/tr.po b/po/tr.po
index 7a24581..6085c26 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,23 +1,24 @@
-# translation of lynx-2.8.9-dev7.po to Turkish
+# translation of lynx-2.8.9-dev15.po to Turkish
 # lynx-2.8.9-dev7.po'nun Türkçe çevirisi
 # Copyright (C) 2002, 2004, 2006, 2009, 2012, 2015 Free Software Foundation, Inc.
 # This file is distributed under the same license as the lynx package.
 # Eyüp Hakan Duran <hakan_duran at hotmail.com>, 2012, 2015.
+# Mehmet Kececi <mkececi at mehmetkececi.com>, 2017.
 msgid ""
 msgstr ""
-"Project-Id-Version: lynx-2.8.9-dev7\n"
+"Project-Id-Version: lynx-2.8.9-dev15\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-14 20:39-0500\n"
-"PO-Revision-Date: 2015-12-22 21:33-0600\n"
-"Last-Translator: Eyüp Hakan Duran <hakan_duran at hotmail.com>\n"
+"POT-Creation-Date: 2017-07-04 16:51-0400\n"
+"PO-Revision-Date: 2017-07-05 14:30+0300\n"
+"Last-Translator: Mehmet Kececi <mkececi at mehmetkececi.com>\n"
 "Language-Team: Turkish <gnu-tr-u12a at lists.sourceforge.net>\n"
 "Language: tr\n"
-"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 2.0\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Virtaal 0.7.1\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 
 #. ******************************************************************
 #. * The following definitions are for status line prompts, messages, or
@@ -2332,7 +2333,7 @@ msgstr "(İsim yok.)"
 msgid "(No value.)"
 msgstr "(Değer yok.)"
 
-#: LYMessages.c:743 src/LYOptions.c:2424
+#: LYMessages.c:743 src/LYOptions.c:2446
 msgid "None"
 msgstr "Hiçbiri"
 
@@ -2858,35 +2859,39 @@ msgstr "İz(leme) desteklenmiyor"
 msgid "\tIndents: first=%.0f others=%.0f, Height=%.1f Desc=%.1f\n"
 msgstr "\tGirinti: ilk satır=%.0f diğerleri=%.0f, Yükseklik=%.1f Alt çıkıntı=%.1f\n"
 
-#.
-#. * Set up the message for the username prompt, and then issue the
-#. * prompt.  The default username is included in the call to the
-#. * prompting function, but the password is NULL-ed and always replaced.
-#. * - FM
-#.
-#: WWW/Library/Implementation/HTAABrow.c:634
+#: WWW/Library/Implementation/HTAABrow.c:569
+#, c-format
+msgid "username for realm %s changed from %s to %s"
+msgstr "Kullanıcı adı bölge %s için %s'den %s'e değişti"
+
+#: WWW/Library/Implementation/HTAABrow.c:585
+#, c-format
+msgid "password for realm %s user %s changed"
+msgstr "bölge %s kullanıcı %s için parola değişti"
+
+#: WWW/Library/Implementation/HTAABrow.c:697
 #, c-format
 msgid "Username for '%s' at %s '%s%s':"
-msgstr "%2$s '%3$s%4$s'deki '%1$s' için kullanıcı adı:"
+msgstr "'%s' kullanıcısı için %s'de '%s%s':"
 
-#: WWW/Library/Implementation/HTAABrow.c:904
+#: WWW/Library/Implementation/HTAABrow.c:970
 msgid "This client doesn't know how to compose proxy authorization information for scheme"
 msgstr "Bu istemci şema için vekil(proxy) yetkilendirme bilgisi oluşturmayı bilmiyor"
 
-#: WWW/Library/Implementation/HTAABrow.c:983
+#: WWW/Library/Implementation/HTAABrow.c:1047
 msgid "This client doesn't know how to compose authorization information for scheme"
 msgstr "Bu istemci şema için yetkilendirme bilgisi oluşturmayı bilmiyor"
 
-#: WWW/Library/Implementation/HTAABrow.c:1094
+#: WWW/Library/Implementation/HTAABrow.c:1156
 #, c-format
 msgid "Invalid header '%s%s%s%s%s'"
 msgstr "Geçersiz başlık '%s%s%s%s%s'"
 
-#: WWW/Library/Implementation/HTAABrow.c:1200
+#: WWW/Library/Implementation/HTAABrow.c:1260
 msgid "Proxy authorization required -- retrying"
 msgstr "Vekil(proxy) yetkilendirmesi gerekli -- yeniden deneniyor"
 
-#: WWW/Library/Implementation/HTAABrow.c:1256
+#: WWW/Library/Implementation/HTAABrow.c:1316
 msgid "Access without authorization denied -- retrying"
 msgstr "Yetkilendirilmeden erişim reddedildi -- yeniden deneniyor"
 
@@ -2902,7 +2907,7 @@ msgstr "Önbellekte POST içerikli belge bulunmadı.  Yeniden gönderilsin mi?"
 msgid "Loading failed, use a previous copy."
 msgstr "Yükleme başarısız, önceki bir kopyayı kullanın."
 
-#: WWW/Library/Implementation/HTAccess.c:1056 src/GridText.c:8875
+#: WWW/Library/Implementation/HTAccess.c:1056 src/GridText.c:8865
 msgid "Loading incomplete."
 msgstr "Yükleme tamamlanmadı."
 
@@ -2925,7 +2930,7 @@ msgstr "**** HTAccess: Dönen durum: %d\n"
 #. * hack: if we fail in HTAccess.c
 #. * avoid duplicating URL, oh.
 #.
-#: WWW/Library/Implementation/HTAccess.c:1096 src/LYMainLoop.c:8074
+#: WWW/Library/Implementation/HTAccess.c:1096 src/LYMainLoop.c:8075
 msgid "Can't Access"
 msgstr "Erişilemiyor"
 
@@ -2933,37 +2938,37 @@ msgstr "Erişilemiyor"
 msgid "Unable to access document."
 msgstr "Belgeye erişilemiyor."
 
-#: WWW/Library/Implementation/HTFTP.c:875
+#: WWW/Library/Implementation/HTFTP.c:870
 #, c-format
 msgid "Enter password for user %s@%s:"
 msgstr "%s@%s kullanıcısı için parola giriniz:"
 
-#: WWW/Library/Implementation/HTFTP.c:903
+#: WWW/Library/Implementation/HTFTP.c:898
 msgid "Unable to connect to FTP host."
 msgstr "FTP makinasına bağlanılamadı."
 
-#: WWW/Library/Implementation/HTFTP.c:1142
+#: WWW/Library/Implementation/HTFTP.c:1137
 msgid "close master socket"
 msgstr "ana soketi kapatınız"
 
-#: WWW/Library/Implementation/HTFTP.c:1204
+#: WWW/Library/Implementation/HTFTP.c:1199
 msgid "socket for master socket"
 msgstr "ana soket için soket"
 
-#: WWW/Library/Implementation/HTFTP.c:2952
+#: WWW/Library/Implementation/HTFTP.c:2948
 msgid "Receiving FTP directory."
 msgstr "FTP dizini alınıyor."
 
-#: WWW/Library/Implementation/HTFTP.c:3090
+#: WWW/Library/Implementation/HTFTP.c:3086
 #, c-format
 msgid "Transferred %d bytes (%5d)"
 msgstr "%d bayt aktarıldı (%5d)"
 
-#: WWW/Library/Implementation/HTFTP.c:3448
+#: WWW/Library/Implementation/HTFTP.c:3444
 msgid "connect for data"
 msgstr "veri için bağlan"
 
-#: WWW/Library/Implementation/HTFTP.c:4120
+#: WWW/Library/Implementation/HTFTP.c:4126
 msgid "Receiving FTP file."
 msgstr "FTP dosyası alınıyor"
 
@@ -3122,8 +3127,8 @@ msgstr "Adres portu geçersiz"
 msgid "Address length looks invalid"
 msgstr "Adres uzunluğu geçersiz görünüyor"
 
-#: WWW/Library/Implementation/HTTCP.c:1845
-#: WWW/Library/Implementation/HTTCP.c:1863
+#: WWW/Library/Implementation/HTTCP.c:1839
+#: WWW/Library/Implementation/HTTCP.c:1857
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr "%s adlı karşı makina konumlandırılamıyor."
@@ -3132,141 +3137,146 @@ msgstr "%s adlı karşı makina konumlandırılamıyor."
 #. * but not HTAlert, because typically there will be other
 #. * alerts from the callers.  - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1860
+#: WWW/Library/Implementation/HTTCP.c:1854
 #: WWW/Library/Implementation/HTTelnet.c:115
 #, c-format
 msgid "Invalid hostname %s"
 msgstr "Geçersiz makina adı %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1874
+#: WWW/Library/Implementation/HTTCP.c:1868
 #, c-format
 msgid "Making %s connection to %s"
 msgstr "%2$s'e %1$s bağlantısı kuruluyor"
 
-#: WWW/Library/Implementation/HTTCP.c:1885
+#: WWW/Library/Implementation/HTTCP.c:1879
 msgid "socket failed."
 msgstr "soket başarısız."
 
-#: WWW/Library/Implementation/HTTCP.c:1899
+#: WWW/Library/Implementation/HTTCP.c:1893
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
 msgstr "soket başarısız: aile %d adres %s port %s."
 
-#: WWW/Library/Implementation/HTTCP.c:1923
+#: WWW/Library/Implementation/HTTCP.c:1917
 msgid "Could not make connection non-blocking."
 msgstr "Bağlantı engelsizleştirilemedi (non-blocking)."
 
-#: WWW/Library/Implementation/HTTCP.c:1991
+#: WWW/Library/Implementation/HTTCP.c:1985
 msgid "Connection failed (too many retries)."
 msgstr "Bağlantı başarısız (çok sayıda yeniden deneme)."
 
-#: WWW/Library/Implementation/HTTCP.c:2180
+#: WWW/Library/Implementation/HTTCP.c:2174
 msgid "Could not restore socket to blocking."
 msgstr "Soket engellemeye (blocking) geri yüklenemedi."
 
-#: WWW/Library/Implementation/HTTCP.c:2248
+#: WWW/Library/Implementation/HTTCP.c:2242
 msgid "Socket read failed (too many tries)."
 msgstr "Soket okuma başarısız (çok sayıda deneme)."
 
-#: WWW/Library/Implementation/HTTP.c:136
+#: WWW/Library/Implementation/HTTP.c:134
 #, c-format
 msgid "SSL callback:%s, preverify_ok=%d, ssl_okay=%d"
 msgstr "SSL geriçağırımı:%s, öndoğrulama_tamam=%d, ssl_tamam=%d"
 
-#: WWW/Library/Implementation/HTTP.c:516
+#: WWW/Library/Implementation/HTTP.c:629
+#, c-format
+msgid "User/password contains only punctuation: %s"
+msgstr "Kullanıcı/parola yalnızca noktalama işaretlerini içerir: %s"
+
+#: WWW/Library/Implementation/HTTP.c:633
 #, c-format
-msgid "Address contains a username: %s"
-msgstr "Adres bir kullanıcı adı içeriyor: %s"
+msgid "User/password may be confused with hostname: '%s' (e.g, '%s')"
+msgstr "Kullanıcı/parola hostname ile karışık olabilir: '%s' (örneğin, '%s')"
 
-#: WWW/Library/Implementation/HTTP.c:570
+#: WWW/Library/Implementation/HTTP.c:694
 #, c-format
 msgid "Certificate issued by: %s"
 msgstr "Sertifikayı veren:%s"
 
-#: WWW/Library/Implementation/HTTP.c:757
+#: WWW/Library/Implementation/HTTP.c:881
 msgid "This client does not contain support for HTTPS URLs."
 msgstr "Bu istemci HTTPS URL'ler için destek içermiyor."
 
-#: WWW/Library/Implementation/HTTP.c:782
+#: WWW/Library/Implementation/HTTP.c:906
 msgid "Unable to connect to remote host."
 msgstr "Karşı makinaya bağlanılamadı."
 
-#: WWW/Library/Implementation/HTTP.c:825
+#: WWW/Library/Implementation/HTTP.c:953
 msgid "Retrying connection without TLS."
 msgstr "Bağlantı, TLS'siz tekrar deneniyor."
 
-#: WWW/Library/Implementation/HTTP.c:877
+#: WWW/Library/Implementation/HTTP.c:1005
 msgid "GnuTLS error when trying to verify certificate."
 msgstr "Sertifika onaylanırken GnuTLS hatası."
 
-#: WWW/Library/Implementation/HTTP.c:889
+#: WWW/Library/Implementation/HTTP.c:1018
 msgid "the certificate has no known issuer"
 msgstr "sertifikanın bilinen bir yayınlayıcısı yok"
 
-#: WWW/Library/Implementation/HTTP.c:891
+#: WWW/Library/Implementation/HTTP.c:1020
 msgid "no issuer was found"
 msgstr "yayınlayıcı bulunamadı"
 
-#: WWW/Library/Implementation/HTTP.c:893
+#: WWW/Library/Implementation/HTTP.c:1022
 msgid "issuer is not a CA"
 msgstr "yayınlayıcı bir CA değil"
 
-#: WWW/Library/Implementation/HTTP.c:895
+#: WWW/Library/Implementation/HTTP.c:1024
 msgid "the certificate has been revoked"
 msgstr "sertifika hükümsüz kılınmış"
 
-#: WWW/Library/Implementation/HTTP.c:897
+#: WWW/Library/Implementation/HTTP.c:1026
 msgid "the certificate is not trusted"
 msgstr "sertifikaya güvenilmiyor"
 
-#: WWW/Library/Implementation/HTTP.c:972
+#: WWW/Library/Implementation/HTTP.c:1101
 #, c-format
 msgid "Verified connection to %s (cert=%s)"
 msgstr "%1$s'e doğrulanmış bağlantı (cert=%2$s)"
 
-#: WWW/Library/Implementation/HTTP.c:1022
-#: WWW/Library/Implementation/HTTP.c:1064
+#: WWW/Library/Implementation/HTTP.c:1151
+#: WWW/Library/Implementation/HTTP.c:1193
 #, c-format
 msgid "Verified connection to %s (subj=%s)"
 msgstr "%s'e bağlantı doğrulandı (konu=%s)"
 
-#: WWW/Library/Implementation/HTTP.c:1094
+#: WWW/Library/Implementation/HTTP.c:1223
 msgid "Can't find common name in certificate"
 msgstr "Sertifikada ortak ad bulunamadı"
 
-#: WWW/Library/Implementation/HTTP.c:1097
+#: WWW/Library/Implementation/HTTP.c:1226
 #, c-format
 msgid "SSL error:host(%s)!=cert(%s)-Continue?"
 msgstr "SSL hatası:makina(%s)!=sert(%s)-Devam edilsin mi?"
 
-#: WWW/Library/Implementation/HTTP.c:1104
+#: WWW/Library/Implementation/HTTP.c:1233
 msgid "SSL error"
 msgstr "SSL hatası"
 
-#: WWW/Library/Implementation/HTTP.c:1112
+#: WWW/Library/Implementation/HTTP.c:1241
 #, c-format
 msgid "UNVERIFIED connection to %s (cert=%s)"
 msgstr "%s'e DOĞRULANMAMIŞ bağlantı (cert=%s)"
 
-#: WWW/Library/Implementation/HTTP.c:1121
+#: WWW/Library/Implementation/HTTP.c:1250
 #, c-format
 msgid "Secure %d-bit %s (%s) HTTP connection"
 msgstr "Güvenli %d-bit %s (%s) HTTP bağlantısı"
 
-#: WWW/Library/Implementation/HTTP.c:1584
+#: WWW/Library/Implementation/HTTP.c:1718
 msgid "Sending HTTP request."
 msgstr "HTTP istemi gönderiliyor."
 
-#: WWW/Library/Implementation/HTTP.c:1626
+#: WWW/Library/Implementation/HTTP.c:1760
 msgid "Unexpected network write error; connection aborted."
 msgstr "Umulmadık ağa yazma hatası; bağlantı yarıda kesildi."
 
-#: WWW/Library/Implementation/HTTP.c:1632
+#: WWW/Library/Implementation/HTTP.c:1766
 msgid "HTTP request sent; waiting for response."
 msgstr "HTTP istemi gönderildi; yanıt bekleniyor."
 
-#: WWW/Library/Implementation/HTTP.c:1705
-#: WWW/Library/Implementation/HTTP.c:1715
+#: WWW/Library/Implementation/HTTP.c:1839
+#: WWW/Library/Implementation/HTTP.c:1849
 msgid "Unexpected network read error; connection aborted."
 msgstr "Umulmadık ağa yazma hatası; bağlantı yarıda kesildi."
 
@@ -3279,7 +3289,7 @@ msgstr "Umulmadık ağa yazma hatası; bağlantı yarıda kesildi."
 #. * line and possibly other headers, so we'll deal with them by
 #. * showing the full header to the user as text/plain.  - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1917
+#: WWW/Library/Implementation/HTTP.c:2051
 msgid "Got unexpected Informational Status."
 msgstr "Umulmadık Bilgisel Durum alındı."
 
@@ -3289,7 +3299,7 @@ msgstr "Umulmadık Bilgisel Durum alındı."
 #. * content.  We'll instruct the user to do that, and
 #. * restore the current document.  - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1951
+#: WWW/Library/Implementation/HTTP.c:2085
 msgid "Request fulfilled.  Reset Content."
 msgstr "İstem karşılandı.  İçeriği temizle."
 
@@ -3299,27 +3309,27 @@ msgstr "İstem karşılandı.  İçeriği temizle."
 #. * status is inappropriate.  We'll deal with it by showing
 #. * the full header to the user as text/plain.  - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:2066
+#: WWW/Library/Implementation/HTTP.c:2202
 msgid "Got unexpected 304 Not Modified status."
 msgstr "Umulmadık 304 Değiştirilmedi durumu alındı."
 
-#: WWW/Library/Implementation/HTTP.c:2129
+#: WWW/Library/Implementation/HTTP.c:2265
 msgid "Redirection of POST content requires user approval."
 msgstr "POST içeriğinin yeniden yönlendirilmesi kullanıcı onayı gerektirir."
 
-#: WWW/Library/Implementation/HTTP.c:2144
+#: WWW/Library/Implementation/HTTP.c:2280
 msgid "Have POST content.  Treating Permanent Redirection as Temporary.\n"
 msgstr "POST içeriği mevcut.  Kalıcı Yeniden Yönlendirmeye Geçici muamelesi yapılıyor.\n"
 
-#: WWW/Library/Implementation/HTTP.c:2188
+#: WWW/Library/Implementation/HTTP.c:2326
 msgid "Retrying with access authorization information."
 msgstr "Erişim yetkilendirme bilgisiyle yeniden deneniyor."
 
-#: WWW/Library/Implementation/HTTP.c:2200
+#: WWW/Library/Implementation/HTTP.c:2338
 msgid "Show the 401 message body?"
 msgstr "401 mesaj gövdesi gösterilsin mi?"
 
-#: WWW/Library/Implementation/HTTP.c:2244
+#: WWW/Library/Implementation/HTTP.c:2382
 msgid "Show the 407 message body?"
 msgstr "407 mesaj gövdesi gösterilsin mi?"
 
@@ -3327,7 +3337,7 @@ msgstr "407 mesaj gövdesi gösterilsin mi?"
 #. * Bad or unknown server_status number.  Take a chance and hope
 #. * there is something to display.  - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:2344
+#: WWW/Library/Implementation/HTTP.c:2482
 msgid "Unknown status reply from server!"
 msgstr "Sunucudan bilinmeyen durum yanıtı!"
 
@@ -3523,98 +3533,98 @@ msgstr "Bellek tükendi, görüntü kesildi!"
 msgid "Memory exhausted, will interrupt transfer!"
 msgstr "Bellek tükendi, aktarım kesilecek!"
 
-#: src/GridText.c:3674
+#: src/GridText.c:3666
 msgid " *** MEMORY EXHAUSTED ***"
 msgstr " *** BELLEK TÜKENDİ ***"
 
-#: src/GridText.c:6152
+#: src/GridText.c:6144
 msgid "text entry field"
 msgstr "metin giriş alanı"
 
-#: src/GridText.c:6155
+#: src/GridText.c:6147
 msgid "password entry field"
 msgstr "parola giriş alanı"
 
-#: src/GridText.c:6158
+#: src/GridText.c:6150
 msgid "checkbox"
 msgstr "onay kutusu"
 
-#: src/GridText.c:6161
+#: src/GridText.c:6153
 msgid "radio button"
 msgstr "radyo düğmesi"
 
-#: src/GridText.c:6164
+#: src/GridText.c:6156
 msgid "submit button"
 msgstr "gönderme düğmesi"
 
-#: src/GridText.c:6167
+#: src/GridText.c:6159
 msgid "reset button"
 msgstr "temizleme düğmesi"
 
-#: src/GridText.c:6170
+#: src/GridText.c:6162
 msgid "script button"
 msgstr "betik düğmesi"
 
-#: src/GridText.c:6173
+#: src/GridText.c:6165
 msgid "popup menu"
 msgstr "açılır menü"
 
-#: src/GridText.c:6176
+#: src/GridText.c:6168
 msgid "hidden form field"
 msgstr "gizli form alanı"
 
-#: src/GridText.c:6179
+#: src/GridText.c:6171
 msgid "text entry area"
 msgstr "metin giriş alanı"
 
-#: src/GridText.c:6182
+#: src/GridText.c:6174
 msgid "range entry field"
 msgstr "erim giriş alanı"
 
-#: src/GridText.c:6185
+#: src/GridText.c:6177
 msgid "file entry field"
 msgstr "dosya giriş alanı"
 
-#: src/GridText.c:6188
+#: src/GridText.c:6180
 msgid "text-submit field"
 msgstr "metin-gönderme alanı"
 
-#: src/GridText.c:6191
+#: src/GridText.c:6183
 msgid "image-submit button"
 msgstr "resim-gönderme alanı"
 
-#: src/GridText.c:6194
+#: src/GridText.c:6186
 msgid "keygen field"
 msgstr "keygen alanı"
 
-#: src/GridText.c:6197
+#: src/GridText.c:6189
 msgid "unknown form field"
 msgstr "bilinmeyen form alanı"
 
-#: src/GridText.c:6217 src/GridText.c:6224 src/LYList.c:249
+#: src/GridText.c:6209 src/GridText.c:6216 src/LYList.c:249
 msgid "unknown field or link"
 msgstr "bilinmeyen alan ya da link"
 
-#: src/GridText.c:10650
+#: src/GridText.c:10633
 msgid "Can't open file for uploading"
 msgstr "Yüklemek için dosya açılamıyor."
 
-#: src/GridText.c:11843
+#: src/GridText.c:11821
 #, c-format
 msgid "Submitting %s"
 msgstr "%s gönderiliyor"
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12919
+#: src/GridText.c:12891
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr "Takılma Saptandı: TextAnchor struct bozuk - sonlandırmanız önerilir!"
 
 #. don't show previous state
-#: src/GridText.c:13083
+#: src/GridText.c:13050
 msgid "Wrap lines to fit displayed area?"
 msgstr "Görüntülenen alana sığmak üzere satırlar sarmalansın mı?"
 
-#: src/GridText.c:13719
+#: src/GridText.c:13680
 msgid "Very long lines have been truncated!"
 msgstr "Çok uzun satırların sonundan kırpıldı!"
 
@@ -3704,27 +3714,27 @@ msgstr "hayır"
 #. * (Y/N/Always/neVer)              - English (original)
 #. * (O/N/Toujours/Jamais)           - French
 #.
-#: src/HTAlert.c:940
+#: src/HTAlert.c:938
 msgid "Y/N/A/V"
 msgstr "(E/H/D/A)"
 
-#: src/HTML.c:5931
+#: src/HTML.c:5932
 msgid "Description:"
 msgstr "Açıklama:"
 
-#: src/HTML.c:5936
+#: src/HTML.c:5937
 msgid "(none)"
 msgstr "(hiçbiri)"
 
-#: src/HTML.c:5940
+#: src/HTML.c:5941
 msgid "Filepath:"
 msgstr "Dosya yolu:"
 
-#: src/HTML.c:5946
+#: src/HTML.c:5947
 msgid "(unknown)"
 msgstr "(bilinmiyor)"
 
-#: src/HTML.c:7386
+#: src/HTML.c:7387
 msgid "Document has only hidden links.  Use the 'l'ist command."
 msgstr "Belgede yalnızca gizli linkler var.  Listele(l) komutunu kullanınız."
 
@@ -3792,7 +3802,7 @@ msgstr ""
 msgid "File may be recoverable from %s during this session"
 msgstr "Dosya, bu oturum boyunca %s'den kurtarılabilir"
 
-#: src/LYCgi.c:162
+#: src/LYCgi.c:161
 #, c-format
 msgid "Do you want to execute \"%s\"?"
 msgstr "\"%s\"'i çalıştırmak ister misiniz?"
@@ -3801,23 +3811,23 @@ msgstr "\"%s\"'i çalıştırmak ister misiniz?"
 #. * Neither the path as given nor any components examined by backing up
 #. * were stat()able.  - kw
 #.
-#: src/LYCgi.c:277
+#: src/LYCgi.c:276
 msgid "Unable to access cgi script"
 msgstr "cgi betiğine erişilemiyor"
 
-#: src/LYCgi.c:711 src/LYCgi.c:714
+#: src/LYCgi.c:709 src/LYCgi.c:712
 msgid "Good Advice"
 msgstr "İyi Öneri"
 
-#: src/LYCgi.c:718
+#: src/LYCgi.c:716
 msgid "An excellent http server for VMS is available via"
 msgstr "VMS için kusursuz bir http sunucusu, şu link aracılığıyla"
 
-#: src/LYCgi.c:725
+#: src/LYCgi.c:723
 msgid "this link"
 msgstr "temin edilebilir"
 
-#: src/LYCgi.c:729
+#: src/LYCgi.c:727
 msgid "It provides state of the art CGI script support.\n"
 msgstr "Güncel CGI betik desteğini sağlar.\n"
 
@@ -3825,19 +3835,19 @@ msgstr "Güncel CGI betik desteğini sağlar.\n"
 msgid "Exiting via interrupt:"
 msgstr "İşkesmesi aracılığıyla kapanıyor:"
 
-#: src/LYCookie.c:2541
+#: src/LYCookie.c:2537
 msgid "(from a previous session)"
 msgstr "(önceki bir oturumdan)"
 
-#: src/LYCookie.c:2602
+#: src/LYCookie.c:2598
 msgid "Maximum Gobble Date:"
 msgstr "Maksimum Silip Süpürme Tarihi:"
 
-#: src/LYCookie.c:2641
+#: src/LYCookie.c:2637
 msgid "Internal"
 msgstr "Dahili"
 
-#: src/LYCookie.c:2642
+#: src/LYCookie.c:2638
 msgid "cookie_domain_flag_set error, aborting program"
 msgstr "cookie_domain_flag_set hatası, program yarıda kesiliyor"
 
@@ -3849,27 +3859,27 @@ msgstr "Uçbirim ön değer ataması başarısız - bilinmeyen uçbirim türü?"
 msgid "Terminal initialisation failed - unknown terminal type?"
 msgstr "Uçbirim ön değer ataması başarısız - bilinmeyen uçbirim türü?"
 
-#: src/LYCurses.c:1863
+#: src/LYCurses.c:1869
 msgid "Terminal ="
 msgstr "Uçbirim ="
 
-#: src/LYCurses.c:1867
+#: src/LYCurses.c:1873
 msgid "You must use a vt100, 200, etc. terminal with this program."
 msgstr "Bu programla bir vt100, 200 vb. uçbirim kullanmalısınız."
 
-#: src/LYCurses.c:1916
+#: src/LYCurses.c:1922
 msgid "Your Terminal type is unknown!"
 msgstr "Uçbirim türünüz bilinmiyor!"
 
-#: src/LYCurses.c:1917
+#: src/LYCurses.c:1923
 msgid "Enter a terminal type:"
 msgstr "Bir uçbirim türü giriniz:"
 
-#: src/LYCurses.c:1931
+#: src/LYCurses.c:1937
 msgid "TERMINAL TYPE IS SET TO"
 msgstr "UÇBİRİM TÜRÜ AYARI"
 
-#: src/LYCurses.c:2483
+#: src/LYCurses.c:2491
 #, c-format
 msgid ""
 "\n"
@@ -3878,7 +3888,7 @@ msgstr ""
 "\n"
 "%2$s Sür. %1$s'de ölümcül bir hata oluştu\n"
 
-#: src/LYCurses.c:2486
+#: src/LYCurses.c:2494
 #, c-format
 msgid ""
 "\n"
@@ -3945,31 +3955,31 @@ msgstr "Yerel eklentiler:"
 msgid "No Name Given"
 msgstr "İsim Verilmemiş"
 
-#: src/LYHistory.c:680
+#: src/LYHistory.c:676
 msgid "You selected:"
 msgstr "Seçiminiz:"
 
-#: src/LYHistory.c:704 src/LYHistory.c:933
+#: src/LYHistory.c:700 src/LYHistory.c:929
 msgid "(no address)"
 msgstr "(adres yok)"
 
-#: src/LYHistory.c:708
+#: src/LYHistory.c:704
 msgid " (internal)"
 msgstr " (dahili)"
 
-#: src/LYHistory.c:710
+#: src/LYHistory.c:706
 msgid " (was internal)"
 msgstr " (dahiliydi)"
 
-#: src/LYHistory.c:808
+#: src/LYHistory.c:804
 msgid " (From History)"
 msgstr " (Tarihçe'den)"
 
-#: src/LYHistory.c:853
+#: src/LYHistory.c:849
 msgid "You visited (POSTs, bookmark, menu and list files excluded):"
 msgstr "Uğradıklarınız (POSTlar, yer imi, menü ve liste dosyaları hariç):"
 
-#: src/LYHistory.c:1155
+#: src/LYHistory.c:1151
 msgid "(No messages yet)"
 msgstr "(Henüz hiç mesaj yok)"
 
@@ -4309,7 +4319,7 @@ msgstr "Zaten hedef dizinde: %s"
 msgid "Installation complete"
 msgstr "Kurma tamamlandı"
 
-#: src/LYLocal.c:2680
+#: src/LYLocal.c:2678
 msgid "Temporary URL or list would be too long."
 msgstr "Geçici URL ya da liste çok uzun olacaktı."
 
@@ -4348,19 +4358,19 @@ msgstr "Bu mesajı otomatik olarak oluşturan"
 msgid "No system mailer configured"
 msgstr "Ayarlanmış sistem postacısı yok"
 
-#: src/LYMain.c:1071
+#: src/LYMain.c:1074
 msgid "No Winsock found, sorry."
 msgstr "Winsock bulunamadı, üzgünüm."
 
-#: src/LYMain.c:1262
+#: src/LYMain.c:1265
 msgid "You MUST define a valid TMP or TEMP area!"
 msgstr "Geçerli bir TMP ya da TEMP alanı tanımlamalısınız!"
 
-#: src/LYMain.c:1315 src/LYMainLoop.c:5283
+#: src/LYMain.c:1318 src/LYMainLoop.c:5284
 msgid "No such directory"
 msgstr "Böyle bir dizin yok"
 
-#: src/LYMain.c:1509
+#: src/LYMain.c:1512
 #, c-format
 msgid ""
 "\n"
@@ -4371,7 +4381,7 @@ msgstr ""
 "Ayarlama dosyası \"%s\" temin edilemiyor.\n"
 "\n"
 
-#: src/LYMain.c:1519
+#: src/LYMain.c:1522
 #, c-format
 msgid ""
 "\n"
@@ -4382,66 +4392,66 @@ msgstr ""
 "Lynx karakter kümeleri bildirilmemiş.\n"
 "\n"
 
-#: src/LYMain.c:1675
+#: src/LYMain.c:1678
 #, c-format
 msgid "Ignored %d characters from standard input.\n"
 msgstr "Standart girdiden %d karakter yok sayıldı.\n"
 
-#: src/LYMain.c:1677
+#: src/LYMain.c:1680
 #, c-format
 msgid "Use \"-stdin\" or \"-\" to tell how to handle piped input.\n"
 msgstr "Veriyolu girdisinin nasıl halledileceğini belirtmek için \"-stdin\" ya da \"-\" kullanın.\n"
 
-#: src/LYMain.c:1835
+#: src/LYMain.c:1838
 msgid "Warning:"
 msgstr "Uyarı:"
 
-#: src/LYMain.c:2405
+#: src/LYMain.c:2408
 msgid "persistent cookies state will be changed in next session only."
 msgstr "kalıcı çerezler durumu, yalnızca gelecek oturumda değişecek."
 
-#: src/LYMain.c:2642 src/LYMain.c:2687
+#: src/LYMain.c:2645 src/LYMain.c:2690
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr "Lynx: tanınmayan karakterkümesi=%s yoksayılıyor\n"
 
-#: src/LYMain.c:3206
+#: src/LYMain.c:3209
 #, c-format
 msgid "%s Version %s (%s)"
 msgstr "%s Sürüm %s (%s)"
 
-#: src/LYMain.c:3247
+#: src/LYMain.c:3250
 #, c-format
 msgid "Built on %s%s.\n"
 msgstr "%s%s üzerine yapılandırıldı.\n"
 
-#: src/LYMain.c:3261
+#: src/LYMain.c:3264
 msgid "Copyrights held by the Lynx Developers Group,"
 msgstr "Telif hakları Lynx Geliştirme Grubu,"
 
-#: src/LYMain.c:3262
+#: src/LYMain.c:3265
 msgid "the University of Kansas, CERN, and other contributors."
 msgstr "Kansas Üniversitesi, CERN ve diğer katılımcılar tarafından (saklı) tutulmaktadır."
 
-#: src/LYMain.c:3263
+#: src/LYMain.c:3266
 msgid "Distributed under the GNU General Public License (Version 2)."
 msgstr "GNU Genel Kamu Lisansı (Sürüm 2) altında dağıtılmaktadır."
 
-#: src/LYMain.c:3264
+#: src/LYMain.c:3267
 msgid "See http://lynx.invisible-island.net/ and the online help for more information."
 msgstr "Daha fazla bilgi için http://lynx.invisible-island.net/ ve çevrim içi yardıma bakınız."
 
-#: src/LYMain.c:4107
+#: src/LYMain.c:4118
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "KULLANIM: %s [seçenekler] [dosya]\n"
 
-#: src/LYMain.c:4108
+#: src/LYMain.c:4119
 #, c-format
 msgid "Options are:\n"
 msgstr "Seçenekler:\n"
 
-#: src/LYMain.c:4411
+#: src/LYMain.c:4422
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr "%s: Geçersiz Seçenek: %s\n"
@@ -4451,7 +4461,7 @@ msgstr "%s: Geçersiz Seçenek: %s\n"
 msgid "Internal error: Invalid mouse link %d!"
 msgstr "Dahili hata: Geçersiz fare linki %d!"
 
-#: src/LYMainLoop.c:693 src/LYMainLoop.c:5305
+#: src/LYMainLoop.c:693 src/LYMainLoop.c:5306
 msgid "A URL specified by the user"
 msgstr "Kullanıcı tarafından belirtilmiş bir URL"
 
@@ -4470,89 +4480,89 @@ msgstr "Yardım Ekranı"
 msgid "System Index"
 msgstr "Sistem İndeksi"
 
-#: src/LYMainLoop.c:3575
+#: src/LYMainLoop.c:3576
 #, c-format
 msgid "Query parameter %d: "
 msgstr "Sorgu parametresi %d: "
 
-#: src/LYMainLoop.c:3804 src/LYMainLoop.c:5581
+#: src/LYMainLoop.c:3805 src/LYMainLoop.c:5582
 msgid "Entry into main screen"
 msgstr "Ana ekrana giriş"
 
-#: src/LYMainLoop.c:4062
+#: src/LYMainLoop.c:4063
 msgid "No next document present"
 msgstr "Sonrasında başka belge yok"
 
-#: src/LYMainLoop.c:4357
+#: src/LYMainLoop.c:4358
 msgid "charset for this document specified explicitly, sorry..."
 msgstr "bu belge için karakterkümesi özgün şekilde belirtilmiştir, üzgünüm..."
 
-#: src/LYMainLoop.c:5263
+#: src/LYMainLoop.c:5264
 msgid "cd to:"
 msgstr "hangi dizine cd:"
 
-#: src/LYMainLoop.c:5286
+#: src/LYMainLoop.c:5287
 msgid "A component of path is not a directory"
 msgstr "Yolun bileşenlerinden biri dizin değildir"
 
-#: src/LYMainLoop.c:5289
+#: src/LYMainLoop.c:5290
 msgid "failed to change directory"
 msgstr "dizin değiştirme başarısız"
 
-#: src/LYMainLoop.c:6515
+#: src/LYMainLoop.c:6516
 msgid "Reparsing document under current settings..."
 msgstr "Mevcut ayarlarla belge yeniden ayrıştırılıyor..."
 
-#: src/LYMainLoop.c:6809
+#: src/LYMainLoop.c:6810
 #, c-format
 msgid "Fatal error - could not open output file %s\n"
 msgstr "Ölümcül hata - çıktı dosyası %s açılamıyor\n"
 
-#: src/LYMainLoop.c:7151
+#: src/LYMainLoop.c:7152
 msgid "TABLE center enable."
 msgstr "TABLO ortala(mayı) etkinleştir."
 
-#: src/LYMainLoop.c:7154
+#: src/LYMainLoop.c:7155
 msgid "TABLE center disable."
 msgstr "TABLO ortala(mayı) devre dışı bırak."
 
-#: src/LYMainLoop.c:7234
+#: src/LYMainLoop.c:7235
 msgid "Current URL is empty."
 msgstr "Mevcut URL boş."
 
-#: src/LYMainLoop.c:7236 src/LYUtils.c:1917
+#: src/LYMainLoop.c:7237 src/LYUtils.c:1915
 msgid "Copy to clipboard failed."
 msgstr "Panoya kopyalama başarısız."
 
-#: src/LYMainLoop.c:7238
+#: src/LYMainLoop.c:7239
 msgid "Document URL put to clipboard."
 msgstr "Belge URL'sini panoya koy."
 
-#: src/LYMainLoop.c:7240
+#: src/LYMainLoop.c:7241
 msgid "Link URL put to clipboard."
 msgstr "Link URL'sini panoya koy."
 
-#: src/LYMainLoop.c:7267
+#: src/LYMainLoop.c:7268
 msgid "No URL in the clipboard."
 msgstr "Panoda URL yok."
 
-#: src/LYMainLoop.c:7960 src/LYMainLoop.c:8131
+#: src/LYMainLoop.c:7961 src/LYMainLoop.c:8132
 msgid "-index-"
 msgstr "-indeks-"
 
-#: src/LYMainLoop.c:8069
+#: src/LYMainLoop.c:8070
 msgid "lynx: Can't access startfile"
 msgstr "lynx: başlat dosyasına (startfile) erişilemiyor"
 
-#: src/LYMainLoop.c:8081
+#: src/LYMainLoop.c:8082
 msgid "lynx: Start file could not be found or is not text/html or text/plain"
 msgstr "lynx: Başlat dosyası bulunamıyor ya da html-metin ya da salt-metin değil"
 
-#: src/LYMainLoop.c:8082
+#: src/LYMainLoop.c:8083
 msgid "      Exiting..."
 msgstr "      Kapanıyor..."
 
-#: src/LYMainLoop.c:8125
+#: src/LYMainLoop.c:8126
 msgid "-more-"
 msgstr "-devam-"
 
@@ -4624,374 +4634,392 @@ msgstr "Yer imi(B) dosyalarını gözden geçir/düzenle"
 msgid "B)ookmark file: "
 msgstr "Yer imi(B) dosyası: "
 
-#: src/LYOptions.c:2123 src/LYOptions.c:2130
+#: src/LYOptions.c:2127 src/LYOptions.c:2134
 msgid "ON"
 msgstr "AÇIK"
 
 #. verbose_img variable
-#: src/LYOptions.c:2124 src/LYOptions.c:2129 src/LYOptions.c:2302
-#: src/LYOptions.c:2313
+#. LYCollapseBRs variable
+#. LYtrimBlankLines variable
+#: src/LYOptions.c:2128 src/LYOptions.c:2133 src/LYOptions.c:2306
+#: src/LYOptions.c:2315 src/LYOptions.c:2324 src/LYOptions.c:2335
 msgid "OFF"
 msgstr "KAPALI"
 
-#: src/LYOptions.c:2125
+#: src/LYOptions.c:2129
 msgid "NEVER"
 msgstr "ASLA"
 
-#: src/LYOptions.c:2126
+#: src/LYOptions.c:2130
 msgid "ALWAYS"
 msgstr "HER ZAMAN"
 
-#: src/LYOptions.c:2142 src/LYOptions.c:2294
+#: src/LYOptions.c:2146 src/LYOptions.c:2298
 msgid "ignore"
 msgstr "yoksay"
 
-#: src/LYOptions.c:2143
+#: src/LYOptions.c:2147
 msgid "ask user"
 msgstr "kullanıcıya sor"
 
-#: src/LYOptions.c:2144
+#: src/LYOptions.c:2148
 msgid "accept all"
 msgstr "tümünü kabul et"
 
-#: src/LYOptions.c:2156
+#: src/LYOptions.c:2160
 msgid "ALWAYS OFF"
 msgstr "HER ZAMAN KAPALI"
 
-#: src/LYOptions.c:2157
+#: src/LYOptions.c:2161
 msgid "FOR LOCAL FILES ONLY"
 msgstr "YALNIZCA YEREL DOSYALAR İÇİN"
 
-#: src/LYOptions.c:2159
+#: src/LYOptions.c:2163
 msgid "ALWAYS ON"
 msgstr "HER ZAMAN AÇIK"
 
-#: src/LYOptions.c:2171
+#: src/LYOptions.c:2175
 msgid "Numbers act as arrows"
 msgstr "Rakamlar oklar gibi davranırlar"
 
-#: src/LYOptions.c:2173
+#: src/LYOptions.c:2177
 msgid "Links are numbered"
 msgstr "Linkler numaralandı"
 
-#: src/LYOptions.c:2176
+#: src/LYOptions.c:2180
 msgid "Links and form fields are numbered"
 msgstr "Linkler ve form alanları numaralandı"
 
-#: src/LYOptions.c:2179
+#: src/LYOptions.c:2183
 msgid "Form fields are numbered"
 msgstr "Form alanları numaralandı"
 
-#: src/LYOptions.c:2194
+#: src/LYOptions.c:2198
 msgid "Case insensitive"
 msgstr "Büyük/küçük harf duyarsız"
 
-#: src/LYOptions.c:2195
+#: src/LYOptions.c:2199
 msgid "Case sensitive"
 msgstr "Büyük/küçük harf duyarlı"
 
-#: src/LYOptions.c:2229
+#: src/LYOptions.c:2233
 msgid "prompt normally"
 msgstr "normal bilgi istemi"
 
-#: src/LYOptions.c:2230
+#: src/LYOptions.c:2234
 msgid "force yes-response"
 msgstr "evet-yanıtına zorla"
 
-#: src/LYOptions.c:2231
+#: src/LYOptions.c:2235
 msgid "force no-response"
 msgstr "hayır-yanıtına zorla"
 
-#: src/LYOptions.c:2249
+#: src/LYOptions.c:2253
 msgid "Novice"
 msgstr "Acemi"
 
-#: src/LYOptions.c:2250
+#: src/LYOptions.c:2254
 msgid "Intermediate"
 msgstr "Orta düzey"
 
-#: src/LYOptions.c:2251
+#: src/LYOptions.c:2255
 msgid "Advanced"
 msgstr "İleri düzey"
 
-#: src/LYOptions.c:2260
+#: src/LYOptions.c:2264
 msgid "By First Visit"
 msgstr "İlk Ziyaretle"
 
-#: src/LYOptions.c:2262
+#: src/LYOptions.c:2266
 msgid "By First Visit Reversed"
 msgstr "İlk Ziyaretle-Tersten"
 
-#: src/LYOptions.c:2263
+#: src/LYOptions.c:2267
 msgid "As Visit Tree"
 msgstr "Ziyaret Ağacı Gibi"
 
-#: src/LYOptions.c:2264
+#: src/LYOptions.c:2268
 msgid "By Last Visit"
 msgstr "Son Ziyaretle"
 
-#: src/LYOptions.c:2266
+#: src/LYOptions.c:2270
 msgid "By Last Visit Reversed"
 msgstr "Son Ziyaretle-Tersten"
 
 #. Old_DTD variable
-#: src/LYOptions.c:2277
+#: src/LYOptions.c:2281
 msgid "relaxed (TagSoup mode)"
 msgstr "gevşek (TagSoup kipi)"
 
-#: src/LYOptions.c:2278
+#: src/LYOptions.c:2282
 msgid "strict (SortaSGML mode)"
 msgstr "katı (SortaSGML kipi)"
 
-#: src/LYOptions.c:2285
+#: src/LYOptions.c:2289
 msgid "Ignore"
 msgstr "Yoksay"
 
-#: src/LYOptions.c:2286
+#: src/LYOptions.c:2290
 msgid "Add to trace-file"
 msgstr "İz dosyasına ekle"
 
-#: src/LYOptions.c:2287
+#: src/LYOptions.c:2291
 msgid "Add to LYNXMESSAGES"
 msgstr "LYNXMESSAGES'a ekle"
 
-#: src/LYOptions.c:2288
+#: src/LYOptions.c:2292
 msgid "Warn, point to trace-file"
 msgstr "Uyar, iz dosyasına yönlendir"
 
-#: src/LYOptions.c:2295
+#: src/LYOptions.c:2299
 msgid "as labels"
 msgstr "etiket gibi"
 
-#: src/LYOptions.c:2296
+#: src/LYOptions.c:2300
 msgid "as links"
 msgstr "link gibi"
 
-#: src/LYOptions.c:2303
+#: src/LYOptions.c:2307
 msgid "show filename"
 msgstr "dosya adını göster"
 
-#: src/LYOptions.c:2314
+#: src/LYOptions.c:2316
+msgid "collapse"
+msgstr "Daralt"
+
+#: src/LYOptions.c:2325
+msgid "trim-lines"
+msgstr "kesme-satırları"
+
+#: src/LYOptions.c:2336
 msgid "STANDARD"
 msgstr "STANDART"
 
-#: src/LYOptions.c:2315
+#: src/LYOptions.c:2337
 msgid "ADVANCED"
 msgstr "İLERİ DÜZEY"
 
-#: src/LYOptions.c:2349
+#: src/LYOptions.c:2371
 msgid "Directories first"
 msgstr "Önce dizinler"
 
-#: src/LYOptions.c:2350
+#: src/LYOptions.c:2372
 msgid "Files first"
 msgstr "Önce dosyalar"
 
-#: src/LYOptions.c:2351
+#: src/LYOptions.c:2373
 msgid "Mixed style"
 msgstr "Karışık stil"
 
-#: src/LYOptions.c:2359 src/LYOptions.c:2379
+#: src/LYOptions.c:2381 src/LYOptions.c:2401
 msgid "By Name"
 msgstr "İsimle"
 
-#: src/LYOptions.c:2360 src/LYOptions.c:2380
+#: src/LYOptions.c:2382 src/LYOptions.c:2402
 msgid "By Type"
 msgstr "Türle"
 
-#: src/LYOptions.c:2361 src/LYOptions.c:2381
+#: src/LYOptions.c:2383 src/LYOptions.c:2403
 msgid "By Size"
 msgstr "Boyutla"
 
-#: src/LYOptions.c:2362 src/LYOptions.c:2382
+#: src/LYOptions.c:2384 src/LYOptions.c:2404
 msgid "By Date"
 msgstr "Tarihle"
 
-#: src/LYOptions.c:2363
+#: src/LYOptions.c:2385
 msgid "By Mode"
 msgstr "Kiple"
 
-#: src/LYOptions.c:2365
+#: src/LYOptions.c:2387
 msgid "By User"
 msgstr "Kullanıcıyla"
 
-#: src/LYOptions.c:2366
+#: src/LYOptions.c:2388
 msgid "By Group"
 msgstr "Grupla"
 
-#: src/LYOptions.c:2391
+#: src/LYOptions.c:2413
 msgid "Do not show rate"
 msgstr "Hızı gösterme"
 
-#: src/LYOptions.c:2392 src/LYOptions.c:2393
+#: src/LYOptions.c:2414 src/LYOptions.c:2415
 #, c-format
 msgid "Show %s/sec rate"
 msgstr "%s/sn hızını göster"
 
-#: src/LYOptions.c:2395 src/LYOptions.c:2396
+#: src/LYOptions.c:2417 src/LYOptions.c:2418
 #, c-format
 msgid "Show %s/sec, ETA"
 msgstr "%s/sn'yi göster, ETA"
 
-#: src/LYOptions.c:2397 src/LYOptions.c:2398
+#: src/LYOptions.c:2419 src/LYOptions.c:2420
 #, c-format
 msgid "Show %s/sec (2-digits), ETA"
 msgstr "%s/sn'yi (2-basamaklı) göster, ETA"
 
-#: src/LYOptions.c:2401
+#: src/LYOptions.c:2423
 msgid "Show progressbar"
 msgstr "Gelişim çubuğunu göster"
 
-#: src/LYOptions.c:2413
+#: src/LYOptions.c:2435
 msgid "Accept lynx's internal types"
 msgstr "Lynx'in dahili türlerini kabul et"
 
-#: src/LYOptions.c:2414
+#: src/LYOptions.c:2436
 msgid "Also accept lynx.cfg's types"
 msgstr "Lynx cfg'nin türlerini de kabul et"
 
-#: src/LYOptions.c:2415
+#: src/LYOptions.c:2437
 msgid "Also accept user's types"
 msgstr "Kullanıcının türlerini de kabul et"
 
-#: src/LYOptions.c:2416
+#: src/LYOptions.c:2438
 msgid "Also accept system's types"
 msgstr "Sistemin türlerini de kabul et"
 
-#: src/LYOptions.c:2417
+#: src/LYOptions.c:2439
 msgid "Accept all types"
 msgstr "Tüm türleri kabul et"
 
-#: src/LYOptions.c:2426
+#: src/LYOptions.c:2448
 msgid "gzip"
 msgstr "gzip"
 
-#: src/LYOptions.c:2427
+#: src/LYOptions.c:2449
 msgid "deflate"
 msgstr "söndür"
 
-#: src/LYOptions.c:2430
+#: src/LYOptions.c:2452
 msgid "compress"
 msgstr "sıkıştır"
 
-#: src/LYOptions.c:2433
+#: src/LYOptions.c:2455
 msgid "bzip2"
 msgstr "bzip2"
 
-#: src/LYOptions.c:2435
+#: src/LYOptions.c:2457
 msgid "All"
 msgstr "Tümü"
 
-#: src/LYOptions.c:2801 src/LYOptions.c:2830
+#: src/LYOptions.c:2467
+msgid "HTTP 1.0"
+msgstr "HTTP 1.0"
+
+#: src/LYOptions.c:2468
+msgid "HTTP 1.1"
+msgstr "HTTP 1.1"
+
+#: src/LYOptions.c:2827 src/LYOptions.c:2856
 #, c-format
 msgid "Use %s to invoke the Options menu!"
 msgstr "Seçenekler menüsünü çağırmak için %s kullanınız!"
 
-#: src/LYOptions.c:3688
+#: src/LYOptions.c:3739
 msgid "(options marked with (!) will not be saved)"
 msgstr "((!) ile işaretlenmiş seçenekler kaydedilmeyecek)"
 
-#: src/LYOptions.c:3696
+#: src/LYOptions.c:3747
 msgid "General Preferences"
 msgstr "Genel Tercihler"
 
 #. ***************************************************************
 #. User Mode: SELECT
-#: src/LYOptions.c:3700
+#: src/LYOptions.c:3751
 msgid "User mode"
 msgstr "Kullanıcı kipi"
 
 #. Editor: INPUT
-#: src/LYOptions.c:3706
+#: src/LYOptions.c:3757
 msgid "Editor"
 msgstr "Düzenleyici"
 
 #. Search Type: SELECT
-#: src/LYOptions.c:3711
+#: src/LYOptions.c:3762
 msgid "Type of Search"
 msgstr "Arama Tipi"
 
-#: src/LYOptions.c:3716
+#: src/LYOptions.c:3767
 msgid "Security and Privacy"
 msgstr "Güvenlik ve Mahremiyet"
 
 #. ***************************************************************
 #. Cookies: SELECT
-#: src/LYOptions.c:3720
+#: src/LYOptions.c:3771
 msgid "Cookies"
 msgstr "Çerezler"
 
 #. Cookie Prompting: SELECT
-#: src/LYOptions.c:3734
+#: src/LYOptions.c:3785
 msgid "Invalid-Cookie Prompting"
 msgstr "Geçersiz Çerez Bilgi İstemi"
 
 #. SSL Prompting: SELECT
-#: src/LYOptions.c:3741
+#: src/LYOptions.c:3792
 msgid "SSL Prompting"
 msgstr "SSL Bilgi İstemi"
 
-#: src/LYOptions.c:3746
+#: src/LYOptions.c:3797
 msgid "SSL client certificate file"
 msgstr "SSL istemci sertifika dosyası"
 
-#: src/LYOptions.c:3750
+#: src/LYOptions.c:3801
 msgid "SSL client key file"
 msgstr "SSL istemci anahtar dosyası"
 
-#: src/LYOptions.c:3756
+#: src/LYOptions.c:3807
 msgid "Keyboard Input"
 msgstr "Klavye Girdisi"
 
 #. ***************************************************************
 #. Keypad Mode: SELECT
-#: src/LYOptions.c:3760
+#: src/LYOptions.c:3811
 msgid "Keypad mode"
 msgstr "Mini klavye(keypad) kipi"
 
 #. Emacs keys: ON/OFF
-#: src/LYOptions.c:3766
+#: src/LYOptions.c:3817
 msgid "Emacs keys"
 msgstr "Emacs tuşları"
 
 #. VI Keys: ON/OFF
-#: src/LYOptions.c:3772
+#: src/LYOptions.c:3823
 msgid "VI keys"
 msgstr "VI tuşları"
 
 #. Line edit style: SELECT
 #. well, at least 2 line edit styles available
-#: src/LYOptions.c:3779
+#: src/LYOptions.c:3830
 msgid "Line edit style"
 msgstr "Satır düzenleme stili"
 
 #. Keyboard layout: SELECT
-#: src/LYOptions.c:3791
+#: src/LYOptions.c:3842
 msgid "Keyboard layout"
 msgstr "Klavye yerleşimi"
 
 #.
 #. * Display and Character Set
 #.
-#: src/LYOptions.c:3805
+#: src/LYOptions.c:3856
 msgid "Display and Character Set"
 msgstr "Görüntüleme ve Karakter Kümesi"
 
 #. Use locale-based character set: ON/OFF
-#: src/LYOptions.c:3810
+#: src/LYOptions.c:3861
 msgid "Use locale-based character set"
 msgstr "Yerel tabanlı karakter kümesini kullan"
 
-#: src/LYOptions.c:3817
+#: src/LYOptions.c:3868
 msgid "Use HTML5 charset replacements"
 msgstr "HTML5 karakter setini kullan"
 
 #. Display Character Set: SELECT
-#: src/LYOptions.c:3823
+#: src/LYOptions.c:3874
 msgid "Display character set"
 msgstr "Karakter kümesini görüntüle"
 
-#: src/LYOptions.c:3854
+#: src/LYOptions.c:3905
 msgid "Assumed document character set"
 msgstr "Varsayılan belge karakter kümesi"
 
@@ -5000,211 +5028,226 @@ msgstr "Varsayılan belge karakter kümesi"
 #. * we split the header to make it more readable:
 #. * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others.
 #.
-#: src/LYOptions.c:3874
+#: src/LYOptions.c:3925
 msgid "CJK mode"
 msgstr "CJK kipi"
 
-#: src/LYOptions.c:3876
+#: src/LYOptions.c:3927
 msgid "Raw 8-bit"
 msgstr "Ham 8-bit"
 
 #. X Display: INPUT
-#: src/LYOptions.c:3884
+#: src/LYOptions.c:3935
 msgid "X Display"
 msgstr "X Görüntüleme"
 
 #.
 #. * Document Appearance
 #.
-#: src/LYOptions.c:3890
+#: src/LYOptions.c:3941
 msgid "Document Appearance"
 msgstr "Belge Görünümü"
 
-#: src/LYOptions.c:3896
+#: src/LYOptions.c:3947
 msgid "Show color"
 msgstr "Renkleri göster"
 
 #. Color style: ON/OFF
-#: src/LYOptions.c:3921
+#: src/LYOptions.c:3972
 msgid "Color style"
 msgstr "Renk stili"
 
-#: src/LYOptions.c:3930
+#: src/LYOptions.c:3981
 msgid "Default colors"
 msgstr "Öntanımlı renkler"
 
 #. Show cursor: ON/OFF
-#: src/LYOptions.c:3938
+#: src/LYOptions.c:3989
 msgid "Show cursor"
 msgstr "İmleci göster"
 
 #. Underline links: ON/OFF
-#: src/LYOptions.c:3944
+#: src/LYOptions.c:3995
 msgid "Underline links"
 msgstr "Linklerin altı çizili"
 
 #. Show scrollbar: ON/OFF
-#: src/LYOptions.c:3951
+#: src/LYOptions.c:4002
 msgid "Show scrollbar"
 msgstr "Kaydırma çubuğunu göster"
 
 #. Select Popups: ON/OFF
-#: src/LYOptions.c:3958
+#: src/LYOptions.c:4009
 msgid "Popups for select fields"
 msgstr "Seçme alanlar için açılırlar(popups)"
 
 #. HTML error recovery: SELECT
-#: src/LYOptions.c:3964
+#: src/LYOptions.c:4015
 msgid "HTML error recovery"
 msgstr "HTML hata kurtarma"
 
 #. Bad HTML messages: SELECT
-#: src/LYOptions.c:3970
+#: src/LYOptions.c:4021
 msgid "Bad HTML messages"
 msgstr "Kötü HTML mesajları"
 
 #. Show Images: SELECT
-#: src/LYOptions.c:3976
+#: src/LYOptions.c:4027
 msgid "Show images"
 msgstr "Resimleri göster"
 
 #. Verbose Images: ON/OFF
-#: src/LYOptions.c:3990
+#: src/LYOptions.c:4041
 msgid "Verbose images"
 msgstr "Resimleri dillendir"
 
+#. Collapse BR Tags: ON/OFF
+#: src/LYOptions.c:4047
+msgid "Collapse BR tags"
+msgstr "BR etiketler daralt"
+
+#. Trim blank lines: ON/OFF
+#: src/LYOptions.c:4053
+msgid "Trim blank lines"
+msgstr "Boş satırlar düzelt"
+
 #.
 #. * Headers Transferred to Remote Servers
 #.
-#: src/LYOptions.c:3998
+#: src/LYOptions.c:4061
 msgid "Headers Transferred to Remote Servers"
 msgstr "Başlıklar Karşı Sunuculara Aktarıldı"
 
 #. ***************************************************************
 #. Mail Address: INPUT
-#: src/LYOptions.c:4002
+#: src/LYOptions.c:4065
 msgid "Personal mail address"
 msgstr "Kişisel mektup adresi"
 
-#: src/LYOptions.c:4007
+#: src/LYOptions.c:4070
 msgid "Personal name for mail"
 msgstr "Posta için kişisel ad"
 
-#: src/LYOptions.c:4014
+#: src/LYOptions.c:4077
 msgid "Password for anonymous ftp"
 msgstr "Anonim ftp için parola"
 
 #. Preferred media type: SELECT
-#: src/LYOptions.c:4020
+#: src/LYOptions.c:4083
 msgid "Preferred media type"
 msgstr "Tercih edilen ortam türü"
 
 #. Preferred encoding: SELECT
-#: src/LYOptions.c:4026
+#: src/LYOptions.c:4089
 msgid "Preferred encoding"
 msgstr "Tercih edilen kodlama"
 
 #. Preferred Document Character Set: INPUT
-#: src/LYOptions.c:4032
+#: src/LYOptions.c:4095
 msgid "Preferred document character set"
 msgstr "Tercih edilen belge karakter kümesi"
 
 #. Preferred Document Language: INPUT
-#: src/LYOptions.c:4037
+#: src/LYOptions.c:4100
 msgid "Preferred document language"
 msgstr "Tercih edilen belge dili"
 
-#: src/LYOptions.c:4043
+#. HTTP protocol SELECT
+#: src/LYOptions.c:4105
+msgid "HTTP protocol"
+msgstr "HTTP iletişim kuralı"
+
+#: src/LYOptions.c:4112
 msgid "Send User-Agent header"
 msgstr "Kullanıcı-Ajanı başlığını gönder"
 
-#: src/LYOptions.c:4045
+#: src/LYOptions.c:4114
 msgid "User-Agent header"
 msgstr "Kullanıcı-Ajanı başlığı"
 
 #.
 #. * Listing and Accessing Files
 #.
-#: src/LYOptions.c:4053
+#: src/LYOptions.c:4122
 msgid "Listing and Accessing Files"
 msgstr "Dosya Listeleme ve Erişim"
 
 #. FTP sort: SELECT
-#: src/LYOptions.c:4058
+#: src/LYOptions.c:4127
 msgid "Use Passive FTP"
 msgstr "Edilgen FTP Kullan"
 
 #. FTP sort: SELECT
-#: src/LYOptions.c:4064
+#: src/LYOptions.c:4133
 msgid "FTP sort criteria"
 msgstr "FTP sıralama ölçütleri"
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:4072
+#: src/LYOptions.c:4141
 msgid "Local directory sort criteria"
 msgstr "Yerel dizin sıralama ölçütleri"
 
 #. Local Directory Order: SELECT
-#: src/LYOptions.c:4078
+#: src/LYOptions.c:4147
 msgid "Local directory sort order"
 msgstr "Yerel dizin sıralama ölçütleri"
 
-#: src/LYOptions.c:4087
+#: src/LYOptions.c:4156
 msgid "Show dot files"
 msgstr "Nokta dosyaları göster"
 
-#: src/LYOptions.c:4095
+#: src/LYOptions.c:4164
 msgid "Execution links"
 msgstr "İcra linkleri"
 
-#: src/LYOptions.c:4113
+#: src/LYOptions.c:4182
 msgid "Pause when showing message"
 msgstr "Mesajı gösterirken durakla"
 
 #. Show transfer rate: SELECT
-#: src/LYOptions.c:4120
+#: src/LYOptions.c:4189
 msgid "Show transfer rate"
 msgstr "Aktarım hızını göster"
 
 #.
 #. * Special Files and Screens
 #.
-#: src/LYOptions.c:4140
+#: src/LYOptions.c:4209
 msgid "Special Files and Screens"
 msgstr "Özel Dosyalar ve Ekranlar"
 
-#: src/LYOptions.c:4145
+#: src/LYOptions.c:4214
 msgid "Multi-bookmarks"
 msgstr "Çoklu-yer imleri"
 
-#: src/LYOptions.c:4153
+#: src/LYOptions.c:4222
 msgid "Review/edit Bookmarks files"
 msgstr "Yer İmi dosyalarını gözden geçir/düzenle"
 
-#: src/LYOptions.c:4156
+#: src/LYOptions.c:4225
 msgid "Goto multi-bookmark menu"
 msgstr "Çoklu-yer imi menüsüne git"
 
-#: src/LYOptions.c:4158
+#: src/LYOptions.c:4227
 msgid "Bookmarks file"
 msgstr "Yer İmleri dosyası"
 
 #. Auto Session: ON/OFF
-#: src/LYOptions.c:4165
+#: src/LYOptions.c:4234
 msgid "Auto Session"
 msgstr "Otomatik Oturum"
 
 #. Session File Menu: INPUT
-#: src/LYOptions.c:4171
+#: src/LYOptions.c:4240
 msgid "Session file"
 msgstr "Oturum dosyası"
 
 #. Visited Pages: SELECT
-#: src/LYOptions.c:4177
+#: src/LYOptions.c:4246
 msgid "Visited Pages"
 msgstr "Uğranan Sayfalar"
 
-#: src/LYOptions.c:4182
+#: src/LYOptions.c:4251
 msgid "View the file "
 msgstr "Dosyayı görüntüle"
 
@@ -5269,7 +5312,7 @@ msgstr "Ekrana yazdır"
 msgid "Print out on a printer attached to your vt100 terminal"
 msgstr "vt100 uçbiriminize bağlı bir yazıcıya yazdırın"
 
-#: src/LYReadCFG.c:441
+#: src/LYReadCFG.c:437
 #, c-format
 msgid ""
 "Syntax Error parsing COLOR in configuration file:\n"
@@ -5286,76 +5329,76 @@ msgstr ""
 "Burada ÖNPLAN ve ARKAPLAN özel dizgeler olan\n"
 "'nocolor' ya da 'default' (ya da) 'dan biri olmalıdır\n"
 
-#: src/LYReadCFG.c:454
+#: src/LYReadCFG.c:450
 msgid "Offending line:"
 msgstr "İncitici satır:"
 
-#: src/LYReadCFG.c:769
+#: src/LYReadCFG.c:764
 #, c-format
 msgid "key remapping of %s to %s for %s failed\n"
 msgstr "%s'in %s'e tuş yeniden eşlemlemesi %s kez başarısız\n"
 
-#: src/LYReadCFG.c:776
+#: src/LYReadCFG.c:771
 #, c-format
 msgid "key remapping of %s to %s failed\n"
 msgstr "%s'in %s'e tuş yeniden eşlemlemesi başarısız\n"
 
-#: src/LYReadCFG.c:797
+#: src/LYReadCFG.c:792
 #, c-format
 msgid "invalid line-editor selection %s for key %s, selecting all\n"
 msgstr "%2$s tuşu için geçersiz satır-düzenleyici seçimi %1$s, tümü seçiliyor\n"
 
-#: src/LYReadCFG.c:822 src/LYReadCFG.c:834
+#: src/LYReadCFG.c:817 src/LYReadCFG.c:829
 #, c-format
 msgid "setting of line-editor binding for key %s (0x%x) to 0x%x for %s failed\n"
 msgstr "%s (0x%x) tuşu için 0x%x'e satır-düzenleyici bağlantısı kurulması %s kez başarısız\n"
 
-#: src/LYReadCFG.c:838
+#: src/LYReadCFG.c:833
 #, c-format
 msgid "setting of line-editor binding for key %s (0x%x) for %s failed\n"
 msgstr "%s (0x%x) tuşu için satır-düzenleyici bağlantısı kurulması %s kez başarısız\n"
 
-#: src/LYReadCFG.c:934
+#: src/LYReadCFG.c:929
 #, c-format
 msgid "Lynx: cannot start, CERN rules file %s is not available\n"
 msgstr "Lynx: başlayamıyor, CERN kuralları dosyası %s temin edilemiyor\n"
 
-#: src/LYReadCFG.c:935
+#: src/LYReadCFG.c:930
 msgid "(no name)"
 msgstr "(isimsiz)"
 
-#: src/LYReadCFG.c:2075
+#: src/LYReadCFG.c:2070
 #, c-format
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
 msgstr "lynx.cfg içermeleri, %d'den çok içiçe geçmiş -- belki bir döngü olmasın?\n"
 
-#: src/LYReadCFG.c:2077
+#: src/LYReadCFG.c:2072
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr "Son kalkışılan içerme '%s' idi,\n"
 
-#: src/LYReadCFG.c:2078
+#: src/LYReadCFG.c:2073
 #, c-format
 msgid "included from '%s'.\n"
 msgstr "'%s'den içerilmişti.\n"
 
-#: src/LYReadCFG.c:2481 src/LYReadCFG.c:2494 src/LYReadCFG.c:2552
+#: src/LYReadCFG.c:2476 src/LYReadCFG.c:2489 src/LYReadCFG.c:2547
 msgid "The following is read from your lynx.cfg file."
 msgstr "Aşağıdaki, lynx.cfg dosyanızdan okunmuştur."
 
-#: src/LYReadCFG.c:2482 src/LYReadCFG.c:2495
+#: src/LYReadCFG.c:2477 src/LYReadCFG.c:2490
 msgid "Please read the distribution"
 msgstr "Lütfen daha fazla yorum için"
 
-#: src/LYReadCFG.c:2488 src/LYReadCFG.c:2498
+#: src/LYReadCFG.c:2483 src/LYReadCFG.c:2493
 msgid "for more comments."
 msgstr "dağıtımı okuyunuz."
 
-#: src/LYReadCFG.c:2534
+#: src/LYReadCFG.c:2529
 msgid "RELOAD THE CHANGES"
 msgstr "DEĞİŞİKLİKLERİ YENİDEN YÜKLE"
 
-#: src/LYReadCFG.c:2542
+#: src/LYReadCFG.c:2537
 msgid "Your primary configuration"
 msgstr "Birincil ayarlarınız"
 
@@ -5574,7 +5617,7 @@ msgstr "Mevcut sayfada link yok"
 msgid "Server Headers:"
 msgstr "Sunucu Başlıkları:"
 
-#: src/LYStyle.c:338
+#: src/LYStyle.c:339
 #, c-format
 msgid ""
 "Syntax Error parsing style in lss file:\n"
@@ -5591,7 +5634,7 @@ msgstr ""
 "burada NESNE EM,STRONG,B,I,U,BLINK vs'den biri olmalıdır.\n"
 "\n"
 
-#: src/LYStyle.c:933
+#: src/LYStyle.c:948
 #, c-format
 msgid ""
 "\n"
@@ -5634,33 +5677,33 @@ msgstr "Yüklenecek yer:"
 msgid "Upload options:"
 msgstr "Yükleme seçenekleri:"
 
-#: src/LYUtils.c:1919
+#: src/LYUtils.c:1917
 msgid "Download document URL put to clipboard."
 msgstr "Belge indirme URL'sini panoya koy."
 
-#: src/LYUtils.c:2666
+#: src/LYUtils.c:2664
 msgid "Unexpected access protocol for this URL scheme."
 msgstr "Bu URL şeması için umulmadık erişim protokolü."
 
-#: src/LYUtils.c:3571
+#: src/LYUtils.c:3569
 msgid "Too many tempfiles"
 msgstr "Çok sayıda geçici dosya"
 
-#: src/LYUtils.c:3871
+#: src/LYUtils.c:3869
 msgid "unknown restriction"
 msgstr "bilinmeyen kısıtlama"
 
-#: src/LYUtils.c:3902
+#: src/LYUtils.c:3900
 #, c-format
 msgid "No restrictions set.\n"
 msgstr "Hiçbir kısıtlama kurulmamış.\n"
 
-#: src/LYUtils.c:3905
+#: src/LYUtils.c:3903
 #, c-format
 msgid "Restrictions set:\n"
 msgstr "Kurulmuş kısıtlamalar:\n"
 
-#: src/LYUtils.c:5279
+#: src/LYUtils.c:5278
 msgid "Cannot find HOME directory"
 msgstr "EV dizini bulunamıyor"
 
@@ -5668,7 +5711,7 @@ msgstr "EV dizini bulunamıyor"
 msgid "Normally disabled.  See ENABLE_LYNXRC in lynx.cfg\n"
 msgstr "Normalde devre dışıdır.  Bkz. lynx.cfg'de ENABLE_LYNXRC\n"
 
-#: src/LYrcFile.c:327
+#: src/LYrcFile.c:349
 msgid ""
 "accept_all_cookies allows the user to tell Lynx to automatically\n"
 "accept all cookies if desired.  The default is \"FALSE\" which will\n"
@@ -5680,7 +5723,7 @@ msgstr ""
 "olup, her çerez için sorulmasını sağlar.  Tüm çerezleri kabul etmek için\n"
 "accept_all_cookies'i \"TRUE\" (doğru)ya ayarlayın.\n"
 
-#: src/LYrcFile.c:335
+#: src/LYrcFile.c:357
 msgid ""
 "anonftp_password allows the user to tell Lynx to use the personal\n"
 "email address as the password for anonymous ftp.  If no value is given,\n"
@@ -5691,7 +5734,7 @@ msgstr ""
 "anonim ftp için parola olarak kullanmasını bildirir.  Eğer bir değer verilmezse,\n"
 "Lynx kişisel e-posta adresini kullanacaktır.  anonftp_password'ü başka bir değere kurmayı seçebilirsiniz.\n"
 
-#: src/LYrcFile.c:344
+#: src/LYrcFile.c:366
 msgid ""
 "bookmark_file specifies the name and location of the default bookmark\n"
 "file into which the user can paste links for easy access at a later\n"
@@ -5701,7 +5744,7 @@ msgstr ""
 "için linkleri içine yapıştırdığı öntanımlı yer imi dosyasının adı\n"
 "ve konumunu belirtir.\n"
 
-#: src/LYrcFile.c:349
+#: src/LYrcFile.c:371
 msgid ""
 "If case_sensitive_searching is \"on\" then when the user invokes a search\n"
 "using the 's' or '/' keys, the search performed will be case sensitive\n"
@@ -5711,7 +5754,7 @@ msgstr ""
 "bir arama başlattığında, arama büyük/küçük harfe duyarSIZ olmak yerine duyarlı\n"
 "olarak yapılacaktır.  Öntanımlısı genellikle \"off\" (kapalı)dır.\n"
 
-#: src/LYrcFile.c:354
+#: src/LYrcFile.c:376
 msgid ""
 "The character_set definition controls the representation of 8 bit\n"
 "characters for your terminal.  If 8 bit characters do not show up\n"
@@ -5725,7 +5768,7 @@ msgstr ""
 "yaklaşıklıklarını deneyebilirsiniz.\n"
 "Mevcut geçerli karakter kümeleri şunlardır:\n"
 
-#: src/LYrcFile.c:361
+#: src/LYrcFile.c:384
 msgid ""
 "cookie_accept_domains and cookie_reject_domains are comma-delimited\n"
 "lists of domains from which Lynx should automatically accept or reject\n"
@@ -5739,7 +5782,7 @@ msgstr ""
 "öncelik taşır.  accept_all_cookies parametresi, burada yapılan tüm ayarları\n"
 "geçersiz kılar.\n"
 
-#: src/LYrcFile.c:369
+#: src/LYrcFile.c:392
 msgid ""
 "cookie_file specifies the file from which to read persistent cookies.\n"
 "The default is ~/"
@@ -5747,7 +5790,7 @@ msgstr ""
 "cookie_file kalıcı çerezlerin okunacağı dosyayı belirler.\n"
 "Öntanımlısı ~/'dir"
 
-#: src/LYrcFile.c:374
+#: src/LYrcFile.c:397
 msgid ""
 "cookie_loose_invalid_domains, cookie_strict_invalid_domains, and\n"
 "cookie_query_invalid_domains are comma-delimited lists of which domains\n"
@@ -5765,7 +5808,7 @@ msgstr ""
 "yol ya da yöre öznitelikli çerez kurma izni verilir.  Tüm yöreler, öntanımlı\n"
 "olarak, geçersiz bir yol ya da yöre (özniteliğini) kullanıcıya sorgulatır.\n"
 
-#: src/LYrcFile.c:388
+#: src/LYrcFile.c:411
 msgid ""
 "dir_list_order specifies the directory list order under DIRED_SUPPORT\n"
 "(if implemented).  The default is \"ORDER_BY_NAME\"\n"
@@ -5773,7 +5816,7 @@ msgstr ""
 "dir_list_order (eğer mevcutsa) DIRED_SUPPORT altındaki dizin listesi\n"
 "sırasını belirler.  Öntanımlısı \"ORDER_BY_NAME\"'dir\n"
 
-#: src/LYrcFile.c:393
+#: src/LYrcFile.c:416
 msgid ""
 "dir_list_styles specifies the directory list style under DIRED_SUPPORT\n"
 "(if implemented).  The default is \"MIXED_STYLE\", which sorts both\n"
@@ -5785,7 +5828,7 @@ msgstr ""
 "ve dizinleri birlikte sıralar.  \"FILES_FIRST\" önce dosyaları,\n"
 "\"DIRECTORIES_FIRST\" önce dizinleri sıralar.\n"
 
-#: src/LYrcFile.c:401
+#: src/LYrcFile.c:424
 msgid ""
 "If emacs_keys is to \"on\" then the normal EMACS movement keys:\n"
 "  ^N = down    ^P = up\n"
@@ -5797,7 +5840,7 @@ msgstr ""
 "  ^B = sol      ^F = sağ\n"
 "etkinleştirilecektir.\n"
 
-#: src/LYrcFile.c:407
+#: src/LYrcFile.c:430
 msgid ""
 "file_editor specifies the editor to be invoked when editing local files\n"
 "or sending mail.  If no editor is specified, then file editing is disabled\n"
@@ -5809,7 +5852,7 @@ msgstr ""
 "etkinleştirilmedikçe dosya düzenleme devre dışı kalır ve posta göndermek için yerleşik satır\n"
 "düzenleyici kullanılır.\n"
 
-#: src/LYrcFile.c:414
+#: src/LYrcFile.c:437
 msgid ""
 "The file_sorting_method specifies which value to sort on when viewing\n"
 "file lists such as FTP directories.  The options are:\n"
@@ -5825,7 +5868,7 @@ msgstr ""
 "   BY_SIZE     -- dosya boyutuna göre sıralar\n"
 "   BY_DATE     -- dosyanın tarihine göre sıralar\n"
 
-#: src/LYrcFile.c:437
+#: src/LYrcFile.c:462
 msgid ""
 "lineedit_mode specifies the key binding used for inputting strings in\n"
 "prompts and forms.  If lineedit_mode is set to \"Default Binding\" then\n"
@@ -5851,7 +5894,7 @@ msgstr ""
 "\n"
 "Mevcut satır düzenleme kipleri şunlardır:\n"
 
-#: src/LYrcFile.c:455
+#: src/LYrcFile.c:480
 msgid ""
 "The following allow you to define sub-bookmark files and descriptions.\n"
 "The format is multi_bookmark<capital_letter>=<filename>,<description>\n"
@@ -5863,7 +5906,7 @@ msgstr ""
 "26 yer imi dosyasına (İngilizce'deki büyük harfler) kadar izin verilir.\n"
 "\"multi_bookmarkB\" ile başlanır, zira 'A' öntanımlı olandır (yukarıya bkz).\n"
 
-#: src/LYrcFile.c:461
+#: src/LYrcFile.c:486
 msgid ""
 "personal_mail_address specifies your personal mail address.  The\n"
 "address will be sent during HTTP file transfers for authorization and\n"
@@ -5882,7 +5925,7 @@ msgstr ""
 "boş da bırakabilirsiniz, ama o zaman gönderilmiş yorumlarınızda da\n"
 "bu alan içerilmeyecektir.\n"
 
-#: src/LYrcFile.c:470
+#: src/LYrcFile.c:495
 msgid ""
 "personal_mail_name specifies your personal name, for mail.  The\n"
 "name is sent for mailed comments.  Lynx will prompt for this,\n"
@@ -5901,7 +5944,7 @@ msgstr ""
 "değere kaydetmez. Öntanımlı değeri güncellemek için ya seçenekler menüsünü\n"
 "kullanmalı, ya da direkt olarak bu dosyayı değiştirmelisiniz.\n"
 
-#: src/LYrcFile.c:480
+#: src/LYrcFile.c:505
 msgid ""
 "preferred_charset specifies the character set in MIME notation (e.g.,\n"
 "ISO-8859-2, ISO-8859-5) which Lynx will indicate you prefer in requests\n"
@@ -5929,7 +5972,7 @@ msgstr ""
 "gönderimine de izin verilir.\n"
 "\n"
 
-#: src/LYrcFile.c:496
+#: src/LYrcFile.c:521
 msgid ""
 "preferred_language specifies the language in MIME notation (e.g., en,\n"
 "fr, may be a comma-separated list in decreasing preference)\n"
@@ -5943,7 +5986,7 @@ msgstr ""
 "O dilde bir dosya mevcutsa, sunucu onu gönderecektir.\n"
 "Aksi halde, sunucu öntanımlı dilindeki dosyayı gönderir.\n"
 
-#: src/LYrcFile.c:507
+#: src/LYrcFile.c:532
 msgid ""
 "If run_all_execution_links is set \"on\" then all local execution links\n"
 "will be executed when they are selected.\n"
@@ -5965,7 +6008,7 @@ msgstr ""
 "        yalnızca güvenilir kaynak bilgisi görüntülediğiniz koşulda \"on\" (açık)a\n"
 "        ayarlanmalıdır.\n"
 
-#: src/LYrcFile.c:518
+#: src/LYrcFile.c:543
 msgid ""
 "If run_execution_links_on_local_files is set \"on\" then all local\n"
 "execution links that are found in LOCAL files will be executed when they\n"
@@ -5992,7 +6035,7 @@ msgstr ""
 "        yalnızca güvenilir kaynak bilgisi görüntülediğiniz koşulda \"on\" (açık)a\n"
 "        ayarlanmalıdır.\n"
 
-#: src/LYrcFile.c:536
+#: src/LYrcFile.c:561
 msgid ""
 "select_popups specifies whether the OPTIONs in a SELECT block which\n"
 "lacks a MULTIPLE attribute are presented as a vertical list of radio\n"
@@ -6010,7 +6053,7 @@ msgstr ""
 "olarak açılır menüler kurarken, \"off\" (kapalı), radyo kutuları kullanımını kuracaktır.\n"
 "Öntanımlı, -popup komut satır anahtarıyla geçersiz kılınabilir.\n"
 
-#: src/LYrcFile.c:547
+#: src/LYrcFile.c:572
 msgid ""
 "show_color specifies how to set the color mode at startup.  A value of\n"
 "\"never\" will force color mode off (treat the terminal as monochrome)\n"
@@ -6044,7 +6087,7 @@ msgstr ""
 "\"on\" (açık) \"off\" (kapalı) ve \"show color\" (renk göster) ayarları \"default\"\n"
 "(öntanımlı) olarak muamele görecektir.\n"
 
-#: src/LYrcFile.c:564
+#: src/LYrcFile.c:589
 msgid ""
 "show_cursor specifies whether to 'hide' the cursor to the right (and\n"
 "bottom, if possible) of the screen, or to place it to the left of the\n"
@@ -6066,7 +6109,7 @@ msgstr ""
 "imlecin gizlenmesini sağlar.\n"
 "Öntanımlı, -show_cursor komut satır anahtarıyla geçersiz kılınabilir.\n"
 
-#: src/LYrcFile.c:575
+#: src/LYrcFile.c:600
 msgid ""
 "show_dotfiles specifies that the directory listing should include\n"
 "\"hidden\" (dot) files/directories.  If set \"on\", this will be\n"
@@ -6080,7 +6123,7 @@ msgstr ""
 "satır seçeneğiyle kısıtlanmayacaktır.  Eğer gizli dosyaların gösterimi devre dışı\n"
 "bırakılırsa, Lynx aracılığıyla bu tür dosyaların oluşturulması da devre dışı kalacaktır.\n"
 
-#: src/LYrcFile.c:586
+#: src/LYrcFile.c:611
 msgid ""
 "If sub_bookmarks is not turned \"off\", and multiple bookmarks have\n"
 "been defined (see below), then all bookmark operations will first\n"
@@ -6102,7 +6145,7 @@ msgstr ""
 "\"standard\"a ayarlandığında menü, kullanıcı kipinden bağımsız olarak\n"
 "görüntülenecektir.\n"
 
-#: src/LYrcFile.c:600
+#: src/LYrcFile.c:626
 msgid ""
 "user_mode specifies the users level of knowledge with Lynx.  The\n"
 "default is \"NOVICE\" which displays two extra lines of help at the\n"
@@ -6118,7 +6161,7 @@ msgstr ""
 "ayarlayınız.  Ekranın en altında mevcut seçilmiş linkin URL'sini görmek için\n"
 "\"ADVANCED\" (ileri düzey)i kullanın.\n"
 
-#: src/LYrcFile.c:609
+#: src/LYrcFile.c:635
 msgid ""
 "If verbose_images is \"on\", lynx will print the name of the image\n"
 "source file in place of [INLINE], [LINK] or [IMAGE]\n"
@@ -6128,7 +6171,7 @@ msgstr ""
 "[IMAGE] yerine resim kaynak dosyasının ismini yazacaktır.\n"
 "Ayrıca lynx.cfg'deki VERBOSE_IMAGES'a bkz\n"
 
-#: src/LYrcFile.c:614
+#: src/LYrcFile.c:640
 msgid ""
 "If vi_keys is set to \"on\", then the normal VI movement keys:\n"
 "  j = down    k = up\n"
@@ -6144,7 +6187,7 @@ msgstr ""
 "Büyük 'H', 'J' ve 'K', hâlâ sırasıyla yardım, kısayollara\n"
 "sıçrama ve tuşeşlem görüntülemeyi etkinleştireceklerdir.\n"
 
-#: src/LYrcFile.c:622
+#: src/LYrcFile.c:648
 msgid ""
 "The visited_links setting controls how Lynx organizes the information\n"
 "in the Visited Links Page.\n"
@@ -6152,7 +6195,7 @@ msgstr ""
 "visited_links ayarı, Lynx'in Uğranmış Linkler Sayfası'ndaki bilgiyi\n"
 "nasıl düzenleyeceğini denetler.\n"
 
-#: src/LYrcFile.c:863
+#: src/LYrcFile.c:890
 msgid ""
 "If keypad_mode is set to \"NUMBERS_AS_ARROWS\", then the numbers on\n"
 "your keypad when the numlock is on will act as arrow keys:\n"
@@ -6170,7 +6213,7 @@ msgstr ""
 "ve karşılık gelen klavye rakamları, numlock'ın açık olup olmadığından\n"
 "bağımsız olarak ok tuşları gibi davranacaktır.\n"
 
-#: src/LYrcFile.c:872
+#: src/LYrcFile.c:899
 msgid ""
 "If keypad_mode is set to \"LINKS_ARE_NUMBERED\", then numbers will\n"
 "appear next to each link and numbers are used to select links.\n"
@@ -6178,7 +6221,7 @@ msgstr ""
 "Eğer keypad_mode \"LINKS_ARE_NUMBERED\"e ayarlanırsa, her linkin yanında\n"
 "numaralar belirecek ve bu numaralar linkleri seçmekte kullanılacaktır.\n"
 
-#: src/LYrcFile.c:876
+#: src/LYrcFile.c:903
 msgid ""
 "If keypad_mode is set to \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\", then\n"
 "numbers will appear next to each link and visible form input field.\n"
@@ -6196,7 +6239,7 @@ msgstr ""
 "bir seçenek no'su tuşlayarak seçeneği seçebilir.  Referans listeleri ve\n"
 "list komutu çıktısı da form girdilerini numaralandırır.\n"
 
-#: src/LYrcFile.c:885
+#: src/LYrcFile.c:912
 msgid ""
 "NOTE: Some fixed format documents may look disfigured when\n"
 "\"LINKS_ARE_NUMBERED\" or \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\" are\n"
@@ -6206,7 +6249,7 @@ msgstr ""
 "etkinleştirildiğinde, bazı sabit biçemli belgeler bozuk şekilde\n"
 "görünebilir.\n"
 
-#: src/LYrcFile.c:917
+#: src/LYrcFile.c:944
 msgid ""
 "Lynx User Defaults File\n"
 "\n"
@@ -6214,7 +6257,7 @@ msgstr ""
 "Lynx Kullanıcı Öntanımlıları Dosyası\n"
 "\n"
 
-#: src/LYrcFile.c:926
+#: src/LYrcFile.c:953
 msgid ""
 "This file contains options saved from the Lynx Options Screen (normally\n"
 "with the 'o' key).  To save options with that screen, you must select the\n"
@@ -6224,7 +6267,7 @@ msgstr ""
 "'o' tuşuyla birlikte).  O ekranla seçenekleri kaydetmek için onay\n"
 "kutusunu seçmelisiniz:\n"
 
-#: src/LYrcFile.c:933
+#: src/LYrcFile.c:960
 msgid ""
 "You must then save the settings using the link on the line above the\n"
 "checkbox:\n"
@@ -6232,7 +6275,7 @@ msgstr ""
 "Daha sonra da onay kutusunun üstünde bulunan satırdaki linki kullanarak\n"
 "ayarları kaydetmelisiniz:\n"
 
-#: src/LYrcFile.c:940
+#: src/LYrcFile.c:967
 msgid ""
 "You may also use the command-line option \"-forms_options\", which displays\n"
 "the simpler Options Menu instead.  Save options with that using the '>' key.\n"
@@ -6242,7 +6285,7 @@ msgstr ""
 "Seçenekler Menüsünü gösterecektir.  Seçenekleri buradan '>' tuşunu kullanarak kaydedebilirsiniz.\n"
 "\n"
 
-#: src/LYrcFile.c:947
+#: src/LYrcFile.c:974
 msgid ""
 "This file contains options saved from the Lynx Options Screen (normally\n"
 "with the '>' key).\n"
@@ -6252,7 +6295,7 @@ msgstr ""
 "'>' tuşuyla).\n"
 "\n"
 
-#: src/LYrcFile.c:954
+#: src/LYrcFile.c:981
 msgid ""
 "There is normally no need to edit this file manually, since the defaults\n"
 "here can be controlled from the Options Screen, and the next time options\n"
@@ -6272,6 +6315,9 @@ msgstr ""
 "olarak anılır.  Onun farklı bir içeriği ve biçemi vardır.\n"
 "O, bu dosya değildir.\n"
 
+#~ msgid "Address contains a username: %s"
+#~ msgstr "Adres bir kullanıcı adı içeriyor: %s"
+
 #~ msgid ""
 #~ "\n"
 #~ "Lynx edit map not declared.\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index fd16db3..d9a3472 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -10,7 +10,7 @@ msgstr ""
 "Last-Translator: Abel Cheung <maddog at linux.org.hk>\n"
 "Language-Team: Chinese (traditional) <zh-l10n at linux.org.tw>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=Big5\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #. ******************************************************************
@@ -35,39 +35,39 @@ msgstr ""
 #: LYMessages.c:32
 #, c-format
 msgid "Alert!: %s"
-msgstr "ĵ�i�I�G%s"
+msgstr "警告!:%s"
 
 #: LYMessages.c:33
 msgid "Welcome"
-msgstr "�w��"
+msgstr "歡迎"
 
 #: LYMessages.c:34
 msgid "Are you sure you want to quit?"
-msgstr "�O�_�T�w�n���}�H"
+msgstr "是否確定要離開?"
 
 #: LYMessages.c:36
 msgid "Really exit from Lynx?"
-msgstr "�O�_�T�w�n���} Lynx?"
+msgstr "是否確定要離開 Lynx?"
 
 #: LYMessages.c:38
 msgid "Connection interrupted."
-msgstr "�s�u���_�C"
+msgstr "連線中斷。"
 
 #: LYMessages.c:39
 msgid "Data transfer interrupted."
-msgstr "��ƶǿ餤�_�C"
+msgstr "資料傳輸中斷。"
 
 #: LYMessages.c:40
 msgid "Cancelled!!!"
-msgstr "����!!!"
+msgstr "取消!!!"
 
 #: LYMessages.c:41
 msgid "Cancelling!"
-msgstr "�����I"
+msgstr "取消!"
 
 #: LYMessages.c:42
 msgid "Excellent!!!"
-msgstr "�n��!!!"
+msgstr "好極!!!"
 
 #: LYMessages.c:43
 msgid "OK"
@@ -75,7 +75,7 @@ msgstr "OK"
 
 #: LYMessages.c:44
 msgid "Done!"
-msgstr "�����I"
+msgstr "完成!"
 
 #: LYMessages.c:45
 msgid "Bad request!"
@@ -83,15 +83,15 @@ msgstr ""
 
 #: LYMessages.c:46
 msgid "previous"
-msgstr "�W�@��"
+msgstr "上一頁"
 
 #: LYMessages.c:47
 msgid "next screen"
-msgstr "�U�@��"
+msgstr "下一頁"
 
 #: LYMessages.c:48
 msgid "HELP!"
-msgstr "�D�U�I"
+msgstr "求助!"
 
 #: LYMessages.c:49
 msgid ", help on "
@@ -100,37 +100,37 @@ msgstr ""
 #. #define HELP
 #: LYMessages.c:51
 msgid "Commands: Use arrow keys to move, '?' for help, 'q' to quit, '<-' to go back."
-msgstr "���O�G�ϥΤ�V�䲾�ʡA'?' �D�U�A'q' ����A'��' �^�e�@���C"
+msgstr "指令:使用方向鍵移動,'?' 求助,'q' 結束,'←' 回前一頁。"
 
 #. #define MOREHELP
 #: LYMessages.c:53
 msgid "-- press space for more, use arrow keys to move, '?' for help, 'q' to quit."
-msgstr "�w ���ť���ݤU�@���A�ϥΤ�V�䲾�ʡA'?' �D�U�A'q' ����C"
+msgstr "─ 按空白鍵看下一頁,使用方向鍵移動,'?' 求助,'q' 結束。"
 
 #: LYMessages.c:54
 msgid "-- press space for next page --"
-msgstr "�w �Ы��ť���ݤU�@�� �w"
+msgstr "─ 請按空白鍵看下一頁 ─"
 
 #: LYMessages.c:55
 msgid "URL too long"
-msgstr "URL �L��"
+msgstr "URL 過長"
 
 #. Inactive input fields, messages used with -tna option - kw
 #. #define FORM_LINK_TEXT_MESSAGE_INA
 #: LYMessages.c:61
 msgid "(Text entry field) Inactive.  Press <return> to activate."
-msgstr "(��r��J���) �Ȱ��ϥΡC�Ы� <return> �}�l��J�C"
+msgstr "(文字輸入欄位) 暫停使用。請按 <return> 開始輸入。"
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE_INA
 #: LYMessages.c:63
 msgid "(Textarea) Inactive.  Press <return> to activate."
-msgstr "(��r�ϰ�) �Ȱ��ϥΡC�Ы� <return> �}�l��J�C"
+msgstr "(文字區域) 暫停使用。請按 <return> 開始輸入。"
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE_INA_E
 #: LYMessages.c:65
 #, c-format
 msgid "(Textarea) Inactive.  Press <return> to activate (%s for editor)."
-msgstr "(��r�ϰ�) �Ȱ��ϥΡC�Ы� <return> �}�l��J (�� %s �Ұʽs�边)�C"
+msgstr "(文字區域) 暫停使用。請按 <return> 開始輸入 (按 %s 啟動編輯器)。"
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_INA
 #: LYMessages.c:67
@@ -151,43 +151,43 @@ msgstr ""
 #. #define FORM_TEXT_SUBMIT_MAILTO_MSG_INA
 #: LYMessages.c:73
 msgid "(mailto form field) Inactive.  Press <return> to change."
-msgstr "(mailto ������) �Ȱ��ϥΡC�Ы� <return> �}�l��J�C"
+msgstr "(mailto 表格欄位) 暫停使用。請按 <return> 開始輸入。"
 
 #. #define FORM_LINK_PASSWORD_MESSAGE_INA
 #: LYMessages.c:75
 msgid "(Password entry field) Inactive.  Press <return> to activate."
-msgstr "(�K�X��J���) �Ȱ��ϥΡC�Ы� <return> �}�l��J�C"
+msgstr "(密碼輸入欄位) 暫停使用。請按 <return> 開始輸入。"
 
 #. #define FORM_LINK_FILE_UNM_MSG
 #: LYMessages.c:78
 msgid "UNMODIFIABLE file entry field.  Use UP or DOWN arrows or tab to move off."
-msgstr "*���i�ק諸* �ɮ׿�J���C�ϥ� ��B�� �� tab �����}���C"
+msgstr "*不可修改的* 檔案輸入欄位。使用 ↑、↓ 或 tab 鍵離開欄位。"
 
 #. #define FORM_LINK_FILE_MESSAGE
 #: LYMessages.c:80
 msgid "(File entry field) Enter filename.  Use UP or DOWN arrows or tab to move off."
-msgstr "(�ɮ׿�J���) �п�J�ɮצW�١C�ϥ� ��B�� �� tab �����}���C"
+msgstr "(檔案輸入欄位) 請輸入檔案名稱。使用 ↑、↓ 或 tab 鍵離開欄位。"
 
 #. #define FORM_LINK_TEXT_MESSAGE
 #: LYMessages.c:82
 msgid "(Text entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
-msgstr "(��r��J���) �п�J��r�C�ϥ� ��B�� �� tab �����}���C"
+msgstr "(文字輸入欄位) 請輸入文字。使用 ↑、↓ 或 tab 鍵離開欄位。"
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE
 #: LYMessages.c:84
 msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off."
-msgstr "(��r��J�ϰ�) �п�J��r�C�ϥ� ��B�� �� tab �����}�ϰ�C"
+msgstr "(文字輸入區域) 請輸入文字。使用 ↑、↓ 或 tab 鍵離開區域。"
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE_E
 #: LYMessages.c:86
 #, c-format
 msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off (%s for editor)."
-msgstr "(��r��J�ϰ�) �п�J��r�C�ϥ� ��B�� �� tab �����}�ϰ� (%s �Ұʽs�边)�C"
+msgstr "(文字輸入區域) 請輸入文字。使用 ↑、↓ 或 tab 鍵離開區域 (%s 啟動編輯器)。"
 
 #. #define FORM_LINK_TEXT_UNM_MSG
 #: LYMessages.c:88
 msgid "UNMODIFIABLE form text field.  Use UP or DOWN arrows or tab to move off."
-msgstr "*���i�ק諸* ��r��J���C�ϥ� ��B�� �� tab �����}���C"
+msgstr "*不可修改的* 文字輸入欄位。使用 ↑、↓ 或 tab 鍵離開欄位。"
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE
 #: LYMessages.c:90
@@ -208,7 +208,7 @@ msgstr ""
 #. #define FORM_LINK_TEXT_SUBMIT_UNM_MSG
 #: LYMessages.c:96
 msgid "UNMODIFIABLE form field.  Use UP or DOWN arrows or tab to move off."
-msgstr "*���i�ק諸* ����J���C�ϥ� ��B�� �� tab �����}���C"
+msgstr "*不可修改的* 表格輸入欄位。使用 ↑、↓ 或 tab 鍵離開欄位。"
 
 #. #define FORM_LINK_TEXT_SUBMIT_MAILTO_MSG
 #: LYMessages.c:98
@@ -223,12 +223,12 @@ msgstr ""
 #. #define FORM_LINK_PASSWORD_MESSAGE
 #: LYMessages.c:102
 msgid "(Password entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
-msgstr "(�K�X��J���) �п�J��r�C�ϥ� ��B�� �� tab �����}���C"
+msgstr "(密碼輸入欄位) 請輸入文字。使用 ↑、↓ 或 tab 鍵離開欄位。"
 
 #. #define FORM_LINK_PASSWORD_UNM_MSG
 #: LYMessages.c:104
 msgid "UNMODIFIABLE form password.  Use UP or DOWN arrows or tab to move off."
-msgstr "*���i�ק諸* �K�X��J���C�ϥ� ��B�� �� tab �����}���C"
+msgstr "*不可修改的* 密碼輸入欄位。使用 ↑、↓ 或 tab 鍵離開欄位。"
 
 #. #define FORM_LINK_CHECKBOX_MESSAGE
 #: LYMessages.c:106
@@ -293,22 +293,22 @@ msgstr ""
 #. #define FORM_LINK_RESET_MESSAGE
 #: LYMessages.c:130
 msgid "(Form reset button)   Use right-arrow or <return> to reset form to defaults."
-msgstr "(���]�����s) �Ы� �� �� <return> �N�����쭫�]���w�]�ȡC"
+msgstr "(重設表格按鈕) 請按 → 或 <return> 將表格欄位重設為預設值。"
 
 #. #define FORM_LINK_RESET_DIS_MSG
 #: LYMessages.c:132
 msgid "DISABLED form reset button.  Use UP or DOWN arrows or tab to move off."
-msgstr "*�Ȱ��ϥΪ�* ���]�����s�C�ϥ� ��B�� �� tab �����}���C"
+msgstr "*暫停使用的* 重設表格按鈕。使用 ↑、↓ 或 tab 鍵離開欄位。"
 
 #. #define FORM_LINK_OPTION_LIST_MESSAGE
 #: LYMessages.c:134
 msgid "(Option list) Hit return and use arrow keys and return to select option."
-msgstr "(�ﶵ�M��) �� return�A�M��ϥΤ�V��M return ��ܩһݪ��ﶵ�C"
+msgstr "(選項清單) 按 return,然後使用方向鍵和 return 選擇所需的選項。"
 
 #. #define CHOICE_LIST_MESSAGE
 #: LYMessages.c:136
 msgid "(Choice list) Hit return and use arrow keys and return to select option."
-msgstr "(��ܲM��) �� return�A�M��ϥΤ�V��M return ��ܩһݪ��ﶵ�C"
+msgstr "(選擇清單) 按 return,然後使用方向鍵和 return 選擇所需的選項。"
 
 #. #define FORM_LINK_OPTION_LIST_UNM_MSG
 #: LYMessages.c:138
@@ -326,12 +326,12 @@ msgstr ""
 
 #: LYMessages.c:142
 msgid "Resetting form..."
-msgstr "���]���..."
+msgstr "重設表格..."
 
 #. #define RELOADING_FORM
 #: LYMessages.c:144
 msgid "Reloading document.  Any form entries will be lost!"
-msgstr "���s���J���C�N�|���h�Ҧ��ק�L�������줺�e�I"
+msgstr "重新載入網頁。將會失去所有修改過的表格欄位內容!"
 
 #: LYMessages.c:145
 #, c-format
@@ -341,7 +341,7 @@ msgstr ""
 #. #define NORMAL_LINK_MESSAGE
 #: LYMessages.c:148
 msgid "(NORMAL LINK)   Use right-arrow or <return> to activate."
-msgstr "(���q�쵲) �Ы� �� �� <return> �s���C"
+msgstr "(普通鏈結) 請按 → 或 <return> 瀏覽。"
 
 #: LYMessages.c:149
 msgid "The resource requested is not available at this time."
@@ -353,7 +353,7 @@ msgstr ""
 
 #: LYMessages.c:151
 msgid "Looking up "
-msgstr "�dz��˯� "
+msgstr "準備檢索 "
 
 #: LYMessages.c:152
 #, c-format
@@ -363,31 +363,31 @@ msgstr ""
 #: LYMessages.c:153
 #, c-format
 msgid "Skipping %s"
-msgstr "���L %s"
+msgstr "略過 %s"
 
 #: LYMessages.c:154
 #, c-format
 msgid "Using %s"
-msgstr "�ϥ� %s"
+msgstr "使用 %s"
 
 #: LYMessages.c:155
 #, c-format
 msgid "Illegal URL: %s"
-msgstr "���X�k�� URL�G%s"
+msgstr "不合法的 URL:%s"
 
 #: LYMessages.c:156
 #, c-format
 msgid "Badly formed address %s"
-msgstr "�a�} %s �榡���~"
+msgstr "地址 %s 格式錯誤"
 
 #: LYMessages.c:157
 #, c-format
 msgid "URL: %s"
-msgstr "URL�G%s"
+msgstr "URL:%s"
 
 #: LYMessages.c:158
 msgid "Unable to access WWW file!!!"
-msgstr "�L�k�s�� WWW �ɮ�!!!"
+msgstr "無法存取 WWW 檔案!!!"
 
 #: LYMessages.c:159
 #, c-format
@@ -412,17 +412,17 @@ msgstr ""
 #. #define NOVICE_LINE_ONE
 #: LYMessages.c:166
 msgid "  Arrow keys: Up and Down to move.  Right to follow a link; Left to go back.  \n"
-msgstr "  ��V��G ��/�� ����   �� �i�J�쵲   �� �^�e�@��\n"
+msgstr "  方向鍵: ↑/↓ 移動   → 進入鏈結   ← 回前一頁\n"
 
 #. #define NOVICE_LINE_TWO
 #: LYMessages.c:168
 msgid " H)elp O)ptions P)rint G)o M)ain screen Q)uit /=search [delete]=history list \n"
-msgstr " H)�D�U  O)�ﶵ  P)�C�L  G)����  M)�D�e��  Q)���}  /)�j�M  [delete])�s������\n"
+msgstr " H)求助  O)選項  P)列印  G)移至  M)主畫面  Q)離開  /)搜尋  [delete])瀏覽紀錄\n"
 
 #. #define NOVICE_LINE_TWO_A
 #: LYMessages.c:170
 msgid "  O)ther cmds  H)elp  K)eymap  G)oto  P)rint  M)ain screen  o)ptions  Q)uit  \n"
-msgstr "  O)�䥦���O  H)�D�U  K)����]�w  G)����  P)�C�L  M)�D�e��  o)�ﶵ  Q)���}\n"
+msgstr "  O)其它指令  H)求助  K)按鍵設定  G)移至  P)列印  M)主畫面  o)選項  Q)離開\n"
 
 #. #define NOVICE_LINE_TWO_B
 #: LYMessages.c:172
@@ -437,29 +437,29 @@ msgstr ""
 #. #define FORM_NOVICELINE_ONE
 #: LYMessages.c:176
 msgid "            Enter text into the field by typing on the keyboard              "
-msgstr "                        �Шϥ���L�b��줤��J��r"
+msgstr "                        請使用鍵盤在欄位中輸入文字"
 
 #. #define FORM_NOVICELINE_TWO
 #: LYMessages.c:178
 msgid "    Ctrl-U to delete all text in field, [Backspace] to delete a character    "
-msgstr "    Ctrl-U �|�R����줤���Ҧ���r�A[Backspace] �|�V��R���@�Ӧr��"
+msgstr "    Ctrl-U 會刪除欄位中的所有文字,[Backspace] 會向後刪除一個字元"
 
 #. #define FORM_NOVICELINE_TWO_DELBL
 #: LYMessages.c:180
 msgid "      Ctrl-U to delete text in field, [Backspace] to delete a character    "
-msgstr "      Ctrl-U �|�R����줤����r�A[Backspace] �|�V��R���@�Ӧr��"
+msgstr "      Ctrl-U 會刪除欄位中的文字,[Backspace] 會向後刪除一個字元"
 
 #. #define FORM_NOVICELINE_TWO_VAR
 #: LYMessages.c:182
 #, c-format
 msgid "    %s to delete all text in field, [Backspace] to delete a character    "
-msgstr "        %s �|�R����줤���Ҧ���r�A[Backspace] �|�V��R���@�Ӧr��"
+msgstr "        %s 會刪除欄位中的所有文字,[Backspace] 會向後刪除一個字元"
 
 #. #define FORM_NOVICELINE_TWO_DELBL_VAR
 #: LYMessages.c:184
 #, c-format
 msgid "      %s to delete text in field, [Backspace] to delete a character    "
-msgstr "        %s �|�R����줤����r�A[Backspace] �|�V��R���@�Ӧr��"
+msgstr "        %s 會刪除欄位中的文字,[Backspace] 會向後刪除一個字元"
 
 #. mailto
 #: LYMessages.c:187
@@ -468,7 +468,7 @@ msgstr ""
 
 #: LYMessages.c:188
 msgid "Warning!  Control codes in mail address replaced by ?"
-msgstr "ĵ�i�I �q�l�a�}��������r���w�� '?' �r�����N"
+msgstr "警告! 電郵地址中的控制字元已用 '?' 字元取代"
 
 #: LYMessages.c:189
 msgid "Mail disallowed!  Cannot submit."
@@ -484,16 +484,16 @@ msgstr ""
 
 #: LYMessages.c:192
 msgid "Sending form content..."
-msgstr "���b�e�X��椺�e..."
+msgstr "正在送出表格內容..."
 
 #: LYMessages.c:193
 msgid "No email address is present in mailto URL!"
-msgstr "mailto URL ���S���q�l�a�}�I"
+msgstr "mailto URL 中沒有電郵地址!"
 
 #. #define MAILTO_URL_TEMPOPEN_FAILED
 #: LYMessages.c:195
 msgid "Unable to open temporary file for mailto URL!"
-msgstr "�L�k�}�� mailto URL �һݪ��Ȧs�ɡI"
+msgstr "無法開啟 mailto URL 所需的暫存檔!"
 
 #. #define INC_ORIG_MSG_PROMPT
 #: LYMessages.c:197
@@ -508,12 +508,12 @@ msgstr ""
 #. #define SPAWNING_EDITOR_FOR_MAIL
 #: LYMessages.c:201
 msgid "Spawning your selected editor to edit mail message"
-msgstr "�dzƱҰʫ��w���s�边�ӭק�l�󤺮e"
+msgstr "準備啟動指定的編輯器來修改郵件內容"
 
 #. #define ERROR_SPAWNING_EDITOR
 #: LYMessages.c:203
 msgid "Error spawning editor, check your editor definition in the options menu"
-msgstr "�Ұʽs�边�ɥX�{���~�A���ˬd�ﶵ�]�w�������s�边������"
+msgstr "啟動編輯器時出現錯誤,請檢查選項設定中有關編輯器的部份"
 
 #: LYMessages.c:204
 msgid "Send this comment?"
@@ -521,11 +521,11 @@ msgstr ""
 
 #: LYMessages.c:205
 msgid "Send this message?"
-msgstr "�O�_�ǰe���T���H"
+msgstr "是否傳送此訊息?"
 
 #: LYMessages.c:206
 msgid "Sending your message..."
-msgstr "�dzƶǰe�դU���T��..."
+msgstr "準備傳送閣下的訊息..."
 
 #: LYMessages.c:207
 msgid "Sending your comment:"
@@ -534,11 +534,11 @@ msgstr ""
 #. textarea
 #: LYMessages.c:210
 msgid "Not in a TEXTAREA; cannot use external editor."
-msgstr "�ثe���O�b��r�s��ϰ줤�F�L�k�ϥΥ~�����s�边�C"
+msgstr "目前不是在文字編輯區域中;無法使用外部的編輯器。"
 
 #: LYMessages.c:211
 msgid "Not in a TEXTAREA; cannot use command."
-msgstr "�ثe���O�b��r�s��ϰ줤�F�L�k�ϥΫ��O�C"
+msgstr "目前不是在文字編輯區域中;無法使用指令。"
 
 #: LYMessages.c:213
 msgid "file: ACTIONs are disallowed!"
@@ -551,7 +551,7 @@ msgstr ""
 
 #: LYMessages.c:216
 msgid "Access to local files denied."
-msgstr "�ڵ��s�������ɮסC"
+msgstr "拒絕存取本機檔案。"
 
 #: LYMessages.c:217
 msgid "file: URLs via bookmarks are disallowed!"
@@ -564,7 +564,7 @@ msgstr ""
 
 #: LYMessages.c:220
 msgid "Press <return> to return to Lynx."
-msgstr "�� <return> ��^ Lynx�C"
+msgstr "請按 <return> 返回 Lynx。"
 
 #. #define SPAWNING_MSG
 #: LYMessages.c:223
@@ -574,7 +574,7 @@ msgstr ""
 #. #define SPAWNING_MSG
 #: LYMessages.c:227
 msgid "Type EXIT to return to Lynx.\n"
-msgstr "�п�J EXIT ��^ Lynx�C\n"
+msgstr "請輸入 EXIT 返回 Lynx。\n"
 
 #. #define SPAWNING_MSG
 #: LYMessages.c:230
@@ -587,11 +587,11 @@ msgstr ""
 
 #: LYMessages.c:234
 msgid "The 'd'ownload command is currently disabled."
-msgstr "�ثe�L�k���ѡu�U���v('d') ���O�C"
+msgstr "目前無法提供「下載」('d') 指令。"
 
 #: LYMessages.c:235
 msgid "You cannot download an input field."
-msgstr "���i�U����J���C"
+msgstr "不可下載輸入欄位。"
 
 #: LYMessages.c:236
 msgid "Form has a mailto action!  Cannot download."
@@ -599,19 +599,19 @@ msgstr ""
 
 #: LYMessages.c:237
 msgid "You cannot download a mailto: link."
-msgstr "���i�U�� mailto: �쵲�C"
+msgstr "不可下載 mailto: 鏈結。"
 
 #: LYMessages.c:238
 msgid "You cannot download cookies."
-msgstr "���i�U�� cookie�C"
+msgstr "不可下載 cookie。"
 
 #: LYMessages.c:239
 msgid "You cannot download a printing option."
-msgstr "���i�U�������C�L���ﶵ"
+msgstr "不可下載有關列印的選項"
 
 #: LYMessages.c:240
 msgid "You cannot download an upload option."
-msgstr "���i�U�������W�Ǫ��ﶵ"
+msgstr "不可下載有關上傳的選項"
 
 #: LYMessages.c:241
 msgid "You cannot download an permit option."
@@ -619,11 +619,11 @@ msgstr ""
 
 #: LYMessages.c:242
 msgid "This special URL cannot be downloaded!"
-msgstr "���i�U�����S�� URL�I"
+msgstr "不可下載此特殊 URL!"
 
 #: LYMessages.c:243
 msgid "Nothing to download."
-msgstr "�S���i�U������ơC"
+msgstr "沒有可下載的資料。"
 
 #: LYMessages.c:244
 msgid "Trace ON!"
@@ -655,11 +655,11 @@ msgstr ""
 
 #: LYMessages.c:254
 msgid "Raw 8-bit or CJK mode toggled OFF!  Reloading..."
-msgstr "�w���� 8-bit ��l�Ҧ��άO CJK �Ҧ��I�dzƭ��s���J..."
+msgstr "已關閉 8-bit 原始模式或是 CJK 模式!準備重新載入..."
 
 #: LYMessages.c:255
 msgid "Raw 8-bit or CJK mode toggled ON!  Reloading..."
-msgstr "�w�ҥ� 8-bit ��l�Ҧ��άO CJK �Ҧ��I�dzƭ��s���J..."
+msgstr "已啟用 8-bit 原始模式或是 CJK 模式!準備重新載入..."
 
 #. #define HEAD_D_L_OR_CANCEL
 #: LYMessages.c:257
@@ -673,11 +673,11 @@ msgstr ""
 
 #: LYMessages.c:260
 msgid "Sorry, the document is not an http URL."
-msgstr "��p�A�Ӥ�󤣬O http URL�C"
+msgstr "抱歉,該文件不是 http URL。"
 
 #: LYMessages.c:261
 msgid "Sorry, the link is not an http URL."
-msgstr "��p�A���쵲���O http URL�C"
+msgstr "抱歉,該鏈結不是 http URL。"
 
 #: LYMessages.c:262
 msgid "Sorry, the ACTION for this form is disabled."
@@ -702,11 +702,11 @@ msgstr ""
 
 #: LYMessages.c:268
 msgid "News posting is disabled!"
-msgstr "�Ȱ��ϥαN�T���K�W�s�D�ժ��\��I"
+msgstr "暫停使用將訊息貼上新聞組的功能!"
 
 #: LYMessages.c:269
 msgid "File management support is disabled!"
-msgstr "�Ȱ��ϥ��ɮ׺޲z���\��I"
+msgstr "暫停使用檔案管理的功能!"
 
 #: LYMessages.c:270
 msgid "No jump file is currently available."
@@ -730,7 +730,7 @@ msgstr ""
 
 #: LYMessages.c:275
 msgid "Bookmark features are currently disabled."
-msgstr "�ثe�L�k���Ѯ��ҥ\��C"
+msgstr "目前無法提供書籤功能。"
 
 #: LYMessages.c:276
 msgid "Execution via bookmarks is disabled."
@@ -745,16 +745,16 @@ msgstr ""
 #. #define NO_TEMP_FOR_HOTLIST
 #: LYMessages.c:280
 msgid "Unable to open tempfile for X Mosaic hotlist conversion."
-msgstr "���ഫ X Mosaic hotlist �ɵL�k�}�ҼȦs�ɡC"
+msgstr "當轉換 X Mosaic hotlist 時無法開啟暫存檔。"
 
 #: LYMessages.c:281
 msgid "ERROR - unable to open bookmark file."
-msgstr "���~ �w �L�k�}�Ү����ɡC"
+msgstr "錯誤 ─ 無法開啟書籤檔。"
 
 #. #define BOOKMARK_OPEN_FAILED_FOR_DEL
 #: LYMessages.c:283
 msgid "Unable to open bookmark file for deletion of link."
-msgstr "�L�k�}�Ү����ɨӧR���쵲�C"
+msgstr "無法開啟書籤檔來刪除鏈結。"
 
 #. #define BOOKSCRA_OPEN_FAILED_FOR_DEL
 #: LYMessages.c:285
@@ -767,17 +767,17 @@ msgstr ""
 
 #: LYMessages.c:289
 msgid "Error renaming temporary file."
-msgstr "���Ȧs�ɦW�ٮɥX�{���~�C"
+msgstr "更改暫存檔名稱時出現錯誤。"
 
 #. #define BOOKTEMP_COPY_FAIL
 #: LYMessages.c:291
 msgid "Unable to copy temporary file for deletion of link."
-msgstr "��R���쵲�ɵL�k�ƻs�Ȧs�ɡC"
+msgstr "當刪除鏈結時無法複製暫存檔。"
 
 #. #define BOOKTEMP_REOPEN_FAIL_FOR_DEL
 #: LYMessages.c:293
 msgid "Unable to reopen temporary file for deletion of link."
-msgstr "��R���쵲�ɵL�k���s�}�ҼȦs�ɡC"
+msgstr "當刪除鏈結時無法重新開啟暫存檔。"
 
 #. #define BOOKMARK_LINK_NOT_ONE_LINE
 #: LYMessages.c:296
@@ -786,7 +786,7 @@ msgstr ""
 
 #: LYMessages.c:297
 msgid "Bookmark deletion failed."
-msgstr "�R�����ҥ��ѡC"
+msgstr "刪除書籤失敗。"
 
 #. #define BOOKMARKS_NOT_TRAVERSED
 #: LYMessages.c:299
@@ -796,30 +796,30 @@ msgstr ""
 #. #define BOOKMARKS_NOT_OPEN
 #: LYMessages.c:301
 msgid "Unable to open bookmark file, use 'a' to save a link first"
-msgstr "�L�k�}�Ү����ɡA�Х�����a���x�s�쵲"
+msgstr "無法開啟書籤檔,請先按‘a’儲存鏈結"
 
 #: LYMessages.c:302
 msgid "There are no links in this bookmark file!"
-msgstr "�������ɤ��èS���쵲�I"
+msgstr "本書籤檔中並沒有鏈結!"
 
 #. #define CACHE_D_OR_CANCEL
 #: LYMessages.c:304
 #, fuzzy
 msgid "D)elete cached document or C)ancel? (d,c): "
-msgstr "�b�����ɤ��x�s D)���A�٬O C)�����H (d,c)�G"
+msgstr "在書籤檔中儲存 D)文件,還是 C)取消? (d,c):"
 
 #. #define BOOK_D_L_OR_CANCEL
 #: LYMessages.c:306
 msgid "Save D)ocument or L)ink to bookmark file or C)ancel? (d,l,c): "
-msgstr "�b�����ɤ��x�s D)��� �άO L)�쵲�A�٬O C)�����H (d,l,c)�G"
+msgstr "在書籤檔中儲存 D)文件 或是 L)鏈結,還是 C)取消? (d,l,c):"
 
 #: LYMessages.c:307
 msgid "Save D)ocument to bookmark file or C)ancel? (d,c): "
-msgstr "�b�����ɤ��x�s D)���A�٬O C)�����H (d,c)�G"
+msgstr "在書籤檔中儲存 D)文件,還是 C)取消? (d,c):"
 
 #: LYMessages.c:308
 msgid "Save L)ink to bookmark file or C)ancel? (l,c): "
-msgstr "�b�����ɤ��x�s L)�쵲�A�٬O C)�����H (l,c)�G"
+msgstr "在書籤檔中儲存 L)鏈結,還是 C)取消? (l,c):"
 
 #. #define NOBOOK_POST_FORM
 #: LYMessages.c:310
@@ -828,7 +828,7 @@ msgstr ""
 
 #: LYMessages.c:311
 msgid "Cannot save form fields/links"
-msgstr "���i���x�s������/�쵲"
+msgstr "不可能儲存表格欄位/鏈結"
 
 #. #define NOBOOK_HSML
 #: LYMessages.c:313
@@ -838,11 +838,11 @@ msgstr ""
 #. #define CONFIRM_BOOKMARK_DELETE
 #: LYMessages.c:315
 msgid "Do you really want to delete this link from your bookmark file?"
-msgstr "�O�_�T�w�n�q�����ɤ��R�����쵲�H"
+msgstr "是否確定要從書籤檔中刪除本鏈結?"
 
 #: LYMessages.c:316
 msgid "Malformed address."
-msgstr "�a�}�榡�����T�C"
+msgstr "地址格式不正確。"
 
 #. #define HISTORICAL_ON_MINIMAL_OFF
 #: LYMessages.c:318
@@ -894,46 +894,46 @@ msgstr ""
 
 #: LYMessages.c:335
 msgid "Now using TagSoup parsing of HTML."
-msgstr "�{�b�ϥ� TagSoup �覡���R HTML ���C"
+msgstr "現在使用 TagSoup 方式分析 HTML 文件。"
 
 #: LYMessages.c:336
 msgid "Now using SortaSGML parsing of HTML!"
-msgstr "�{�b�ϥ� SortaSGML �覡���R HTML ���C"
+msgstr "現在使用 SortaSGML 方式分析 HTML 文件。"
 
 #: LYMessages.c:337
 msgid "You are already at the end of this document."
-msgstr "�w�g�b��󪺥��ݤF�C"
+msgstr "已經在文件的末端了。"
 
 #: LYMessages.c:338
 msgid "You are already at the beginning of this document."
-msgstr "�w�g�b��󪺶}�l��m�F�C"
+msgstr "已經在文件的開始位置了。"
 
 #: LYMessages.c:339
 #, c-format
 msgid "You are already at page %d of this document."
-msgstr "�w�g�b��󪺲� %d ���F�C"
+msgstr "已經在文件的第 %d 頁了。"
 
 #: LYMessages.c:340
 #, c-format
 msgid "Link number %d already is current."
-msgstr "�쵲�s�� %d �w�g�O�ثe������쵲�C"
+msgstr "鏈結編號 %d 已經是目前選取的鏈結。"
 
 #: LYMessages.c:341
 msgid "You are already at the first document"
-msgstr "�����w�g�O�Ĥ@�����"
+msgstr "本文件已經是第一份文件"
 
 #: LYMessages.c:342
 msgid "There are no links above this line of the document."
-msgstr "����H�W�w�g�S���쵲�C"
+msgstr "本行以上已經沒有鏈結。"
 
 #: LYMessages.c:343
 msgid "There are no links below this line of the document."
-msgstr "����H�U�w�g�S���쵲�C"
+msgstr "本行以下已經沒有鏈結。"
 
 #. #define MAXLEN_REACHED_DEL_OR_MOV
 #: LYMessages.c:345
 msgid "Maximum length reached!  Delete text or move off field."
-msgstr "�w��F��r���ת��W���I�ЧR����r�άO���}�����C"
+msgstr "已到達文字長度的上限!請刪除文字或是離開本欄位。"
 
 #. #define NOT_ON_SUBMIT_OR_LINK
 #: LYMessages.c:347
@@ -951,7 +951,7 @@ msgstr ""
 
 #: LYMessages.c:351
 msgid "Do you want to go back to the previous document?"
-msgstr "�O�_��^�w�g�s���L�����H"
+msgstr "是否返回已經瀏覽過的文件?"
 
 #: LYMessages.c:352
 msgid "Use arrows or tab to move off of field."
@@ -960,7 +960,7 @@ msgstr ""
 #. #define ENTER_TEXT_ARROWS_OR_TAB
 #: LYMessages.c:354
 msgid "Enter text.  Use arrows or tab to move off of field."
-msgstr "�п�J��r�C�ϥΤ�V��� tab �����}���C"
+msgstr "請輸入文字。使用方向鍵或 tab 鍵離開欄位。"
 
 #: LYMessages.c:355
 msgid "** Bad HTML!!  No form action defined. **"
@@ -976,48 +976,48 @@ msgstr ""
 
 #: LYMessages.c:358
 msgid "Goto a random URL is disallowed!"
-msgstr "�����\�i�J�H���� URL�I"
+msgstr "不允許進入隨機的 URL!"
 
 #: LYMessages.c:359
 msgid "Goto a non-http URL is disallowed!"
-msgstr "�����\�s���D http �� URL�I"
+msgstr "不允許瀏覽非 http 的 URL!"
 
 #: LYMessages.c:360
 #, c-format
 msgid "You are not allowed to goto \"%s\" URLs"
-msgstr "�դU�����\�i�J��%s�������� URL"
+msgstr "閣下不允許進入“%s”類型的 URL"
 
 #: LYMessages.c:361
 msgid "URL to open: "
-msgstr "�dzƶ}�Ҫ� URL�G"
+msgstr "準備開啟的 URL:"
 
 #: LYMessages.c:362
 msgid "Edit the current Goto URL: "
-msgstr "�ק�ثe�� URL�G"
+msgstr "修改目前的 URL:"
 
 #: LYMessages.c:363
 msgid "Edit the previous Goto URL: "
-msgstr "�ק﴿�g�s���� URL�G"
+msgstr "修改曾經瀏覽的 URL:"
 
 #: LYMessages.c:364
 msgid "Edit a previous Goto URL: "
-msgstr "�ק﴿�g�s���� URL�G"
+msgstr "修改曾經瀏覽的 URL:"
 
 #: LYMessages.c:365
 msgid "Current document has POST data."
-msgstr "�ثe�������� POST ��ơC"
+msgstr "目前的文件載有 POST 資料。"
 
 #: LYMessages.c:366
 msgid "Edit this document's URL: "
-msgstr "�ק糧��� URL�G"
+msgstr "修改本文件的 URL:"
 
 #: LYMessages.c:367
 msgid "Edit the current link's URL: "
-msgstr "�ק�ثe������쵲�� URL�G"
+msgstr "修改目前選取的鏈結的 URL:"
 
 #: LYMessages.c:368
 msgid "You cannot edit File Management URLs"
-msgstr "���i�ק靈���ɮ׺޲z�� URL"
+msgstr "不可修改有關檔案管理的 URL"
 
 #: LYMessages.c:369
 msgid "Enter a database query: "
@@ -1025,19 +1025,19 @@ msgstr ""
 
 #: LYMessages.c:370
 msgid "Enter a whereis query: "
-msgstr "��J�dzƷj�M���r��G"
+msgstr "輸入準備搜尋的字串:"
 
 #: LYMessages.c:371
 msgid "Edit the current query: "
-msgstr "�ק�ثe�dzƷj�M���r��G"
+msgstr "修改目前準備搜尋的字串:"
 
 #: LYMessages.c:372
 msgid "Edit the previous query: "
-msgstr "�ק蠟�e�dzƷj�M���r��G"
+msgstr "修改之前準備搜尋的字串:"
 
 #: LYMessages.c:373
 msgid "Edit a previous query: "
-msgstr "�ק蠟�e�dzƷj�M���r��G"
+msgstr "修改之前準備搜尋的字串:"
 
 #. #define USE_C_R_TO_RESUB_CUR_QUERY
 #: LYMessages.c:375
@@ -1088,16 +1088,16 @@ msgstr ""
 #. #define CONFIRM_MAIN_SCREEN
 #: LYMessages.c:387
 msgid "Do you really want to go to the Main screen?"
-msgstr "�O�_�T�w�n�s���D�e���H"
+msgstr "是否確定要瀏覽主畫面?"
 
 #: LYMessages.c:388
 msgid "You are already at main screen!"
-msgstr "�w�g�b�D�e���F�I"
+msgstr "已經在主畫面了!"
 
 #. #define NOT_ISINDEX
 #: LYMessages.c:390
 msgid "Not a searchable indexed document -- press '/' to search for a text string"
-msgstr "���O�i�i��j�M�����ޤ�� �w �Ы���/���j�M�r��"
+msgstr "不是可進行搜尋的索引文件 ─ 請按‘/’搜尋字串"
 
 #. #define NO_OWNER
 #: LYMessages.c:392
@@ -1119,23 +1119,23 @@ msgstr ""
 
 #: LYMessages.c:396
 msgid "The 'e'dit command is currently disabled."
-msgstr "�Ȱ��ϥΡu�s��v('e') ���O�C"
+msgstr "暫停使用「編輯」('e') 指令。"
 
 #: LYMessages.c:397
 msgid "External editing is currently disabled."
-msgstr "�Ȱ��ϥΥ~�����s�边�C"
+msgstr "暫停使用外部的編輯器。"
 
 #: LYMessages.c:398
 msgid "System error - failure to get status."
-msgstr "�t��~ �w �L�k�o�����A�C"
+msgstr "系統錯誤 ─ 無法得知狀態。"
 
 #: LYMessages.c:399
 msgid "No editor is defined!"
-msgstr "�����w�s�边�I"
+msgstr "未指定編輯器!"
 
 #: LYMessages.c:400
 msgid "The 'p'rint command is currently disabled."
-msgstr "�Ȱ��ϥΡu�C�L�v('p') ���O�C"
+msgstr "暫停使用「列印」('p') 指令。"
 
 #: LYMessages.c:401
 msgid "Document has no Toolbar links or Banner."
@@ -1167,32 +1167,32 @@ msgstr ""
 
 #: LYMessages.c:408
 msgid "Select option (or page) number: "
-msgstr "�п���ﶵ�s��(�έ���)�G"
+msgstr "請選取選項編號(或頁數):"
 
 #: LYMessages.c:409
 #, c-format
 msgid "Option number %d already is current."
-msgstr "�ﶵ�s�� %d �w�g�O�ثe���ﶵ�C"
+msgstr "選項編號 %d 已經是目前的選項。"
 
 #. #define ALREADY_AT_OPTION_END
 #: LYMessages.c:411
 msgid "You are already at the end of this option list."
-msgstr "�w�g�b�ﶵ�M�檺�������F�C"
+msgstr "已經在選項清單的結束部份了。"
 
 #. #define ALREADY_AT_OPTION_BEGIN
 #: LYMessages.c:413
 msgid "You are already at the beginning of this option list."
-msgstr "�w�g�b�ﶵ�M�檺�}�l�����F�C"
+msgstr "已經在選項清單的開始部份了。"
 
 #. #define ALREADY_AT_OPTION_PAGE
 #: LYMessages.c:415
 #, c-format
 msgid "You are already at page %d of this option list."
-msgstr "�w�g�b�ﶵ�M�檺�� %d ���F�C"
+msgstr "已經在選項清單的第 %d 頁了。"
 
 #: LYMessages.c:416
 msgid "You have entered an invalid option number."
-msgstr "�դU��J�F�L�Ī��ﶵ�s���C"
+msgstr "閣下輸入了無效的選項編號。"
 
 #: LYMessages.c:417
 msgid "** Bad HTML!!  Use -trace to diagnose. **"
@@ -1208,11 +1208,11 @@ msgstr ""
 
 #: LYMessages.c:420
 msgid "Can't open temporary file!"
-msgstr "�L�k�}�ҼȦs�ɡI"
+msgstr "無法開啟暫存檔!"
 
 #: LYMessages.c:421
 msgid "Can't open output file!  Cancelling!"
-msgstr "�L�k�}�ҿ�X�ɡI������X�I"
+msgstr "無法開啟輸出檔!取消輸出!"
 
 #: LYMessages.c:422
 msgid "Execution is disabled."
@@ -1231,41 +1231,41 @@ msgstr ""
 
 #: LYMessages.c:427
 msgid "This file cannot be displayed on this terminal."
-msgstr "�L�k�b���׺ݾ���ܸ��ɮסC"
+msgstr "無法在本終端機顯示該檔案。"
 
 #. #define CANNOT_DISPLAY_FILE_D_OR_C
 #: LYMessages.c:429
 msgid "This file cannot be displayed on this terminal:  D)ownload, or C)ancel"
-msgstr "�L�k�b���׺ݾ���ܸ��ɮסG D)�U��  C)����"
+msgstr "無法在本終端機顯示該檔案: D)下載  C)取消"
 
 #: LYMessages.c:430
 #, c-format
 msgid "%s  D)ownload, or C)ancel"
-msgstr "%s  D)�U��  C)����"
+msgstr "%s  D)下載  C)取消"
 
 #: LYMessages.c:431
 msgid "Cancelling file."
-msgstr "���������ɮסC"
+msgstr "取消接收檔案。"
 
 #: LYMessages.c:432
 msgid "Retrieving file.  - PLEASE WAIT -"
-msgstr "���b�����ɮסC�w �еy�� �w"
+msgstr "正在接收檔案。─ 請稍等 ─"
 
 #: LYMessages.c:433
 msgid "Enter a filename: "
-msgstr "�п�J�ɮצW�١G"
+msgstr "請輸入檔案名稱:"
 
 #: LYMessages.c:434
 msgid "Edit the previous filename: "
-msgstr "�ק�H���ϥΪ��ɮצW�١G"
+msgstr "修改以往使用的檔案名稱:"
 
 #: LYMessages.c:435
 msgid "Edit a previous filename: "
-msgstr "�ק�H���ϥΪ��ɮצW�١G"
+msgstr "修改以往使用的檔案名稱:"
 
 #: LYMessages.c:436
 msgid "Enter a new filename: "
-msgstr "�п�J�s���ɮצW�١G"
+msgstr "請輸入新的檔案名稱:"
 
 #: LYMessages.c:437
 msgid "File name may not begin with a dot."
@@ -1277,62 +1277,62 @@ msgstr ""
 
 #: LYMessages.c:441
 msgid "File exists.  Overwrite?"
-msgstr "�ɮפw�s�b�C�O�_�мg�H"
+msgstr "檔案已存在。是否覆寫?"
 
 #: LYMessages.c:443
 msgid "Cannot write to file."
-msgstr "�L�k�g�J�ɮסC"
+msgstr "無法寫入檔案。"
 
 #: LYMessages.c:444
 msgid "ERROR! - download command is misconfigured."
-msgstr "���~�I�w �����U�������O�����]�w�n�C"
+msgstr "錯誤!─ 有關下載的指令仍未設定好。"
 
 #: LYMessages.c:445
 msgid "Unable to download file."
-msgstr "�L�k�U���ɮסC"
+msgstr "無法下載檔案。"
 
 #: LYMessages.c:446
 msgid "Reading directory..."
-msgstr "���bŪ���ؿ�..."
+msgstr "正在讀取目錄..."
 
 #: LYMessages.c:447
 msgid "Building directory listing..."
-msgstr "���b�s�@�ؿ��M��..."
+msgstr "正在製作目錄清單..."
 
 #: LYMessages.c:448
 msgid "Saving..."
-msgstr "�x�s��..."
+msgstr "儲存中..."
 
 #: LYMessages.c:449
 #, c-format
 msgid "Could not edit file '%s'."
-msgstr "�L�k�s���ɮס�%s���C"
+msgstr "無法編輯檔案‘%s’。"
 
 #: LYMessages.c:450
 msgid "Unable to access document!"
-msgstr "�L�k�s�����I"
+msgstr "無法存取文件!"
 
 #: LYMessages.c:451
 msgid "Could not access file."
-msgstr "�L�k�s���ɮסC"
+msgstr "無法存取檔案。"
 
 #: LYMessages.c:452
 msgid "Could not access directory."
-msgstr "�L�k�s���ؿ��C"
+msgstr "無法存取目錄。"
 
 #: LYMessages.c:453
 msgid "Could not load data."
-msgstr "�L�k���J��ơC"
+msgstr "無法載入資料。"
 
 #. #define CANNOT_EDIT_REMOTE_FILES
 #: LYMessages.c:455
 msgid "Lynx cannot currently (e)dit remote WWW files."
-msgstr "�ثe Lynx �L�k�s�軷�ݪ� WWW �ɮסC"
+msgstr "目前 Lynx 無法編輯遠端的 WWW 檔案。"
 
 #. #define CANNOT_EDIT_FIELD
 #: LYMessages.c:457
 msgid "This field cannot be (e)dited with an external editor."
-msgstr "�����L�k�ϥΥ~�����s�边�ӽs��C"
+msgstr "本欄位無法使用外部的編輯器來編輯。"
 
 #: LYMessages.c:458
 msgid "Bad rule"
@@ -1344,31 +1344,31 @@ msgstr ""
 
 #: LYMessages.c:460
 msgid "You are not authorized to edit this file."
-msgstr "�դU������v�ק糧�ɮסC"
+msgstr "閣下未獲授權修改本檔案。"
 
 #: LYMessages.c:461
 msgid "Title: "
-msgstr "���D�G"
+msgstr "標題:"
 
 #: LYMessages.c:462
 msgid "Subject: "
-msgstr "�D�D�G"
+msgstr "主題:"
 
 #: LYMessages.c:463
 msgid "Username: "
-msgstr "�b��W�١G"
+msgstr "帳戶名稱:"
 
 #: LYMessages.c:464
 msgid "Password: "
-msgstr "�K�X�G"
+msgstr "密碼:"
 
 #: LYMessages.c:465
 msgid "lynx: Username and Password required!!!"
-msgstr "lynx�G�ݭn�b��W�٤αK�X!!!"
+msgstr "lynx:需要帳戶名稱及密碼!!!"
 
 #: LYMessages.c:466
 msgid "lynx: Password required!!!"
-msgstr "lynx�G�ݭn�K�X!!!"
+msgstr "lynx:需要密碼!!!"
 
 #: LYMessages.c:467
 msgid "Clear all authorization info for this session?"
@@ -1376,33 +1376,33 @@ msgstr ""
 
 #: LYMessages.c:468
 msgid "Authorization info cleared."
-msgstr "�w�M���{�Ҹ�T�C"
+msgstr "已清除認證資訊。"
 
 #: LYMessages.c:469
 msgid "Authorization failed.  Retry?"
-msgstr "�{�ҥ��ѡC�O�_���աH"
+msgstr "認證失敗。是否重試?"
 
 #: LYMessages.c:470
 msgid "cgi support has been disabled."
-msgstr "�Ȱ��䴩 cgi �\��C"
+msgstr "暫停支援 cgi 功能。"
 
 #. #define CGI_NOT_COMPILED
 #: LYMessages.c:472
 msgid "Lynxcgi capabilities are not compiled into this version."
-msgstr "�sĶ�ɨèS���[�J lynxcgi �\��C"
+msgstr "編譯時並沒有加入 lynxcgi 功能。"
 
 #: LYMessages.c:473
 #, c-format
 msgid "Sorry, no known way of converting %s to %s."
-msgstr "��p�A�S���w������k�i�H�N %s �ഫ�� %s�C"
+msgstr "抱歉,沒有已知的方法可以將 %s 轉換至 %s。"
 
 #: LYMessages.c:474
 msgid "Unable to set up connection."
-msgstr "�L�k�إ߳s�u�C"
+msgstr "無法建立連線。"
 
 #: LYMessages.c:475
 msgid "Unable to make connection"
-msgstr "�L�k�إ߳s�u�C"
+msgstr "無法建立連線。"
 
 #. #define MALFORMED_EXEC_REQUEST
 #: LYMessages.c:477
@@ -1491,15 +1491,15 @@ msgstr ""
 
 #: LYMessages.c:505
 msgid "*** You have unread mail. ***"
-msgstr "*** ����Ū���l��C ***"
+msgstr "*** 有未讀的郵件。 ***"
 
 #: LYMessages.c:507
 msgid "*** You have mail. ***"
-msgstr "*** ���l��C ***"
+msgstr "*** 有郵件。 ***"
 
 #: LYMessages.c:509
 msgid "*** You have new mail. ***"
-msgstr "*** ���s�l��C ***"
+msgstr "*** 有新郵件。 ***"
 
 #: LYMessages.c:510
 msgid "File insert cancelled!!!"
@@ -1507,19 +1507,19 @@ msgstr ""
 
 #: LYMessages.c:511
 msgid "Not enough memory for file!"
-msgstr "�O���餣���H���J�ɮסI"
+msgstr "記憶體不足以載入檔案!"
 
 #: LYMessages.c:512
 msgid "Can't open file for reading."
-msgstr "�L�k�}�ҷdz�Ū�J���ɮסC"
+msgstr "無法開啟準備讀入的檔案。"
 
 #: LYMessages.c:513
 msgid "File does not exist."
-msgstr "�ɮפ��s�b�C"
+msgstr "檔案不存在。"
 
 #: LYMessages.c:514
 msgid "File does not exist - reenter or cancel:"
-msgstr "�ɮפ��s�b �w �Э��s��J�Ψ����G"
+msgstr "檔案不存在 ─ 請重新輸入或取消:"
 
 #: LYMessages.c:515
 msgid "File is not readable."
@@ -1535,7 +1535,7 @@ msgstr ""
 
 #: LYMessages.c:518
 msgid "Save request cancelled!!!"
-msgstr "�w�����x�s���n�D!!!"
+msgstr "已取消儲存的要求!!!"
 
 #: LYMessages.c:519
 msgid "Mail request cancelled!!!"
@@ -1548,39 +1548,39 @@ msgstr ""
 
 #: LYMessages.c:522
 msgid "Please wait..."
-msgstr "�еy��..."
+msgstr "請稍等..."
 
 #: LYMessages.c:523
 msgid "Mailing file.  Please wait..."
-msgstr "���b�H�X�ɮסC�еy��..."
+msgstr "正在寄出檔案。請稍等..."
 
 #: LYMessages.c:524
 msgid "ERROR - Unable to mail file"
-msgstr "���~ �w �L�k�H�X�ɮ�"
+msgstr "錯誤 ─ 無法寄出檔案"
 
 #. #define CONFIRM_LONG_SCREEN_PRINT
 #: LYMessages.c:526
 #, c-format
 msgid "File is %d screens long.  Are you sure you want to print?"
-msgstr "�ɮת��׬� %d �ӵe���C�O�_�T�w�n�C�L�H"
+msgstr "檔案長度為 %d 個畫面。是否確定要列印?"
 
 #: LYMessages.c:527
 msgid "Print request cancelled!!!"
-msgstr "�w�����C�L���n�D!!!"
+msgstr "已取消列印的要求!!!"
 
 #: LYMessages.c:528
 msgid "Press <return> to begin: "
-msgstr "�Ы� <return> �}�l�G"
+msgstr "請按 <return> 開始:"
 
 #: LYMessages.c:529
 msgid "Press <return> to finish: "
-msgstr "�� <return> ����G"
+msgstr "請按 <return> 結束:"
 
 #. #define CONFIRM_LONG_PAGE_PRINT
 #: LYMessages.c:531
 #, c-format
 msgid "File is %d pages long.  Are you sure you want to print?"
-msgstr "�ɮת��׬� %d ���C�O�_�T�w�n�C�L�H"
+msgstr "檔案長度為 %d 頁。是否確定要列印?"
 
 #. #define CHECK_PRINTER
 #: LYMessages.c:533
@@ -1589,11 +1589,11 @@ msgstr ""
 
 #: LYMessages.c:534
 msgid "ERROR - Unable to allocate file space!!!"
-msgstr "���~ �w �L�k���t�ɮתŶ�!!!"
+msgstr "錯誤 ─ 無法分配檔案空間!!!"
 
 #: LYMessages.c:535
 msgid "Unable to open tempfile"
-msgstr "�L�k�}�ҼȦs��"
+msgstr "無法開啟暫存檔"
 
 #: LYMessages.c:536
 msgid "Unable to open print options file"
@@ -1601,15 +1601,15 @@ msgstr ""
 
 #: LYMessages.c:537
 msgid "Printing file.  Please wait..."
-msgstr "���b�C�L�ɮסC�еy��..."
+msgstr "正在列印檔案。請稍等..."
 
 #: LYMessages.c:538
 msgid "Please enter a valid internet mail address: "
-msgstr "�п�J���Ī��q�l�a�}�G"
+msgstr "請輸入有效的電郵地址:"
 
 #: LYMessages.c:539
 msgid "ERROR! - printer is misconfigured!"
-msgstr "���~�I - �L����]�w���~�I"
+msgstr "錯誤! - 印表機設定錯誤!"
 
 #: LYMessages.c:540
 msgid "Image map from POST response not available!"
@@ -1634,17 +1634,17 @@ msgstr ""
 #. #define OPTION_SCREEN_NEEDS_24
 #: LYMessages.c:547
 msgid "Screen height must be at least 24 lines for the Options menu!"
-msgstr "�b�ﶵ�]�w���A�e�����ץ����̤֦� 24 ��I"
+msgstr "在選項設定中,畫面高度必須最少有 24 行!"
 
 #. #define OPTION_SCREEN_NEEDS_23
 #: LYMessages.c:549
 msgid "Screen height must be at least 23 lines for the Options menu!"
-msgstr "�b�ﶵ�]�w���A�e�����ץ����̤֦� 23 ��I"
+msgstr "在選項設定中,畫面高度必須最少有 23 行!"
 
 #. #define OPTION_SCREEN_NEEDS_22
 #: LYMessages.c:551
 msgid "Screen height must be at least 22 lines for the Options menu!"
-msgstr "�b�ﶵ�]�w���A�e�����ץ����̤֦� 22 ��I"
+msgstr "在選項設定中,畫面高度必須最少有 22 行!"
 
 #: LYMessages.c:553
 msgid "That key requires Advanced User mode."
@@ -1653,27 +1653,27 @@ msgstr ""
 #: LYMessages.c:554
 #, c-format
 msgid "Content-type: %s"
-msgstr "Content-type�G%s"
+msgstr "Content-type:%s"
 
 #: LYMessages.c:555
 msgid "Command: "
-msgstr "���O�G"
+msgstr "指令:"
 
 #: LYMessages.c:556
 msgid "Unknown or ambiguous command"
-msgstr "�����ηN�q�t�k�����O"
+msgstr "不明或意義含糊的指令"
 
 #: LYMessages.c:557
 msgid " Version "
-msgstr " ���� "
+msgstr " 版本 "
 
 #: LYMessages.c:558
 msgid " first"
-msgstr " (��������)"
+msgstr " (首先測試)"
 
 #: LYMessages.c:559
 msgid ", guessing..."
-msgstr "�A���b��p..."
+msgstr ",正在估計..."
 
 #: LYMessages.c:560
 msgid "Permissions for "
@@ -1693,7 +1693,7 @@ msgstr ""
 
 #: LYMessages.c:564
 msgid " to save,"
-msgstr " �x�s  "
+msgstr " 儲存  "
 
 #: LYMessages.c:565
 msgid " to "
@@ -1701,7 +1701,7 @@ msgstr ""
 
 #: LYMessages.c:566
 msgid " or "
-msgstr " �άO "
+msgstr " 或是 "
 
 #: LYMessages.c:567
 msgid " index"
@@ -1709,27 +1709,27 @@ msgstr ""
 
 #: LYMessages.c:568
 msgid " to return to Lynx."
-msgstr " ��^ Lynx�C"
+msgstr " 返回 Lynx。"
 
 #: LYMessages.c:569
 msgid "Accept Changes"
-msgstr "�������"
+msgstr "接受更改"
 
 #: LYMessages.c:570
 msgid "Reset Changes"
-msgstr "���]�ﶵ"
+msgstr "重設選項"
 
 #: LYMessages.c:571
 msgid "Left Arrow cancels changes"
-msgstr "���b�C��������ﶵ"
+msgstr "左箭咀鍵取消更改選項"
 
 #: LYMessages.c:572
 msgid "Save options to disk"
-msgstr "�N�ﶵ�x�s��ϺФ�"
+msgstr "將選項儲存於磁碟中"
 
 #: LYMessages.c:573
 msgid "Hit RETURN to accept entered data."
-msgstr "�� RETURN ������J����ơC"
+msgstr "按 RETURN 接受輸入的資料。"
 
 #. #define ACCEPT_DATA_OR_DEFAULT
 #: LYMessages.c:575
@@ -1738,43 +1738,43 @@ msgstr ""
 
 #: LYMessages.c:576
 msgid "Value accepted!"
-msgstr "�w�����]�w�ȡI"
+msgstr "已接受設定值!"
 
 #. #define VALUE_ACCEPTED_WARNING_X
 #: LYMessages.c:578
 msgid "Value accepted! -- WARNING: Lynx is configured for XWINDOWS!"
-msgstr "�w�����]�w�ȡI�w ĵ�i�GLynx �]�w�F�u�b XWINDOW �A�ΡI"
+msgstr "已接受設定值!─ 警告:Lynx 設定了只在 XWINDOW 適用!"
 
 #. #define VALUE_ACCEPTED_WARNING_NONX
 #: LYMessages.c:580
 msgid "Value accepted! -- WARNING: Lynx is NOT configured for XWINDOWS!"
-msgstr "�w�����]�w�ȡI�w ĵ�i�GLynx �]�w�F���A�Ω� XWINDOW�I"
+msgstr "已接受設定值!─ 警告:Lynx 設定了不適用於 XWINDOW!"
 
 #: LYMessages.c:581
 msgid "You are not allowed to change which editor to use!"
-msgstr "�����\�ۦ���w�ϥΪ��s�边�I"
+msgstr "不允許自行指定使用的編輯器!"
 
 #: LYMessages.c:582
 msgid "Failed to set DISPLAY variable!"
-msgstr "�L�k�]�w DISPLAY ����ܼơI"
+msgstr "無法設定 DISPLAY 環境變數!"
 
 #: LYMessages.c:583
 msgid "Failed to clear DISPLAY variable!"
-msgstr "�L�k�M�� DISPLAY ����ܼơI"
+msgstr "無法清除 DISPLAY 環境變數!"
 
 #. #define BOOKMARK_CHANGE_DISALLOWED
 #: LYMessages.c:585
 msgid "You are not allowed to change the bookmark file!"
-msgstr "�����\�������ɡI"
+msgstr "不允許更改書籤檔!"
 
 #: LYMessages.c:586
 msgid "Terminal does not support color"
-msgstr "�׺ݾ����䴩��m"
+msgstr "終端機不支援色彩"
 
 #: LYMessages.c:587
 #, c-format
 msgid "Your '%s' terminal does not support color."
-msgstr "��%s���׺ݾ����䴩��m"
+msgstr "‘%s’終端機不支援色彩"
 
 #: LYMessages.c:588
 msgid "Access to dot files is disabled!"
@@ -1783,7 +1783,7 @@ msgstr ""
 #. #define UA_NO_LYNX_WARNING
 #: LYMessages.c:590
 msgid "User-Agent string does not contain \"Lynx\" or \"L_y_n_x\""
-msgstr "User-Agent �r�ꤣ�]�A��Lynx���Ρ�L_y_n_x��"
+msgstr "User-Agent 字串不包括“Lynx”或“L_y_n_x”"
 
 #. #define UA_PLEASE_USE_LYNX
 #: LYMessages.c:592
@@ -1793,32 +1793,32 @@ msgstr ""
 #. #define UA_CHANGE_DISABLED
 #: LYMessages.c:594
 msgid "Changing of the User-Agent string is disabled!"
-msgstr "�����\��� User-Agent �r��I"
+msgstr "不允許更改 User-Agent 字串!"
 
 #. #define CHANGE_OF_SETTING_DISALLOWED
 #: LYMessages.c:596
 msgid "You are not allowed to change this setting."
-msgstr "�����\��惡���]�w�C"
+msgstr "不允許更改此項設定。"
 
 #: LYMessages.c:597
 msgid "Saving Options..."
-msgstr "���b�x�s�ﶵ..."
+msgstr "正在儲存選項..."
 
 #: LYMessages.c:598
 msgid "Options saved!"
-msgstr "�w�x�s�ﶵ�I"
+msgstr "已儲存選項!"
 
 #: LYMessages.c:599
 msgid "Unable to save Options!"
-msgstr "�L�k�x�s�ﶵ�I"
+msgstr "無法儲存選項!"
 
 #: LYMessages.c:600
 msgid " 'r' to return to Lynx "
-msgstr "����r����^ Lynx "
+msgstr "請按‘r’返回 Lynx "
 
 #: LYMessages.c:601
 msgid " '>' to save, or 'r' to return to Lynx "
-msgstr "����>���x�s�A�άO����r����^ Lynx "
+msgstr "按‘>’儲存,或是按‘r’返回 Lynx "
 
 #. #define ANY_KEY_CHANGE_RET_ACCEPT
 #: LYMessages.c:603
@@ -1827,7 +1827,7 @@ msgstr ""
 
 #: LYMessages.c:604
 msgid "Error uncompressing temporary file!"
-msgstr "�N�Ȧs�ɸ����ɵo�Ϳ��~�I"
+msgstr "將暫存檔解壓時發生錯誤!"
 
 #: LYMessages.c:605
 msgid "Unsupported URL scheme!"
@@ -1839,7 +1839,7 @@ msgstr ""
 
 #: LYMessages.c:607
 msgid "Redirection limit of 10 URL's reached."
-msgstr "�w�F�� URL ���s�ɦV���ƪ����� (10 ��)�C"
+msgstr "已達到 URL 重新導向次數的限制 (10 次)。"
 
 #: LYMessages.c:608
 msgid "Illegal redirection URL received from server!"
@@ -1857,7 +1857,7 @@ msgstr ""
 
 #: LYMessages.c:614
 msgid "P)roceed, or C)ancel "
-msgstr "P)�~��  C)����"
+msgstr "P)繼續  C)取消"
 
 #. #define ADVANCED_POST_GET_REDIRECT
 #: LYMessages.c:616
@@ -1903,11 +1903,11 @@ msgstr ""
 #: LYMessages.c:630
 #, c-format
 msgid "Proceed (%s)?"
-msgstr "�O�_�~�� (%s)?"
+msgstr "是否繼續 (%s)?"
 
 #: LYMessages.c:631
 msgid "Cannot POST to this host."
-msgstr "�L�k�ǰe POST ��ƦܸӥD���C"
+msgstr "無法傳送 POST 資料至該主機。"
 
 #: LYMessages.c:632
 msgid "POST not supported for this URL - ignoring POST data!"
@@ -1915,32 +1915,32 @@ msgstr ""
 
 #: LYMessages.c:633
 msgid "Discarding POST data..."
-msgstr "�˱� POST ���..."
+msgstr "捨棄 POST 資料..."
 
 #: LYMessages.c:634
 msgid "Document will not be reloaded!"
-msgstr "���|���s���J���I"
+msgstr "不會重新載入文件!"
 
 #: LYMessages.c:635
 msgid "Location: "
-msgstr "��m�G"
+msgstr "位置:"
 
 #: LYMessages.c:636
 #, c-format
 msgid "'%s' not found!"
-msgstr "�䤣�졥%s���I"
+msgstr "找不到‘%s’!"
 
 #: LYMessages.c:637
 msgid "Default Bookmark File"
-msgstr "�w�]������"
+msgstr "預設書籤檔"
 
 #: LYMessages.c:638
 msgid "Screen too small! (8x35 min)"
-msgstr "�e���Ӥp�I(�̤p 8x35)"
+msgstr "畫面太小!(最小 8x35)"
 
 #: LYMessages.c:639
 msgid "Select destination or ^G to Cancel: "
-msgstr "�п�ܥت��a�Ϋ� ^G �����G"
+msgstr "請選擇目的地或按 ^G 取消:"
 
 #. #define MULTIBOOKMARKS_SELECT
 #: LYMessages.c:641
@@ -1954,7 +1954,7 @@ msgstr ""
 
 #: LYMessages.c:644
 msgid "Multiple bookmark support is not available."
-msgstr "�L�k���Ѧh�����ɪ��䴩�C"
+msgstr "無法提供多書籤檔的支援。"
 
 #: LYMessages.c:645
 #, c-format
@@ -1963,7 +1963,7 @@ msgstr ""
 
 #: LYMessages.c:646
 msgid "       Select Bookmark"
-msgstr "       ��ܮ���"
+msgstr "       選擇書籤"
 
 #. #define MULTIBOOKMARKS_EHEAD_MASK
 #: LYMessages.c:648
@@ -1974,11 +1974,11 @@ msgstr ""
 #. #define MULTIBOOKMARKS_EHEAD
 #: LYMessages.c:650
 msgid "         Editing Bookmark DESCRIPTION and FILEPATH"
-msgstr "         �ק靈�����Ҫ��������ɮ׸�|"
+msgstr "         修改有關書籤的說明及檔案路徑"
 
 #: LYMessages.c:651
 msgid "Letter: "
-msgstr "�r���G"
+msgstr "字母:"
 
 #. #define USE_PATH_OFF_HOME
 #: LYMessages.c:654
@@ -1996,27 +1996,27 @@ msgstr ""
 
 #: LYMessages.c:660
 msgid "No previously visited links available!"
-msgstr "�L�k���Ѥ��e�s���L���쵲�I"
+msgstr "無法提供之前瀏覽過的鏈結!"
 
 #: LYMessages.c:661
 msgid "Memory exhausted!  Program aborted!"
-msgstr "�O����ӺɡI�{����������I"
+msgstr "記憶體耗盡!程式必須中止!"
 
 #: LYMessages.c:662
 msgid "Memory exhausted!  Aborting..."
-msgstr "�O����ӺɡI�{������..."
+msgstr "記憶體耗盡!程式中止..."
 
 #: LYMessages.c:663
 msgid "Not enough memory!"
-msgstr "�O���餣���I"
+msgstr "記憶體不足!"
 
 #: LYMessages.c:664
 msgid "Directory/File Manager not available"
-msgstr "�L�k���ѥؿ�/�ɮ׺޲z�\��"
+msgstr "無法提供目錄/檔案管理功能"
 
 #: LYMessages.c:665
 msgid "HREF in BASE tag is not an absolute URL."
-msgstr "BASE ���Ҫ� HREF ���O�������|�� URL�C"
+msgstr "BASE 標籤的 HREF 不是有絕對路徑的 URL。"
 
 #: LYMessages.c:666
 msgid "Location URL is not absolute."
@@ -2024,7 +2024,7 @@ msgstr ""
 
 #: LYMessages.c:667
 msgid "Refresh URL is not absolute."
-msgstr "�dzƧ�s�� URL ���S�������|�C"
+msgstr "準備更新的 URL 中沒有絕對路徑。"
 
 #. #define SENDING_MESSAGE_WITH_BODY_TO
 #: LYMessages.c:669
@@ -2062,7 +2062,7 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"�p�G���Q�e�X�T���A�� Ctrl-G ����\n"
+"如果不想送出訊息,請按 Ctrl-G 取消\n"
 
 #. #define ENTER_NAME_OR_BLANK
 #: LYMessages.c:676
@@ -2071,7 +2071,7 @@ msgid ""
 " Please enter your name, or leave it blank to remain anonymous\n"
 msgstr ""
 "\n"
-" �п�J�դU���m�W�A�άO�N�W�ٯd�ťN��L�W��\n"
+" 請輸入閣下的姓名,或是將名稱留空代表無名氏\n"
 
 #. #define ENTER_MAIL_ADDRESS_OR_OTHER
 #: LYMessages.c:678
@@ -2080,12 +2080,12 @@ msgid ""
 " Please enter a mail address or some other\n"
 msgstr ""
 "\n"
-" �p�G�ݭn���^�СA�ж�W�q�l\n"
+" 如果需要對方回覆,請填上電郵\n"
 
 #. #define MEANS_TO_CONTACT_FOR_RESPONSE
 #: LYMessages.c:680
 msgid " means to contact you, if you desire a response.\n"
-msgstr " �a�}�Ψ䥦�p����k�C\n"
+msgstr " 地址或其它聯絡方法。\n"
 
 #: LYMessages.c:681
 msgid ""
@@ -2093,7 +2093,7 @@ msgid ""
 " Please enter a subject line.\n"
 msgstr ""
 "\n"
-" �п�J���D�C\n"
+" 請輸入標題。\n"
 
 #. #define ENTER_ADDRESS_FOR_CC
 #: LYMessages.c:683
@@ -2104,7 +2104,7 @@ msgstr ""
 
 #: LYMessages.c:684
 msgid " (Leave blank if you don't want a copy.)\n"
-msgstr " (�p�G���Q����ƥ��бN����d�šC)\n"
+msgstr " (如果不想收到副本請將此欄留空。)\n"
 
 #: LYMessages.c:685
 msgid ""
@@ -2113,7 +2113,7 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-" ���ˬd�T�����e�G\n"
+" 請檢查訊息內容:\n"
 "\n"
 
 #: LYMessages.c:686
@@ -2122,7 +2122,7 @@ msgid ""
 "Press RETURN to continue: "
 msgstr ""
 "\n"
-"�� RETURN �~��G"
+"請按 RETURN 繼續:"
 
 #: LYMessages.c:687
 msgid ""
@@ -2132,7 +2132,7 @@ msgstr ""
 
 #: LYMessages.c:688
 msgid " Use Control-U to erase the default.\n"
-msgstr " �Ы� Control-U �M���w�]�ȡC\n"
+msgstr " 請按 Control-U 清除預設值。\n"
 
 #: LYMessages.c:689
 msgid ""
@@ -2140,7 +2140,7 @@ msgid ""
 " Please enter your message below."
 msgstr ""
 "\n"
-" �Цb�H�U���a���J�T���C"
+" 請在以下的地方輸入訊息。"
 
 #. #define ENTER_PERIOD_WHEN_DONE_A
 #: LYMessages.c:691 src/LYNews.c:360
@@ -2149,7 +2149,7 @@ msgid ""
 " When you are done, press enter and put a single period (.)"
 msgstr ""
 "\n"
-" ������� enter�A�M��b�U�@��"
+" 完成後請按 enter,然後在下一行"
 
 #. #define ENTER_PERIOD_WHEN_DONE_B
 #: LYMessages.c:693 src/LYNews.c:361
@@ -2158,20 +2158,20 @@ msgid ""
 " on a line and press enter again."
 msgstr ""
 "\n"
-" �u��J�@�I (.) �åB�A�� enter�C"
+" 只輸入一點 (.) 並且再按 enter。"
 
 #. Cookies messages
 #. #define ADVANCED_COOKIE_CONFIRMATION
 #: LYMessages.c:697
 #, c-format
 msgid "%s cookie: %.*s=%.*s  Allow? (Y/N/Always/neVer)"
-msgstr "%s cookie�G%.*s=%.*s  �O�_�����H (Y/N/Always/neVer)"
+msgstr "%s cookie:%.*s=%.*s  是否接受? (Y/N/Always/neVer)"
 
 #. #define INVALID_COOKIE_DOMAIN_CONFIRMATION
 #: LYMessages.c:699
 #, c-format
 msgid "Accept invalid cookie domain=%s for '%s'?"
-msgstr "�O�_���� domain=%s�A�@�ӥѡ�%s���o�X���L�� cookie�H"
+msgstr "是否接受 domain=%s,一個由‘%s’發出的無效 cookie?"
 
 #. #define INVALID_COOKIE_PATH_CONFIRMATION
 #: LYMessages.c:701
@@ -2181,20 +2181,20 @@ msgstr ""
 
 #: LYMessages.c:702
 msgid "Allowing this cookie."
-msgstr "������ cookie�C"
+msgstr "接受此 cookie。"
 
 #: LYMessages.c:703
 msgid "Rejecting this cookie."
-msgstr "�ڵ��� cookie�C"
+msgstr "拒絕此 cookie。"
 
 #: LYMessages.c:704
 msgid "The Cookie Jar is empty."
-msgstr "�S���x�s��� cookie�C"
+msgstr "沒有儲存任何 cookie。"
 
 #: LYMessages.c:705
 #, fuzzy
 msgid "The Cache Jar is empty."
-msgstr "�S���x�s��� cookie�C"
+msgstr "沒有儲存任何 cookie。"
 
 #. #define ACTIVATE_TO_GOBBLE
 #: LYMessages.c:707
@@ -2207,15 +2207,15 @@ msgstr ""
 
 #: LYMessages.c:709
 msgid "(Cookies never allowed.)"
-msgstr "(����� cookie�C)"
+msgstr "(永不接受 cookie。)"
 
 #: LYMessages.c:710
 msgid "(Cookies always allowed.)"
-msgstr "(�@�w���� cookie�C)"
+msgstr "(一定接受 cookie。)"
 
 #: LYMessages.c:711
 msgid "(Cookies allowed via prompt.)"
-msgstr "(�C�����߰ݨϥΪ̬O�_���� cookie�C)"
+msgstr "(每次都詢問使用者是否接受 cookie。)"
 
 #: LYMessages.c:712
 msgid "(Persistent Cookies.)"
@@ -2243,69 +2243,69 @@ msgstr ""
 
 #: LYMessages.c:718
 msgid "Delete this cookie?"
-msgstr "�O�_�R���� cookie�H"
+msgstr "是否刪除該 cookie?"
 
 #: LYMessages.c:719
 msgid "The cookie has been eaten!"
-msgstr "�� cookie �w�g�Q�R���F�I"
+msgstr "該 cookie 已經被刪除了!"
 
 #: LYMessages.c:720
 msgid "Delete this empty domain?"
-msgstr "�O�_�R���Ӫťժ����H"
+msgstr "是否刪除該空白的網域?"
 
 #: LYMessages.c:721
 msgid "The domain has been eaten!"
-msgstr "�w�g�R���Ӻ��I"
+msgstr "已經刪除該網域!"
 
 #. #define DELETE_COOKIES_SET_ALLOW_OR_CANCEL
 #: LYMessages.c:723
 msgid "D)elete domain's cookies, set allow A)lways/P)rompt/neV)er, or C)ancel? "
-msgstr "D)�R����쪺 cookie  A)�@�w���� cookie  P)�߰ݬO�_����  V)�ä�����  C)����"
+msgstr "D)刪除網域的 cookie  A)一定接受 cookie  P)詢問是否接受  V)永不接受  C)取消"
 
 #. #define DELETE_DOMAIN_SET_ALLOW_OR_CANCEL
 #: LYMessages.c:725
 msgid "D)elete domain, set allow A)lways/P)rompt/neV)er, or C)ancel? "
-msgstr "D)�R�����  A)�@�w���� cookie  P)�߰ݬO�_����  V)�ä�����  C)����"
+msgstr "D)刪除網域  A)一定接受 cookie  P)詢問是否接受  V)永不接受  C)取消"
 
 #: LYMessages.c:726
 msgid "All cookies in the domain have been eaten!"
-msgstr "�w�g�R���Ҧ��Ӧ۸Ӻ�쪺 cookie�I"
+msgstr "已經刪除所有來自該網域的 cookie!"
 
 #: LYMessages.c:727
 #, c-format
 msgid "'A'lways allowing from domain '%s'."
-msgstr "�@�w�����Ӧۺ�졥%s���� cookie�C"
+msgstr "一定接受來自網域‘%s’的 cookie。"
 
 #: LYMessages.c:728
 #, c-format
 msgid "ne'V'er allowing from domain '%s'."
-msgstr "�û��������Ӧۺ�졥%s���� cookie�C"
+msgstr "永遠不接受來自網域‘%s’的 cookie。"
 
 #: LYMessages.c:729
 #, c-format
 msgid "'P'rompting to allow from domain '%s'."
-msgstr "(�C�����߰ݬO�_�����Ӧۺ�졥%s���� cookie�C)"
+msgstr "(每次都詢問是否接受來自網域‘%s’的 cookie。)"
 
 #: LYMessages.c:730
 msgid "Delete all cookies in this domain?"
-msgstr "�O�_�R���Ҧ��Ӧ۸Ӻ�쪺 cookie�H"
+msgstr "是否刪除所有來自該網域的 cookie?"
 
 #: LYMessages.c:731
 msgid "All of the cookies in the jar have been eaten!"
-msgstr "�w�g�R���Ҧ� cookie�I"
+msgstr "已經刪除所有 cookie!"
 
 #: LYMessages.c:733
 msgid "Port 19 not permitted in URLs."
-msgstr "URL �̤����\�ϥγs���𸹽X 19�C"
+msgstr "URL 裡不允許使用連接埠號碼 19。"
 
 #: LYMessages.c:734
 msgid "Port 25 not permitted in URLs."
-msgstr "URL �̤����\�ϥγs���𸹽X 25�C"
+msgstr "URL 裡不允許使用連接埠號碼 25。"
 
 #: LYMessages.c:735
 #, c-format
 msgid "Port %lu not permitted in URLs."
-msgstr "URL �̤����\�ϥγs���𸹽X %lu�C"
+msgstr "URL 裡不允許使用連接埠號碼 %lu。"
 
 #: LYMessages.c:736
 msgid "URL has a bad port field."
@@ -2334,7 +2334,7 @@ msgstr ""
 #. #define MAX_TEMPCOUNT_REACHED
 #: LYMessages.c:743
 msgid "The maximum temporary file count has been reached!"
-msgstr "�v�F��i�������Ȧs�ɼƥؤW���I"
+msgstr "己達到可接受的暫存檔數目上限!"
 
 #. #define FORM_VALUE_TOO_LONG
 #: LYMessages.c:745
@@ -2349,11 +2349,11 @@ msgstr ""
 #. HTFile.c
 #: LYMessages.c:750
 msgid "Directory"
-msgstr "�ؿ�"
+msgstr "目錄"
 
 #: LYMessages.c:751
 msgid "Directory browsing is not allowed."
-msgstr "�����\�s���ؿ��C"
+msgstr "不允許瀏覽目錄。"
 
 #: LYMessages.c:752
 msgid "Selective access is not enabled for this directory"
@@ -2365,11 +2365,11 @@ msgstr ""
 
 #: LYMessages.c:754
 msgid "This directory is not readable."
-msgstr "�S��Ū���ӥؿ����v���C"
+msgstr "沒有讀取該目錄的權限。"
 
 #: LYMessages.c:755
 msgid "Can't access requested file."
-msgstr "�L�k�s���ҭn�D���ɮסC"
+msgstr "無法存取所要求的檔案。"
 
 #: LYMessages.c:756
 msgid "Could not find suitable representation for transmission."
@@ -2377,19 +2377,19 @@ msgstr ""
 
 #: LYMessages.c:757
 msgid "Could not open file for decompression!"
-msgstr "�L�k�}�ҷdzƸ������ɮסI"
+msgstr "無法開啟準備解壓的檔案!"
 
 #: LYMessages.c:758
 msgid "Files:"
-msgstr "�ɮסG"
+msgstr "檔案:"
 
 #: LYMessages.c:759
 msgid "Subdirectories:"
-msgstr "�ƥؿ��G"
+msgstr "副目錄:"
 
 #: LYMessages.c:760
 msgid " directory"
-msgstr " �ؿ�"
+msgstr " 目錄"
 
 #: LYMessages.c:761
 msgid "Up to "
@@ -2397,16 +2397,16 @@ msgstr ""
 
 #: LYMessages.c:762
 msgid "Current directory is "
-msgstr "�ثe���ؿ��O "
+msgstr "目前的目錄是 "
 
 #. HTGopher.c
 #: LYMessages.c:765
 msgid "No response from server!"
-msgstr "���A���S���^���I"
+msgstr "伺服器沒有回應!"
 
 #: LYMessages.c:766
 msgid "CSO index"
-msgstr "CSO ����"
+msgstr "CSO 索引"
 
 #: LYMessages.c:767
 msgid ""
@@ -2416,7 +2416,7 @@ msgstr ""
 
 #: LYMessages.c:768
 msgid "CSO Search Results"
-msgstr "CSO �j�M���G"
+msgstr "CSO 搜尋結果"
 
 #: LYMessages.c:769
 #, c-format
@@ -2429,7 +2429,7 @@ msgid ""
 "Press the 's' key and enter search keywords.\n"
 msgstr ""
 "\n"
-"�Ы���s���ÿ�J�dzƷj�M������r�C\n"
+"請按‘s’並輸入準備搜尋的關鍵字。\n"
 
 #: LYMessages.c:771
 msgid ""
@@ -2437,35 +2437,35 @@ msgid ""
 "This is a searchable Gopher index.\n"
 msgstr ""
 "\n"
-"�o�O�@�ӥi�H�i��j�M�� Gopher ���ޡC\n"
+"這是一個可以進行搜尋的 Gopher 索引。\n"
 
 #: LYMessages.c:772
 msgid "Gopher index"
-msgstr "Gopher ����"
+msgstr "Gopher 索引"
 
 #: LYMessages.c:773
 msgid "Gopher Menu"
-msgstr "Gopher ���"
+msgstr "Gopher 選單"
 
 #: LYMessages.c:774
 msgid " Search Results"
-msgstr " �j�M���G"
+msgstr " 搜尋結果"
 
 #: LYMessages.c:775
 msgid "Sending CSO/PH request."
-msgstr "���b�e�X CSO/PH �n�D�C"
+msgstr "正在送出 CSO/PH 要求。"
 
 #: LYMessages.c:776
 msgid "Sending Gopher request."
-msgstr "���b�e�X Gopher �n�D�C"
+msgstr "正在送出 Gopher 要求。"
 
 #: LYMessages.c:777
 msgid "CSO/PH request sent; waiting for response."
-msgstr "�w�i�X CSO/PH �n�D�F���b���ݦ^���C"
+msgstr "已進出 CSO/PH 要求;正在等待回應。"
 
 #: LYMessages.c:778
 msgid "Gopher request sent; waiting for response."
-msgstr "�w�i�X Gopher �n�D�F���b���ݦ^���C"
+msgstr "已進出 Gopher 要求;正在等待回應。"
 
 #: LYMessages.c:779
 msgid ""
@@ -2473,7 +2473,7 @@ msgid ""
 "Please enter search keywords.\n"
 msgstr ""
 "\n"
-"�п�J�dzƷj�M������r�C\n"
+"請輸入準備搜尋的關鍵字。\n"
 
 #: LYMessages.c:780
 msgid ""
@@ -2488,7 +2488,7 @@ msgstr ""
 #. HTNews.c
 #: LYMessages.c:784
 msgid "Connection closed ???"
-msgstr "�s�u�����F???"
+msgstr "連線關閉了???"
 
 #: LYMessages.c:785
 msgid "Cannot open temporary file for news POST."
@@ -2517,7 +2517,7 @@ msgstr ""
 #. HTTP.c
 #: LYMessages.c:795
 msgid "Can't proceed without a username and password."
-msgstr "�L�k�~��A�]���S���b��W�٤αK�X�C"
+msgstr "無法繼續,因為沒有帳戶名稱及密碼。"
 
 #: LYMessages.c:796
 msgid "Can't retry with authorization!  Contact the server's WebMaster."
@@ -2529,17 +2529,17 @@ msgstr ""
 
 #: LYMessages.c:798
 msgid "Retrying with proxy authorization information."
-msgstr "�H�N�z���A�{�����{�Ҹ�T���s���աC"
+msgstr "以代理伺服程式的認證資訊重新嘗試。"
 
 #: LYMessages.c:799
 #, fuzzy, c-format
 msgid "SSL error:%s-Continue?"
-msgstr "SSL ���~�G�D��(%s)���ŦX�Ү�(%s)�C�O�_�~��H"
+msgstr "SSL 錯誤:主機(%s)不符合證書(%s)。是否繼續?"
 
 #. HTWAIS.c
 #: LYMessages.c:802
 msgid "HTWAIS: Return message too large."
-msgstr "HTWAIS�G�^�Ǫ��T���L���C"
+msgstr "HTWAIS:回傳的訊息過長。"
 
 #: LYMessages.c:803
 msgid "Enter WAIS query: "
@@ -2548,16 +2548,16 @@ msgstr ""
 #. Miscellaneous status
 #: LYMessages.c:806
 msgid "Retrying as HTTP0 request."
-msgstr "�H HTTP0 �榡���աC"
+msgstr "以 HTTP0 格式重試。"
 
 #: LYMessages.c:807
 #, c-format
 msgid "Transferred %d bytes"
-msgstr "�w�ǿ� %d �줸��"
+msgstr "已傳輸 %d 位元組"
 
 #: LYMessages.c:808
 msgid "Data transfer complete"
-msgstr "��ƶǿ�w����"
+msgstr "資料傳輸已完成"
 
 #: LYMessages.c:809
 #, c-format
@@ -2571,7 +2571,7 @@ msgstr ""
 
 #: LYMessages.c:813
 msgid "Bookmark file"
-msgstr "������"
+msgstr "書籤檔"
 
 #: LYMessages.c:814
 msgid "Configuration Definitions"
@@ -2583,19 +2583,19 @@ msgstr ""
 
 #: LYMessages.c:816
 msgid "Current Key Map"
-msgstr "�ثe������]�w"
+msgstr "目前的按鍵設定"
 
 #: LYMessages.c:817
 msgid "File Management Options"
-msgstr "�ɮ׺޲z�ﶵ"
+msgstr "檔案管理選項"
 
 #: LYMessages.c:818
 msgid "Download Options"
-msgstr "�U���ﶵ"
+msgstr "下載選項"
 
 #: LYMessages.c:819
 msgid "History Page"
-msgstr "�s������"
+msgstr "瀏覽紀錄"
 
 #: LYMessages.c:820
 msgid "Cache Jar"
@@ -2603,11 +2603,11 @@ msgstr ""
 
 #: LYMessages.c:821
 msgid "List Page"
-msgstr "�쵲�M��"
+msgstr "鏈結清單"
 
 #: LYMessages.c:822
 msgid "Lynx.cfg Information"
-msgstr "Lynx.cfg ��T"
+msgstr "Lynx.cfg 資訊"
 
 #: LYMessages.c:823
 msgid "Converted Mosaic Hotlist"
@@ -2615,27 +2615,27 @@ msgstr ""
 
 #: LYMessages.c:824
 msgid "Options Menu"
-msgstr "�ﶵ�]�w"
+msgstr "選項設定"
 
 #: LYMessages.c:825
 msgid "File Permission Options"
-msgstr "�ɮ��v���ﶵ"
+msgstr "檔案權限選項"
 
 #: LYMessages.c:826
 msgid "Printing Options"
-msgstr "�C�L�ﶵ"
+msgstr "列印選項"
 
 #: LYMessages.c:827
 msgid "Information about the current document"
-msgstr "�����ثe����󪺸��"
+msgstr "有關目前的文件的資料"
 
 #: LYMessages.c:828
 msgid "Your recent statusline messages"
-msgstr "���A�C�̪�X�{���T��"
+msgstr "狀態列最近出現的訊息"
 
 #: LYMessages.c:829
 msgid "Upload Options"
-msgstr "�W�ǿﶵ"
+msgstr "上傳選項"
 
 #: LYMessages.c:830
 msgid "Visited Links Page"
@@ -2656,24 +2656,24 @@ msgstr ""
 
 #: LYMessages.c:836
 msgid "compile time options"
-msgstr "�sĶ�ﶵ"
+msgstr "編譯選項"
 
 #: LYMessages.c:837
 #, fuzzy
 msgid "color-style configuration"
-msgstr "�D�n�պA"
+msgstr "主要組態"
 
 #: LYMessages.c:838
 msgid "latest release"
-msgstr "�̷s����"
+msgstr "最新版本"
 
 #: LYMessages.c:839
 msgid "pre-release version"
-msgstr "�w������"
+msgstr "預覽版本"
 
 #: LYMessages.c:840
 msgid "development version"
-msgstr "�}�o������"
+msgstr "開發中版本"
 
 #. #define AUTOCONF_CONFIG_CACHE
 #: LYMessages.c:842
@@ -2693,11 +2693,11 @@ msgstr ""
 #. #define DIRED_NOVICELINE
 #: LYMessages.c:851
 msgid "  C)reate  D)ownload  E)dit  F)ull menu  M)odify  R)emove  T)ag  U)pload     \n"
-msgstr "  C)�إ�  D)�U��  E)�s��  F)������  M)�ק�  R)����  T)�аO  U)�W��\n"
+msgstr "  C)建立  D)下載  E)編輯  F)完整選單  M)修改  R)移除  T)標記  U)上傳\n"
 
 #: LYMessages.c:852
 msgid "Failed to obtain status of current link!"
-msgstr "�L�k����ثe���쵲�����A�I"
+msgstr "無法獲取目前的鏈結的狀態!"
 
 #. #define INVALID_PERMIT_URL
 #: LYMessages.c:855
@@ -2715,11 +2715,11 @@ msgstr ""
 
 #: LYMessages.c:864
 msgid "Linewrap OFF!"
-msgstr "�w�����۰ʴ���\��I"
+msgstr "已關閉自動換行功能!"
 
 #: LYMessages.c:865
 msgid "Linewrap ON!"
-msgstr "�w�}�Ҧ۰ʴ���\��I"
+msgstr "已開啟自動換行功能!"
 
 #: LYMessages.c:866
 msgid "Parsing nested-tables toggled OFF!  Reloading..."
@@ -2758,15 +2758,15 @@ msgstr ""
 #: WWW/Library/Implementation/HTAABrow.c:1079
 #, c-format
 msgid "Invalid header '%s%s%s%s%s'"
-msgstr "�L�Ī����Y���e��%s%s%s%s%s��"
+msgstr "無效的標頭內容‘%s%s%s%s%s’"
 
 #: WWW/Library/Implementation/HTAABrow.c:1181
 msgid "Proxy authorization required -- retrying"
-msgstr "�ϥΥN�z���A���e�ݭn�{�� �w ���s����"
+msgstr "使用代理伺服器前需要認證 ─ 重新嘗試"
 
 #: WWW/Library/Implementation/HTAABrow.c:1239
 msgid "Access without authorization denied -- retrying"
-msgstr "�����{�ҡA�L�k�s�����e �w ���s����"
+msgstr "仍未認證,無法存取內容 ─ 重新嘗試"
 
 #: WWW/Library/Implementation/HTAccess.c:688
 msgid "Access forbidden by rule"
@@ -2782,7 +2782,7 @@ msgstr ""
 
 #: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8546
 msgid "Loading incomplete."
-msgstr "���������J���e�C"
+msgstr "未完成載入內容。"
 
 #: WWW/Library/Implementation/HTAccess.c:1078
 #, c-format
@@ -2792,12 +2792,12 @@ msgstr ""
 #: WWW/Library/Implementation/HTAccess.c:1080
 #, c-format
 msgid "**** HTAccess: Internal software error.  Please mail lynx-dev at nongnu.org!\n"
-msgstr "**** HTAccess�G�����{�����~�C�бH�q�l�� lynx-dev at nongnu.org�I\n"
+msgstr "**** HTAccess:內部程式錯誤。請寄電郵至 lynx-dev at nongnu.org!\n"
 
 #: WWW/Library/Implementation/HTAccess.c:1081
 #, c-format
 msgid "**** HTAccess: Status returned was: %d\n"
-msgstr "**** HTAccess�G�^�Ǫ����A���G%d\n"
+msgstr "**** HTAccess:回傳的狀態為:%d\n"
 
 #.
 #. * hack: if we fail in HTAccess.c
@@ -2805,20 +2805,20 @@ msgstr "**** HTAccess
 #.
 #: WWW/Library/Implementation/HTAccess.c:1087 src/LYMainLoop.c:7779
 msgid "Can't Access"
-msgstr "�L�k�s��"
+msgstr "無法存取"
 
 #: WWW/Library/Implementation/HTAccess.c:1095
 msgid "Unable to access document."
-msgstr "�L�k�s�����C"
+msgstr "無法存取文件。"
 
 #: WWW/Library/Implementation/HTFTP.c:843
 #, c-format
 msgid "Enter password for user %s@%s:"
-msgstr "�п�J�ϥΪ� %s@%s ���K�X�G"
+msgstr "請輸入使用者 %s@%s 的密碼:"
 
 #: WWW/Library/Implementation/HTFTP.c:871
 msgid "Unable to connect to FTP host."
-msgstr "�L�k�p�� FTP �D���C"
+msgstr "無法聯絡 FTP 主機。"
 
 #: WWW/Library/Implementation/HTFTP.c:1152
 msgid "close master socket"
@@ -2834,16 +2834,16 @@ msgstr ""
 #.
 #: WWW/Library/Implementation/HTFTP.c:1733 WWW/Library/Implementation/HTFTP.c:2350
 msgid "Symbolic Link"
-msgstr "�Ÿ��s��"
+msgstr "符號連結"
 
 #: WWW/Library/Implementation/HTFTP.c:2707
 msgid "Receiving FTP directory."
-msgstr "���b���� FTP �ؿ����e�C"
+msgstr "正在接收 FTP 目錄內容。"
 
 #: WWW/Library/Implementation/HTFTP.c:2843
 #, c-format
 msgid "Transferred %d bytes (%5d)"
-msgstr "�w�ǰe %d �줸�� (%5d)"
+msgstr "已傳送 %d 位元組 (%5d)"
 
 #: WWW/Library/Implementation/HTFTP.c:3194
 msgid "connect for data"
@@ -2851,11 +2851,11 @@ msgstr ""
 
 #: WWW/Library/Implementation/HTFTP.c:3855
 msgid "Receiving FTP file."
-msgstr "���b���� FTP �ؿ��C"
+msgstr "正在接收 FTP 目錄。"
 
 #: WWW/Library/Implementation/HTFinger.c:273
 msgid "Could not set up finger connection."
-msgstr "�L�k�إ� finger �s�u�C"
+msgstr "無法建立 finger 連線。"
 
 #: WWW/Library/Implementation/HTFinger.c:320
 msgid "Could not load data (no sitename in finger URL)"
@@ -2863,37 +2863,37 @@ msgstr ""
 
 #: WWW/Library/Implementation/HTFinger.c:326
 msgid "Invalid port number - will only use port 79!"
-msgstr "�L�Ī��s���𸹽X �w �u�|�ϥγs���� 79�I"
+msgstr "無效的連接埠號碼 ─ 只會使用連接埠號 79!"
 
 #: WWW/Library/Implementation/HTFinger.c:392
 msgid "Could not access finger host."
-msgstr "�L�k�s�� finger �D���W����ơC"
+msgstr "無法存取 finger 主機上的資料。"
 
 #: WWW/Library/Implementation/HTFinger.c:400
 msgid "No response from finger server."
-msgstr "finger ���A���S���^���C"
+msgstr "finger 伺服器沒有回應。"
 
 #: WWW/Library/Implementation/HTNews.c:426
 #, c-format
 msgid "Username for news host '%s':"
-msgstr "�s�D�եD����%s�����b��W�١G"
+msgstr "新聞組主機‘%s’的帳戶名稱:"
 
 #: WWW/Library/Implementation/HTNews.c:479
 msgid "Change username?"
-msgstr "�O�_���b��W�١H"
+msgstr "是否更改帳戶名稱?"
 
 #: WWW/Library/Implementation/HTNews.c:483
 msgid "Username:"
-msgstr "�b��W�١G"
+msgstr "帳戶名稱:"
 
 #: WWW/Library/Implementation/HTNews.c:508
 #, c-format
 msgid "Password for news host '%s':"
-msgstr "�s�D�եD����%s�����K�X�G"
+msgstr "新聞組主機‘%s’的密碼:"
 
 #: WWW/Library/Implementation/HTNews.c:591
 msgid "Change password?"
-msgstr "�O�_���K�X�H"
+msgstr "是否更改密碼?"
 
 #: WWW/Library/Implementation/HTNews.c:1711
 #, c-format
@@ -2906,7 +2906,7 @@ msgid ""
 "No articles in this group.\n"
 msgstr ""
 "\n"
-"���s�D�ըS�����峹�C\n"
+"此新聞組沒有任何文章。\n"
 
 #: WWW/Library/Implementation/HTNews.c:1773
 msgid ""
@@ -2948,7 +2948,7 @@ msgstr ""
 
 #: WWW/Library/Implementation/HTNews.c:2342
 msgid "This client does not contain support for SNEWS URLs."
-msgstr "���������{�����䴩 SNEWS URL�C"
+msgstr "此版本的程式不支援 SNEWS URL。"
 
 #: WWW/Library/Implementation/HTNews.c:2550
 msgid "No target for raw text!"
@@ -2956,17 +2956,17 @@ msgstr ""
 
 #: WWW/Library/Implementation/HTNews.c:2581
 msgid "Connecting to NewsHost ..."
-msgstr "���b�p���s�D�եD�� ..."
+msgstr "正在聯絡新聞組主機 ..."
 
 #: WWW/Library/Implementation/HTNews.c:2633
 #, c-format
 msgid "Could not access %s."
-msgstr "�L�k�s�� %s�C"
+msgstr "無法存取 %s。"
 
 #: WWW/Library/Implementation/HTNews.c:2739
 #, c-format
 msgid "Can't read news info.  News host %.20s responded: %.200s"
-msgstr "�L�kŪ���s�D�ո�T�C�s�D�զ��A�� %.20s �^���G%.200s"
+msgstr "無法讀取新聞組資訊。新聞組伺服器 %.20s 回應:%.200s"
 
 #: WWW/Library/Implementation/HTNews.c:2743
 #, c-format
@@ -2982,7 +2982,7 @@ msgstr ""
 
 #: WWW/Library/Implementation/HTNews.c:2968
 msgid "Reading list of articles in newsgroup."
-msgstr "���bŪ���s�D�դ����峹�M��C"
+msgstr "正在讀取新聞組中的文章清單。"
 
 #.
 #. * Get an article from a news group.  - FM
@@ -2997,16 +2997,16 @@ msgstr ""
 
 #: WWW/Library/Implementation/HTTCP.c:1282
 msgid "Address has invalid port"
-msgstr "�a�}�����s����L��"
+msgstr "地址中的連接埠無效"
 
 #: WWW/Library/Implementation/HTTCP.c:1358
 msgid "Address length looks invalid"
-msgstr "�a�}���צ��G�L��"
+msgstr "地址長度似乎無效"
 
 #: WWW/Library/Implementation/HTTCP.c:1618 WWW/Library/Implementation/HTTCP.c:1636
 #, c-format
 msgid "Unable to locate remote host %s."
-msgstr "�䤣�컷�ݥD�� %s�C"
+msgstr "找不到遠端主機 %s。"
 
 #. Not HTProgress, so warning won't be overwritten immediately;
 #. * but not HTAlert, because typically there will be other
@@ -3015,12 +3015,12 @@ msgstr "
 #: WWW/Library/Implementation/HTTCP.c:1633 WWW/Library/Implementation/HTTelnet.c:115
 #, c-format
 msgid "Invalid hostname %s"
-msgstr "�L�Ī��D���W�� %s"
+msgstr "無效的主機名稱 %s"
 
 #: WWW/Library/Implementation/HTTCP.c:1647
 #, c-format
 msgid "Making %s connection to %s"
-msgstr "���b�إ� %s �s�u�A�s�� %s"
+msgstr "正在建立 %s 連線,連至 %s"
 
 #: WWW/Library/Implementation/HTTCP.c:1658
 msgid "socket failed."
@@ -3037,7 +3037,7 @@ msgstr ""
 
 #: WWW/Library/Implementation/HTTCP.c:1763
 msgid "Connection failed (too many retries)."
-msgstr "�s�u���� (���զ��ƤӦh)�C"
+msgstr "連線失敗 (重試次數太多)。"
 
 #: WWW/Library/Implementation/HTTCP.c:1950
 msgid "Could not restore socket to blocking."
@@ -3046,7 +3046,7 @@ msgstr ""
 #: WWW/Library/Implementation/HTTCP.c:2016
 #, fuzzy
 msgid "Socket read failed (too many tries)."
-msgstr "�s�u���� (���զ��ƤӦh)�C"
+msgstr "連線失敗 (重試次數太多)。"
 
 #: WWW/Library/Implementation/HTTP.c:84
 #, c-format
@@ -3056,7 +3056,7 @@ msgstr ""
 #: WWW/Library/Implementation/HTTP.c:406
 #, c-format
 msgid "Address contains a username: %s"
-msgstr "�a��t���b��W�١G%s"
+msgstr "地止中含有帳戶名稱:%s"
 
 #: WWW/Library/Implementation/HTTP.c:460
 #, c-format
@@ -3065,15 +3065,15 @@ msgstr ""
 
 #: WWW/Library/Implementation/HTTP.c:620
 msgid "This client does not contain support for HTTPS URLs."
-msgstr "���s�������䴩 HTTPS URL�C"
+msgstr "此瀏覽器不支援 HTTPS URL。"
 
 #: WWW/Library/Implementation/HTTP.c:645
 msgid "Unable to connect to remote host."
-msgstr "�L�k�p�����ݥD���C"
+msgstr "無法聯絡遠端主機。"
 
 #: WWW/Library/Implementation/HTTP.c:669
 msgid "Retrying connection without TLS."
-msgstr "���եH���� TLS ���覡�s�u�C"
+msgstr "嘗試以不用 TLS 的方式連線。"
 
 #: WWW/Library/Implementation/HTTP.c:714
 msgid "no issuer was found"
@@ -3090,7 +3090,7 @@ msgstr ""
 #: WWW/Library/Implementation/HTTP.c:720
 #, fuzzy
 msgid "the certificate has been revoked"
-msgstr "�� cookie �w�g�Q�R���F�I"
+msgstr "該 cookie 已經被刪除了!"
 
 #: WWW/Library/Implementation/HTTP.c:722
 msgid "the certificate is not trusted"
@@ -3113,7 +3113,7 @@ msgstr ""
 #: WWW/Library/Implementation/HTTP.c:934
 #, c-format
 msgid "SSL error:host(%s)!=cert(%s)-Continue?"
-msgstr "SSL ���~�G�D��(%s)���ŦX�Ү�(%s)�C�O�_�~��H"
+msgstr "SSL 錯誤:主機(%s)不符合證書(%s)。是否繼續?"
 
 #: WWW/Library/Implementation/HTTP.c:947
 #, c-format
@@ -3123,11 +3123,11 @@ msgstr ""
 #: WWW/Library/Implementation/HTTP.c:956
 #, c-format
 msgid "Secure %d-bit %s (%s) HTTP connection"
-msgstr "%d �줸 %s (%s) �w�� HTTP �s�u"
+msgstr "%d 位元 %s (%s) 安全 HTTP 連線"
 
 #: WWW/Library/Implementation/HTTP.c:1426
 msgid "Sending HTTP request."
-msgstr "���b�e�X HTTP �n�D�C"
+msgstr "正在送出 HTTP 要求。"
 
 #: WWW/Library/Implementation/HTTP.c:1465
 msgid "Unexpected network write error; connection aborted."
@@ -3135,7 +3135,7 @@ msgstr ""
 
 #: WWW/Library/Implementation/HTTP.c:1471
 msgid "HTTP request sent; waiting for response."
-msgstr "�w�i�X HTTP �n�D�F���b���ݦ^���C"
+msgstr "已進出 HTTP 要求;正在等待回應。"
 
 #: WWW/Library/Implementation/HTTP.c:1539
 msgid "Unexpected network read error; connection aborted."
@@ -3172,7 +3172,7 @@ msgstr ""
 #.
 #: WWW/Library/Implementation/HTTP.c:1884
 msgid "Got unexpected 304 Not Modified status."
-msgstr "�X�{�w�Ƥ��~�� 304 Not Modified ���A�C"
+msgstr "出現預料之外的 304 Not Modified 狀態。"
 
 #: WWW/Library/Implementation/HTTP.c:1947
 msgid "Redirection of POST content requires user approval."
@@ -3188,11 +3188,11 @@ msgstr ""
 
 #: WWW/Library/Implementation/HTTP.c:2016
 msgid "Show the 401 message body?"
-msgstr "�O�_��� 401 ���~�T���������e�H"
+msgstr "是否顯示 401 錯誤訊息的網頁內容?"
 
 #: WWW/Library/Implementation/HTTP.c:2059
 msgid "Show the 407 message body?"
-msgstr "�O�_��� 407 ���~�T���������e�H"
+msgstr "是否顯示 407 錯誤訊息的網頁內容?"
 
 #.
 #. * Bad or unknown server_status number.  Take a chance and hope
@@ -3200,7 +3200,7 @@ msgstr "
 #.
 #: WWW/Library/Implementation/HTTP.c:2159
 msgid "Unknown status reply from server!"
-msgstr "���A���o�X���������A�^���T���I"
+msgstr "伺服器發出不明的狀態回應訊息!"
 
 #: WWW/Library/Implementation/HTTelnet.c:113
 #, c-format
@@ -3209,11 +3209,11 @@ msgstr ""
 
 #: WWW/Library/Implementation/HTWAIS.c:162
 msgid "Could not connect to WAIS server."
-msgstr "�L�k�p�� WAIS ���A���C"
+msgstr "無法聯絡 WAIS 伺服器。"
 
 #: WWW/Library/Implementation/HTWAIS.c:170
 msgid "Could not open WAIS connection for reading."
-msgstr "�L�k�}�� WAIS �s�u��Ū����ơC"
+msgstr "無法開啟 WAIS 連線來讀取資料。"
 
 #: WWW/Library/Implementation/HTWAIS.c:192
 msgid "Diagnostic code is "
@@ -3274,15 +3274,15 @@ msgstr ""
 
 #: WWW/Library/Implementation/HTWAIS.c:696
 msgid "Syntax error in WAIS URL"
-msgstr "WAIS URL ���X�{�y�k���~"
+msgstr "WAIS URL 中出現語法錯誤"
 
 #: WWW/Library/Implementation/HTWAIS.c:768
 msgid " (WAIS Index)"
-msgstr " (WAIS ����)"
+msgstr " (WAIS 索引)"
 
 #: WWW/Library/Implementation/HTWAIS.c:775
 msgid "WAIS Index: "
-msgstr "WAIS ���ޡG"
+msgstr "WAIS 索引:"
 
 #: WWW/Library/Implementation/HTWAIS.c:781
 msgid "This is a link for searching the "
@@ -3290,7 +3290,7 @@ msgstr ""
 
 #: WWW/Library/Implementation/HTWAIS.c:785
 msgid " WAIS Index.\n"
-msgstr " WAIS ���ޡC\n"
+msgstr " WAIS 索引。\n"
 
 #: WWW/Library/Implementation/HTWAIS.c:814
 msgid ""
@@ -3316,7 +3316,7 @@ msgstr ""
 
 #: WWW/Library/Implementation/HTWAIS.c:873
 msgid "Searching WAIS database..."
-msgstr "���b�j�M WAIS ��Ʈw..."
+msgstr "正在搜尋 WAIS 資料庫..."
 
 #: WWW/Library/Implementation/HTWAIS.c:883
 msgid "Search interrupted."
@@ -3370,35 +3370,35 @@ msgstr ""
 
 #: WWW/Library/Implementation/HTWSRC.c:375
 msgid "Maintainer"
-msgstr "���@��"
+msgstr "維護者"
 
 #: WWW/Library/Implementation/HTWSRC.c:383
 msgid "Host"
-msgstr "�D��"
+msgstr "主機"
 
 #: src/GridText.c:705
 msgid "Memory exhausted, display interrupted!"
-msgstr "�O����ӺɡA�������_��ܡI"
+msgstr "記憶體耗盡,必須中斷顯示!"
 
 #: src/GridText.c:710
 msgid "Memory exhausted, will interrupt transfer!"
-msgstr "�O����ӺɡA�������_�ǿ�I"
+msgstr "記憶體耗盡,必須中斷傳輸!"
 
 #: src/GridText.c:3654
 msgid " *** MEMORY EXHAUSTED ***"
-msgstr "*** �O����Ӻ� ***"
+msgstr "*** 記憶體耗盡 ***"
 
 #: src/GridText.c:6089 src/GridText.c:6096 src/LYList.c:239
 msgid "unknown field or link"
-msgstr "�����������쵲"
+msgstr "不明的欄位或鏈結"
 
 #: src/GridText.c:6105
 msgid "text entry field"
-msgstr "��r��J���"
+msgstr "文字輸入欄位"
 
 #: src/GridText.c:6108
 msgid "password entry field"
-msgstr "�K�X��J���"
+msgstr "密碼輸入欄位"
 
 #: src/GridText.c:6111
 msgid "checkbox"
@@ -3426,7 +3426,7 @@ msgstr ""
 
 #: src/GridText.c:6129
 msgid "text entry area"
-msgstr "��r��J�ϰ�"
+msgstr "文字輸入區域"
 
 #: src/GridText.c:6132
 msgid "range entry field"
@@ -3434,7 +3434,7 @@ msgstr ""
 
 #: src/GridText.c:6135
 msgid "file entry field"
-msgstr "�ɮצW�ٿ�J���"
+msgstr "檔案名稱輸入欄位"
 
 #: src/GridText.c:6138
 msgid "text-submit field"
@@ -3454,7 +3454,7 @@ msgstr ""
 
 #: src/GridText.c:10279
 msgid "Can't open file for uploading"
-msgstr "�L�k�}�ҷdzƤW�Ǫ��ɮ�"
+msgstr "無法開啟準備上傳的檔案"
 
 #: src/GridText.c:11438
 #, c-format
@@ -3469,7 +3469,7 @@ msgstr ""
 #. don't show previous state
 #: src/GridText.c:12628
 msgid "Wrap lines to fit displayed area?"
-msgstr "�O�_�i��۰ʴ���ӲŦX�e���ؤo�H"
+msgstr "是否進行自動換行來符合畫面尺寸?"
 
 #: src/GridText.c:12680
 msgid "Very long lines have been wrapped!"
@@ -3481,7 +3481,7 @@ msgstr ""
 
 #: src/HTAlert.c:164 src/LYShowInfo.c:360 src/LYShowInfo.c:364
 msgid "bytes"
-msgstr "�줸��"
+msgstr "位元組"
 
 #.
 #. * If we know the total size of the file, we can compute
@@ -3490,31 +3490,31 @@ msgstr "
 #: src/HTAlert.c:300 src/HTAlert.c:324
 #, c-format
 msgid "Read %s of data"
-msgstr "�wŪ�� %s ���"
+msgstr "已讀取 %s 資料"
 
 #: src/HTAlert.c:321
 #, c-format
 msgid "Read %s of %s of data"
-msgstr "�wŪ�� %s (�`�� %s) ���"
+msgstr "已讀取 %s (總數 %s) 資料"
 
 #: src/HTAlert.c:330
 #, c-format
 msgid ", %s/sec"
-msgstr "�A�C�� %s"
+msgstr ",每秒 %s"
 
 #: src/HTAlert.c:342
 #, c-format
 msgid " (stalled for %s)"
-msgstr " (����F %s)"
+msgstr " (停止了 %s)"
 
 #: src/HTAlert.c:346
 #, c-format
 msgid ", ETA %s"
-msgstr "�A��p %s �᧹��"
+msgstr ",估計 %s 後完成"
 
 #: src/HTAlert.c:368
 msgid " (Press 'z' to abort)"
-msgstr " (����z������)"
+msgstr " (請按‘z’中止)"
 
 #. Meta-note: don't move the following note from its place right
 #. in front of the first gettext().  As it is now, it should
@@ -3571,19 +3571,19 @@ msgstr ""
 
 #: src/HTML.c:5911
 msgid "Description:"
-msgstr "�y�z�G"
+msgstr "描述:"
 
 #: src/HTML.c:5916
 msgid "(none)"
-msgstr "(�L)"
+msgstr "(無)"
 
 #: src/HTML.c:5920
 msgid "Filepath:"
-msgstr "�ɮ׸�|�G"
+msgstr "檔案路徑:"
 
 #: src/HTML.c:5926
 msgid "(unknown)"
-msgstr "(����)"
+msgstr "(不明)"
 
 #: src/HTML.c:7353
 msgid "Document has only hidden links.  Use the 'l'ist command."
@@ -3611,7 +3611,7 @@ msgid ""
 "     You can delete links by the 'R' key<br>\n"
 "<ol>\n"
 msgstr ""
-"     �i�H�Ρ�R����R���쵲<br>\n"
+"     可以用‘R’鍵刪除鏈結<br>\n"
 "<ol>\n"
 
 #: src/LYBookmark.c:374
@@ -3620,16 +3620,16 @@ msgid ""
 "     the 'R' key but may have been remapped by you or your system\n"
 "     administrator."
 msgstr ""
-"     �դU�i�H�ϥβ������Ҫ����O�ӧR���쵲�C�q�`�O�Ρ�R����A���դU�κ޲z���]\n"
-"     ���i��|�N�����s�w�q���䥦����C"
+"     閣下可以使用移除書籤的指令來刪除鏈結。通常是用‘R’鍵,但閣下或管理員也\n"
+"     有可能會將之重新定義為其它按鍵。"
 
 #: src/LYBookmark.c:378
 msgid ""
 "     This file also may be edited with a standard text editor to delete\n"
 "     outdated or invalid links, or to change their order."
 msgstr ""
-"     ���ɮפ]�i�H�ϥΤ@�몺��r�s�边�s��A�R���L�ɩεL�Ī��쵲�A�Χ��\n"
-"     ���̪����ǡC"
+"     此檔案也可以使用一般的文字編輯器編輯,刪除過時或無效的鏈結,或更改\n"
+"     它們的次序。"
 
 #: src/LYBookmark.c:381
 msgid ""
@@ -3655,11 +3655,11 @@ msgstr ""
 #.
 #: src/LYCgi.c:276
 msgid "Unable to access cgi script"
-msgstr "�L�k�s�� cgi script�C"
+msgstr "無法存取 cgi script。"
 
 #: src/LYCgi.c:701 src/LYCgi.c:704
 msgid "Good Advice"
-msgstr "��ij"
+msgstr "建議"
 
 #: src/LYCgi.c:708
 msgid "An excellent http server for VMS is available via"
@@ -3675,7 +3675,7 @@ msgstr ""
 
 #: src/LYClean.c:122
 msgid "Exiting via interrupt:"
-msgstr "�]�H�U�����_�T�������}�{���G"
+msgstr "因以下的中斷訊號而離開程式:"
 
 #: src/LYCookie.c:2461
 msgid "(from a previous session)"
@@ -3687,35 +3687,35 @@ msgstr ""
 
 #: src/LYCookie.c:2562
 msgid "Internal"
-msgstr "����"
+msgstr "內部"
 
 #: src/LYCookie.c:2563
 msgid "cookie_domain_flag_set error, aborting program"
-msgstr "cookie_domain_flag_set ���~�A����{��"
+msgstr "cookie_domain_flag_set 錯誤,中止程式"
 
 #: src/LYCurses.c:1088
 msgid "Terminal initialisation failed - unknown terminal type?"
-msgstr "�L�k��l�Ʋ׺ݾ� �w �׺ݾ��������ԡH"
+msgstr "無法初始化終端機 ─ 終端機類型不詳?"
 
 #: src/LYCurses.c:1546
 msgid "Terminal ="
-msgstr "�׺ݾ����� ="
+msgstr "終端機類型 ="
 
 #: src/LYCurses.c:1550
 msgid "You must use a vt100, 200, etc. terminal with this program."
-msgstr "�ϥΥ��{���ɲ׺ݾ������������O vt100�B200 �����C"
+msgstr "使用本程式時終端機的類型必須是 vt100、200 等等。"
 
 #: src/LYCurses.c:1599
 msgid "Your Terminal type is unknown!"
-msgstr "�׺ݾ����������I"
+msgstr "終端機類型不明!"
 
 #: src/LYCurses.c:1600
 msgid "Enter a terminal type:"
-msgstr "�п�J�׺ݾ������G"
+msgstr "請輸入終端機類型:"
 
 #: src/LYCurses.c:1614
 msgid "TERMINAL TYPE IS SET TO"
-msgstr "�׺ݾ������w�]�w��"
+msgstr "終端機類型已設定為"
 
 #: src/LYCurses.c:2127
 #, c-format
@@ -3724,7 +3724,7 @@ msgid ""
 "A Fatal error has occurred in %s Ver. %s\n"
 msgstr ""
 "\n"
-"�b %s ���� %s �X�{�Y�����~\n"
+"在 %s 版本 %s 出現嚴重錯誤\n"
 
 #: src/LYCurses.c:2130
 #, c-format
@@ -3737,10 +3737,10 @@ msgid ""
 "TRACEBACK if it can be captured, and any other relevant information.\n"
 msgstr ""
 "\n"
-"�гq���t�κ޲z���T�{�{���O�_�X�{���~�A�p�G���׬O�֩w���A�бN���i\n"
-"�H�� lynx-dev �q�l�׾¡C���~���i�����Ӫ��W�ޭP���D�X�{�����O��/��\n"
-"URL ���ǽT�y�z�B�@�~�t�ΤΨ䪩���BTCPIP �����B���~���l�ܬ��� (�p�G\n"
-"�i�H�������)�A�Ψ䥦������T�C\n"
+"請通知系統管理員確認程式是否出現錯誤,如果答案是肯定的,請將報告\n"
+"寄給 lynx-dev 電郵論壇。錯誤報告中應該附上引致問題出現的指令及/或\n"
+"URL 的準確描述、作業系統及其版本、TCPIP 版本、錯誤的追蹤紀錄 (如果\n"
+"可以獲取的話),及其它相關資訊。\n"
 
 #: src/LYEdit.c:266
 #, c-format
@@ -3749,53 +3749,53 @@ msgstr ""
 
 #: src/LYEdit.c:269
 msgid "Editor killed by signal"
-msgstr "�s�边�]�T���Ӥ���"
+msgstr "編輯器因訊號而中止"
 
 #: src/LYEdit.c:274
 #, fuzzy, c-format
 msgid "Editor returned with error status %s"
-msgstr "�s�边���^�ǿ��~���A�A%s"
+msgstr "編輯器的回傳錯誤狀態,%s"
 
 #: src/LYDownload.c:504
 msgid "Downloaded link:"
-msgstr "�w�U�����쵲�G"
+msgstr "已下載的鏈結:"
 
 #: src/LYDownload.c:509
 msgid "Suggested file name:"
-msgstr "��ij���ɮצW�١G"
+msgstr "建議的檔案名稱:"
 
 #: src/LYDownload.c:514
 msgid "Standard download options:"
-msgstr "�зǪ��U���B�z�覡�G"
+msgstr "標準的下載處理方式:"
 
 #: src/LYDownload.c:515
 msgid "Download options:"
-msgstr "�U���ﶵ�G"
+msgstr "下載選項:"
 
 #: src/LYDownload.c:531
 msgid "Save to disk"
-msgstr "�x�s�ܺϺ�"
+msgstr "儲存至磁碟"
 
 #: src/LYDownload.c:545
 #, fuzzy
 msgid "View temporary file"
-msgstr "�L�k�}�ҼȦs�ɡI"
+msgstr "無法開啟暫存檔!"
 
 #: src/LYDownload.c:552
 msgid "Save to disk disabled."
-msgstr "�T��N���e�x�s�ܺϺСC"
+msgstr "禁止將內容儲存至磁碟。"
 
 #: src/LYDownload.c:556 src/LYPrint.c:1310
 msgid "Local additions:"
-msgstr "�B�~���B�z�覡�G"
+msgstr "額外的處理方式:"
 
 #: src/LYDownload.c:567 src/LYUpload.c:211
 msgid "No Name Given"
-msgstr "�����w�W��"
+msgstr "未指定名稱"
 
 #: src/LYHistory.c:672
 msgid "You selected:"
-msgstr "�п�ܡG"
+msgstr "請選擇:"
 
 #: src/LYHistory.c:696 src/LYHistory.c:925
 msgid "(no address)"
@@ -3831,15 +3831,15 @@ msgstr ""
 
 #: src/LYLeaks.c:225 src/LYLeaks.c:263
 msgid "Pointer:"
-msgstr "Pointer�G"
+msgstr "Pointer:"
 
 #: src/LYLeaks.c:234 src/LYLeaks.c:241 src/LYLeaks.c:282
 msgid "FileName:"
-msgstr "�ɮצW�١G"
+msgstr "檔案名稱:"
 
 #: src/LYLeaks.c:237 src/LYLeaks.c:244 src/LYLeaks.c:285 src/LYLeaks.c:296
 msgid "LineCount:"
-msgstr "��ơG"
+msgstr "行數:"
 
 #: src/LYLeaks.c:258
 msgid "Memory leak detected."
@@ -3879,19 +3879,19 @@ msgstr ""
 
 #: src/LYList.c:84
 msgid "References in "
-msgstr "�H�U���쵲�ݩ���G"
+msgstr "以下的鏈結屬於網頁:"
 
 #: src/LYList.c:87
 msgid "this document:"
-msgstr "(�a�}����)"
+msgstr "(地址不明)"
 
 #: src/LYList.c:93
 msgid "Visible links:"
-msgstr "�����ê��쵲�G"
+msgstr "不隱藏的鏈結:"
 
 #: src/LYList.c:194 src/LYList.c:295
 msgid "Hidden links:"
-msgstr "���ê��쵲�G"
+msgstr "隱藏的鏈結:"
 
 #: src/LYList.c:332
 msgid "References"
@@ -3899,31 +3899,31 @@ msgstr ""
 
 #: src/LYList.c:336
 msgid "Visible links"
-msgstr "�����ê��쵲"
+msgstr "不隱藏的鏈結"
 
 #: src/LYLocal.c:271
 #, c-format
 msgid "Unable to get status of '%s'."
-msgstr "�L�k�����%s�������A�C"
+msgstr "無法獲取‘%s’的狀態。"
 
 #: src/LYLocal.c:305
 msgid "The selected item is not a file or a directory!  Request ignored."
-msgstr "��������ؤ��O�ɮשΥؿ��I�����ӭn�D�C"
+msgstr "選取的項目不是檔案或目錄!忽略該要求。"
 
 #: src/LYLocal.c:373
 #, c-format
 msgid "Unable to %s due to system error!"
-msgstr "�]���t�ο��~�ӵL�k%s�I"
+msgstr "因為系統錯誤而無法%s!"
 
 #: src/LYLocal.c:407
 #, c-format
 msgid "Probable failure to %s due to system error!"
-msgstr "�i��]���t�ο��~�ӵL�k%s�I"
+msgstr "可能因為系統錯誤而無法%s!"
 
 #: src/LYLocal.c:469 src/LYLocal.c:490
 #, c-format
 msgid "remove %s"
-msgstr "���� %s"
+msgstr "移除 %s"
 
 #: src/LYLocal.c:508
 #, c-format
@@ -3933,63 +3933,63 @@ msgstr ""
 #: src/LYLocal.c:536
 #, c-format
 msgid "move %s to %s"
-msgstr "�N %s ���ʦ� %s"
+msgstr "將 %s 移動至 %s"
 
 #: src/LYLocal.c:577
 msgid "There is already a directory with that name!  Request ignored."
-msgstr "�P�@�W�٪��ؿ��w�g�s�b�I�����ӭn�D�C"
+msgstr "同一名稱的目錄已經存在!忽略該要求。"
 
 #: src/LYLocal.c:579
 msgid "There is already a file with that name!  Request ignored."
-msgstr "�P�@�W�٪��ɮפw�g�s�b�I�����ӭn�D�C"
+msgstr "同一名稱的檔案已經存在!忽略該要求。"
 
 #: src/LYLocal.c:581
 msgid "The specified name is already in use!  Request ignored."
-msgstr "���w���ɮפw�b�ϥΤ��I�����ӭn�D�C"
+msgstr "指定的檔案已在使用中!忽略該要求。"
 
 #: src/LYLocal.c:592
 msgid "Destination has different owner!  Request denied."
-msgstr "�ت��a���֦��̤��P�I�ڵ��ӭn�D�C"
+msgstr "目的地的擁有者不同!拒絕該要求。"
 
 #: src/LYLocal.c:595
 msgid "Destination is not a valid directory!  Request denied."
-msgstr "�ت��a���O���Ī��ؿ��I�ڵ��ӭn�D�C"
+msgstr "目的地不是有效的目錄!拒絕該要求。"
 
 #: src/LYLocal.c:617
 msgid "Remove all tagged files and directories?"
-msgstr "�T�w�����Ҧ��[�W�аO���ɮפΥؿ��H"
+msgstr "確定移除所有加上標記的檔案及目錄?"
 
 #: src/LYLocal.c:675
 msgid "Enter new location for tagged items: "
-msgstr "��J�[�W�аO�����ت��s��m�G"
+msgstr "輸入加上標記的項目的新位置:"
 
 #: src/LYLocal.c:745
 msgid "Path too long"
-msgstr "��|�L��"
+msgstr "路徑過長"
 
 #: src/LYLocal.c:776
 msgid "Source and destination are the same location - request ignored!"
-msgstr "�ӷ��Υت��a��m�ۦP �w �����ӭn�D�I"
+msgstr "來源及目的地位置相同 ─ 忽略該要求!"
 
 #: src/LYLocal.c:833
 msgid "Enter new name for directory: "
-msgstr "��J�ؿ����s�W�١G"
+msgstr "輸入目錄的新名稱:"
 
 #: src/LYLocal.c:835
 msgid "Enter new name for file: "
-msgstr "��J�ɮת��s�W�١G"
+msgstr "輸入檔案的新名稱:"
 
 #: src/LYLocal.c:847
 msgid "Illegal character (path-separator) found! Request ignored."
-msgstr "�X�{���X�k���r�� (��|���j�r��)�I�����ӭn�D�C"
+msgstr "出現不合法的字元 (路徑分隔字元)!忽略該要求。"
 
 #: src/LYLocal.c:897
 msgid "Enter new location for directory: "
-msgstr "��J�ؿ����s��m�G"
+msgstr "輸入目錄的新位置:"
 
 #: src/LYLocal.c:903
 msgid "Enter new location for file: "
-msgstr "��J�ɮת��s��m�G"
+msgstr "輸入檔案的新位置:"
 
 #: src/LYLocal.c:930
 msgid "Unexpected failure - unable to find trailing path separator"
@@ -3997,66 +3997,66 @@ msgstr ""
 
 #: src/LYLocal.c:950
 msgid "Source and destination are the same location!  Request ignored!"
-msgstr "�ӷ��Υت��a��m�ۦP�I�����ӭn�D�I"
+msgstr "來源及目的地位置相同!忽略該要求!"
 
 #: src/LYLocal.c:997
 msgid "Modify name, location, or permission (n, l, or p): "
-msgstr "�ק�W�١B��m���v�� (n�Bl �� p)�G"
+msgstr "修改名稱、位置或權限 (n、l 或 p):"
 
 #: src/LYLocal.c:999
 msgid "Modify name or location (n or l): "
-msgstr "�ק�W�٩Φ�m (n �� l)�G"
+msgstr "修改名稱或位置 (n 或 l):"
 
 #.
 #. * Code for changing ownership needed here.
 #.
 #: src/LYLocal.c:1028
 msgid "This feature not yet implemented!"
-msgstr "���\�ऴ�������I"
+msgstr "此功能仍未完成!"
 
 #: src/LYLocal.c:1048
 msgid "Enter name of file to create: "
-msgstr "��J�dzƫإߪ��ɮצW�١G"
+msgstr "輸入準備建立的檔案名稱:"
 
 #: src/LYLocal.c:1052 src/LYLocal.c:1088
 msgid "Illegal redirection \"//\" found! Request ignored."
-msgstr "�X�{���X�k�����s�ɦV \"//\"�I�����ӭn�D�C"
+msgstr "出現不合法的重新導向 \"//\"!忽略該要求。"
 
 #: src/LYLocal.c:1084
 msgid "Enter name for new directory: "
-msgstr "��J�s�ؿ����W�١G"
+msgstr "輸入新目錄的名稱:"
 
 #: src/LYLocal.c:1124
 msgid "Create file or directory (f or d): "
-msgstr "�إ��ɮשΥؿ� (f �� d)�G"
+msgstr "建立檔案或目錄 (f 或 d):"
 
 #: src/LYLocal.c:1166
 #, fuzzy, c-format
 msgid "Remove directory '%s'?"
-msgstr "�O�_�����ɮס�%s���H"
+msgstr "是否移除檔案‘%s’?"
 
 #: src/LYLocal.c:1169
 #, fuzzy
 msgid "Remove directory?"
-msgstr " �ؿ�"
+msgstr " 目錄"
 
 #: src/LYLocal.c:1174
 #, c-format
 msgid "Remove file '%s'?"
-msgstr "�O�_�����ɮס�%s���H"
+msgstr "是否移除檔案‘%s’?"
 
 #: src/LYLocal.c:1176
 msgid "Remove file?"
-msgstr "�O�_�����ɮסH"
+msgstr "是否移除檔案?"
 
 #: src/LYLocal.c:1181
 #, c-format
 msgid "Remove symbolic link '%s'?"
-msgstr "�O�_�����Ÿ��s����%s���H"
+msgstr "是否移除符號連結‘%s’?"
 
 #: src/LYLocal.c:1183
 msgid "Remove symbolic link?"
-msgstr "�O�_�����Ÿ��s���H"
+msgstr "是否移除符號連結?"
 
 #: src/LYLocal.c:1278
 msgid "Sorry, don't know how to permit non-UNIX files yet."
@@ -4068,19 +4068,19 @@ msgstr ""
 
 #: src/LYLocal.c:1338
 msgid "Specify permissions below:"
-msgstr "���w�H�U���v���G"
+msgstr "請指定以下的權限:"
 
 #: src/LYLocal.c:1339 src/LYShowInfo.c:261
 msgid "Owner:"
-msgstr "�֦��̡G"
+msgstr "擁有者:"
 
 #: src/LYLocal.c:1355
 msgid "Group"
-msgstr "���ݸs��"
+msgstr "所屬群組"
 
 #: src/LYLocal.c:1371
 msgid "Others:"
-msgstr "�䥦�G"
+msgstr "其它:"
 
 #: src/LYLocal.c:1389
 msgid "form to permit"
@@ -4092,11 +4092,11 @@ msgstr ""
 
 #: src/LYLocal.c:1488
 msgid "Invalid syntax format."
-msgstr "�L�Ī��y�k�榡�C"
+msgstr "無效的語法格式。"
 
 #: src/LYLocal.c:1670
 msgid "Warning!  UUDecoded file will exist in the directory you started Lynx."
-msgstr "ĵ�i�I�w�g UUDecode ���ɮ׷|��b���� Lynx �ɪ��ؿ��C"
+msgstr "警告!已經 UUDecode 的檔案會放在執行 Lynx 時的目錄。"
 
 #: src/LYLocal.c:1860
 msgid "NULL URL pointer"
@@ -4105,35 +4105,35 @@ msgstr ""
 #: src/LYLocal.c:1942
 #, c-format
 msgid "Executing %s "
-msgstr "���b���� %s "
+msgstr "正在執行 %s "
 
 #: src/LYLocal.c:1945
 msgid "Executing system command. This might take a while."
-msgstr "���b����t�Ϋ��O�C�i��ݭn�y���@�q�ɶ��C"
+msgstr "正在執行系統指令。可能需要稍等一段時間。"
 
 #: src/LYLocal.c:2017
 msgid "Current directory:"
-msgstr "�ثe���ؿ��G"
+msgstr "目前的目錄:"
 
 #: src/LYLocal.c:2020 src/LYLocal.c:2038
 msgid "Current selection:"
-msgstr "�ثe��ܪ����ءG"
+msgstr "目前選擇的項目:"
 
 #: src/LYLocal.c:2024
 msgid "Nothing currently selected."
-msgstr "�������󶵥ءC"
+msgstr "未選取任何項目。"
 
 #: src/LYLocal.c:2040
 msgid "tagged item:"
-msgstr "�ӥ[�W�аO�����ءG"
+msgstr "個加上標記的項目:"
 
 #: src/LYLocal.c:2041
 msgid "tagged items:"
-msgstr "�ӥ[�W�аO�����ءG"
+msgstr "個加上標記的項目:"
 
 #: src/LYLocal.c:2138 src/LYLocal.c:2149
 msgid "Illegal filename; request ignored."
-msgstr "���X�k���ɮצW�١F�����ӭn�D�C"
+msgstr "不合法的檔案名稱;忽略該要求。"
 
 #. directory not writable
 #: src/LYLocal.c:2247 src/LYLocal.c:2306
@@ -4142,11 +4142,11 @@ msgstr ""
 
 #: src/LYLocal.c:2302
 msgid "The selected item is not a directory!  Request ignored."
-msgstr "��������ؤ��O�ؿ��I�����ӭn�D�C"
+msgstr "選取的項目不是目錄!忽略該要求。"
 
 #: src/LYLocal.c:2311
 msgid "Just a moment, ..."
-msgstr "�еy���A..."
+msgstr "請稍等,..."
 
 #: src/LYLocal.c:2328
 msgid "Error building install args"
@@ -4155,7 +4155,7 @@ msgstr ""
 #: src/LYLocal.c:2343 src/LYLocal.c:2374
 #, c-format
 msgid "Source and target are the same: %s"
-msgstr "�ӷ��Υت��a�ۦP�G%s"
+msgstr "來源及目的地相同:%s"
 
 #: src/LYLocal.c:2350 src/LYLocal.c:2381
 #, c-format
@@ -4164,7 +4164,7 @@ msgstr ""
 
 #: src/LYLocal.c:2399
 msgid "Installation complete"
-msgstr "�w�˧���"
+msgstr "安裝完成"
 
 #: src/LYLocal.c:2586
 msgid "Temporary URL or list would be too long."
@@ -4207,15 +4207,15 @@ msgstr ""
 
 #: src/LYMain.c:1023
 msgid "No Winsock found, sorry."
-msgstr "�䤣�� Winsock�A��p�C"
+msgstr "找不到 Winsock,抱歉。"
 
 #: src/LYMain.c:1226
 msgid "You MUST define a valid TMP or TEMP area!"
-msgstr "�դU *����* ���w���Ī� TMP �� TEMP ��m�I"
+msgstr "閣下 *必須* 指定有效的 TMP 或 TEMP 位置!"
 
 #: src/LYMain.c:1279 src/LYMainLoop.c:5074
 msgid "No such directory"
-msgstr "�ӥؿ����s�b"
+msgstr "該目錄不存在"
 
 #: src/LYMain.c:1464
 #, c-format
@@ -4225,7 +4225,7 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"�]�w�� %s ���s�b�C\n"
+"設定檔 %s 不存在。\n"
 "\n"
 
 #: src/LYMain.c:1474
@@ -4236,7 +4236,7 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"���ŧi Lynx �ҥΪ��r�����C\n"
+"未宣告 Lynx 所用的字元集。\n"
 "\n"
 
 #: src/LYMain.c:1503
@@ -4255,7 +4255,7 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Lynx �ɮ� %s ���s�b�C\n"
+"Lynx 檔案 %s 不存在。\n"
 "\n"
 
 #: src/LYMain.c:1654
@@ -4270,7 +4270,7 @@ msgstr ""
 
 #: src/LYMain.c:1804
 msgid "Warning:"
-msgstr "ĵ�i�G"
+msgstr "警告:"
 
 #: src/LYMain.c:2372
 msgid "persistent cookies state will be changed in next session only."
@@ -4279,17 +4279,17 @@ msgstr ""
 #: src/LYMain.c:2617 src/LYMain.c:2662
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
-msgstr "Lynx�G�����L�k�ѧO���r���� %s\n"
+msgstr "Lynx:忽略無法識別的字元集 %s\n"
 
 #: src/LYMain.c:3181
 #, fuzzy, c-format
 msgid "%s Version %s (%s)"
-msgstr "%s ���� %s (%s)\n"
+msgstr "%s 版本 %s (%s)\n"
 
 #: src/LYMain.c:3219
 #, c-format
 msgid "Built on %s %s %s\n"
-msgstr "�sĶ�� %s %s %s\n"
+msgstr "編譯於 %s %s %s\n"
 
 #: src/LYMain.c:3241
 msgid "Copyrights held by the Lynx Developers Group,"
@@ -4298,31 +4298,31 @@ msgstr ""
 #: src/LYMain.c:3242
 #, fuzzy
 msgid "the University of Kansas, CERN, and other contributors."
-msgstr "���v�Ҧ��GUniversity of Kansas�BCERN �Ψ䥦���^�m�̡C"
+msgstr "版權所有:University of Kansas、CERN 及其它有貢獻者。"
 
 #: src/LYMain.c:3243
 #, fuzzy
 msgid "Distributed under the GNU General Public License (Version 2)."
-msgstr "�ϥ� GNU General Public License �o�G�C"
+msgstr "使用 GNU General Public License 發佈。"
 
 #: src/LYMain.c:3244
 msgid "See http://lynx.isc.org/ and the online help for more information."
-msgstr "�Y�ݭn��h��ơA���s�� http://lynx.isc.org/ �κ�W���������C"
+msgstr "若需要更多資料,請瀏覽 http://lynx.isc.org/ 及網上的說明文件。"
 
 #: src/LYMain.c:4065
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
-msgstr "�Ϊk�G%s [�ﶵ] [�ɮ�]\n"
+msgstr "用法:%s [選項] [檔案]\n"
 
 #: src/LYMain.c:4066
 #, c-format
 msgid "Options are:\n"
-msgstr "�ﶵ�]�A�G\n"
+msgstr "選項包括:\n"
 
 #: src/LYMain.c:4365
 #, c-format
 msgid "%s: Invalid Option: %s\n"
-msgstr "%s�G�L�Ī��ﶵ�G%s\n"
+msgstr "%s:無效的選項:%s\n"
 
 #: src/LYMainLoop.c:594
 #, c-format
@@ -4331,7 +4331,7 @@ msgstr ""
 
 #: src/LYMainLoop.c:714 src/LYMainLoop.c:5096
 msgid "A URL specified by the user"
-msgstr "�ѨϥΪ̫��w�� URL"
+msgstr "由使用者指定的 URL"
 
 #: src/LYMainLoop.c:1173
 msgid "Enctype multipart/form-data not yet supported!  Cannot submit."
@@ -4342,7 +4342,7 @@ msgstr ""
 #.
 #: src/LYMainLoop.c:3105
 msgid "Help Screen"
-msgstr "�D�U�����e��"
+msgstr "求助說明畫面"
 
 #: src/LYMainLoop.c:3226
 msgid "System Index"
@@ -4358,28 +4358,28 @@ msgstr ""
 
 #: src/LYMainLoop.c:4139
 msgid "charset for this document specified explicitly, sorry..."
-msgstr "��p�A�Ӥ��w�g�S�a���w�F�r����..."
+msgstr "抱歉,該文件已經特地指定了字元集..."
 
 #: src/LYMainLoop.c:5052
 msgid "cd to:"
-msgstr "�dzƶi�J���ؿ��G"
+msgstr "準備進入的目錄:"
 
 #: src/LYMainLoop.c:5077
 msgid "A component of path is not a directory"
-msgstr "��|�����@�������O�ؿ�"
+msgstr "路徑中的一部份不是目錄"
 
 #: src/LYMainLoop.c:5080
 msgid "failed to change directory"
-msgstr "�L�k�i�J�ؿ�"
+msgstr "無法進入目錄"
 
 #: src/LYMainLoop.c:6252
 msgid "Reparsing document under current settings..."
-msgstr "�ھڥثe���]�w���s���R���..."
+msgstr "根據目前的設定重新分析文件..."
 
 #: src/LYMainLoop.c:6543
 #, c-format
 msgid "Fatal error - could not open output file %s\n"
-msgstr "�Y�����~ �w �L�k�}�ҿ�X�� %s\n"
+msgstr "嚴重錯誤 ─ 無法開啟輸出檔 %s\n"
 
 #: src/LYMainLoop.c:6880
 msgid "TABLE center enable."
@@ -4392,7 +4392,7 @@ msgstr ""
 #: src/LYMainLoop.c:6960
 #, fuzzy
 msgid "Current URL is empty."
-msgstr "�ثe���ؿ��G"
+msgstr "目前的目錄:"
 
 #: src/LYMainLoop.c:6962 src/LYUtils.c:1828
 msgid "Copy to clipboard failed."
@@ -4412,11 +4412,11 @@ msgstr ""
 
 #: src/LYMainLoop.c:7664 src/LYMainLoop.c:7834
 msgid "-index-"
-msgstr "�w���ޢw"
+msgstr "─索引─"
 
 #: src/LYMainLoop.c:7774
 msgid "lynx: Can't access startfile"
-msgstr "lynx�G�L�k�s���}�l����"
+msgstr "lynx:無法存取開始的網頁"
 
 #: src/LYMainLoop.c:7786
 msgid "lynx: Start file could not be found or is not text/html or text/plain"
@@ -4424,11 +4424,11 @@ msgstr ""
 
 #: src/LYMainLoop.c:7787
 msgid "      Exiting..."
-msgstr "      �dz����}..."
+msgstr "      準備離開..."
 
 #: src/LYMainLoop.c:7828
 msgid "-more-"
-msgstr "�w�٦����e�w"
+msgstr "─還有內容─"
 
 #. Enable scrolling.
 #: src/LYNews.c:186
@@ -4447,7 +4447,7 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-" �Цb From: ���Y�����ѻդU���q�l�a�}\n"
+" 請在 From: 標頭中提供閣下的電郵地址\n"
 
 #.
 #. * Get the Subject header, offering the current document's title as the
@@ -4461,7 +4461,7 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-" �д��ѩέק� Subject: ���Y\n"
+" 請提供或修改 Subject: 標頭\n"
 
 #: src/LYNews.c:302
 msgid ""
@@ -4471,7 +4471,7 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-" �д��ѩέק� Organization: ���Y\n"
+" 請提供或修改 Organization: 標頭\n"
 
 #.
 #. * Use the built in line editior.
@@ -4484,7 +4484,7 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-" �Цb�H�U����m��J�T���C"
+" 請在以下的位置輸入訊息。"
 
 #: src/LYNews.c:405
 msgid "Message has no original text!"
@@ -4496,7 +4496,7 @@ msgstr ""
 
 #: src/LYOptions.c:767
 msgid "B)ookmark file: "
-msgstr "B)�����ɡG"
+msgstr "B)書籤檔:"
 
 #: src/LYOptions.c:2127 src/LYOptions.c:2134
 msgid "ON"
@@ -4582,7 +4582,7 @@ msgstr ""
 #: src/LYOptions.c:2243
 #, fuzzy
 msgid "Intermediate"
-msgstr "����"
+msgstr "內部"
 
 #: src/LYOptions.c:2244
 msgid "Advanced"
@@ -4624,12 +4624,12 @@ msgstr ""
 #: src/LYOptions.c:2279
 #, fuzzy
 msgid "as links"
-msgstr "�����ê��쵲"
+msgstr "不隱藏的鏈結"
 
 #: src/LYOptions.c:2286
 #, fuzzy
 msgid "show filename"
-msgstr "��ij���ɮצW�١G"
+msgstr "建議的檔案名稱:"
 
 #: src/LYOptions.c:2297
 msgid "STANDARD"
@@ -4642,22 +4642,22 @@ msgstr ""
 #: src/LYOptions.c:2329
 #, fuzzy
 msgid "Directories first"
-msgstr "�ƥؿ��G"
+msgstr "副目錄:"
 
 #: src/LYOptions.c:2330
 #, fuzzy
 msgid "Files first"
-msgstr " (��������)"
+msgstr " (首先測試)"
 
 #: src/LYOptions.c:2331
 #, fuzzy
 msgid "Mixed style"
-msgstr "��r�s��Ҧ�"
+msgstr "文字編輯模式"
 
 #: src/LYOptions.c:2339 src/LYOptions.c:2359
 #, fuzzy
 msgid "By Name"
-msgstr "�W�١G"
+msgstr "名稱:"
 
 #: src/LYOptions.c:2340 src/LYOptions.c:2360
 msgid "By Type"
@@ -4670,7 +4670,7 @@ msgstr ""
 #: src/LYOptions.c:2342 src/LYOptions.c:2362
 #, fuzzy
 msgid "By Date"
-msgstr "����G"
+msgstr "日期:"
 
 #: src/LYOptions.c:2343
 msgid "By Mode"
@@ -4683,7 +4683,7 @@ msgstr ""
 #: src/LYOptions.c:2346
 #, fuzzy
 msgid "By Group"
-msgstr "���ݸs��"
+msgstr "所屬群組"
 
 #: src/LYOptions.c:2371
 msgid "Do not show rate"
@@ -4692,7 +4692,7 @@ msgstr ""
 #: src/LYOptions.c:2372 src/LYOptions.c:2373
 #, fuzzy, c-format
 msgid "Show %s/sec rate"
-msgstr "��ܶǿ�t�v"
+msgstr "顯示傳輸速率"
 
 #: src/LYOptions.c:2375 src/LYOptions.c:2376
 #, c-format
@@ -4702,7 +4702,7 @@ msgstr ""
 #: src/LYOptions.c:2379
 #, fuzzy
 msgid "Show progressbar"
-msgstr "��ܱ��ʦC"
+msgstr "顯示捲動列"
 
 #: src/LYOptions.c:2391
 msgid "Accept lynx's internal types"
@@ -4723,7 +4723,7 @@ msgstr ""
 #: src/LYOptions.c:2395
 #, fuzzy
 msgid "Accept all types"
-msgstr "�������"
+msgstr "接受更改"
 
 #: src/LYOptions.c:2404
 msgid "gzip"
@@ -4756,23 +4756,23 @@ msgstr ""
 
 #: src/LYOptions.c:3485
 msgid "General Preferences"
-msgstr "�@�밾�n�]�w"
+msgstr "一般偏好設定"
 
 #. ***************************************************************
 #. User Mode: SELECT
 #: src/LYOptions.c:3489
 msgid "User mode"
-msgstr "�ϥΪ̼Ҧ�"
+msgstr "使用者模式"
 
 #. Editor: INPUT
 #: src/LYOptions.c:3495
 msgid "Editor"
-msgstr "�s�边"
+msgstr "編輯器"
 
 #. Search Type: SELECT
 #: src/LYOptions.c:3500
 msgid "Type of Search"
-msgstr "�j�M�覡"
+msgstr "搜尋方式"
 
 #: src/LYOptions.c:3505
 msgid "Security and Privacy"
@@ -4796,56 +4796,56 @@ msgstr ""
 
 #: src/LYOptions.c:3536
 msgid "Keyboard Input"
-msgstr "��L��J"
+msgstr "鍵盤輸入"
 
 #. ***************************************************************
 #. Keypad Mode: SELECT
 #: src/LYOptions.c:3540
 msgid "Keypad mode"
-msgstr "�Ʀr��L�Ҧ�"
+msgstr "數字鍵盤模式"
 
 #. Emacs keys: ON/OFF
 #: src/LYOptions.c:3546
 msgid "Emacs keys"
-msgstr "Emacs �զX��"
+msgstr "Emacs 組合鍵"
 
 #. VI Keys: ON/OFF
 #: src/LYOptions.c:3552
 msgid "VI keys"
-msgstr "VI �զX��"
+msgstr "VI 組合鍵"
 
 #. Line edit style: SELECT
 #. well, at least 2 line edit styles available
 #: src/LYOptions.c:3559
 msgid "Line edit style"
-msgstr "��r�s��Ҧ�"
+msgstr "文字編輯模式"
 
 #. Keyboard layout: SELECT
 #: src/LYOptions.c:3571
 msgid "Keyboard layout"
-msgstr "��L�t�m"
+msgstr "鍵盤配置"
 
 #.
 #. * Display and Character Set
 #.
 #: src/LYOptions.c:3585
 msgid "Display and Character Set"
-msgstr "��ܤΦr����"
+msgstr "顯示及字元集"
 
 #. Use locale-based character set: ON/OFF
 #: src/LYOptions.c:3590
 #, fuzzy
 msgid "Use locale-based character set"
-msgstr "��ƪ��r����"
+msgstr "後備的字元集"
 
 #. Display Character Set: SELECT
 #: src/LYOptions.c:3599
 msgid "Display character set"
-msgstr "�w�]��ܪ��r����"
+msgstr "預設顯示的字元集"
 
 #: src/LYOptions.c:3630
 msgid "Assumed document character set"
-msgstr "��ƪ��r����"
+msgstr "後備的字元集"
 
 #.
 #. * Since CJK people hardly mixed with other world
@@ -4854,43 +4854,43 @@ msgstr "
 #.
 #: src/LYOptions.c:3650
 msgid "CJK mode"
-msgstr "CJK �Ҧ�"
+msgstr "CJK 模式"
 
 #: src/LYOptions.c:3652
 msgid "Raw 8-bit"
-msgstr "8-bit ��l�Ҧ�"
+msgstr "8-bit 原始模式"
 
 #. X Display: INPUT
 #: src/LYOptions.c:3660
 msgid "X Display"
-msgstr "X �e��"
+msgstr "X 畫面"
 
 #.
 #. * Document Appearance
 #.
 #: src/LYOptions.c:3666
 msgid "Document Appearance"
-msgstr "���~�["
+msgstr "文件外觀"
 
 #: src/LYOptions.c:3672
 msgid "Show color"
-msgstr "��ܦ�m"
+msgstr "顯示色彩"
 
 #. Show cursor: ON/OFF
 #: src/LYOptions.c:3696
 msgid "Show cursor"
-msgstr "��ܴ��"
+msgstr "顯示游標"
 
 #. Underline links: ON/OFF
 #: src/LYOptions.c:3702
 #, fuzzy
 msgid "Underline links"
-msgstr "���ê��쵲�G"
+msgstr "隱藏的鏈結:"
 
 #. Show scrollbar: ON/OFF
 #: src/LYOptions.c:3709
 msgid "Show scrollbar"
-msgstr "��ܱ��ʦC"
+msgstr "顯示捲動列"
 
 #. Select Popups: ON/OFF
 #: src/LYOptions.c:3716
@@ -4905,63 +4905,63 @@ msgstr ""
 #. Show Images: SELECT
 #: src/LYOptions.c:3728
 msgid "Show images"
-msgstr "��ܹϹ�"
+msgstr "顯示圖像"
 
 #. Verbose Images: ON/OFF
 #: src/LYOptions.c:3742
 msgid "Verbose images"
-msgstr "�Ϲ��ԲӸ��"
+msgstr "圖像詳細資料"
 
 #.
 #. * Headers Transferred to Remote Servers
 #.
 #: src/LYOptions.c:3750
 msgid "Headers Transferred to Remote Servers"
-msgstr "�ǰe�ܻ��ݦ��A�������Y���"
+msgstr "傳送至遠端伺服器的標頭資料"
 
 #. ***************************************************************
 #. Mail Address: INPUT
 #: src/LYOptions.c:3754
 msgid "Personal mail address"
-msgstr "�ӤH�q�l�a�}"
+msgstr "個人電郵地址"
 
 #: src/LYOptions.c:3760
 #, fuzzy
 msgid "Password for anonymous ftp"
-msgstr "�s�D�եD����%s�����K�X�G"
+msgstr "新聞組主機‘%s’的密碼:"
 
 #. Preferred media type: SELECT
 #: src/LYOptions.c:3766
 #, fuzzy
 msgid "Preferred media type"
-msgstr "�w�ǿ� %d �줸��"
+msgstr "已傳輸 %d 位元組"
 
 #. Preferred encoding: SELECT
 #: src/LYOptions.c:3772
 #, fuzzy
 msgid "Preferred encoding"
-msgstr "�u���ϥΪ��y��"
+msgstr "優先使用的語言"
 
 #. Preferred Document Character Set: INPUT
 #: src/LYOptions.c:3778
 msgid "Preferred document character set"
-msgstr "�u���ϥΪ��r����"
+msgstr "優先使用的字元集"
 
 #. Preferred Document Language: INPUT
 #: src/LYOptions.c:3783
 msgid "Preferred document language"
-msgstr "�u���ϥΪ��y��"
+msgstr "優先使用的語言"
 
 #: src/LYOptions.c:3789
 msgid "User-Agent header"
-msgstr "User-Agent ���Y"
+msgstr "User-Agent 標頭"
 
 #.
 #. * Listing and Accessing Files
 #.
 #: src/LYOptions.c:3797
 msgid "Listing and Accessing Files"
-msgstr "�C�X�Φs���ɮ�"
+msgstr "列出及存取檔案"
 
 #. FTP sort: SELECT
 #: src/LYOptions.c:3802
@@ -4971,21 +4971,21 @@ msgstr ""
 #. FTP sort: SELECT
 #: src/LYOptions.c:3808
 msgid "FTP sort criteria"
-msgstr "FTP ���رƧDZ���"
+msgstr "FTP 項目排序條件"
 
 #. Local Directory Sort: SELECT
 #: src/LYOptions.c:3816
 msgid "Local directory sort criteria"
-msgstr "���a�ݥؿ��ƧDZ���"
+msgstr "本地端目錄排序條件"
 
 #. Local Directory Order: SELECT
 #: src/LYOptions.c:3822
 msgid "Local directory sort order"
-msgstr "���a�ݥؿ��ƦC����"
+msgstr "本地端目錄排列次序"
 
 #: src/LYOptions.c:3831
 msgid "Show dot files"
-msgstr "���������"
+msgstr "顯示隱藏檔"
 
 #: src/LYOptions.c:3839
 msgid "Execution links"
@@ -4994,30 +4994,30 @@ msgstr ""
 #. Show transfer rate: SELECT
 #: src/LYOptions.c:3859
 msgid "Show transfer rate"
-msgstr "��ܶǿ�t�v"
+msgstr "顯示傳輸速率"
 
 #.
 #. * Special Files and Screens
 #.
 #: src/LYOptions.c:3879
 msgid "Special Files and Screens"
-msgstr "�S���ɮפεe��"
+msgstr "特殊檔案及畫面"
 
 #: src/LYOptions.c:3884
 msgid "Multi-bookmarks"
-msgstr "�h�����ɼҦ�"
+msgstr "多書籤檔模式"
 
 #: src/LYOptions.c:3892
 msgid "Review/edit Bookmarks files"
-msgstr "�i�s���νs�������"
+msgstr "可瀏覽或編輯書籤檔"
 
 #: src/LYOptions.c:3894
 msgid "Goto multi-bookmark menu"
-msgstr "�i�J�h�����ɼҦ����"
+msgstr "進入多書籤檔模式選單"
 
 #: src/LYOptions.c:3896
 msgid "Bookmarks file"
-msgstr "������"
+msgstr "書籤檔"
 
 #. Auto Session: ON/OFF
 #: src/LYOptions.c:3903
@@ -5032,7 +5032,7 @@ msgstr ""
 #. Visited Pages: SELECT
 #: src/LYOptions.c:3915
 msgid "Visited Pages"
-msgstr "���g�s������"
+msgstr "曾經瀏覽的網頁"
 
 #: src/LYOptions.c:3920
 msgid "View the file "
@@ -5041,63 +5041,63 @@ msgstr ""
 #: src/LYPrint.c:937
 #, c-format
 msgid " Print job complete.\n"
-msgstr " �����C�L�{�ǡC\n"
+msgstr " 完成列印程序。\n"
 
 #: src/LYPrint.c:1262
 msgid "Document:"
-msgstr "���G"
+msgstr "文件:"
 
 #: src/LYPrint.c:1263
 msgid "Number of lines:"
-msgstr "��ơG"
+msgstr "行數:"
 
 #: src/LYPrint.c:1264
 msgid "Number of pages:"
-msgstr "���ơG"
+msgstr "頁數:"
 
 #: src/LYPrint.c:1265
 msgid "pages"
-msgstr "��"
+msgstr "頁"
 
 #: src/LYPrint.c:1265
 msgid "page"
-msgstr "��"
+msgstr "頁"
 
 #: src/LYPrint.c:1266
 msgid "(approximately)"
-msgstr "(�ʲ���p)"
+msgstr "(粗略估計)"
 
 #: src/LYPrint.c:1273
 msgid "Some print functions have been disabled!"
-msgstr "�w�T��ϥάY�������C�L�\��I"
+msgstr "已禁止使用某部份的列印功能!"
 
 #: src/LYPrint.c:1277
 msgid "Standard print options:"
-msgstr "�зǪ��C�L�B�z�覡�G"
+msgstr "標準的列印處理方式:"
 
 #: src/LYPrint.c:1278
 msgid "Print options:"
-msgstr "�C�L�ﶵ�G"
+msgstr "列印選項:"
 
 #: src/LYPrint.c:1285
 msgid "Save to a local file"
-msgstr "�x�s�ܥ������ɮ�"
+msgstr "儲存至本機的檔案"
 
 #: src/LYPrint.c:1287
 msgid "Save to disk disabled"
-msgstr "�T��N���e�x�s�ܺϺ�"
+msgstr "禁止將內容儲存至磁碟"
 
 #: src/LYPrint.c:1294
 msgid "Mail the file"
-msgstr "�l�H�ɮ�"
+msgstr "郵寄檔案"
 
 #: src/LYPrint.c:1301
 msgid "Print to the screen"
-msgstr "�b�e���L�X���"
+msgstr "在畫面印出資料"
 
 #: src/LYPrint.c:1306
 msgid "Print out on a printer attached to your vt100 terminal"
-msgstr "�b�s�� vt100 �׺ݾ����L����C�L���"
+msgstr "在連接 vt100 終端機的印表機列印資料"
 
 #: src/LYReadCFG.c:371
 #, c-format
@@ -5165,7 +5165,7 @@ msgstr ""
 
 #: src/LYReadCFG.c:2292 src/LYReadCFG.c:2305 src/LYReadCFG.c:2363
 msgid "The following is read from your lynx.cfg file."
-msgstr "�H�U�O�q�դU�� lynx.cfg �ɮ�Ū�����]�w�C"
+msgstr "以下是從閣下的 lynx.cfg 檔案讀取的設定。"
 
 #: src/LYReadCFG.c:2293 src/LYReadCFG.c:2306
 msgid "Please read the distribution"
@@ -5177,43 +5177,43 @@ msgstr ""
 
 #: src/LYReadCFG.c:2345
 msgid "RELOAD THE CHANGES"
-msgstr "���s���J���᪺�]�w"
+msgstr "重新載入更改後的設定"
 
 #: src/LYReadCFG.c:2353
 msgid "Your primary configuration"
-msgstr "�D�n�պA"
+msgstr "主要組態"
 
 #: src/LYShowInfo.c:173
 msgid "Directory that you are currently viewing"
-msgstr "�ثe�s�����ؿ�"
+msgstr "目前瀏覽的目錄"
 
 #: src/LYShowInfo.c:176
 msgid "Name:"
-msgstr "�W�١G"
+msgstr "名稱:"
 
 #: src/LYShowInfo.c:179
 msgid "URL:"
-msgstr "URL�G"
+msgstr "URL:"
 
 #: src/LYShowInfo.c:193
 msgid "Directory that you have currently selected"
-msgstr "�ثe������ؿ�"
+msgstr "目前選取的目錄"
 
 #: src/LYShowInfo.c:195
 msgid "File that you have currently selected"
-msgstr "�ثe������ɮ�"
+msgstr "目前選取的檔案"
 
 #: src/LYShowInfo.c:198
 msgid "Symbolic link that you have currently selected"
-msgstr "�ثe������Ÿ��s��"
+msgstr "目前選取的符號連結"
 
 #: src/LYShowInfo.c:201
 msgid "Item that you have currently selected"
-msgstr "�ثe���������"
+msgstr "目前選取的項目"
 
 #: src/LYShowInfo.c:203
 msgid "Full name:"
-msgstr "����W�١G"
+msgstr "完整名稱:"
 
 #: src/LYShowInfo.c:213
 msgid "Unable to follow link"
@@ -5225,44 +5225,44 @@ msgstr ""
 
 #: src/LYShowInfo.c:220
 msgid "Name of owner:"
-msgstr "�֦��̦W�١G"
+msgstr "擁有者名稱:"
 
 #: src/LYShowInfo.c:223
 msgid "Group name:"
-msgstr "�s�զW�١G"
+msgstr "群組名稱:"
 
 #: src/LYShowInfo.c:225
 msgid "File size:"
-msgstr "�ɮפj�p�G"
+msgstr "檔案大小:"
 
 #: src/LYShowInfo.c:227
 #, fuzzy
 msgid "(bytes)"
-msgstr "�줸��"
+msgstr "位元組"
 
 #.
 #. * Include date and time information.
 #.
 #: src/LYShowInfo.c:232
 msgid "Creation date:"
-msgstr "�s�@����G"
+msgstr "製作日期:"
 
 #: src/LYShowInfo.c:235
 msgid "Last modified:"
-msgstr "�̫�ק�ɶ��G"
+msgstr "最後修改時間:"
 
 #: src/LYShowInfo.c:238
 msgid "Last accessed:"
-msgstr "�̫�s���ɶ��G"
+msgstr "最後存取時間:"
 
 #: src/LYShowInfo.c:244
 msgid "Access Permissions"
-msgstr "�s�����v��"
+msgstr "存取的權限"
 
 #: src/LYShowInfo.c:279
 #, fuzzy
 msgid "Group:"
-msgstr "���ݸs��"
+msgstr "所屬群組"
 
 #: src/LYShowInfo.c:299
 msgid "World:"
@@ -5270,15 +5270,15 @@ msgstr ""
 
 #: src/LYShowInfo.c:306
 msgid "File that you are currently viewing"
-msgstr "�ثe���b�s�����ɮ�"
+msgstr "目前正在瀏覽的檔案"
 
 #: src/LYShowInfo.c:314 src/LYShowInfo.c:418
 msgid "Linkname:"
-msgstr "�쵲�W�١G"
+msgstr "鏈結名稱:"
 
 #: src/LYShowInfo.c:320 src/LYShowInfo.c:335
 msgid "Charset:"
-msgstr "�r�����G"
+msgstr "字元集:"
 
 #: src/LYShowInfo.c:334
 msgid "(assumed)"
@@ -5286,15 +5286,15 @@ msgstr ""
 
 #: src/LYShowInfo.c:341
 msgid "Server:"
-msgstr "���A���G"
+msgstr "伺服器:"
 
 #: src/LYShowInfo.c:344
 msgid "Date:"
-msgstr "����G"
+msgstr "日期:"
 
 #: src/LYShowInfo.c:347
 msgid "Last Mod:"
-msgstr "�̫�ק�G"
+msgstr "最後修改:"
 
 #: src/LYShowInfo.c:352
 msgid "Expires:"
@@ -5314,7 +5314,7 @@ msgstr ""
 
 #: src/LYShowInfo.c:367
 msgid "Language:"
-msgstr "�y���G"
+msgstr "語言:"
 
 #: src/LYShowInfo.c:374
 msgid "Post Data:"
@@ -5326,15 +5326,15 @@ msgstr ""
 
 #: src/LYShowInfo.c:380
 msgid "Owner(s):"
-msgstr "�֦��̡G"
+msgstr "擁有者:"
 
 #: src/LYShowInfo.c:385
 msgid "size:"
-msgstr "�j�p�G"
+msgstr "大小:"
 
 #: src/LYShowInfo.c:387
 msgid "lines"
-msgstr "��"
+msgstr "行"
 
 #: src/LYShowInfo.c:391
 msgid "forms mode"
@@ -5370,11 +5370,11 @@ msgstr ""
 
 #: src/LYShowInfo.c:411
 msgid "mode:"
-msgstr "�Ҧ��G"
+msgstr "模式:"
 
 #: src/LYShowInfo.c:417
 msgid "Link that you currently have selected"
-msgstr "�ثe�w������쵲"
+msgstr "目前已選取的鏈結"
 
 #: src/LYShowInfo.c:426
 msgid "Method:"
@@ -5382,12 +5382,12 @@ msgstr ""
 
 #: src/LYShowInfo.c:430
 msgid "Enctype:"
-msgstr "�s�X�覡�G"
+msgstr "編碼方式:"
 
 #: src/LYShowInfo.c:436
 #, fuzzy
 msgid "Action:"
-msgstr "��m�G"
+msgstr "位置:"
 
 #: src/LYShowInfo.c:441
 msgid "(Form field)"
@@ -5395,12 +5395,12 @@ msgstr ""
 
 #: src/LYShowInfo.c:450
 msgid "No Links on the current page"
-msgstr "�ӭ����S������쵲"
+msgstr "該頁面沒有任何鏈結"
 
 #: src/LYShowInfo.c:455
 #, fuzzy
 msgid "Server Headers:"
-msgstr "���A���G"
+msgstr "伺服器:"
 
 #: src/LYStyle.c:312
 #, c-format
@@ -5419,31 +5419,31 @@ msgstr ""
 
 #: src/LYUpload.c:75
 msgid "ERROR! - upload command is misconfigured"
-msgstr "���~�I�w �������T�a�]�w�ΨӤW���ɮת����O"
+msgstr "錯誤!─ 未有正確地設定用來上傳檔案的指令"
 
 #: src/LYUpload.c:96
 msgid "Illegal redirection \"../\" found! Request ignored."
-msgstr "�X�{���X�k�����s�ɦV��../���I�����ӭn�D�C"
+msgstr "出現不合法的重新導向“../”!忽略該要求。"
 
 #: src/LYUpload.c:99
 msgid "Illegal character \"/\" found! Request ignored."
-msgstr "�X�{���X�k���r����/���I�����ӭn�D�C"
+msgstr "出現不合法的字元“/”!忽略該要求。"
 
 #: src/LYUpload.c:102
 msgid "Illegal redirection using \"~\" found! Request ignored."
-msgstr "�X�{���X�k�ӥB�ϥΡ�~�������s�ɦV�n�D�I�����ӭn�D�C"
+msgstr "出現不合法而且使用“~”的重新導向要求!忽略該要求。"
 
 #: src/LYUpload.c:159
 msgid "Unable to upload file."
-msgstr "�L�k�W���ɮסC"
+msgstr "無法上傳檔案。"
 
 #: src/LYUpload.c:201
 msgid "Upload To:"
-msgstr "�W�ǦܡG"
+msgstr "上傳至:"
 
 #: src/LYUpload.c:202
 msgid "Upload options:"
-msgstr "�W�ǿﶵ�G"
+msgstr "上傳選項:"
 
 #: src/LYUtils.c:1830
 msgid "Download document URL put to clipboard."
@@ -5455,7 +5455,7 @@ msgstr ""
 
 #: src/LYUtils.c:3419
 msgid "Too many tempfiles"
-msgstr "�Ӧh�Ȧs��"
+msgstr "太多暫存檔"
 
 #: src/LYUtils.c:3719
 msgid "unknown restriction"
@@ -5473,11 +5473,11 @@ msgstr ""
 
 #: src/LYUtils.c:5131
 msgid "Cannot find HOME directory"
-msgstr "�䤣��ӤH�ؿ�"
+msgstr "找不到個人目錄"
 
 #: src/LYrcFile.c:16
 msgid "Normally disabled.  See ENABLE_LYNXRC in lynx.cfg\n"
-msgstr "�@�뤣�|�ҥΡC�аѦ� lynx.cfg ���� ENABLE_LYNXRC\n"
+msgstr "一般不會啟用。請參考 lynx.cfg 中的 ENABLE_LYNXRC\n"
 
 #: src/LYrcFile.c:317
 msgid ""
@@ -5565,9 +5565,9 @@ msgid ""
 "  ^B = left    ^F = right\n"
 "will be enabled.\n"
 msgstr ""
-"�p�G�N emacs_keys �]�w����on���A�h�|�ҥΤ@�몺 EMACS ��V����G\n"
-"  ^N = �U��    ^P = �W��\n"
-"  ^B = ����    ^F = �k��\n"
+"如果將 emacs_keys 設定為“on”,則會啟用一般的 EMACS 方向按鍵:\n"
+"  ^N = 下移    ^P = 上移\n"
+"  ^B = 左移    ^F = 右移\n"
 
 #: src/LYrcFile.c:395
 msgid ""
@@ -5854,16 +5854,16 @@ msgid ""
 msgstr ""
 
 #~ msgid "reason unknown."
-#~ msgstr "��]���ԡC"
+#~ msgstr "原因不詳。"
 
 #~ msgid "KB"
 #~ msgstr "KB"
 
 #~ msgid "Remove '%s' and all of its contents?"
-#~ msgstr "������%s���Ψ䤤�Ҧ������e�H"
+#~ msgstr "移除‘%s’及其中所有的內容?"
 
 #~ msgid "Remove directory and all of its contents?"
-#~ msgstr "�����ӥؿ��Ψ䤤�Ҧ������e�H"
+#~ msgstr "移除該目錄及其中所有的內容?"
 
 #~ msgid "Unable to open file management menu file."
-#~ msgstr "�L�k�}���ɮ׺޲z����ɮסC"
+#~ msgstr "無法開啟檔案管理選單檔案。"
diff --git a/src/HTML.c b/src/HTML.c
index c9ab939..63d6720 100644
--- a/src/HTML.c
+++ b/src/HTML.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTML.c,v 1.173 2017/07/04 20:05:01 tom Exp $
+ * $LynxId: HTML.c,v 1.174 2017/07/05 22:48:09 tom Exp $
  *
  *		Structured stream to Rich hypertext converter
  *		============================================
@@ -505,6 +505,8 @@ void HTML_put_character(HTStructured * me, int c)
  */
 void HTML_put_string(HTStructured * me, const char *s)
 {
+    HTChunk *target = NULL;
+
 #ifdef USE_PRETTYSRC
     char *translated_string = NULL;
 #endif
@@ -525,15 +527,15 @@ void HTML_put_string(HTStructured * me, const char *s)
 	break;			/* Do Nothing */
 
     case HTML_TITLE:
-	HTChunkPuts(&me->title, s);
+	target = &me->title;
 	break;
 
     case HTML_STYLE:
-	HTChunkPuts(&me->style_block, s);
+	target = &me->style_block;
 	break;
 
     case HTML_SCRIPT:
-	HTChunkPuts(&me->script, s);
+	target = &me->script;
 	break;
 
     case HTML_PRE:		/* Formatted text */
@@ -547,20 +549,20 @@ void HTML_put_string(HTStructured * me, const char *s)
 	break;
 
     case HTML_OBJECT:
-	HTChunkPuts(&me->object, s);
+	target = &me->object;
 	break;
 
     case HTML_TEXTAREA:
-	HTChunkPuts(&me->textarea, s);
+	target = &me->textarea;
 	break;
 
     case HTML_SELECT:
     case HTML_OPTION:
-	HTChunkPuts(&me->option, s);
+	target = &me->option;
 	break;
 
     case HTML_MATH:
-	HTChunkPuts(&me->math, s);
+	target = &me->math;
 	break;
 
     default:			/* Free format text? */
@@ -651,6 +653,15 @@ void HTML_put_string(HTStructured * me, const char *s)
 	    }			/* for */
 	}
     }				/* end switch */
+
+    if (target != NULL) {
+	if (target->data == s) {
+	    CTRACE((tfp, "BUG: appending chunk to itself: `%.*s'\n",
+		    target->size, target->data));
+	} else {
+	    HTChunkPuts(target, s);
+	}
+    }
 #ifdef USE_PRETTYSRC
     if (psrc_convert_string) {
 	psrc_convert_string = FALSE;
diff --git a/src/LYIcon.rc b/src/LYIcon.rc
index 5e86762..a95fd38 100644
--- a/src/LYIcon.rc
+++ b/src/LYIcon.rc
@@ -1,12 +1,12 @@
-// $LynxId: LYIcon.rc,v 1.30 2017/05/11 21:22:30 tom Exp $
+// $LynxId: LYIcon.rc,v 1.31 2017/07/05 20:13:35 tom Exp $
 
 #include <windows.h>
 
 100	ICON	"../samples/lynx.ico"
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION    2,8,9,1015
-PRODUCTVERSION 2,8,9,1015
+FILEVERSION    2,8,9,1016
+PRODUCTVERSION 2,8,9,1016
 FILEFLAGSMASK  VS_FFI_FILEFLAGSMASK
 FILEFLAGS      0
 FILEOS         VOS_NT_WINDOWS32
@@ -19,12 +19,12 @@ BEGIN
     BEGIN
       VALUE "CompanyName",      "http://invisible-island.net/lynx"
       VALUE "FileDescription",  "Lynx - web browser"
-      VALUE "FileVersion",      "2.8.9.1015"
+      VALUE "FileVersion",      "2.8.9.1016"
       VALUE "InternalName",     "Lynx"
       VALUE "LegalCopyright",   "�1997-2017 Thomas E. Dickey"
       VALUE "OriginalFilename", "lynx.exe"
       VALUE "ProductName",      "Lynx - web browser"
-      VALUE "ProductVersion",   "2.8.9.1015"
+      VALUE "ProductVersion",   "2.8.9.1016"
     END
   END
   BLOCK "VarFileInfo"
diff --git a/userdefs.h b/userdefs.h
index c232d4e..2bf2387 100644
--- a/userdefs.h
+++ b/userdefs.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: userdefs.h,v 1.327 2017/05/11 21:22:30 tom Exp $
+ * $LynxId: userdefs.h,v 1.330 2017/07/11 08:45:14 tom Exp $
  *
  * Lynx - Hypertext navigation system
  *
@@ -483,7 +483,10 @@
  * Normally we expect you will connect to a remote site, e.g., the Lynx starting
  * site:
  */
-#define STARTFILE "http://lynx.invisible-island.net/"
+#ifndef HOMEPAGE_URL
+#define HOMEPAGE_URL "http://lynx.invisible-island.net/"
+#endif
+#define STARTFILE HOMEPAGE_URL
 /*
  * As an alternative, you may want to use a local URL.  A good choice for this
  * is the user's home directory:
@@ -1442,11 +1445,11 @@
  * the version definition with the Project Version on checkout.  Just
  * ignore it. - kw */
 /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */
-#define LYNX_VERSION "2.8.9dev.15"
+#define LYNX_VERSION "2.8.9dev.16"
 #define LYNX_WWW_HOME "http://lynx.invisible-island.net/"
 #define LYNX_WWW_DIST "http://lynx.invisible-island.net/current/"
 /* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */
-#define LYNX_DATE "Thu, 11 May 2017 17:22:30 -0400"
+#define LYNX_DATE "Tue, 11 Jul 2017 04:45:14 -0400"
 #define LYNX_DATE_OFF 5		/* truncate the automatically-generated date */
 #define LYNX_DATE_LEN 11	/* truncate the automatically-generated date */
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-lynx/lynx-cur.git



More information about the pkg-lynx-commits mailing list