about summary refs log tree commit diff stats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGES6
-rw-r--r--PACKAGE/lynx-curses.iss4
-rw-r--r--WWW/FreeofCharge.html26
-rw-r--r--aclocal.m4272
-rwxr-xr-xconfigure4726
-rw-r--r--configure.in4
-rw-r--r--docs/CHANGES2.3458
-rw-r--r--docs/CHANGES2.4891
-rw-r--r--docs/CHANGES2.51696
-rw-r--r--docs/FM.announce72
-rw-r--r--docs/IBMPC-charsets.announce74
-rw-r--r--docs/SOCKETSHR.announce67
-rw-r--r--docs/djgpp.key214
-rw-r--r--docs/slang.key4
-rw-r--r--makefile.msc4
-rwxr-xr-xsamples/keepviewer20
-rw-r--r--samples/mime.types26
-rw-r--r--src/LYMainLoop.c4
-rw-r--r--src/LYReadCFG.c4
-rw-r--r--src/chrtrans/dmcs_uni.tbl233
-rw-r--r--src/chrtrans/hp_uni.tbl212
-rw-r--r--src/chrtrans/iso15_uni.tbl216
-rw-r--r--src/chrtrans/koi8u_uni.tbl154
-rw-r--r--src/chrtrans/mnem_suni.tbl1861
-rw-r--r--src/chrtrans/rfc_suni.tbl1958
-rw-r--r--src/chrtrans/utf8_uni.tbl35
-rw-r--r--src/chrtrans/viscii_uni.tbl300
27 files changed, 11311 insertions, 2230 deletions
diff --git a/CHANGES b/CHANGES
index 5c2560df..b90a2eb6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,12 @@
--- $LynxId: CHANGES,v 1.318 2008/12/08 01:31:28 tom Exp $
+-- $LynxId: CHANGES,v 1.320 2008/12/10 01:01:37 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
 
 2008-??-?? (2.8.7dev.11)
+* extend configure macros CF_SSL and CF_GNUTLS to check for pkg-config, using
+  that for the default if the corresponding openssl or gnutls packages are
+  installed (suggested by PGNet) -TD
 * add fi.po from
     http://translationproject.org/latest/lynx/
 * update fr.po from
@@ -11,6 +14,7 @@ Changes since Lynx 2.8 release
 * correct handling of the option value from configure "--with-ssl", which was
   not being used in the search-list (report by PGNet) -TD
 * update configure script macros -TD
+  CF_CURSES_LIBS - add "pdcurses", e.g., to link with mingw
   CF_UTF8_LIB - use CF_FIND_LINKAGE to better work with BSD ports.
   CF_XOPEN_SOURCE - add case for dragonfly
 * document width-limitation in manpage, fix a few stray 1024's still in the
diff --git a/PACKAGE/lynx-curses.iss b/PACKAGE/lynx-curses.iss
index b755150d..9be57902 100644
--- a/PACKAGE/lynx-curses.iss
+++ b/PACKAGE/lynx-curses.iss
@@ -1,10 +1,12 @@
-; $LynxId: lynx-curses.iss,v 1.3 2008/09/22 22:08:26 tom Exp $

+; $LynxId: lynx-curses.iss,v 1.4 2008/09/24 22:43:18 tom Exp $

 ;

 ; This script assumes environment variables have been set, e.g., to point to

 ; data which is used by the installer:

 ;

 ; LYNX_DOCSDIR - files and subdirectories installed from Unix with "make install-doc"

 ; LYNX_HELPDIR - files and subdirectories installed from Unix with "make install-help"

+;

+; TODO: install curses or slang dll with executable

 

 #define MyAppName "Lynx"

 #define MyAppVerName "Lynx 2.8.7dev.10"

diff --git a/WWW/FreeofCharge.html b/WWW/FreeofCharge.html
new file mode 100644
index 00000000..67cb3f20
--- /dev/null
+++ b/WWW/FreeofCharge.html
@@ -0,0 +1,26 @@
+<!-- X-URL: http://www.w3.org/History/1993/WWW/Conditions/old/FreeofCharge.html -->
+<BASE HREF="http://www.w3.org/History/1993/WWW/Conditions/old/FreeofCharge.html">
+
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=iso-8859-1">
+
+<HTML><HEAD><TITLE>
+CERN WWW software freely available</TITLE><NEXTID N="z9"></HEAD><BODY><H1>
+Software freely available</H1>The following CERN software is hereby put into
+the public domain.
+<UL>
+<LI>WWW basic ("line-mode") client <LI>WWW basic server <LI>WWW Library of
+common code.</UL>CERN relinquishes all intellectual property rights to this
+code, both source and binary form and permission is granted for anyone to use,
+duplicate,
+modify and redistribute it.<P>CERN provides absolutely NO WARRANTY OF ANY KIND
+with respect to this software.
+The entire risk as to the quality and performance of this software is with the
+user.
+IN NO EVENT WILL CERN BE LIABLE TO ANYONE FOR ANY DAMAGES ARISING OUT THE USE
+OF THIS SOFTWARE, INCLUDING, WITHOUT LIMITATION,
+DAMAGES RESULTING FROM LOST DATA OR LOST PROFITS, OR FOR ANY SPECIAL,
+INCIDENTAL OR CONSEQUENTIAL DAMAGES.<P>This is part of the <A
+HREF="Introduction.html" NAME="z8">
+CERN WWW</A> distribution condidtions.<P>Declaration to this effect signed by
+the CERN directors of Administration (H. Weber) and Research (W.
+Hoogland), May 1993.</BODY></HTML>
diff --git a/aclocal.m4 b/aclocal.m4
index d091ae81..c3960aeb 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $LynxId: aclocal.m4,v 1.127 2008/12/08 00:40:44 tom Exp $
+dnl $LynxId: aclocal.m4,v 1.128 2008/12/12 01:03:21 tom Exp $
 dnl Macros for auto-configure script.
 dnl by T.E.Dickey <dickey@invisible-island.net>
 dnl and Jim Spath <jspath@mail.bcpl.lib.md.us>
@@ -1401,10 +1401,10 @@ fi
 
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CHECK_SSL_X509 version: 3 updated: 2008/01/06 14:56:47
+dnl CF_CHECK_SSL_X509 version: 4 updated: 2008/12/11 19:00:39
 dnl -----------------
 dnl Check for X509 support in the SSL library.
-AC_DEFUN([CF_CHECK_SSL_X509],[
+define([CF_CHECK_SSL_X509],[
 AC_MSG_CHECKING(for X509 support)
 AC_TRY_LINK(CF__SSL_HEAD [
 #include <openssl/x509.h>],
@@ -2643,52 +2643,109 @@ rm -f conftest*
 AC_SUBST(EXTRA_CFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_GNUTLS version: 10 updated: 2008/04/13 10:56:06
+dnl CF_GNUTLS version: 14 updated: 2008/12/11 20:01:57
 dnl ---------
 dnl Check for gnutls library (TLS "is" SSL)
 dnl $1 = the [optional] directory in which the library may be found
 dnl $2 = the [optional] stub file to provide OpenSSL compatibility
 AC_DEFUN([CF_GNUTLS],[
-  CF_ADD_OPTIONAL_PATH($1, [ssl library])
-
-  ifelse($2,,[AC_DEFINE(USE_GNUTLS_INCL)],[AC_DEFINE(USE_GNUTLS_FUNCS)])
-  cf_gnutls_CPPFLAGS=$CPPFLAGS
-
-  CF_FIND_LINKAGE(CF__SSL_HEAD,
-      CF__SSL_BODY,
-      gnutls,
-      cf_cv_have_gnutls=yes,
-      cf_cv_have_gnutls=no,
-      ,
-      ifelse($2,,[-lgnutls-openssl -lgnutls-extra -lgnutls -lcrypt],[-lgnutls -lcrypt]))
-
-  CPPFLAGS=$cf_gnutls_CPPFLAGS
-
-  if test "$cf_cv_have_gnutls" = yes ; then
-    if test -n "$cf_cv_header_path_gnutls" ; then
-      AC_DEFINE(USE_SSL)
-      case $cf_cv_header_path_gnutls in
-      /usr/include/gnutls)
-          ;;
-      *)
-          CF_ADD_INCDIR($cf_cv_header_path_gnutls)
-          ;;
-      esac
-    fi
-    if test -n "$cf_cv_library_path_gnutls" ; then
-      CF_ADD_LIBDIR($cf_cv_library_path_gnutls)
-    fi
-    LIBS="-lgnutls -lcrypt $LIBS"
-  fi
+	AC_REQUIRE([CF_PKG_CONFIG])
+	cf_cv_have_gnutls=no
+
+	CF_ADD_OPTIONAL_PATH($1, [ssl library])
+
+	cf_pkg_gnutls=none
+	if test "x$PKG_CONFIG" != xnone; then
+		cf_pkg_gnutls=ifelse($2,,gnutls-openssl,gnutls)
+		case $1 in #(vi
+		no) #(vi
+			;;
+		yes)
+			CF_VERBOSE(checking pkg-config for $cf_pkg_gnutls)
+			if "$PKG_CONFIG" --exists $cf_pkg_gnutls ; then
+				CF_VERBOSE(... found $cf_pkg_gnutls in pkg-config)
+				cf_cv_have_gnutls=yes
+
+				cf_cflags_ssl=`$PKG_CONFIG --cflags $cf_pkg_gnutls`
+				cf_libs_ssl=`$PKG_CONFIG --libs $cf_pkg_gnutls`
+
+				if test -n "$cf_cflags_ssl" ; then
+					case "$cf_cflags_ssl" in #(vi
+					*-I*) #(vi
+						cf_cv_header_path_ssl=`echo "$cf_cflags_ssl" | sed -e 's/^.*-I//' -e 's/ .*//'`
+						;;
+					*)
+						cf_cv_header_path_ssl=/usr/include
+						;;
+					esac
+					if test -d $cf_cv_header_path_ssl/gnutls ; then
+						cf_cv_header_path_ssl=$cf_cv_header_path_ssl/gnutls
+					fi
+					CF_ADD_CFLAGS($cf_cflags_ssl)
+				fi
+
+				if test -n "$cf_libs_ssl" ; then
+					case "x$cf_libs_ssl" in #(vi
+					*-L*) #(vi
+						cf_cv_library_path_ssl=`echo "$cf_libs_ssl" | sed -e 's/^.*-L//' -e 's/ .*//'`
+						;;
+					*)
+						cf_cv_library_path_ssl=/usr/lib
+						;;
+					esac
+					CF_VERBOSE(adding $cf_libs_ssl to LIBS)
+					LIBS="$cf_libs_ssl $LIBS"
+				fi
+			else
+				CF_VERBOSE(... did not find $cf_pkg_gnutls in pkg-config)
+				cf_pkg_gnutls=none
+			fi
+			;;
+		esac
+	fi
+
+	if test "$cf_cv_have_gnutls" = no ; then
+		ifelse($2,,[AC_DEFINE(USE_GNUTLS_INCL)],[AC_DEFINE(USE_GNUTLS_FUNCS)])
+		cf_gnutls_CPPFLAGS=$CPPFLAGS
 
-  ifelse($2,,[
-  AC_CHECK_LIB(gnutls-openssl,SSL_connect,
-      [LIBS="-lgnutls-openssl $LIBS"],
-      [AC_CHECK_LIB(gnutls-extra,SSL_connect,
-          [LIBS="-lgnutls-extra $LIBS"],
-          [AC_MSG_ERROR(cannot find gnutls openssl functions)])])],[EXTRA_OBJS="$EXTRA_OBJS $2"])
+		CF_FIND_LINKAGE(CF__SSL_HEAD,
+			CF__SSL_BODY,
+			gnutls,
+			cf_cv_have_gnutls=yes,
+			cf_cv_have_gnutls=no,
+			,
+			ifelse($2,,[-lgnutls-openssl -lgnutls-extra -lgnutls -lcrypt],[-lgnutls -lcrypt]))
 
-  CF_CHECK_SSL_X509
+		CPPFLAGS=$cf_gnutls_CPPFLAGS
+	fi
+
+	if test "$cf_cv_have_gnutls" = yes ; then
+		if test -n "$cf_cv_header_path_gnutls" ; then
+			AC_DEFINE(USE_SSL)
+            case $cf_cv_header_path_gnutls in
+				/usr/include/gnutls)
+				;;
+			*)
+				CF_ADD_INCDIR($cf_cv_header_path_gnutls)
+				;;
+			esac
+		fi
+		if test -n "$cf_cv_library_path_gnutls" ; then
+			CF_ADD_LIBDIR($cf_cv_library_path_gnutls)
+		fi
+		LIBS="-lgnutls -lcrypt $LIBS"
+
+		ifelse($2,,
+			[if test "$cf_pkg_gnutls" = none ; then
+				AC_CHECK_LIB(gnutls-openssl,SSL_connect,
+					[LIBS="-lgnutls-openssl $LIBS"],
+					[AC_CHECK_LIB(gnutls-extra,SSL_connect,
+					[LIBS="-lgnutls-extra $LIBS"],
+					[AC_MSG_ERROR(cannot find gnutls openssl functions)])])
+			fi],[EXTRA_OBJS="$EXTRA_OBJS $2"])
+
+		CF_CHECK_SSL_X509
+	fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_GNU_SOURCE version: 6 updated: 2005/07/09 13:23:07
@@ -4352,46 +4409,99 @@ define([CF_SRAND_PARSE],[
 	esac
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_SSL version: 12 updated: 2008/01/06 14:56:47
+dnl CF_SSL version: 14 updated: 2008/12/09 19:45:44
 dnl ------
 dnl Check for ssl library
-dnl $1 = the [optional] directory in which the library may be found
+dnl $1 = [optional] directory in which the library may be found, set by AC_ARG_WITH
 AC_DEFUN([CF_SSL],[
-  CF_ADD_OPTIONAL_PATH([$1], [ssl library])
-
-  CF_FIND_LINKAGE(CF__SSL_HEAD,
-      CF__SSL_BODY,
-      ssl,
-      cf_cv_have_ssl=yes,
-      cf_cv_have_ssl=no,
-      openssl,
-      [-lcrypto])
-
-  if test "$cf_cv_have_ssl" = yes ; then
-    if test -n "$cf_cv_header_path_ssl" ; then
-      AC_DEFINE(USE_SSL)
-
-      case $cf_cv_header_path_ssl in
-      */openssl)
-          AC_DEFINE(USE_OPENSSL_INCL)
-          ;;
-      esac
+	AC_REQUIRE([CF_PKG_CONFIG])
+	cf_cv_have_ssl=no
 
-      case $cf_cv_header_path_ssl in
-      /usr/include/openssl)
-          ;;
-      *)
-          CF_ADD_INCDIR($cf_cv_header_path_ssl)
-          ;;
-      esac
+	# command-line option, etc., override default behavior
+	CF_ADD_OPTIONAL_PATH($1, [ssl library])
 
-    fi
-    if test -n "$cf_cv_library_path_ssl" ; then
-      CF_ADD_LIBDIR($cf_cv_library_path_ssl)
-    fi
-    LIBS="-lssl -lcrypto $LIBS"
-    CF_CHECK_SSL_X509
-  fi
+	if test "x$PKG_CONFIG" != xnone; then
+		case $1 in #(vi
+		no) #(vi
+			;;
+		yes)
+			if "$PKG_CONFIG" --exists openssl ; then
+				cf_cv_have_ssl=yes
+
+				cf_cflags_ssl=`$PKG_CONFIG --cflags openssl`
+				cf_libs_ssl=`$PKG_CONFIG --libs openssl`
+
+				if test -n "$cf_cflags_ssl" ; then
+					case "$cf_cflags_ssl" in #(vi
+					*-I*) #(vi
+						cf_cv_header_path_ssl=`echo "$cf_cflags_ssl" | sed -e 's/^.*-I//' -e 's/ .*//'`
+						;;
+					*)
+						cf_cv_header_path_ssl=/usr/include
+						;;
+					esac
+					if test -d $cf_cv_header_path_ssl/openssl ; then
+						cf_cv_header_path_ssl=$cf_cv_header_path_ssl/openssl
+					fi
+					CF_ADD_CFLAGS($cf_cflags_ssl)
+				fi
+
+				if test -n "$cf_libs_ssl" ; then
+					case "x$cf_libs_ssl" in #(vi
+					*-L*) #(vi
+						cf_cv_library_path_ssl=`echo "$cf_libs_ssl" | sed -e 's/^.*-L//' -e 's/ .*//'`
+						;;
+					*)
+						cf_cv_library_path_ssl=/usr/lib
+						;;
+					esac
+					CF_VERBOSE(adding $cf_libs_ssl to LIBS)
+					LIBS="$cf_libs_ssl $LIBS"
+				fi
+			fi
+			;;
+		esac
+	fi
+
+	if test "$cf_cv_have_ssl" != yes; then
+		case $1 in #(vi
+		no)
+			CF_FIND_LINKAGE(CF__SSL_HEAD,
+				CF__SSL_BODY,
+				ssl,
+				cf_cv_have_ssl=yes,
+				cf_cv_have_ssl=no,
+				openssl,
+				[-lcrypto])
+			;;
+		esac
+	fi
+
+	if test "$cf_cv_have_ssl" = yes ; then
+		if test -n "$cf_cv_header_path_ssl" ; then
+			AC_DEFINE(USE_SSL)
+
+			case $cf_cv_header_path_ssl in
+			*/openssl)
+				AC_DEFINE(USE_OPENSSL_INCL)
+				;;
+			esac
+
+			case $cf_cv_header_path_ssl in
+			/usr/include/openssl)
+				;;
+			*)
+				CF_ADD_INCDIR($cf_cv_header_path_ssl)
+				;;
+			esac
+
+		fi
+		if test -n "$cf_cv_library_path_ssl" ; then
+			CF_ADD_LIBDIR($cf_cv_library_path_ssl)
+		fi
+		LIBS="-lssl -lcrypto $LIBS"
+		CF_CHECK_SSL_X509
+	fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_STRIP_G_OPT version: 3 updated: 2002/12/21 19:25:52
@@ -5667,3 +5777,11 @@ AC_DEFUN([jm_GLIBC21],
     GLIBC21="$ac_cv_gnu_library_2_1"
   ]
 )
+dnl ---------------------------------------------------------------------------
+dnl CF_PKG_CONFIG version: 1 updated: 2006/08/20 13:51:03
+dnl -------------
+dnl Check for the package-config program.
+AC_DEFUN([CF_PKG_CONFIG],
+[
+AC_PATH_PROG(PKG_CONFIG, pkg-config, none)
+])dnl
diff --git a/configure b/configure
index da345e92..75daddfb 100755
--- a/configure
+++ b/configure
@@ -11069,8 +11069,50 @@ echo "$as_me: WARNING: Unable to find library for inet_addr function" >&2;}
     fi
 fi
 
+# 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:11074: 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
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # 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_PKG_CONFIG="$ac_dir/$ac_word"
+   echo "$as_me:11091: found $ac_dir/$ac_word" >&5
+   break
+fi
+done
+
+  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="none"
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
+if test -n "$PKG_CONFIG"; then
+  echo "$as_me:11103: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
+else
+  echo "$as_me:11106: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
 if test "x$cf_cv_use_libssl"  != xno ; then
 
+	cf_cv_have_ssl=no
+
+	# command-line option, etc., override default behavior
+
   case "$cf_cv_use_libssl" in #(vi
   no) #(vi
       ;;
@@ -11105,7 +11147,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 11108 "configure"
+#line 11150 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11117,16 +11159,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11120: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11162: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11123: \$? = $ac_status" >&5
+  echo "$as_me:11165: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11126: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11168: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11129: \$? = $ac_status" >&5
+  echo "$as_me:11171: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -11143,7 +11185,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}:11146: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:11188: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -11184,7 +11226,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 11187 "configure"
+#line 11229 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11196,16 +11238,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11199: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11241: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11202: \$? = $ac_status" >&5
+  echo "$as_me:11244: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11205: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11247: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11208: \$? = $ac_status" >&5
+  echo "$as_me:11250: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -11222,7 +11264,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}:11225: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:11267: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -11238,7 +11280,7 @@ echo "${as_me-configure}:11225: testing adding $cf_add_incdir to include-path ..
 fi
 
 	else
-{ { echo "$as_me:11241: error: cannot find ssl library under $cf_cv_use_libssl" >&5
+{ { echo "$as_me:11283: 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
@@ -11263,7 +11305,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}:11266: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:11308: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -11292,7 +11334,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}:11295: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:11337: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -11301,7 +11343,7 @@ echo "${as_me-configure}:11295: testing adding $cf_add_libdir to library-path ..
 fi
 
 	else
-{ { echo "$as_me:11304: error: cannot find ssl library under $cf_cv_use_libssl" >&5
+{ { echo "$as_me:11346: 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
@@ -11310,15 +11352,133 @@ done
       ;;
   esac
 
+	if test "x$PKG_CONFIG" != xnone; then
+		case $cf_cv_use_libssl in #(vi
+		no) #(vi
+			;;
+		yes)
+			if "$PKG_CONFIG" --exists openssl ; then
+				cf_cv_have_ssl=yes
+
+				cf_cflags_ssl=`$PKG_CONFIG --cflags openssl`
+				cf_libs_ssl=`$PKG_CONFIG --libs openssl`
+
+				if test -n "$cf_cflags_ssl" ; then
+					case "$cf_cflags_ssl" in #(vi
+					*-I*) #(vi
+						cf_cv_header_path_ssl=`echo "$cf_cflags_ssl" | sed -e 's/^.*-I//' -e 's/ .*//'`
+						;;
+					*)
+						cf_cv_header_path_ssl=/usr/include
+						;;
+					esac
+					if test -d $cf_cv_header_path_ssl/openssl ; then
+						cf_cv_header_path_ssl=$cf_cv_header_path_ssl/openssl
+					fi
+
+cf_fix_cppflags=no
+cf_new_cflags=
+cf_new_cppflags=
+cf_new_extra_cppflags=
+
+for cf_add_cflags in $cf_cflags_ssl
+do
+case $cf_fix_cppflags in
+no)
+	case $cf_add_cflags in #(vi
+	-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
+		case $cf_add_cflags in
+		-D*)
+			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+
+			test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+			&& test -z "${cf_tst_cflags}" \
+			&& cf_fix_cppflags=yes
+
+			if test $cf_fix_cppflags = yes ; then
+				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+				continue
+			elif test "${cf_tst_cflags}" = "\"'" ; then
+				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+				continue
+			fi
+			;;
+		esac
+		case "$CPPFLAGS" in
+		*$cf_add_cflags) #(vi
+			;;
+		*) #(vi
+			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+			;;
+		esac
+		;;
+	*)
+		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+		;;
+	esac
+	;;
+yes)
+	cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
+
+	test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+	&& test -z "${cf_tst_cflags}" \
+	&& cf_fix_cppflags=no
+	;;
+esac
+done
+
+if test -n "$cf_new_cflags" ; then
+
+	CFLAGS="$CFLAGS $cf_new_cflags"
+fi
+
+if test -n "$cf_new_cppflags" ; then
+
+	CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
+fi
+
+if test -n "$cf_new_extra_cppflags" ; then
+
+	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+fi
+
+				fi
+
+				if test -n "$cf_libs_ssl" ; then
+					case "x$cf_libs_ssl" in #(vi
+					*-L*) #(vi
+						cf_cv_library_path_ssl=`echo "$cf_libs_ssl" | sed -e 's/^.*-L//' -e 's/ .*//'`
+						;;
+					*)
+						cf_cv_library_path_ssl=/usr/lib
+						;;
+					esac
+					test -n "$verbose" && echo "	adding $cf_libs_ssl to LIBS" 1>&6
+
+echo "${as_me-configure}:11460: testing adding $cf_libs_ssl to LIBS ..." 1>&5
+
+					LIBS="$cf_libs_ssl $LIBS"
+				fi
+			fi
+			;;
+		esac
+	fi
+
+	if test "$cf_cv_have_ssl" != yes; then
+		case $cf_cv_use_libssl in #(vi
+		no)
+
 # 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_ssl=
 cf_cv_library_path_ssl=
 
-echo "${as_me-configure}:11318: testing Starting FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me-configure}:11478: testing Starting FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 11321 "configure"
+#line 11481 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -11347,16 +11507,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11350: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11510: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11353: \$? = $ac_status" >&5
+  echo "$as_me:11513: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11356: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11516: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11359: \$? = $ac_status" >&5
+  echo "$as_me:11519: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_find_linkage_ssl=yes
 else
@@ -11365,7 +11525,7 @@ cat conftest.$ac_ext >&5
 
     cf_cv_find_linkage_ssl=no
 
-echo "${as_me-configure}:11368: testing Searching for headers in FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me-configure}:11528: testing Searching for headers in FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -11473,11 +11633,11 @@ cf_search="$cf_header_path_list $cf_search"
       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}:11476: testing ... testing $cf_cv_header_path_ssl ..." 1>&5
+echo "${as_me-configure}:11636: 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 11480 "configure"
+#line 11640 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -11506,21 +11666,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11509: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11669: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11512: \$? = $ac_status" >&5
+  echo "$as_me:11672: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11515: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11675: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11518: \$? = $ac_status" >&5
+  echo "$as_me:11678: \$? = $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}:11523: testing ... found ssl headers in $cf_cv_header_path_ssl ..." 1>&5
+echo "${as_me-configure}:11683: testing ... found ssl headers in $cf_cv_header_path_ssl ..." 1>&5
 
             cf_cv_find_linkage_ssl=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -11538,7 +11698,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_ssl" = maybe ; then
 
-echo "${as_me-configure}:11541: testing Searching for ssl library in FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me-configure}:11701: testing Searching for ssl library in FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -11546,7 +11706,7 @@ echo "${as_me-configure}:11541: testing Searching for ssl library in FIND_LINKAG
         CPPFLAGS="$cf_test_CPPFLAGS"
         LIBS="-lssl -lcrypto $cf_save_LIBS"
         cat >conftest.$ac_ext <<_ACEOF
-#line 11549 "configure"
+#line 11709 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -11575,21 +11735,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11578: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11738: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11581: \$? = $ac_status" >&5
+  echo "$as_me:11741: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11584: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11744: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11587: \$? = $ac_status" >&5
+  echo "$as_me:11747: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found ssl library in system" 1>&6
 
-echo "${as_me-configure}:11592: testing ... found ssl library in system ..." 1>&5
+echo "${as_me-configure}:11752: testing ... found ssl library in system ..." 1>&5
 
             cf_cv_find_linkage_ssl=yes
 else
@@ -11691,13 +11851,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}:11694: testing ... testing $cf_cv_library_path_ssl ..." 1>&5
+echo "${as_me-configure}:11854: testing ... testing $cf_cv_library_path_ssl ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-lssl -lcrypto $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_ssl"
             cat >conftest.$ac_ext <<_ACEOF
-#line 11700 "configure"
+#line 11860 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -11726,21 +11886,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11729: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11889: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11732: \$? = $ac_status" >&5
+  echo "$as_me:11892: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11735: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11895: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11738: \$? = $ac_status" >&5
+  echo "$as_me:11898: \$? = $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}:11743: testing ... found ssl library in $cf_cv_library_path_ssl ..." 1>&5
+echo "${as_me-configure}:11903: testing ... found ssl library in $cf_cv_library_path_ssl ..." 1>&5
 
                 cf_cv_find_linkage_ssl=yes
                 cf_cv_library_file_ssl="-lssl"
@@ -11775,25 +11935,29 @@ else
 cf_cv_have_ssl=no
 fi
 
-  if test "$cf_cv_have_ssl" = yes ; then
-    if test -n "$cf_cv_header_path_ssl" ; then
-      cat >>confdefs.h <<\EOF
+			;;
+		esac
+	fi
+
+	if test "$cf_cv_have_ssl" = yes ; then
+		if test -n "$cf_cv_header_path_ssl" ; then
+			cat >>confdefs.h <<\EOF
 #define USE_SSL 1
 EOF
 
-      case $cf_cv_header_path_ssl in
-      */openssl)
-          cat >>confdefs.h <<\EOF
+			case $cf_cv_header_path_ssl in
+			*/openssl)
+				cat >>confdefs.h <<\EOF
 #define USE_OPENSSL_INCL 1
 EOF
 
-          ;;
-      esac
+				;;
+			esac
 
-      case $cf_cv_header_path_ssl in
-      /usr/include/openssl)
-          ;;
-      *)
+			case $cf_cv_header_path_ssl in
+			/usr/include/openssl)
+				;;
+			*)
 
 if test -n "$cf_cv_header_path_ssl" ; then
   for cf_add_incdir in $cf_cv_header_path_ssl
@@ -11819,7 +11983,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 11822 "configure"
+#line 11986 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11831,16 +11995,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11834: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11998: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11837: \$? = $ac_status" >&5
+  echo "$as_me:12001: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11840: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12004: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11843: \$? = $ac_status" >&5
+  echo "$as_me:12007: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -11857,7 +12021,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}:11860: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:12024: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -11872,11 +12036,11 @@ echo "${as_me-configure}:11860: testing adding $cf_add_incdir to include-path ..
   done
 fi
 
-          ;;
-      esac
+				;;
+			esac
 
-    fi
-    if test -n "$cf_cv_library_path_ssl" ; then
+		fi
+		if test -n "$cf_cv_library_path_ssl" ; then
 
 if test -n "$cf_cv_library_path_ssl" ; then
   for cf_add_libdir in $cf_cv_library_path_ssl
@@ -11897,7 +12061,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}:11900: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:12064: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -11905,13 +12069,13 @@ echo "${as_me-configure}:11900: testing adding $cf_add_libdir to library-path ..
   done
 fi
 
-    fi
-    LIBS="-lssl -lcrypto $LIBS"
+		fi
+		LIBS="-lssl -lcrypto $LIBS"
 
-echo "$as_me:11911: checking for X509 support" >&5
+echo "$as_me:12075: checking for X509 support" >&5
 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 11914 "configure"
+#line 12078 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -11935,16 +12099,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:11938: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12102: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11941: \$? = $ac_status" >&5
+  echo "$as_me:12105: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11944: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12108: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11947: \$? = $ac_status" >&5
+  echo "$as_me:12111: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_x509_support=yes
 else
@@ -11953,7 +12117,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:11956: result: $cf_x509_support" >&5
+echo "$as_me:12120: result: $cf_x509_support" >&5
 echo "${ECHO_T}$cf_x509_support" >&6
 
 if test "$cf_x509_support" = yes ; then
@@ -11963,11 +12127,13 @@ EOF
 
 fi
 
-  fi
+	fi
 
 elif test "x$cf_cv_use_libgnutls" != xno ; then
     if test "x$cf_cv_gnutls_compat" = xno ; then
 
+	cf_cv_have_gnutls=no
+
   case "$cf_cv_use_libgnutls" in #(vi
   no) #(vi
       ;;
@@ -12002,7 +12168,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 12005 "configure"
+#line 12171 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -12014,16 +12180,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12017: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12183: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12020: \$? = $ac_status" >&5
+  echo "$as_me:12186: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12023: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12189: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12026: \$? = $ac_status" >&5
+  echo "$as_me:12192: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -12040,7 +12206,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}:12043: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:12209: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -12081,7 +12247,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 12084 "configure"
+#line 12250 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -12093,16 +12259,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12096: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12262: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12099: \$? = $ac_status" >&5
+  echo "$as_me:12265: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12102: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12268: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12105: \$? = $ac_status" >&5
+  echo "$as_me:12271: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -12119,7 +12285,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}:12122: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:12288: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -12135,7 +12301,7 @@ echo "${as_me-configure}:12122: testing adding $cf_add_incdir to include-path ..
 fi
 
 	else
-{ { echo "$as_me:12138: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:12304: 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
@@ -12160,7 +12326,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}:12163: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:12329: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -12189,7 +12355,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}:12192: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:12358: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -12198,7 +12364,7 @@ echo "${as_me-configure}:12192: testing adding $cf_add_libdir to library-path ..
 fi
 
 	else
-{ { echo "$as_me:12201: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:12367: 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
@@ -12207,21 +12373,152 @@ done
       ;;
   esac
 
-  cat >>confdefs.h <<\EOF
+	cf_pkg_gnutls=none
+	if test "x$PKG_CONFIG" != xnone; then
+		cf_pkg_gnutls=gnutls
+		case $cf_cv_use_libgnutls in #(vi
+		no) #(vi
+			;;
+		yes)
+			test -n "$verbose" && echo "	checking pkg-config for $cf_pkg_gnutls" 1>&6
+
+echo "${as_me-configure}:12385: 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}:12390: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
+
+				cf_cv_have_gnutls=yes
+
+				cf_cflags_ssl=`$PKG_CONFIG --cflags $cf_pkg_gnutls`
+				cf_libs_ssl=`$PKG_CONFIG --libs $cf_pkg_gnutls`
+
+				if test -n "$cf_cflags_ssl" ; then
+					case "$cf_cflags_ssl" in #(vi
+					*-I*) #(vi
+						cf_cv_header_path_ssl=`echo "$cf_cflags_ssl" | sed -e 's/^.*-I//' -e 's/ .*//'`
+						;;
+					*)
+						cf_cv_header_path_ssl=/usr/include
+						;;
+					esac
+					if test -d $cf_cv_header_path_ssl/gnutls ; then
+						cf_cv_header_path_ssl=$cf_cv_header_path_ssl/gnutls
+					fi
+
+cf_fix_cppflags=no
+cf_new_cflags=
+cf_new_cppflags=
+cf_new_extra_cppflags=
+
+for cf_add_cflags in $cf_cflags_ssl
+do
+case $cf_fix_cppflags in
+no)
+	case $cf_add_cflags in #(vi
+	-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
+		case $cf_add_cflags in
+		-D*)
+			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+
+			test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+			&& test -z "${cf_tst_cflags}" \
+			&& cf_fix_cppflags=yes
+
+			if test $cf_fix_cppflags = yes ; then
+				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+				continue
+			elif test "${cf_tst_cflags}" = "\"'" ; then
+				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+				continue
+			fi
+			;;
+		esac
+		case "$CPPFLAGS" in
+		*$cf_add_cflags) #(vi
+			;;
+		*) #(vi
+			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+			;;
+		esac
+		;;
+	*)
+		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+		;;
+	esac
+	;;
+yes)
+	cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
+
+	test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+	&& test -z "${cf_tst_cflags}" \
+	&& cf_fix_cppflags=no
+	;;
+esac
+done
+
+if test -n "$cf_new_cflags" ; then
+
+	CFLAGS="$CFLAGS $cf_new_cflags"
+fi
+
+if test -n "$cf_new_cppflags" ; then
+
+	CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
+fi
+
+if test -n "$cf_new_extra_cppflags" ; then
+
+	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+fi
+
+				fi
+
+				if test -n "$cf_libs_ssl" ; then
+					case "x$cf_libs_ssl" in #(vi
+					*-L*) #(vi
+						cf_cv_library_path_ssl=`echo "$cf_libs_ssl" | sed -e 's/^.*-L//' -e 's/ .*//'`
+						;;
+					*)
+						cf_cv_library_path_ssl=/usr/lib
+						;;
+					esac
+					test -n "$verbose" && echo "	adding $cf_libs_ssl to LIBS" 1>&6
+
+echo "${as_me-configure}:12491: testing adding $cf_libs_ssl to LIBS ..." 1>&5
+
+					LIBS="$cf_libs_ssl $LIBS"
+				fi
+			else
+				test -n "$verbose" && echo "	... did not find $cf_pkg_gnutls in pkg-config" 1>&6
+
+echo "${as_me-configure}:12498: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
+
+				cf_pkg_gnutls=none
+			fi
+			;;
+		esac
+	fi
+
+	if test "$cf_cv_have_gnutls" = no ; then
+		cat >>confdefs.h <<\EOF
 #define USE_GNUTLS_FUNCS 1
 EOF
 
-  cf_gnutls_CPPFLAGS=$CPPFLAGS
+		cf_gnutls_CPPFLAGS=$CPPFLAGS
 
 # 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_gnutls=
 cf_cv_library_path_gnutls=
 
-echo "${as_me-configure}:12221: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me-configure}:12518: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 12224 "configure"
+#line 12521 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -12250,16 +12547,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12253: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12550: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12256: \$? = $ac_status" >&5
+  echo "$as_me:12553: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12259: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12556: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12262: \$? = $ac_status" >&5
+  echo "$as_me:12559: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_find_linkage_gnutls=yes
 else
@@ -12268,7 +12565,7 @@ cat conftest.$ac_ext >&5
 
     cf_cv_find_linkage_gnutls=no
 
-echo "${as_me-configure}:12271: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me-configure}:12568: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -12376,11 +12673,11 @@ cf_search="$cf_header_path_list $cf_search"
       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}:12379: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me-configure}:12676: 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 12383 "configure"
+#line 12680 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -12409,21 +12706,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12412: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12709: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12415: \$? = $ac_status" >&5
+  echo "$as_me:12712: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12418: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12715: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12421: \$? = $ac_status" >&5
+  echo "$as_me:12718: \$? = $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}:12426: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me-configure}:12723: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
 
             cf_cv_find_linkage_gnutls=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -12441,7 +12738,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_gnutls" = maybe ; then
 
-echo "${as_me-configure}:12444: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me-configure}:12741: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -12537,13 +12834,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}:12540: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me-configure}:12837: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-lgnutls -lgnutls -lcrypt $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_gnutls"
             cat >conftest.$ac_ext <<_ACEOF
-#line 12546 "configure"
+#line 12843 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -12572,21 +12869,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12575: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12872: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12578: \$? = $ac_status" >&5
+  echo "$as_me:12875: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12581: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12878: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12584: \$? = $ac_status" >&5
+  echo "$as_me:12881: \$? = $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}:12589: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me-configure}:12886: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
 
                 cf_cv_find_linkage_gnutls=yes
                 cf_cv_library_file_gnutls="-lgnutls"
@@ -12621,18 +12918,19 @@ else
 cf_cv_have_gnutls=no
 fi
 
-  CPPFLAGS=$cf_gnutls_CPPFLAGS
+		CPPFLAGS=$cf_gnutls_CPPFLAGS
+	fi
 
-  if test "$cf_cv_have_gnutls" = yes ; then
-    if test -n "$cf_cv_header_path_gnutls" ; then
-      cat >>confdefs.h <<\EOF
+	if test "$cf_cv_have_gnutls" = yes ; then
+		if test -n "$cf_cv_header_path_gnutls" ; then
+			cat >>confdefs.h <<\EOF
 #define USE_SSL 1
 EOF
 
-      case $cf_cv_header_path_gnutls in
-      /usr/include/gnutls)
-          ;;
-      *)
+            case $cf_cv_header_path_gnutls in
+				/usr/include/gnutls)
+				;;
+			*)
 
 if test -n "$cf_cv_header_path_gnutls" ; then
   for cf_add_incdir in $cf_cv_header_path_gnutls
@@ -12658,7 +12956,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 12661 "configure"
+#line 12959 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -12670,16 +12968,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12673: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12971: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12676: \$? = $ac_status" >&5
+  echo "$as_me:12974: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12679: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12977: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12682: \$? = $ac_status" >&5
+  echo "$as_me:12980: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -12696,7 +12994,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}:12699: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:12997: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -12711,10 +13009,10 @@ echo "${as_me-configure}:12699: testing adding $cf_add_incdir to include-path ..
   done
 fi
 
-          ;;
-      esac
-    fi
-    if test -n "$cf_cv_library_path_gnutls" ; then
+				;;
+			esac
+		fi
+		if test -n "$cf_cv_library_path_gnutls" ; then
 
 if test -n "$cf_cv_library_path_gnutls" ; then
   for cf_add_libdir in $cf_cv_library_path_gnutls
@@ -12735,7 +13033,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}:12738: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:13036: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -12743,16 +13041,15 @@ echo "${as_me-configure}:12738: testing adding $cf_add_libdir to library-path ..
   done
 fi
 
-    fi
-    LIBS="-lgnutls -lcrypt $LIBS"
-  fi
+		fi
+		LIBS="-lgnutls -lcrypt $LIBS"
 
-  EXTRA_OBJS="$EXTRA_OBJS tidy_tls\$o"
+		EXTRA_OBJS="$EXTRA_OBJS tidy_tls\$o"
 
-echo "$as_me:12752: checking for X509 support" >&5
+echo "$as_me:13049: checking for X509 support" >&5
 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 12755 "configure"
+#line 13052 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -12776,16 +13073,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:12779: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13076: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12782: \$? = $ac_status" >&5
+  echo "$as_me:13079: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12785: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13082: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12788: \$? = $ac_status" >&5
+  echo "$as_me:13085: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_x509_support=yes
 else
@@ -12794,7 +13091,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:12797: result: $cf_x509_support" >&5
+echo "$as_me:13094: result: $cf_x509_support" >&5
 echo "${ECHO_T}$cf_x509_support" >&6
 
 if test "$cf_x509_support" = yes ; then
@@ -12804,8 +13101,12 @@ EOF
 
 fi
 
+	fi
+
     else
 
+	cf_cv_have_gnutls=no
+
   case "$cf_cv_use_libgnutls" in #(vi
   no) #(vi
       ;;
@@ -12840,7 +13141,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 12843 "configure"
+#line 13144 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -12852,16 +13153,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12855: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13156: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12858: \$? = $ac_status" >&5
+  echo "$as_me:13159: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12861: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13162: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12864: \$? = $ac_status" >&5
+  echo "$as_me:13165: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -12878,7 +13179,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}:12881: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:13182: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -12919,7 +13220,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 12922 "configure"
+#line 13223 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -12931,16 +13232,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12934: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13235: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12937: \$? = $ac_status" >&5
+  echo "$as_me:13238: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12940: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13241: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12943: \$? = $ac_status" >&5
+  echo "$as_me:13244: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -12957,7 +13258,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}:12960: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:13261: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -12973,7 +13274,7 @@ echo "${as_me-configure}:12960: testing adding $cf_add_incdir to include-path ..
 fi
 
 	else
-{ { echo "$as_me:12976: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:13277: 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
@@ -12998,7 +13299,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}:13001: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:13302: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -13027,7 +13328,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}:13030: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:13331: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -13036,7 +13337,7 @@ echo "${as_me-configure}:13030: testing adding $cf_add_libdir to library-path ..
 fi
 
 	else
-{ { echo "$as_me:13039: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:13340: 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
@@ -13045,21 +13346,152 @@ done
       ;;
   esac
 
-  cat >>confdefs.h <<\EOF
+	cf_pkg_gnutls=none
+	if test "x$PKG_CONFIG" != xnone; then
+		cf_pkg_gnutls=gnutls-openssl
+		case $cf_cv_use_libgnutls in #(vi
+		no) #(vi
+			;;
+		yes)
+			test -n "$verbose" && echo "	checking pkg-config for $cf_pkg_gnutls" 1>&6
+
+echo "${as_me-configure}:13358: 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}:13363: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
+
+				cf_cv_have_gnutls=yes
+
+				cf_cflags_ssl=`$PKG_CONFIG --cflags $cf_pkg_gnutls`
+				cf_libs_ssl=`$PKG_CONFIG --libs $cf_pkg_gnutls`
+
+				if test -n "$cf_cflags_ssl" ; then
+					case "$cf_cflags_ssl" in #(vi
+					*-I*) #(vi
+						cf_cv_header_path_ssl=`echo "$cf_cflags_ssl" | sed -e 's/^.*-I//' -e 's/ .*//'`
+						;;
+					*)
+						cf_cv_header_path_ssl=/usr/include
+						;;
+					esac
+					if test -d $cf_cv_header_path_ssl/gnutls ; then
+						cf_cv_header_path_ssl=$cf_cv_header_path_ssl/gnutls
+					fi
+
+cf_fix_cppflags=no
+cf_new_cflags=
+cf_new_cppflags=
+cf_new_extra_cppflags=
+
+for cf_add_cflags in $cf_cflags_ssl
+do
+case $cf_fix_cppflags in
+no)
+	case $cf_add_cflags in #(vi
+	-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
+		case $cf_add_cflags in
+		-D*)
+			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
+
+			test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+			&& test -z "${cf_tst_cflags}" \
+			&& cf_fix_cppflags=yes
+
+			if test $cf_fix_cppflags = yes ; then
+				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+				continue
+			elif test "${cf_tst_cflags}" = "\"'" ; then
+				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+				continue
+			fi
+			;;
+		esac
+		case "$CPPFLAGS" in
+		*$cf_add_cflags) #(vi
+			;;
+		*) #(vi
+			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+			;;
+		esac
+		;;
+	*)
+		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+		;;
+	esac
+	;;
+yes)
+	cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
+
+	test "${cf_add_cflags}" != "${cf_tst_cflags}" \
+	&& test -z "${cf_tst_cflags}" \
+	&& cf_fix_cppflags=no
+	;;
+esac
+done
+
+if test -n "$cf_new_cflags" ; then
+
+	CFLAGS="$CFLAGS $cf_new_cflags"
+fi
+
+if test -n "$cf_new_cppflags" ; then
+
+	CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
+fi
+
+if test -n "$cf_new_extra_cppflags" ; then
+
+	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+fi
+
+				fi
+
+				if test -n "$cf_libs_ssl" ; then
+					case "x$cf_libs_ssl" in #(vi
+					*-L*) #(vi
+						cf_cv_library_path_ssl=`echo "$cf_libs_ssl" | sed -e 's/^.*-L//' -e 's/ .*//'`
+						;;
+					*)
+						cf_cv_library_path_ssl=/usr/lib
+						;;
+					esac
+					test -n "$verbose" && echo "	adding $cf_libs_ssl to LIBS" 1>&6
+
+echo "${as_me-configure}:13464: testing adding $cf_libs_ssl to LIBS ..." 1>&5
+
+					LIBS="$cf_libs_ssl $LIBS"
+				fi
+			else
+				test -n "$verbose" && echo "	... did not find $cf_pkg_gnutls in pkg-config" 1>&6
+
+echo "${as_me-configure}:13471: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
+
+				cf_pkg_gnutls=none
+			fi
+			;;
+		esac
+	fi
+
+	if test "$cf_cv_have_gnutls" = no ; then
+		cat >>confdefs.h <<\EOF
 #define USE_GNUTLS_INCL 1
 EOF
 
-  cf_gnutls_CPPFLAGS=$CPPFLAGS
+		cf_gnutls_CPPFLAGS=$CPPFLAGS
 
 # 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_gnutls=
 cf_cv_library_path_gnutls=
 
-echo "${as_me-configure}:13059: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me-configure}:13491: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 13062 "configure"
+#line 13494 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -13088,16 +13520,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13091: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13523: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13094: \$? = $ac_status" >&5
+  echo "$as_me:13526: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13097: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13529: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13100: \$? = $ac_status" >&5
+  echo "$as_me:13532: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_find_linkage_gnutls=yes
 else
@@ -13106,7 +13538,7 @@ cat conftest.$ac_ext >&5
 
     cf_cv_find_linkage_gnutls=no
 
-echo "${as_me-configure}:13109: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me-configure}:13541: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -13214,11 +13646,11 @@ cf_search="$cf_header_path_list $cf_search"
       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}:13217: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me-configure}:13649: 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 13221 "configure"
+#line 13653 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -13247,21 +13679,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13250: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13682: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13253: \$? = $ac_status" >&5
+  echo "$as_me:13685: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13256: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13688: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13259: \$? = $ac_status" >&5
+  echo "$as_me:13691: \$? = $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}:13264: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me-configure}:13696: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
 
             cf_cv_find_linkage_gnutls=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -13279,7 +13711,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_gnutls" = maybe ; then
 
-echo "${as_me-configure}:13282: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me-configure}:13714: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -13375,13 +13807,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}:13378: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me-configure}:13810: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-lgnutls -lgnutls-openssl -lgnutls-extra -lgnutls -lcrypt $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_gnutls"
             cat >conftest.$ac_ext <<_ACEOF
-#line 13384 "configure"
+#line 13816 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -13410,21 +13842,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13413: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13845: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13416: \$? = $ac_status" >&5
+  echo "$as_me:13848: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13419: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13851: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13422: \$? = $ac_status" >&5
+  echo "$as_me:13854: \$? = $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}:13427: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me-configure}:13859: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
 
                 cf_cv_find_linkage_gnutls=yes
                 cf_cv_library_file_gnutls="-lgnutls"
@@ -13459,18 +13891,19 @@ else
 cf_cv_have_gnutls=no
 fi
 
-  CPPFLAGS=$cf_gnutls_CPPFLAGS
+		CPPFLAGS=$cf_gnutls_CPPFLAGS
+	fi
 
-  if test "$cf_cv_have_gnutls" = yes ; then
-    if test -n "$cf_cv_header_path_gnutls" ; then
-      cat >>confdefs.h <<\EOF
+	if test "$cf_cv_have_gnutls" = yes ; then
+		if test -n "$cf_cv_header_path_gnutls" ; then
+			cat >>confdefs.h <<\EOF
 #define USE_SSL 1
 EOF
 
-      case $cf_cv_header_path_gnutls in
-      /usr/include/gnutls)
-          ;;
-      *)
+            case $cf_cv_header_path_gnutls in
+				/usr/include/gnutls)
+				;;
+			*)
 
 if test -n "$cf_cv_header_path_gnutls" ; then
   for cf_add_incdir in $cf_cv_header_path_gnutls
@@ -13496,7 +13929,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 13499 "configure"
+#line 13932 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13508,16 +13941,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13511: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13944: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13514: \$? = $ac_status" >&5
+  echo "$as_me:13947: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13517: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13950: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13520: \$? = $ac_status" >&5
+  echo "$as_me:13953: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -13534,7 +13967,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}:13537: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:13970: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -13549,10 +13982,10 @@ echo "${as_me-configure}:13537: testing adding $cf_add_incdir to include-path ..
   done
 fi
 
-          ;;
-      esac
-    fi
-    if test -n "$cf_cv_library_path_gnutls" ; then
+				;;
+			esac
+		fi
+		if test -n "$cf_cv_library_path_gnutls" ; then
 
 if test -n "$cf_cv_library_path_gnutls" ; then
   for cf_add_libdir in $cf_cv_library_path_gnutls
@@ -13573,7 +14006,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}:13576: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:14009: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -13581,11 +14014,11 @@ echo "${as_me-configure}:13576: testing adding $cf_add_libdir to library-path ..
   done
 fi
 
-    fi
-    LIBS="-lgnutls -lcrypt $LIBS"
-  fi
+		fi
+		LIBS="-lgnutls -lcrypt $LIBS"
 
-  echo "$as_me:13588: checking for SSL_connect in -lgnutls-openssl" >&5
+		if test "$cf_pkg_gnutls" = none ; then
+				echo "$as_me:14021: 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
@@ -13593,7 +14026,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnutls-openssl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 13596 "configure"
+#line 14029 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13612,16 +14045,16 @@ SSL_connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13615: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14048: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13618: \$? = $ac_status" >&5
+  echo "$as_me:14051: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13621: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14054: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13624: \$? = $ac_status" >&5
+  echo "$as_me:14057: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gnutls_openssl_SSL_connect=yes
 else
@@ -13632,12 +14065,12 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13635: result: $ac_cv_lib_gnutls_openssl_SSL_connect" >&5
+echo "$as_me:14068: result: $ac_cv_lib_gnutls_openssl_SSL_connect" >&5
 echo "${ECHO_T}$ac_cv_lib_gnutls_openssl_SSL_connect" >&6
 if test $ac_cv_lib_gnutls_openssl_SSL_connect = yes; then
   LIBS="-lgnutls-openssl $LIBS"
 else
-  echo "$as_me:13640: checking for SSL_connect in -lgnutls-extra" >&5
+  echo "$as_me:14073: 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
@@ -13645,7 +14078,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnutls-extra  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 13648 "configure"
+#line 14081 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13664,16 +14097,16 @@ SSL_connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13667: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14100: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13670: \$? = $ac_status" >&5
+  echo "$as_me:14103: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13673: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14106: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13676: \$? = $ac_status" >&5
+  echo "$as_me:14109: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gnutls_extra_SSL_connect=yes
 else
@@ -13684,22 +14117,24 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13687: result: $ac_cv_lib_gnutls_extra_SSL_connect" >&5
+echo "$as_me:14120: result: $ac_cv_lib_gnutls_extra_SSL_connect" >&5
 echo "${ECHO_T}$ac_cv_lib_gnutls_extra_SSL_connect" >&6
 if test $ac_cv_lib_gnutls_extra_SSL_connect = yes; then
   LIBS="-lgnutls-extra $LIBS"
 else
-  { { echo "$as_me:13692: error: cannot find gnutls openssl functions" >&5
+  { { echo "$as_me:14125: error: cannot find gnutls openssl functions" >&5
 echo "$as_me: error: cannot find gnutls openssl functions" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 fi
 
-echo "$as_me:13699: checking for X509 support" >&5
+			fi
+
+echo "$as_me:14134: checking for X509 support" >&5
 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 13702 "configure"
+#line 14137 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -13723,16 +14158,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:13726: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14161: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13729: \$? = $ac_status" >&5
+  echo "$as_me:14164: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13732: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14167: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13735: \$? = $ac_status" >&5
+  echo "$as_me:14170: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_x509_support=yes
 else
@@ -13741,7 +14176,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:13744: result: $cf_x509_support" >&5
+echo "$as_me:14179: result: $cf_x509_support" >&5
 echo "${ECHO_T}$cf_x509_support" >&6
 
 if test "$cf_x509_support" = yes ; then
@@ -13751,6 +14186,8 @@ EOF
 
 fi
 
+	fi
+
     fi
 elif test "x$cf_cv_use_libnss_compat"  != xno ; then
 
@@ -13771,7 +14208,7 @@ no) #(vi
 	;;
 yes) #(vi
 
-echo "$as_me:13774: checking for SSL_get_version in -lnss_compat_ossl" >&5
+echo "$as_me:14211: 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
@@ -13779,7 +14216,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnss_compat_ossl -lnss_compat_ossl $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 13782 "configure"
+#line 14219 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13798,16 +14235,16 @@ SSL_get_version ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13801: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14238: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13804: \$? = $ac_status" >&5
+  echo "$as_me:14241: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13807: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14244: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13810: \$? = $ac_status" >&5
+  echo "$as_me:14247: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nss_compat_ossl_SSL_get_version=yes
 else
@@ -13818,7 +14255,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13821: result: $ac_cv_lib_nss_compat_ossl_SSL_get_version" >&5
+echo "$as_me:14258: 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
@@ -13833,11 +14270,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}:13836: testing assume it is in $cf_ssl_root ..." 1>&5
+echo "${as_me-configure}:14273: 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:13840: error: cannot find NSS compilant libraries" >&5
+			{ { echo "$as_me:14277: error: cannot find NSS compilant libraries" >&5
 echo "$as_me: error: cannot find NSS compilant libraries" >&2;}
    { (exit 1); exit 1; }; }
 		fi
@@ -13852,13 +14289,13 @@ fi
 		elif test -d $cf_cv_use_libnss_compat/../include ; then
 			cf_ssl_root=$cf_cv_use_libnss_compat/..
 		else
-			{ { echo "$as_me:13855: error: cannot find NSS compilant library under $cf_cv_use_libnss_compat" >&5
+			{ { echo "$as_me:14292: 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:13861: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&5
+		{ echo "$as_me:14298: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&5
 echo "$as_me: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&2;}
 	fi
 	;;
@@ -13942,10 +14379,10 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 if test "$cf_ssl_subincs" = yes ; then
-echo "$as_me:13945: checking for NSS compilant include directory" >&5
+echo "$as_me:14382: 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 13948 "configure"
+#line 14385 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -13959,16 +14396,16 @@ SSL_shutdown((SSL *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13962: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14399: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13965: \$? = $ac_status" >&5
+  echo "$as_me:14402: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13968: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14405: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13971: \$? = $ac_status" >&5
+  echo "$as_me:14408: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_ssl_incl=yes
 else
@@ -13977,7 +14414,7 @@ cat conftest.$ac_ext >&5
 cf_ssl_incl=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:13980: result: $cf_ssl_incl" >&5
+echo "$as_me:14417: result: $cf_ssl_incl" >&5
 echo "${ECHO_T}$cf_ssl_incl" >&6
 test "$cf_ssl_incl" = yes && cat >>confdefs.h <<\EOF
 #define USE_NSS_COMPAT_INCL 1
@@ -13985,10 +14422,10 @@ EOF
 
 fi
 
-echo "$as_me:13988: checking if we can link to NSS compilant library" >&5
+echo "$as_me:14425: 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 13991 "configure"
+#line 14428 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14007,16 +14444,16 @@ SSL_shutdown((SSL *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14010: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14447: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14013: \$? = $ac_status" >&5
+  echo "$as_me:14450: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14016: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14453: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14019: \$? = $ac_status" >&5
+  echo "$as_me:14456: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_ssl_library=yes
 else
@@ -14025,7 +14462,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:14028: result: $cf_ssl_library" >&5
+echo "$as_me:14465: result: $cf_ssl_library" >&5
 echo "${ECHO_T}$cf_ssl_library" >&6
 if test "$cf_ssl_library" = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -14037,7 +14474,7 @@ EOF
 EOF
 
 else
-	{ { echo "$as_me:14040: error: Cannot link with NSS compilant libraries" >&5
+	{ { echo "$as_me:14477: error: Cannot link with NSS compilant libraries" >&5
 echo "$as_me: error: Cannot link with NSS compilant libraries" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -14045,7 +14482,7 @@ fi
 fi
 
 ### check for ipv6 support
-echo "$as_me:14048: checking whether to enable ipv6" >&5
+echo "$as_me:14485: 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.
@@ -14061,11 +14498,11 @@ EOF
 else
   enableval=no
 fi;
-echo "$as_me:14064: result: $enableval" >&5
+echo "$as_me:14501: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 if test "$enableval" = "yes"; then
 
-echo "$as_me:14068: checking ipv6 stack type" >&5
+echo "$as_me:14505: 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
@@ -14086,7 +14523,7 @@ do
 		;;
 	inria) #(vi
 				cat >conftest.$ac_ext <<_ACEOF
-#line 14089 "configure"
+#line 14526 "configure"
 #include "confdefs.h"
 
 #include <netinet/in.h>
@@ -14103,7 +14540,7 @@ rm -f conftest*
 		;;
 	kame) #(vi
 				cat >conftest.$ac_ext <<_ACEOF
-#line 14106 "configure"
+#line 14543 "configure"
 #include "confdefs.h"
 
 #include <netinet/in.h>
@@ -14120,7 +14557,7 @@ rm -f conftest*
 		;;
 	linux-glibc) #(vi
 				cat >conftest.$ac_ext <<_ACEOF
-#line 14123 "configure"
+#line 14560 "configure"
 #include "confdefs.h"
 
 #include <features.h>
@@ -14146,7 +14583,7 @@ rm -f conftest*
 		;;
 	toshiba) #(vi
 		cat >conftest.$ac_ext <<_ACEOF
-#line 14149 "configure"
+#line 14586 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -14163,7 +14600,7 @@ rm -f conftest*
 		;;
 	v6d) #(vi
 		cat >conftest.$ac_ext <<_ACEOF
-#line 14166 "configure"
+#line 14603 "configure"
 #include "confdefs.h"
 
 #include </usr/local/v6/include/sys/v6config.h>
@@ -14180,7 +14617,7 @@ rm -f conftest*
 		;;
 	zeta)
 		cat >conftest.$ac_ext <<_ACEOF
-#line 14183 "configure"
+#line 14620 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -14202,13 +14639,13 @@ rm -f conftest*
 done
 
 fi
-echo "$as_me:14205: result: $cf_cv_ipv6type" >&5
+echo "$as_me:14642: result: $cf_cv_ipv6type" >&5
 echo "${ECHO_T}$cf_cv_ipv6type" >&6
 
 cf_ipv6lib=none
 cf_ipv6dir=none
 
-echo "$as_me:14211: checking for IPv6 library if required" >&5
+echo "$as_me:14648: checking for IPv6 library if required" >&5
 echo $ECHO_N "checking for IPv6 library if required... $ECHO_C" >&6
 case $cf_cv_ipv6type in #(vi
 solaris) #(vi
@@ -14238,13 +14675,13 @@ zeta)
 	cf_ipv6dir=v6
 	;;
 esac
-echo "$as_me:14241: result: $cf_ipv6lib" >&5
+echo "$as_me:14678: result: $cf_ipv6lib" >&5
 echo "${ECHO_T}$cf_ipv6lib" >&6
 
 if test "$cf_ipv6lib" != "none"; then
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 14247 "configure"
+#line 14684 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -14260,16 +14697,16 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14263: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14700: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14266: \$? = $ac_status" >&5
+  echo "$as_me:14703: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14269: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14706: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14272: \$? = $ac_status" >&5
+  echo "$as_me:14709: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -14404,7 +14841,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 14407 "configure"
+#line 14844 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14416,16 +14853,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14419: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14856: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14422: \$? = $ac_status" >&5
+  echo "$as_me:14859: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14425: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14862: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14428: \$? = $ac_status" >&5
+  echo "$as_me:14865: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -14442,7 +14879,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}:14445: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:14882: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -14468,13 +14905,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:14471: checking for getaddrinfo" >&5
+	echo "$as_me:14908: 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 14477 "configure"
+#line 14914 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char getaddrinfo (); below.  */
@@ -14505,16 +14942,16 @@ f = getaddrinfo;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14508: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14945: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14511: \$? = $ac_status" >&5
+  echo "$as_me:14948: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14514: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14951: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14517: \$? = $ac_status" >&5
+  echo "$as_me:14954: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_getaddrinfo=yes
 else
@@ -14524,18 +14961,18 @@ ac_cv_func_getaddrinfo=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:14527: result: $ac_cv_func_getaddrinfo" >&5
+echo "$as_me:14964: 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:14534: checking for getaddrinfo in -l$cf_ipv6lib" >&5
+		echo "$as_me:14971: 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 14538 "configure"
+#line 14975 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -14551,25 +14988,25 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14554: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14991: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14557: \$? = $ac_status" >&5
+  echo "$as_me:14994: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14560: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14997: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14563: \$? = $ac_status" >&5
+  echo "$as_me:15000: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:14565: result: yes" >&5
+  echo "$as_me:15002: 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:14572: result: no" >&5
+echo "$as_me:15009: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_library_path_list=""
@@ -14658,11 +15095,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:14661: checking for -l$cf_ipv6lib in $cf_libdir" >&5
+				echo "$as_me:15098: 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 14665 "configure"
+#line 15102 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -14678,25 +15115,25 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14681: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15118: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14684: \$? = $ac_status" >&5
+  echo "$as_me:15121: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14687: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15124: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14690: \$? = $ac_status" >&5
+  echo "$as_me:15127: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:14692: result: yes" >&5
+  echo "$as_me:15129: 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:14699: result: no" >&5
+echo "$as_me:15136: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -14711,7 +15148,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_ipv6lib
 
 	if test $cf_found_library = no ; then
-		{ { echo "$as_me:14714: error: No $cf_ipv6lib library found, cannot continue.  You must fetch lib$cf_ipv6lib.a
+		{ { echo "$as_me:15151: 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;}
@@ -14719,7 +15156,7 @@ from an appropriate IPv6 kit and compile beforehand." >&2;}
 	fi
 fi
 
-echo "$as_me:14722: checking working getaddrinfo" >&5
+echo "$as_me:15159: 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
@@ -14729,7 +15166,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_getaddrinfo=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 14732 "configure"
+#line 15169 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -14809,15 +15246,15 @@ int main()
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:14812: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15249: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14815: \$? = $ac_status" >&5
+  echo "$as_me:15252: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:14817: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15254: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14820: \$? = $ac_status" >&5
+  echo "$as_me:15257: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_getaddrinfo=yes
 else
@@ -14830,7 +15267,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:14833: result: $cf_cv_getaddrinfo" >&5
+echo "$as_me:15270: result: $cf_cv_getaddrinfo" >&5
 echo "${ECHO_T}$cf_cv_getaddrinfo" >&6
 if test "$cf_cv_getaddrinfo" = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -14845,12 +15282,12 @@ fi
 
 if test "$cf_cv_getaddrinfo" != "yes"; then
 	if test "$cf_cv_ipv6type" != "linux"; then
-		{ echo "$as_me:14848: WARNING: You must get working getaddrinfo() function,
+		{ echo "$as_me:15285: 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:14853: WARNING: The getaddrinfo() implementation on your system seems be buggy.
+		{ echo "$as_me:15290: 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.
@@ -14861,7 +15298,7 @@ fi
 
 fi
 
-echo "$as_me:14864: checking for screen type" >&5
+echo "$as_me:15301: 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
@@ -14875,7 +15312,7 @@ case $withval in
 curses|ncurses|ncursesw|pdcurses|slang)
 	cf_cv_screen=$withval
 	;;
-*)	{ { echo "$as_me:14878: error: Unexpected value" >&5
+*)	{ { echo "$as_me:15315: error: Unexpected value" >&5
 echo "$as_me: error: Unexpected value" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -14884,7 +15321,7 @@ else
   cf_cv_screen=curses
 fi;
 fi
-echo "$as_me:14887: result: $cf_cv_screen" >&5
+echo "$as_me:15324: result: $cf_cv_screen" >&5
 echo "${ECHO_T}$cf_cv_screen" >&6
 
 case $cf_cv_screen in
@@ -14919,7 +15356,7 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:14922: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:15359: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -14938,7 +15375,7 @@ dft_color_style=yes
 case $cf_cv_screen in
 curses)
 
-echo "$as_me:14941: checking for extra include directories" >&5
+echo "$as_me:15378: 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
@@ -14958,11 +15395,11 @@ sunos3*|sunos4*)
 esac
 
 fi
-echo "$as_me:14961: result: $cf_cv_curses_incdir" >&5
+echo "$as_me:15398: result: $cf_cv_curses_incdir" >&5
 echo "${ECHO_T}$cf_cv_curses_incdir" >&6
 test "$cf_cv_curses_incdir" != no && CPPFLAGS="$cf_cv_curses_incdir $CPPFLAGS"
 
-echo "$as_me:14965: checking if we have identified curses headers" >&5
+echo "$as_me:15402: 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
@@ -14976,7 +15413,7 @@ for cf_header in \
 	ncurses/ncurses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 14979 "configure"
+#line 15416 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -14988,16 +15425,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14991: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15428: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14994: \$? = $ac_status" >&5
+  echo "$as_me:15431: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14997: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15434: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15000: \$? = $ac_status" >&5
+  echo "$as_me:15437: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -15008,11 +15445,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:15011: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:15448: 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:15015: error: No curses header-files found" >&5
+	{ { echo "$as_me:15452: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -15022,23 +15459,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:15025: checking for $ac_header" >&5
+echo "$as_me:15462: 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 15031 "configure"
+#line 15468 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:15035: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:15472: \"$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:15041: \$? = $ac_status" >&5
+  echo "$as_me:15478: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -15057,7 +15494,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:15060: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:15497: 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
@@ -15067,7 +15504,7 @@ EOF
 fi
 done
 
-echo "$as_me:15070: checking for terminfo header" >&5
+echo "$as_me:15507: 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
@@ -15085,7 +15522,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 15088 "configure"
+#line 15525 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -15100,16 +15537,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15103: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15540: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15106: \$? = $ac_status" >&5
+  echo "$as_me:15543: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15109: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15546: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15112: \$? = $ac_status" >&5
+  echo "$as_me:15549: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -15125,7 +15562,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:15128: result: $cf_cv_term_header" >&5
+echo "$as_me:15565: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -15154,7 +15591,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:15157: checking for ncurses version" >&5
+echo "$as_me:15594: 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
@@ -15180,10 +15617,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:15183: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:15620: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:15186: \$? = $ac_status" >&5
+  echo "$as_me:15623: \$? = $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%".*%%'`
@@ -15193,7 +15630,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15196 "configure"
+#line 15633 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -15218,15 +15655,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:15221: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15658: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15224: \$? = $ac_status" >&5
+  echo "$as_me:15661: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:15226: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15663: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15229: \$? = $ac_status" >&5
+  echo "$as_me:15666: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -15240,16 +15677,16 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:15243: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:15680: 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:15249: checking if we have identified curses libraries" >&5
+echo "$as_me:15686: 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 15252 "configure"
+#line 15689 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -15261,16 +15698,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15264: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15701: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15267: \$? = $ac_status" >&5
+  echo "$as_me:15704: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15270: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15707: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15273: \$? = $ac_status" >&5
+  echo "$as_me:15710: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -15279,13 +15716,13 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:15282: result: $cf_result" >&5
+echo "$as_me:15719: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 if test "$cf_result" = no ; then
 case $host_os in #(vi
 freebsd*) #(vi
-    echo "$as_me:15288: checking for tgoto in -lmytinfo" >&5
+    echo "$as_me:15725: 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
@@ -15293,7 +15730,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 15296 "configure"
+#line 15733 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15312,16 +15749,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15315: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15752: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15318: \$? = $ac_status" >&5
+  echo "$as_me:15755: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15321: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15758: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15324: \$? = $ac_status" >&5
+  echo "$as_me:15761: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -15332,7 +15769,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15335: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:15772: result: $ac_cv_lib_mytinfo_tgoto" >&5
 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
 if test $ac_cv_lib_mytinfo_tgoto = yes; then
   LIBS="-lmytinfo $LIBS"
@@ -15340,7 +15777,7 @@ fi
 
     ;;
 hpux10.*) #(vi
-    echo "$as_me:15343: checking for initscr in -lcur_colr" >&5
+    echo "$as_me:15780: 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
@@ -15348,7 +15785,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcur_colr  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 15351 "configure"
+#line 15788 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15367,16 +15804,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15370: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15807: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15373: \$? = $ac_status" >&5
+  echo "$as_me:15810: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15376: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15813: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15379: \$? = $ac_status" >&5
+  echo "$as_me:15816: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_cur_colr_initscr=yes
 else
@@ -15387,7 +15824,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15390: result: $ac_cv_lib_cur_colr_initscr" >&5
+echo "$as_me:15827: 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
 
@@ -15396,7 +15833,7 @@ if test $ac_cv_lib_cur_colr_initscr = yes; then
 
 else
 
-    echo "$as_me:15399: checking for initscr in -lHcurses" >&5
+    echo "$as_me:15836: 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
@@ -15404,7 +15841,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lHcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 15407 "configure"
+#line 15844 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15423,16 +15860,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15426: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15863: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15429: \$? = $ac_status" >&5
+  echo "$as_me:15866: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15432: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15869: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15435: \$? = $ac_status" >&5
+  echo "$as_me:15872: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Hcurses_initscr=yes
 else
@@ -15443,7 +15880,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15446: result: $ac_cv_lib_Hcurses_initscr" >&5
+echo "$as_me:15883: 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
 
@@ -15478,7 +15915,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}:15481: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:15918: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -15509,7 +15946,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}:15512: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:15949: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -15537,13 +15974,13 @@ if test ".$ac_cv_func_initscr" != .yes ; then
 
     # Check for library containing tgoto.  Do this before curses library
     # because it may be needed to link the test-case for initscr.
-    echo "$as_me:15540: checking for tgoto" >&5
+    echo "$as_me:15977: 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 15546 "configure"
+#line 15983 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char tgoto (); below.  */
@@ -15574,16 +16011,16 @@ f = tgoto;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15577: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16014: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15580: \$? = $ac_status" >&5
+  echo "$as_me:16017: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15583: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16020: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15586: \$? = $ac_status" >&5
+  echo "$as_me:16023: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_tgoto=yes
 else
@@ -15593,7 +16030,7 @@ ac_cv_func_tgoto=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:15596: result: $ac_cv_func_tgoto" >&5
+echo "$as_me:16033: 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
@@ -15602,7 +16039,7 @@ else
         for cf_term_lib in $cf_check_list termcap termlib unknown
         do
             as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh`
-echo "$as_me:15605: checking for tgoto in -l$cf_term_lib" >&5
+echo "$as_me:16042: 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
@@ -15610,7 +16047,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_term_lib  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 15613 "configure"
+#line 16050 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15629,16 +16066,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15632: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16069: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15635: \$? = $ac_status" >&5
+  echo "$as_me:16072: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15638: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16075: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15641: \$? = $ac_status" >&5
+  echo "$as_me:16078: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -15649,7 +16086,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15652: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:16089: 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
@@ -15664,7 +16101,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:15667: checking for initscr in -l$cf_curs_lib" >&5
+echo "$as_me:16104: 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
@@ -15672,7 +16109,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_curs_lib  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 15675 "configure"
+#line 16112 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -15691,16 +16128,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15694: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16131: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15697: \$? = $ac_status" >&5
+  echo "$as_me:16134: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15700: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16137: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15703: \$? = $ac_status" >&5
+  echo "$as_me:16140: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -15711,23 +16148,23 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:15714: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:16151: result: `eval echo '${'$as_ac_Lib'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
 if test `eval echo '${'$as_ac_Lib'}'` = yes; then
   break
 fi
 
     done
-    test $cf_curs_lib = unknown && { { echo "$as_me:15721: error: no curses library found" >&5
+    test $cf_curs_lib = unknown && { { echo "$as_me:16158: 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:15727: checking if we can link with $cf_curs_lib library" >&5
+        echo "$as_me:16164: 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 15730 "configure"
+#line 16167 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -15739,16 +16176,16 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15742: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16179: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15745: \$? = $ac_status" >&5
+  echo "$as_me:16182: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15748: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16185: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15751: \$? = $ac_status" >&5
+  echo "$as_me:16188: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -15757,18 +16194,18 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-        echo "$as_me:15760: result: $cf_result" >&5
+        echo "$as_me:16197: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
-        test $cf_result = no && { { echo "$as_me:15762: error: Cannot link curses library" >&5
+        test $cf_result = no && { { echo "$as_me:16199: 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:15768: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+        echo "$as_me:16205: 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 15771 "configure"
+#line 16208 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -15780,16 +16217,16 @@ initscr(); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15783: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16220: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15786: \$? = $ac_status" >&5
+  echo "$as_me:16223: \$? = $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:16226: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15792: \$? = $ac_status" >&5
+  echo "$as_me:16229: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=no
 else
@@ -15798,7 +16235,7 @@ cat conftest.$ac_ext >&5
 
             LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
             cat >conftest.$ac_ext <<_ACEOF
-#line 15801 "configure"
+#line 16238 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -15810,16 +16247,16 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15813: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16250: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15816: \$? = $ac_status" >&5
+  echo "$as_me:16253: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15819: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16256: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15822: \$? = $ac_status" >&5
+  echo "$as_me:16259: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -15831,13 +16268,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:15834: result: $cf_result" >&5
+        echo "$as_me:16271: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
     fi
 fi
 fi
 
-echo "$as_me:15840: checking for curses performance tradeoff" >&5
+echo "$as_me:16277: 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
@@ -15845,7 +16282,7 @@ else
 
     cf_cv_curs_performance=no
     cat >conftest.$ac_ext <<_ACEOF
-#line 15848 "configure"
+#line 16285 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -15864,20 +16301,20 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15867: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16304: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15870: \$? = $ac_status" >&5
+  echo "$as_me:16307: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15873: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16310: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15876: \$? = $ac_status" >&5
+  echo "$as_me:16313: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 15880 "configure"
+#line 16317 "configure"
 #include "confdefs.h"
 
 #define CURS_PERFORMANCE
@@ -15897,16 +16334,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15900: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16337: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15903: \$? = $ac_status" >&5
+  echo "$as_me:16340: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15906: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16343: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15909: \$? = $ac_status" >&5
+  echo "$as_me:16346: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_curs_performance=yes
 else
@@ -15921,20 +16358,20 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:15924: result: $cf_cv_curs_performance" >&5
+echo "$as_me:16361: 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:15930: checking for curses touchline function" >&5
+echo "$as_me:16367: 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 15937 "configure"
+#line 16374 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -15947,23 +16384,23 @@ touchline(stdscr, 1,2,3);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15950: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16387: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15953: \$? = $ac_status" >&5
+  echo "$as_me:16390: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15956: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16393: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15959: \$? = $ac_status" >&5
+  echo "$as_me:16396: \$? = $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 15966 "configure"
+#line 16403 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -15976,16 +16413,16 @@ touchline(stdscr, 1,2);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15979: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16416: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15982: \$? = $ac_status" >&5
+  echo "$as_me:16419: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15985: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16422: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15988: \$? = $ac_status" >&5
+  echo "$as_me:16425: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_curs_touchline=sysv
 else
@@ -15997,7 +16434,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:16000: result: $cf_cv_curs_touchline" >&5
+echo "$as_me:16437: result: $cf_cv_curs_touchline" >&5
 echo "${ECHO_T}$cf_cv_curs_touchline" >&6
 case "$cf_cv_curs_touchline" in #(vi
 bsd) #(vi
@@ -16024,7 +16461,7 @@ for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:16027: checking for $ac_word" >&5
+echo "$as_me:16464: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_NCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16041,7 +16478,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_NCURSES_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:16044: found $ac_dir/$ac_word" >&5
+   echo "$as_me:16481: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -16052,10 +16489,10 @@ fi
 NCURSES_CONFIG=$ac_cv_path_NCURSES_CONFIG
 
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:16055: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:16492: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:16058: result: no" >&5
+  echo "$as_me:16495: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -16113,7 +16550,7 @@ if test -n "$cf_cv_curses_dir/include $cf_cv_curses_dir/include/$cf_ncuhdr_root"
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 16116 "configure"
+#line 16553 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -16125,16 +16562,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16128: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16565: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16131: \$? = $ac_status" >&5
+  echo "$as_me:16568: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16134: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16571: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16137: \$? = $ac_status" >&5
+  echo "$as_me:16574: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -16151,7 +16588,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}:16154: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:16591: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -16168,7 +16605,7 @@ fi
 
 }
 
-echo "$as_me:16171: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:16608: 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
@@ -16180,7 +16617,7 @@ else
 	do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 16183 "configure"
+#line 16620 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -16204,16 +16641,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16207: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16644: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16210: \$? = $ac_status" >&5
+  echo "$as_me:16647: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16213: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16650: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16216: \$? = $ac_status" >&5
+  echo "$as_me:16653: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -16228,14 +16665,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 	done
 
 fi
-echo "$as_me:16231: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:16668: 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:16238: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:16675: 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
@@ -16370,7 +16807,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 16373 "configure"
+#line 16810 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -16382,16 +16819,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16385: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16822: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16388: \$? = $ac_status" >&5
+  echo "$as_me:16825: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16391: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16828: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16394: \$? = $ac_status" >&5
+  echo "$as_me:16831: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -16408,7 +16845,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}:16411: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:16848: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -16429,7 +16866,7 @@ fi
 		do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 16432 "configure"
+#line 16869 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -16453,16 +16890,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16456: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16893: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16459: \$? = $ac_status" >&5
+  echo "$as_me:16896: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16462: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16899: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16465: \$? = $ac_status" >&5
+  echo "$as_me:16902: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -16483,12 +16920,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:16486: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:16923: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:16491: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:16928: 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%/[^/]*$%%'`
@@ -16521,7 +16958,7 @@ if test -n "$cf_1st_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 16524 "configure"
+#line 16961 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -16533,16 +16970,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16536: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16973: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16539: \$? = $ac_status" >&5
+  echo "$as_me:16976: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16542: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16979: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16545: \$? = $ac_status" >&5
+  echo "$as_me:16982: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -16559,7 +16996,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}:16562: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:16999: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -16602,7 +17039,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:16605: checking for terminfo header" >&5
+echo "$as_me:17042: 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
@@ -16620,7 +17057,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 16623 "configure"
+#line 17060 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -16635,16 +17072,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16638: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17075: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16641: \$? = $ac_status" >&5
+  echo "$as_me:17078: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16644: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17081: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16647: \$? = $ac_status" >&5
+  echo "$as_me:17084: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -16660,7 +17097,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:16663: result: $cf_cv_term_header" >&5
+echo "$as_me:17100: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -16694,7 +17131,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:16697: checking for ncurses version" >&5
+echo "$as_me:17134: 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
@@ -16720,10 +17157,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:16723: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:17160: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:16726: \$? = $ac_status" >&5
+  echo "$as_me:17163: \$? = $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%".*%%'`
@@ -16733,7 +17170,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 16736 "configure"
+#line 17173 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -16758,15 +17195,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:16761: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17198: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16764: \$? = $ac_status" >&5
+  echo "$as_me:17201: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:16766: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17203: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16769: \$? = $ac_status" >&5
+  echo "$as_me:17206: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -16780,7 +17217,7 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:16783: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:17220: 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
@@ -16792,7 +17229,7 @@ cf_nculib_root=ncurses
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:16795: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:17232: 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
@@ -16800,7 +17237,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 16803 "configure"
+#line 17240 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16819,16 +17256,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16822: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17259: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16825: \$? = $ac_status" >&5
+  echo "$as_me:17262: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16828: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17265: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16831: \$? = $ac_status" >&5
+  echo "$as_me:17268: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -16839,10 +17276,10 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16842: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:17279: 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:16845: checking for initscr in -lgpm" >&5
+  echo "$as_me:17282: 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
@@ -16850,7 +17287,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 16853 "configure"
+#line 17290 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16869,16 +17306,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16872: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17309: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16875: \$? = $ac_status" >&5
+  echo "$as_me:17312: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16878: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17315: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16881: \$? = $ac_status" >&5
+  echo "$as_me:17318: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -16889,7 +17326,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16892: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:17329: 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"
@@ -16904,7 +17341,7 @@ freebsd*)
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it's static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:16907: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:17344: 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
@@ -16912,7 +17349,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 16915 "configure"
+#line 17352 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16931,16 +17368,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16934: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17371: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16937: \$? = $ac_status" >&5
+  echo "$as_me:17374: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16940: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17377: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16943: \$? = $ac_status" >&5
+  echo "$as_me:17380: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -16951,7 +17388,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16954: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:17391: 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"
@@ -16985,7 +17422,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}:16988: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:17425: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -16998,13 +17435,13 @@ else
 
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
-	echo "$as_me:17001: checking for initscr" >&5
+	echo "$as_me:17438: 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 17007 "configure"
+#line 17444 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */
@@ -17035,16 +17472,16 @@ f = initscr;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17038: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17475: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17041: \$? = $ac_status" >&5
+  echo "$as_me:17478: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17044: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17481: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17047: \$? = $ac_status" >&5
+  echo "$as_me:17484: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -17054,18 +17491,18 @@ ac_cv_func_initscr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:17057: result: $ac_cv_func_initscr" >&5
+echo "$as_me:17494: 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:17064: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:17501: 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 17068 "configure"
+#line 17505 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -17077,25 +17514,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17080: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17517: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17083: \$? = $ac_status" >&5
+  echo "$as_me:17520: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17086: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17523: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17089: \$? = $ac_status" >&5
+  echo "$as_me:17526: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:17091: result: yes" >&5
+  echo "$as_me:17528: 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:17098: result: no" >&5
+echo "$as_me:17535: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_library_path_list=""
@@ -17184,11 +17621,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:17187: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:17624: 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 17191 "configure"
+#line 17628 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -17200,25 +17637,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17203: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17640: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17206: \$? = $ac_status" >&5
+  echo "$as_me:17643: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17209: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17646: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17212: \$? = $ac_status" >&5
+  echo "$as_me:17649: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:17214: result: yes" >&5
+  echo "$as_me:17651: 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:17221: result: no" >&5
+echo "$as_me:17658: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -17233,7 +17670,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:17236: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:17673: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -17241,7 +17678,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:17244: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:17681: 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
@@ -17251,7 +17688,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >conftest.$ac_ext <<_ACEOF
-#line 17254 "configure"
+#line 17691 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -17263,23 +17700,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17266: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17703: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17269: \$? = $ac_status" >&5
+  echo "$as_me:17706: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17272: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17709: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17275: \$? = $ac_status" >&5
+  echo "$as_me:17712: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:17277: result: yes" >&5
+  echo "$as_me:17714: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:17282: result: no" >&5
+echo "$as_me:17719: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -17297,7 +17734,7 @@ fi
 	;;
 ncursesw)
 
-echo "$as_me:17300: checking for multibyte character support" >&5
+echo "$as_me:17737: 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
@@ -17305,7 +17742,7 @@ else
 
 	cf_save_LIBS="$LIBS"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 17308 "configure"
+#line 17745 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -17318,16 +17755,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17321: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17758: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17324: \$? = $ac_status" >&5
+  echo "$as_me:17761: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17327: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17764: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17330: \$? = $ac_status" >&5
+  echo "$as_me:17767: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_utf8_lib=yes
 else
@@ -17339,10 +17776,10 @@ cat conftest.$ac_ext >&5
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
-echo "${as_me-configure}:17342: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me-configure}:17779: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 17345 "configure"
+#line 17782 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -17355,16 +17792,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17358: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17795: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17361: \$? = $ac_status" >&5
+  echo "$as_me:17798: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17364: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17801: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17367: \$? = $ac_status" >&5
+  echo "$as_me:17804: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_find_linkage_utf8=yes
 else
@@ -17373,7 +17810,7 @@ cat conftest.$ac_ext >&5
 
     cf_cv_find_linkage_utf8=no
 
-echo "${as_me-configure}:17376: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me-configure}:17813: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -17481,11 +17918,11 @@ cf_search="$cf_header_path_list $cf_search"
       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}:17484: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me-configure}:17921: 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 17488 "configure"
+#line 17925 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -17498,21 +17935,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17501: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17938: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17504: \$? = $ac_status" >&5
+  echo "$as_me:17941: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17507: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17944: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17510: \$? = $ac_status" >&5
+  echo "$as_me:17947: \$? = $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}:17515: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me-configure}:17952: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
 
             cf_cv_find_linkage_utf8=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -17530,7 +17967,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
-echo "${as_me-configure}:17533: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me-configure}:17970: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -17626,13 +18063,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}:17629: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me-configure}:18066: 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 17635 "configure"
+#line 18072 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -17645,21 +18082,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17648: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18085: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17651: \$? = $ac_status" >&5
+  echo "$as_me:18088: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17654: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18091: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17657: \$? = $ac_status" >&5
+  echo "$as_me:18094: \$? = $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}:17662: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me-configure}:18099: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
 
                 cf_cv_find_linkage_utf8=yes
                 cf_cv_library_file_utf8="-lutf8"
@@ -17697,7 +18134,7 @@ fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:17700: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:18137: 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
@@ -17731,7 +18168,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 17734 "configure"
+#line 18171 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -17743,16 +18180,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17746: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18183: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17749: \$? = $ac_status" >&5
+  echo "$as_me:18186: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17752: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18189: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17755: \$? = $ac_status" >&5
+  echo "$as_me:18192: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -17769,7 +18206,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}:17772: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:18209: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -17803,7 +18240,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}:17806: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:18243: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -17821,7 +18258,7 @@ for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:17824: checking for $ac_word" >&5
+echo "$as_me:18261: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_NCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17838,7 +18275,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_NCURSES_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:17841: found $ac_dir/$ac_word" >&5
+   echo "$as_me:18278: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -17849,10 +18286,10 @@ fi
 NCURSES_CONFIG=$ac_cv_path_NCURSES_CONFIG
 
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:17852: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:18289: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:17855: result: no" >&5
+  echo "$as_me:18292: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -17910,7 +18347,7 @@ if test -n "$cf_cv_curses_dir/include $cf_cv_curses_dir/include/$cf_ncuhdr_root"
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 17913 "configure"
+#line 18350 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -17922,16 +18359,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17925: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18362: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17928: \$? = $ac_status" >&5
+  echo "$as_me:18365: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17931: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18368: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17934: \$? = $ac_status" >&5
+  echo "$as_me:18371: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -17948,7 +18385,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}:17951: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:18388: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -17965,7 +18402,7 @@ fi
 
 }
 
-echo "$as_me:17968: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:18405: 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
@@ -17977,7 +18414,7 @@ else
 	do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 17980 "configure"
+#line 18417 "configure"
 #include "confdefs.h"
 
 #define _XOPEN_SOURCE_EXTENDED
@@ -18009,16 +18446,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18012: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18449: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18015: \$? = $ac_status" >&5
+  echo "$as_me:18452: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18018: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18455: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18021: \$? = $ac_status" >&5
+  echo "$as_me:18458: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -18033,14 +18470,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 	done
 
 fi
-echo "$as_me:18036: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:18473: 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:18043: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:18480: 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
@@ -18175,7 +18612,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 18178 "configure"
+#line 18615 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -18187,16 +18624,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18190: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18627: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18193: \$? = $ac_status" >&5
+  echo "$as_me:18630: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18196: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18633: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18199: \$? = $ac_status" >&5
+  echo "$as_me:18636: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -18213,7 +18650,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}:18216: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:18653: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -18234,7 +18671,7 @@ fi
 		do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 18237 "configure"
+#line 18674 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -18258,16 +18695,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18261: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18698: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18264: \$? = $ac_status" >&5
+  echo "$as_me:18701: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18267: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18704: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18270: \$? = $ac_status" >&5
+  echo "$as_me:18707: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -18288,12 +18725,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:18291: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:18728: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:18296: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:18733: 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%/[^/]*$%%'`
@@ -18326,7 +18763,7 @@ if test -n "$cf_1st_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 18329 "configure"
+#line 18766 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -18338,16 +18775,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18341: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18778: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18344: \$? = $ac_status" >&5
+  echo "$as_me:18781: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18347: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18784: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18350: \$? = $ac_status" >&5
+  echo "$as_me:18787: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -18364,7 +18801,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}:18367: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:18804: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -18407,7 +18844,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:18410: checking for terminfo header" >&5
+echo "$as_me:18847: 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
@@ -18425,7 +18862,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 18428 "configure"
+#line 18865 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -18440,16 +18877,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18443: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18880: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18446: \$? = $ac_status" >&5
+  echo "$as_me:18883: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18449: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18886: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18452: \$? = $ac_status" >&5
+  echo "$as_me:18889: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -18465,7 +18902,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:18468: result: $cf_cv_term_header" >&5
+echo "$as_me:18905: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -18499,7 +18936,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:18502: checking for ncurses version" >&5
+echo "$as_me:18939: 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
@@ -18525,10 +18962,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:18528: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:18965: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:18531: \$? = $ac_status" >&5
+  echo "$as_me:18968: \$? = $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%".*%%'`
@@ -18538,7 +18975,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 18541 "configure"
+#line 18978 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -18563,15 +19000,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:18566: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19003: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18569: \$? = $ac_status" >&5
+  echo "$as_me:19006: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:18571: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19008: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18574: \$? = $ac_status" >&5
+  echo "$as_me:19011: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -18585,7 +19022,7 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:18588: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:19025: 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
@@ -18597,7 +19034,7 @@ cf_nculib_root=ncursesw
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:18600: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:19037: 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
@@ -18605,7 +19042,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 18608 "configure"
+#line 19045 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18624,16 +19061,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18627: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19064: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18630: \$? = $ac_status" >&5
+  echo "$as_me:19067: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18633: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19070: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18636: \$? = $ac_status" >&5
+  echo "$as_me:19073: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -18644,10 +19081,10 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18647: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:19084: 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:18650: checking for initscr in -lgpm" >&5
+  echo "$as_me:19087: 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
@@ -18655,7 +19092,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 18658 "configure"
+#line 19095 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18674,16 +19111,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18677: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19114: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18680: \$? = $ac_status" >&5
+  echo "$as_me:19117: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18683: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19120: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18686: \$? = $ac_status" >&5
+  echo "$as_me:19123: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -18694,7 +19131,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18697: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:19134: 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"
@@ -18709,7 +19146,7 @@ freebsd*)
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it's static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:18712: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:19149: 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
@@ -18717,7 +19154,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 18720 "configure"
+#line 19157 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18736,16 +19173,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18739: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19176: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18742: \$? = $ac_status" >&5
+  echo "$as_me:19179: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18745: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19182: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18748: \$? = $ac_status" >&5
+  echo "$as_me:19185: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -18756,7 +19193,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18759: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:19196: 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"
@@ -18790,7 +19227,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}:18793: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:19230: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -18803,13 +19240,13 @@ else
 
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
-	echo "$as_me:18806: checking for initscr" >&5
+	echo "$as_me:19243: 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 18812 "configure"
+#line 19249 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */
@@ -18840,16 +19277,16 @@ f = initscr;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18843: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19280: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18846: \$? = $ac_status" >&5
+  echo "$as_me:19283: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18849: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19286: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18852: \$? = $ac_status" >&5
+  echo "$as_me:19289: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -18859,18 +19296,18 @@ ac_cv_func_initscr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:18862: result: $ac_cv_func_initscr" >&5
+echo "$as_me:19299: 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:18869: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:19306: 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 18873 "configure"
+#line 19310 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -18882,25 +19319,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18885: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19322: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18888: \$? = $ac_status" >&5
+  echo "$as_me:19325: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18891: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19328: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18894: \$? = $ac_status" >&5
+  echo "$as_me:19331: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:18896: result: yes" >&5
+  echo "$as_me:19333: 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:18903: result: no" >&5
+echo "$as_me:19340: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_library_path_list=""
@@ -18989,11 +19426,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:18992: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:19429: 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 18996 "configure"
+#line 19433 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -19005,25 +19442,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19008: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19445: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19011: \$? = $ac_status" >&5
+  echo "$as_me:19448: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19014: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19451: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19017: \$? = $ac_status" >&5
+  echo "$as_me:19454: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:19019: result: yes" >&5
+  echo "$as_me:19456: 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:19026: result: no" >&5
+echo "$as_me:19463: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -19038,7 +19475,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:19041: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:19478: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -19046,7 +19483,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:19049: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:19486: 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
@@ -19056,7 +19493,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >conftest.$ac_ext <<_ACEOF
-#line 19059 "configure"
+#line 19496 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -19068,23 +19505,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19071: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19508: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19074: \$? = $ac_status" >&5
+  echo "$as_me:19511: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19077: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19514: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19080: \$? = $ac_status" >&5
+  echo "$as_me:19517: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:19082: result: yes" >&5
+  echo "$as_me:19519: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:19087: result: no" >&5
+echo "$as_me:19524: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -19107,14 +19544,14 @@ pdcurses)
 	;;
 slang)
 
-echo "$as_me:19110: checking for slang header file" >&5
+echo "$as_me:19547: 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
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 19117 "configure"
+#line 19554 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -19126,16 +19563,16 @@ printf("%s\n", SLANG_VERSION)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19129: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19566: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19132: \$? = $ac_status" >&5
+  echo "$as_me:19569: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19135: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19572: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19138: \$? = $ac_status" >&5
+  echo "$as_me:19575: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_header=predefined
 else
@@ -19253,14 +19690,14 @@ cf_search="$cf_header_path_list $cf_search"
 		done
 		test -n "$cf_cv_slang_header" && break
 	done
-	test -z "$cf_cv_slang_header" && { { echo "$as_me:19256: error: not found" >&5
+	test -z "$cf_cv_slang_header" && { { echo "$as_me:19693: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:19263: result: $cf_cv_slang_header" >&5
+echo "$as_me:19700: result: $cf_cv_slang_header" >&5
 echo "${ECHO_T}$cf_cv_slang_header" >&6
 cat >>confdefs.h <<\EOF
 #define USE_SLANG 1
@@ -19297,7 +19734,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 19300 "configure"
+#line 19737 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -19309,16 +19746,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19312: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19749: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19315: \$? = $ac_status" >&5
+  echo "$as_me:19752: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19318: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19755: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19321: \$? = $ac_status" >&5
+  echo "$as_me:19758: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -19335,7 +19772,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}:19338: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:19775: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -19355,14 +19792,14 @@ esac
 
 # 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:19358: checking if we must define UTF8" >&5
+echo "$as_me:19795: 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 19365 "configure"
+#line 19802 "configure"
 #include "confdefs.h"
 
 #include <slang.h>
@@ -19375,16 +19812,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19378: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19815: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19381: \$? = $ac_status" >&5
+  echo "$as_me:19818: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19384: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19821: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19387: \$? = $ac_status" >&5
+  echo "$as_me:19824: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_utf8=no
 else
@@ -19392,7 +19829,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 19395 "configure"
+#line 19832 "configure"
 #include "confdefs.h"
 
 #define UTF8
@@ -19406,16 +19843,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19409: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19846: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19412: \$? = $ac_status" >&5
+  echo "$as_me:19849: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19415: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19852: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19418: \$? = $ac_status" >&5
+  echo "$as_me:19855: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_utf8=yes
 else
@@ -19428,7 +19865,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:19431: result: $cf_cv_slang_utf8" >&5
+echo "$as_me:19868: result: $cf_cv_slang_utf8" >&5
 echo "${ECHO_T}$cf_cv_slang_utf8" >&6
 
 if test "$cf_cv_slang_utf8" = yes ; then
@@ -19446,7 +19883,7 @@ else
 
 cf_cv_termlib=none
 cat >conftest.$ac_ext <<_ACEOF
-#line 19449 "configure"
+#line 19886 "configure"
 #include "confdefs.h"
 
 int
@@ -19458,19 +19895,19 @@ char *x=(char*)tgoto("",0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19461: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19898: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19464: \$? = $ac_status" >&5
+  echo "$as_me:19901: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19467: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19904: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19470: \$? = $ac_status" >&5
+  echo "$as_me:19907: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 19473 "configure"
+#line 19910 "configure"
 #include "confdefs.h"
 
 int
@@ -19482,16 +19919,16 @@ int x=tigetstr("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19485: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19922: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19488: \$? = $ac_status" >&5
+  echo "$as_me:19925: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19491: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19928: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19494: \$? = $ac_status" >&5
+  echo "$as_me:19931: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termlib=terminfo
 else
@@ -19502,7 +19939,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}:19505: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
+echo "${as_me-configure}:19942: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
 
 else
   echo "$as_me: failed program was:" >&5
@@ -19517,10 +19954,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:19520: checking for $cf_func in -l$cf_lib" >&5
+		echo "$as_me:19957: 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 19523 "configure"
+#line 19960 "configure"
 #include "confdefs.h"
 
 int
@@ -19532,16 +19969,16 @@ int x=$cf_func("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19535: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19972: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19538: \$? = $ac_status" >&5
+  echo "$as_me:19975: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19541: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19978: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19544: \$? = $ac_status" >&5
+  echo "$as_me:19981: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -19550,7 +19987,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-		echo "$as_me:19553: result: $cf_result" >&5
+		echo "$as_me:19990: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 		if test "$cf_result" = yes ; then
 			if test "$cf_func" = tigetstr ; then
@@ -19567,7 +20004,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:19570: checking for initscr in -lcurses" >&5
+	echo "$as_me:20007: 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
@@ -19575,7 +20012,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 19578 "configure"
+#line 20015 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19594,16 +20031,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19597: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20034: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19600: \$? = $ac_status" >&5
+  echo "$as_me:20037: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19603: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20040: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19606: \$? = $ac_status" >&5
+  echo "$as_me:20043: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_curses_initscr=yes
 else
@@ -19614,13 +20051,13 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19617: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:20054: result: $ac_cv_lib_curses_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_curses_initscr" >&6
 if test $ac_cv_lib_curses_initscr = yes; then
   LIBS="$LIBS -lcurses" cf_cv_termlib=termcap
 fi
 
-	echo "$as_me:19623: checking for tgoto in -ltermcap" >&5
+	echo "$as_me:20060: 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
@@ -19628,7 +20065,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 19631 "configure"
+#line 20068 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19647,16 +20084,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19650: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20087: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19653: \$? = $ac_status" >&5
+  echo "$as_me:20090: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19656: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20093: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19659: \$? = $ac_status" >&5
+  echo "$as_me:20096: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_termcap_tgoto=yes
 else
@@ -19667,7 +20104,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19670: result: $ac_cv_lib_termcap_tgoto" >&5
+echo "$as_me:20107: result: $ac_cv_lib_termcap_tgoto" >&5
 echo "${ECHO_T}$ac_cv_lib_termcap_tgoto" >&6
 if test $ac_cv_lib_termcap_tgoto = yes; then
   LIBS="$LIBS -ltermcap" cf_cv_termlib=termcap
@@ -19678,20 +20115,20 @@ fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 if test "$cf_cv_termlib" = none; then
-	{ echo "$as_me:19681: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
+	{ echo "$as_me:20118: 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:19688: checking for acos" >&5
+echo "$as_me:20125: 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 19694 "configure"
+#line 20131 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char acos (); below.  */
@@ -19722,16 +20159,16 @@ f = acos;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19725: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20162: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19728: \$? = $ac_status" >&5
+  echo "$as_me:20165: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19731: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20168: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19734: \$? = $ac_status" >&5
+  echo "$as_me:20171: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_acos=yes
 else
@@ -19741,13 +20178,13 @@ ac_cv_func_acos=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:19744: result: $ac_cv_func_acos" >&5
+echo "$as_me:20181: 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:19750: checking for acos in -lm" >&5
+echo "$as_me:20187: 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
@@ -19755,7 +20192,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm $LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 19758 "configure"
+#line 20195 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19774,16 +20211,16 @@ acos ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19777: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20214: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19780: \$? = $ac_status" >&5
+  echo "$as_me:20217: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19783: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20220: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19786: \$? = $ac_status" >&5
+  echo "$as_me:20223: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_m_acos=yes
 else
@@ -19794,7 +20231,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19797: result: $ac_cv_lib_m_acos" >&5
+echo "$as_me:20234: 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
 
@@ -19820,13 +20257,13 @@ os2*)
 
 	eval 'cf_cv_have_lib_'video'=no'
 	cf_libdir=""
-	echo "$as_me:19823: checking for v_init" >&5
+	echo "$as_me:20260: 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 19829 "configure"
+#line 20266 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char v_init (); below.  */
@@ -19857,16 +20294,16 @@ f = v_init;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19860: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20297: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19863: \$? = $ac_status" >&5
+  echo "$as_me:20300: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19866: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20303: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19869: \$? = $ac_status" >&5
+  echo "$as_me:20306: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_v_init=yes
 else
@@ -19876,18 +20313,18 @@ ac_cv_func_v_init=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:19879: result: $ac_cv_func_v_init" >&5
+echo "$as_me:20316: 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:19886: checking for v_init in -lvideo" >&5
+		echo "$as_me:20323: 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 19890 "configure"
+#line 20327 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -19899,25 +20336,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19902: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20339: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19905: \$? = $ac_status" >&5
+  echo "$as_me:20342: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19908: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20345: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19911: \$? = $ac_status" >&5
+  echo "$as_me:20348: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:19913: result: yes" >&5
+  echo "$as_me:20350: 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:19920: result: no" >&5
+echo "$as_me:20357: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_library_path_list=""
@@ -20006,11 +20443,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:20009: checking for -lvideo in $cf_libdir" >&5
+				echo "$as_me:20446: 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 20013 "configure"
+#line 20450 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -20022,25 +20459,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20025: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20462: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20028: \$? = $ac_status" >&5
+  echo "$as_me:20465: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20031: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20468: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20034: \$? = $ac_status" >&5
+  echo "$as_me:20471: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:20036: result: yes" >&5
+  echo "$as_me:20473: 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:20043: result: no" >&5
+echo "$as_me:20480: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -20055,7 +20492,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'video
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:20058: error: Cannot link video library" >&5
+	{ { echo "$as_me:20495: error: Cannot link video library" >&5
 echo "$as_me: error: Cannot link video library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -20065,13 +20502,13 @@ esac
 
 	eval 'cf_cv_have_lib_'slang'=no'
 	cf_libdir=""
-	echo "$as_me:20068: checking for SLtt_get_screen_size" >&5
+	echo "$as_me:20505: 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 20074 "configure"
+#line 20511 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char SLtt_get_screen_size (); below.  */
@@ -20102,16 +20539,16 @@ f = SLtt_get_screen_size;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20105: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20542: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20108: \$? = $ac_status" >&5
+  echo "$as_me:20545: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20111: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20548: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20114: \$? = $ac_status" >&5
+  echo "$as_me:20551: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_SLtt_get_screen_size=yes
 else
@@ -20121,18 +20558,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:20124: result: $ac_cv_func_SLtt_get_screen_size" >&5
+echo "$as_me:20561: 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:20131: checking for SLtt_get_screen_size in -lslang" >&5
+		echo "$as_me:20568: 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 20135 "configure"
+#line 20572 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -20144,25 +20581,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20147: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20584: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20150: \$? = $ac_status" >&5
+  echo "$as_me:20587: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20153: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20590: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20156: \$? = $ac_status" >&5
+  echo "$as_me:20593: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:20158: result: yes" >&5
+  echo "$as_me:20595: 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:20165: result: no" >&5
+echo "$as_me:20602: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_library_path_list=""
@@ -20251,11 +20688,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:20254: checking for -lslang in $cf_libdir" >&5
+				echo "$as_me:20691: 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 20258 "configure"
+#line 20695 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -20267,25 +20704,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20270: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20707: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20273: \$? = $ac_status" >&5
+  echo "$as_me:20710: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20276: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20713: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20279: \$? = $ac_status" >&5
+  echo "$as_me:20716: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:20281: result: yes" >&5
+  echo "$as_me:20718: 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:20288: result: no" >&5
+echo "$as_me:20725: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -20300,13 +20737,13 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'slang
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:20303: error: Cannot link slang library" >&5
+	{ { echo "$as_me:20740: 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:20309: checking if we can link slang without termcap" >&5
+echo "$as_me:20746: 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%^.%%'`
@@ -20315,7 +20752,7 @@ else
 fi
 LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s%$cf_exclude%%" -e 's%^.%%'`
 cat >conftest.$ac_ext <<_ACEOF
-#line 20318 "configure"
+#line 20755 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -20327,16 +20764,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20330: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20767: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20333: \$? = $ac_status" >&5
+  echo "$as_me:20770: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20336: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20773: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20339: \$? = $ac_status" >&5
+  echo "$as_me:20776: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -20345,18 +20782,18 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:20348: result: $cf_result" >&5
+echo "$as_me:20785: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 test $cf_result = no && LIBS="$cf_slang_LIBS3"
 
-echo "$as_me:20352: checking if we must tell slang this is UNIX" >&5
+echo "$as_me:20789: 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 20359 "configure"
+#line 20796 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -20375,16 +20812,16 @@ SLang_TT_Baud_Rate = 1
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20378: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20815: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20381: \$? = $ac_status" >&5
+  echo "$as_me:20818: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20384: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20821: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20387: \$? = $ac_status" >&5
+  echo "$as_me:20824: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_unix=yes
 else
@@ -20395,7 +20832,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:20398: result: $cf_cv_slang_unix" >&5
+echo "$as_me:20835: 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
@@ -20405,7 +20842,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:20408: checking if you want the wide-curses features" >&5
+echo "$as_me:20845: 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.
@@ -20422,10 +20859,10 @@ else
   use_wide_curses=$cf_wide_curses
 
 fi;
-echo "$as_me:20425: result: $use_wide_curses" >&5
+echo "$as_me:20862: result: $use_wide_curses" >&5
 echo "${ECHO_T}$use_wide_curses" >&6
 
-echo "$as_me:20428: checking if color-style code should be used" >&5
+echo "$as_me:20865: 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.
@@ -20445,7 +20882,7 @@ fi;
 
 case $use_color_style in
 no)
-	echo "$as_me:20448: result: no" >&5
+	echo "$as_me:20885: result: no" >&5
 echo "${ECHO_T}no" >&6
 	INSTALL_LSS=
 	;;
@@ -20454,10 +20891,10 @@ echo "${ECHO_T}no" >&6
 #define USE_COLOR_STYLE 1
 EOF
 
-	echo "$as_me:20457: result: yes" >&5
+	echo "$as_me:20894: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-	echo "$as_me:20460: checking for location of style-sheet file" >&5
+	echo "$as_me:20897: 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.
@@ -20493,7 +20930,7 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:20496: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:20933: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -20502,7 +20939,7 @@ esac
 fi
 LYNX_LSS_FILE="$withval"
 
-	echo "$as_me:20505: result: $LYNX_LSS_FILE" >&5
+	echo "$as_me:20942: result: $LYNX_LSS_FILE" >&5
 echo "${ECHO_T}$LYNX_LSS_FILE" >&6
 
 	test "$LYNX_LSS_FILE" = no && LYNX_LSS_FILE=
@@ -20514,7 +20951,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:20517: checking for the default configuration-file" >&5
+echo "$as_me:20954: 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.
@@ -20550,7 +20987,7 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:20553: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:20990: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -20559,7 +20996,7 @@ esac
 fi
 LYNX_CFG_FILE="$withval"
 
-echo "$as_me:20562: result: $LYNX_CFG_FILE" >&5
+echo "$as_me:20999: result: $LYNX_CFG_FILE" >&5
 echo "${ECHO_T}$LYNX_CFG_FILE" >&6
 
 test "$LYNX_CFG_FILE" = no && LYNX_CFG_FILE=
@@ -20567,7 +21004,7 @@ cat >>confdefs.h <<EOF
 #define LYNX_CFG_FILE "$LYNX_CFG_FILE"
 EOF
 
-echo "$as_me:20570: checking if htmlized lynx.cfg should be built" >&5
+echo "$as_me:21007: 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.
@@ -20584,7 +21021,7 @@ else
   use_htmlized_cfg=no
 
 fi;
-echo "$as_me:20587: result: $use_htmlized_cfg" >&5
+echo "$as_me:21024: result: $use_htmlized_cfg" >&5
 echo "${ECHO_T}$use_htmlized_cfg" >&6
 
 LYNXCFG_MAKE=''
@@ -20592,7 +21029,7 @@ if test $use_htmlized_cfg = no ; then
 	LYNXCFG_MAKE='#'
 fi
 
-echo "$as_me:20595: checking if local doc directory should be linked to help page" >&5
+echo "$as_me:21032: 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.
@@ -20609,7 +21046,7 @@ else
   use_local_docs=no
 
 fi;
-echo "$as_me:20612: result: $use_local_docs" >&5
+echo "$as_me:21049: result: $use_local_docs" >&5
 echo "${ECHO_T}$use_local_docs" >&6
 
 LYNXDOC_MAKE=''
@@ -20617,7 +21054,7 @@ if test $use_local_docs = no ; then
 	LYNXDOC_MAKE='#'
 fi
 
-echo "$as_me:20620: checking for MIME library directory" >&5
+echo "$as_me:21057: 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.
@@ -20653,7 +21090,7 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:20656: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:21093: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -20662,14 +21099,14 @@ esac
 fi
 MIME_LIBDIR="$withval"
 
-echo "$as_me:20665: result: $MIME_LIBDIR" >&5
+echo "$as_me:21102: result: $MIME_LIBDIR" >&5
 echo "${ECHO_T}$MIME_LIBDIR" >&6
 MIME_LIBDIR=`echo "$MIME_LIBDIR" | sed -e 's,/$,,' -e 's,$,/,'`
 cat >>confdefs.h <<EOF
 #define MIME_LIBDIR "$MIME_LIBDIR"
 EOF
 
-echo "$as_me:20672: checking if locale-charset selection logic should be used" >&5
+echo "$as_me:21109: 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.
@@ -20686,7 +21123,7 @@ else
   use_locale_charset=yes
 
 fi;
-echo "$as_me:20689: result: $use_locale_charset" >&5
+echo "$as_me:21126: result: $use_locale_charset" >&5
 echo "${ECHO_T}$use_locale_charset" >&6
 test $use_locale_charset != no && cat >>confdefs.h <<\EOF
 #define USE_LOCALE_CHARSET 1
@@ -20694,7 +21131,7 @@ EOF
 
 CHARSET_DEFS=
 
-echo "$as_me:20697: checking if you want only a few charsets" >&5
+echo "$as_me:21134: 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.
@@ -20706,7 +21143,7 @@ else
 fi;
 
 if test -n "$cf_charsets" ; then
-	echo "$as_me:20709: result: yes" >&5
+	echo "$as_me:21146: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	cat >>confdefs.h <<\EOF
 #define ALL_CHARSETS 0
@@ -20719,7 +21156,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}:20722: testing using minimal list of charsets: $cf_min_charsets ..." 1>&5
+echo "${as_me-configure}:21159: 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'`
@@ -20746,28 +21183,28 @@ echo "${as_me-configure}:20722: testing using minimal list of charsets: $cf_min_
 		then
 			test -n "$verbose" && echo "	found $cf_charset" 1>&6
 
-echo "${as_me-configure}:20749: testing found $cf_charset ..." 1>&5
+echo "${as_me-configure}:21186: 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}:20755: testing not found $cf_charset ..." 1>&5
+echo "${as_me-configure}:21192: testing not found $cf_charset ..." 1>&5
 
 		fi
 	done
 else
-	echo "$as_me:20760: result: no" >&5
+	echo "$as_me:21197: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:20764: checking for ANSI C header files" >&5
+echo "$as_me:21201: 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 20770 "configure"
+#line 21207 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -20775,13 +21212,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:20778: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:21215: \"$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:20784: \$? = $ac_status" >&5
+  echo "$as_me:21221: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20803,7 +21240,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 20806 "configure"
+#line 21243 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -20821,7 +21258,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 20824 "configure"
+#line 21261 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -20842,7 +21279,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 20845 "configure"
+#line 21282 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -20868,15 +21305,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:20871: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21308: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20874: \$? = $ac_status" >&5
+  echo "$as_me:21311: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:20876: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21313: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20879: \$? = $ac_status" >&5
+  echo "$as_me:21316: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -20889,7 +21326,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:20892: result: $ac_cv_header_stdc" >&5
+echo "$as_me:21329: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -20899,13 +21336,13 @@ EOF
 
 fi
 
-echo "$as_me:20902: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:21339: 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 20908 "configure"
+#line 21345 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -20921,16 +21358,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20924: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21361: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20927: \$? = $ac_status" >&5
+  echo "$as_me:21364: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20930: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21367: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20933: \$? = $ac_status" >&5
+  echo "$as_me:21370: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_header_time=yes
 else
@@ -20940,7 +21377,7 @@ ac_cv_header_time=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:20943: result: $ac_cv_header_time" >&5
+echo "$as_me:21380: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -20953,13 +21390,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:20956: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:21393: 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 20962 "configure"
+#line 21399 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -20974,16 +21411,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20977: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21414: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20980: \$? = $ac_status" >&5
+  echo "$as_me:21417: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20983: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21420: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20986: \$? = $ac_status" >&5
+  echo "$as_me:21423: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -20993,7 +21430,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:20996: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:21433: 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
@@ -21006,7 +21443,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:21009: checking for opendir in -ldir" >&5
+  echo "$as_me:21446: 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
@@ -21014,7 +21451,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 21017 "configure"
+#line 21454 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21033,16 +21470,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21036: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21473: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21039: \$? = $ac_status" >&5
+  echo "$as_me:21476: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21042: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21479: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21045: \$? = $ac_status" >&5
+  echo "$as_me:21482: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -21053,14 +21490,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21056: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:21493: 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:21063: checking for opendir in -lx" >&5
+  echo "$as_me:21500: 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
@@ -21068,7 +21505,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 21071 "configure"
+#line 21508 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21087,16 +21524,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21090: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21527: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21093: \$? = $ac_status" >&5
+  echo "$as_me:21530: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21096: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21533: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21099: \$? = $ac_status" >&5
+  echo "$as_me:21536: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -21107,7 +21544,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21110: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:21547: 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"
@@ -21135,23 +21572,23 @@ for ac_header in \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:21138: checking for $ac_header" >&5
+echo "$as_me:21575: 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 21144 "configure"
+#line 21581 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:21148: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:21585: \"$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:21154: \$? = $ac_status" >&5
+  echo "$as_me:21591: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -21170,7 +21607,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:21173: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:21610: 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
@@ -21180,14 +21617,14 @@ EOF
 fi
 done
 
-echo "$as_me:21183: checking termio.h and termios.h" >&5
+echo "$as_me:21620: 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 21190 "configure"
+#line 21627 "configure"
 #include "confdefs.h"
 
 #if HAVE_TERMIO_H
@@ -21205,16 +21642,16 @@ putchar (0x0a)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21208: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21645: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21211: \$? = $ac_status" >&5
+  echo "$as_me:21648: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21214: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21651: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21217: \$? = $ac_status" >&5
+  echo "$as_me:21654: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termio_and_termios=yes
 else
@@ -21225,20 +21662,20 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:21228: result: $cf_cv_termio_and_termios" >&5
+echo "$as_me:21665: 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:21234: checking for sigaction and structs" >&5
+echo "$as_me:21671: 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 21241 "configure"
+#line 21678 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -21258,16 +21695,16 @@ struct sigaction act;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21261: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21698: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21264: \$? = $ac_status" >&5
+  echo "$as_me:21701: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21267: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21704: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21270: \$? = $ac_status" >&5
+  echo "$as_me:21707: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_func_sigaction=yes
 else
@@ -21278,7 +21715,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:21281: result: $cf_cv_func_sigaction" >&5
+echo "$as_me:21718: result: $cf_cv_func_sigaction" >&5
 echo "${ECHO_T}$cf_cv_func_sigaction" >&6
 test "$cf_cv_func_sigaction" = yes && cat >>confdefs.h <<\EOF
 #define HAVE_SIGACTION 1
@@ -21287,23 +21724,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:21290: checking for $ac_header" >&5
+echo "$as_me:21727: 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 21296 "configure"
+#line 21733 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:21300: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:21737: \"$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:21306: \$? = $ac_status" >&5
+  echo "$as_me:21743: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -21322,7 +21759,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:21325: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:21762: 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
@@ -21343,23 +21780,23 @@ else
 for ac_header in wait.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:21346: checking for $ac_header" >&5
+echo "$as_me:21783: 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 21352 "configure"
+#line 21789 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:21356: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:21793: \"$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:21362: \$? = $ac_status" >&5
+  echo "$as_me:21799: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -21378,7 +21815,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:21381: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:21818: 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
@@ -21391,23 +21828,23 @@ done
 for ac_header in waitstatus.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:21394: checking for $ac_header" >&5
+echo "$as_me:21831: 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 21400 "configure"
+#line 21837 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:21404: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:21841: \"$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:21410: \$? = $ac_status" >&5
+  echo "$as_me:21847: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -21426,7 +21863,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:21429: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:21866: 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
@@ -21448,14 +21885,14 @@ cf_wait_headers="$cf_wait_headers
 fi
 fi
 
-echo "$as_me:21451: checking for union wait" >&5
+echo "$as_me:21888: 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 21458 "configure"
+#line 21895 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -21471,16 +21908,16 @@ int x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21474: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21911: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21477: \$? = $ac_status" >&5
+  echo "$as_me:21914: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21480: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21917: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21483: \$? = $ac_status" >&5
+  echo "$as_me:21920: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_unionwait=no
 	 echo compiles ok w/o union wait 1>&5
@@ -21490,7 +21927,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 21493 "configure"
+#line 21930 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -21510,16 +21947,16 @@ union wait x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21513: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21950: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21516: \$? = $ac_status" >&5
+  echo "$as_me:21953: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21519: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21956: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21522: \$? = $ac_status" >&5
+  echo "$as_me:21959: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_unionwait=yes
 	 echo compiles ok with union wait and possibly macros too 1>&5
@@ -21534,7 +21971,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:21537: result: $cf_cv_type_unionwait" >&5
+echo "$as_me:21974: result: $cf_cv_type_unionwait" >&5
 echo "${ECHO_T}$cf_cv_type_unionwait" >&6
 test $cf_cv_type_unionwait = yes && cat >>confdefs.h <<\EOF
 #define HAVE_TYPE_UNIONWAIT 1
@@ -21542,14 +21979,14 @@ EOF
 
 if test $cf_cv_type_unionwait = yes; then
 
-	echo "$as_me:21545: checking if union wait can be used as wait-arg" >&5
+	echo "$as_me:21982: 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 21552 "configure"
+#line 21989 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -21561,16 +21998,16 @@ union wait x; wait(&x)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21564: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22001: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21567: \$? = $ac_status" >&5
+  echo "$as_me:22004: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21570: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22007: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21573: \$? = $ac_status" >&5
+  echo "$as_me:22010: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_arg_union_wait=yes
 else
@@ -21582,20 +22019,20 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-	echo "$as_me:21585: result: $cf_cv_arg_union_wait" >&5
+	echo "$as_me:22022: 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:21591: checking if union wait can be used as waitpid-arg" >&5
+	echo "$as_me:22028: 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 21598 "configure"
+#line 22035 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -21607,16 +22044,16 @@ union wait x; waitpid(0, &x, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21610: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22047: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21613: \$? = $ac_status" >&5
+  echo "$as_me:22050: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21616: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22053: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21619: \$? = $ac_status" >&5
+  echo "$as_me:22056: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_arg_union_waitpid=yes
 else
@@ -21628,7 +22065,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-	echo "$as_me:21631: result: $cf_cv_arg_union_waitpid" >&5
+	echo "$as_me:22068: result: $cf_cv_arg_union_waitpid" >&5
 echo "${ECHO_T}$cf_cv_arg_union_waitpid" >&6
 	test $cf_cv_arg_union_waitpid = yes && cat >>confdefs.h <<\EOF
 #define WAITPID_USES_UNION 1
@@ -21639,23 +22076,23 @@ fi
 for ac_header in stdarg.h varargs.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:21642: checking for $ac_header" >&5
+echo "$as_me:22079: 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 21648 "configure"
+#line 22085 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:21652: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:22089: \"$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:21658: \$? = $ac_status" >&5
+  echo "$as_me:22095: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -21674,7 +22111,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:21677: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:22114: 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
@@ -21684,14 +22121,14 @@ EOF
 fi
 done
 
-echo "$as_me:21687: checking for standard varargs" >&5
+echo "$as_me:22124: checking for standard varargs" >&5
 echo $ECHO_N "checking for standard varargs... $ECHO_C" >&6
 if test "${cf_cv_ansi_varargs+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 21694 "configure"
+#line 22131 "configure"
 #include "confdefs.h"
 
 #if HAVE_STDARG_H
@@ -21711,16 +22148,16 @@ return 0;} int foo(char *fmt,...){va_list args;va_start(args,fmt);va_end(args)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21714: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22151: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21717: \$? = $ac_status" >&5
+  echo "$as_me:22154: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21720: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22157: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21723: \$? = $ac_status" >&5
+  echo "$as_me:22160: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ansi_varargs=yes
 else
@@ -21732,19 +22169,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:21735: result: $cf_cv_ansi_varargs" >&5
+echo "$as_me:22172: result: $cf_cv_ansi_varargs" >&5
 echo "${ECHO_T}$cf_cv_ansi_varargs" >&6
 test $cf_cv_ansi_varargs = yes && cat >>confdefs.h <<\EOF
 #define ANSI_VARARGS 1
 EOF
 
-echo "$as_me:21741: checking for uid_t in sys/types.h" >&5
+echo "$as_me:22178: 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 21747 "configure"
+#line 22184 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -21758,7 +22195,7 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:21761: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:22198: 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
 
@@ -21772,7 +22209,7 @@ EOF
 
 fi
 
-echo "$as_me:21775: checking type of array argument to getgroups" >&5
+echo "$as_me:22212: 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
@@ -21781,7 +22218,7 @@ else
   ac_cv_type_getgroups=cross
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 21784 "configure"
+#line 22221 "configure"
 #include "confdefs.h"
 /* Thanks to Mike Rendell for this test.  */
 #include <sys/types.h>
@@ -21807,15 +22244,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:21810: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22247: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21813: \$? = $ac_status" >&5
+  echo "$as_me:22250: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:21815: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22252: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21818: \$? = $ac_status" >&5
+  echo "$as_me:22255: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_getgroups=gid_t
 else
@@ -21828,7 +22265,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 21831 "configure"
+#line 22268 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 
@@ -21843,20 +22280,20 @@ rm -f conftest*
 
 fi
 fi
-echo "$as_me:21846: result: $ac_cv_type_getgroups" >&5
+echo "$as_me:22283: 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:21853: checking for off_t" >&5
+echo "$as_me:22290: 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 21859 "configure"
+#line 22296 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -21871,16 +22308,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21874: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22311: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21877: \$? = $ac_status" >&5
+  echo "$as_me:22314: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21880: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22317: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21883: \$? = $ac_status" >&5
+  echo "$as_me:22320: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -21890,7 +22327,7 @@ ac_cv_type_off_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:21893: result: $ac_cv_type_off_t" >&5
+echo "$as_me:22330: 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
   :
@@ -21902,13 +22339,13 @@ EOF
 
 fi
 
-echo "$as_me:21905: checking for pid_t" >&5
+echo "$as_me:22342: 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 21911 "configure"
+#line 22348 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -21923,16 +22360,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21926: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22363: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21929: \$? = $ac_status" >&5
+  echo "$as_me:22366: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21932: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22369: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21935: \$? = $ac_status" >&5
+  echo "$as_me:22372: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -21942,7 +22379,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:21945: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:22382: 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
   :
@@ -21954,13 +22391,13 @@ EOF
 
 fi
 
-echo "$as_me:21957: checking for uid_t in sys/types.h" >&5
+echo "$as_me:22394: 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 21963 "configure"
+#line 22400 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -21974,7 +22411,7 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:21977: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:22414: 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
 
@@ -21988,13 +22425,13 @@ EOF
 
 fi
 
-echo "$as_me:21991: checking for mode_t" >&5
+echo "$as_me:22428: 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 21997 "configure"
+#line 22434 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -22009,16 +22446,16 @@ if (sizeof (mode_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22012: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22449: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22015: \$? = $ac_status" >&5
+  echo "$as_me:22452: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22018: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22455: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22021: \$? = $ac_status" >&5
+  echo "$as_me:22458: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_mode_t=yes
 else
@@ -22028,7 +22465,7 @@ ac_cv_type_mode_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:22031: result: $ac_cv_type_mode_t" >&5
+echo "$as_me:22468: 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
   :
@@ -22040,13 +22477,13 @@ EOF
 
 fi
 
-	echo "$as_me:22043: checking for socklen_t" >&5
+	echo "$as_me:22480: 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 22049 "configure"
+#line 22486 "configure"
 #include "confdefs.h"
 #include <sys/socket.h>
 
@@ -22062,16 +22499,16 @@ if (sizeof (socklen_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22065: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22502: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22068: \$? = $ac_status" >&5
+  echo "$as_me:22505: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22071: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22508: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22074: \$? = $ac_status" >&5
+  echo "$as_me:22511: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_socklen_t=yes
 else
@@ -22081,7 +22518,7 @@ ac_cv_type_socklen_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:22084: result: $ac_cv_type_socklen_t" >&5
+echo "$as_me:22521: 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
@@ -22096,14 +22533,14 @@ EOF
 
 fi
 
-echo "$as_me:22099: checking for tm.tm_gmtoff" >&5
+echo "$as_me:22536: 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 22106 "configure"
+#line 22543 "configure"
 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME
@@ -22128,16 +22565,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22131: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22568: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22134: \$? = $ac_status" >&5
+  echo "$as_me:22571: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22137: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22574: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22140: \$? = $ac_status" >&5
+  echo "$as_me:22577: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_tm_gmtoff=yes
 else
@@ -22148,19 +22585,19 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:22151: result: $cf_cv_tm_gmtoff" >&5
+echo "$as_me:22588: 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:22157: checking for long" >&5
+echo "$as_me:22594: 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 22163 "configure"
+#line 22600 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -22175,16 +22612,16 @@ if (sizeof (long))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22178: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22615: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22181: \$? = $ac_status" >&5
+  echo "$as_me:22618: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22184: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22621: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22187: \$? = $ac_status" >&5
+  echo "$as_me:22624: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_long=yes
 else
@@ -22194,10 +22631,10 @@ ac_cv_type_long=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:22197: result: $ac_cv_type_long" >&5
+echo "$as_me:22634: result: $ac_cv_type_long" >&5
 echo "${ECHO_T}$ac_cv_type_long" >&6
 
-echo "$as_me:22200: checking size of long" >&5
+echo "$as_me:22637: 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
@@ -22206,7 +22643,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 22209 "configure"
+#line 22646 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -22218,21 +22655,21 @@ int _array_ [1 - 2 * !((sizeof (long)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22221: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22658: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22224: \$? = $ac_status" >&5
+  echo "$as_me:22661: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22227: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22664: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22230: \$? = $ac_status" >&5
+  echo "$as_me:22667: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 22235 "configure"
+#line 22672 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -22244,16 +22681,16 @@ int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22247: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22684: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22250: \$? = $ac_status" >&5
+  echo "$as_me:22687: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22253: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22690: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22256: \$? = $ac_status" >&5
+  echo "$as_me:22693: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -22269,7 +22706,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 22272 "configure"
+#line 22709 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -22281,16 +22718,16 @@ int _array_ [1 - 2 * !((sizeof (long)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22284: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22721: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22287: \$? = $ac_status" >&5
+  echo "$as_me:22724: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22290: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22727: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22293: \$? = $ac_status" >&5
+  echo "$as_me:22730: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -22306,7 +22743,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 22309 "configure"
+#line 22746 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -22318,16 +22755,16 @@ int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22321: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22758: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22324: \$? = $ac_status" >&5
+  echo "$as_me:22761: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22327: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22764: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22330: \$? = $ac_status" >&5
+  echo "$as_me:22767: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -22340,12 +22777,12 @@ done
 ac_cv_sizeof_long=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:22343: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:22780: 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 22348 "configure"
+#line 22785 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -22361,15 +22798,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:22364: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22801: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22367: \$? = $ac_status" >&5
+  echo "$as_me:22804: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:22369: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22806: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22372: \$? = $ac_status" >&5
+  echo "$as_me:22809: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_long=`cat conftest.val`
 else
@@ -22385,19 +22822,19 @@ else
   ac_cv_sizeof_long=0
 fi
 fi
-echo "$as_me:22388: result: $ac_cv_sizeof_long" >&5
+echo "$as_me:22825: result: $ac_cv_sizeof_long" >&5
 echo "${ECHO_T}$ac_cv_sizeof_long" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_LONG $ac_cv_sizeof_long
 EOF
 
-echo "$as_me:22394: checking for off_t" >&5
+echo "$as_me:22831: 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 22400 "configure"
+#line 22837 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -22412,16 +22849,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22415: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22852: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22418: \$? = $ac_status" >&5
+  echo "$as_me:22855: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22421: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22858: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22424: \$? = $ac_status" >&5
+  echo "$as_me:22861: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -22431,10 +22868,10 @@ ac_cv_type_off_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:22434: result: $ac_cv_type_off_t" >&5
+echo "$as_me:22871: result: $ac_cv_type_off_t" >&5
 echo "${ECHO_T}$ac_cv_type_off_t" >&6
 
-echo "$as_me:22437: checking size of off_t" >&5
+echo "$as_me:22874: 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
@@ -22443,7 +22880,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 22446 "configure"
+#line 22883 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -22455,21 +22892,21 @@ int _array_ [1 - 2 * !((sizeof (off_t)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22458: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22895: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22461: \$? = $ac_status" >&5
+  echo "$as_me:22898: \$? = $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:22901: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22467: \$? = $ac_status" >&5
+  echo "$as_me:22904: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 22472 "configure"
+#line 22909 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -22481,16 +22918,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22484: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22921: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22487: \$? = $ac_status" >&5
+  echo "$as_me:22924: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22490: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22927: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22493: \$? = $ac_status" >&5
+  echo "$as_me:22930: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -22506,7 +22943,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 22509 "configure"
+#line 22946 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -22518,16 +22955,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22521: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22958: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22524: \$? = $ac_status" >&5
+  echo "$as_me:22961: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22527: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22964: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22530: \$? = $ac_status" >&5
+  echo "$as_me:22967: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -22543,7 +22980,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 22546 "configure"
+#line 22983 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -22555,16 +22992,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22558: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22995: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22561: \$? = $ac_status" >&5
+  echo "$as_me:22998: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22564: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23001: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22567: \$? = $ac_status" >&5
+  echo "$as_me:23004: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -22577,12 +23014,12 @@ done
 ac_cv_sizeof_off_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:22580: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:23017: 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 22585 "configure"
+#line 23022 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -22598,15 +23035,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:22601: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23038: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22604: \$? = $ac_status" >&5
+  echo "$as_me:23041: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:22606: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23043: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22609: \$? = $ac_status" >&5
+  echo "$as_me:23046: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_off_t=`cat conftest.val`
 else
@@ -22622,19 +23059,19 @@ else
   ac_cv_sizeof_off_t=0
 fi
 fi
-echo "$as_me:22625: result: $ac_cv_sizeof_off_t" >&5
+echo "$as_me:23062: result: $ac_cv_sizeof_off_t" >&5
 echo "${ECHO_T}$ac_cv_sizeof_off_t" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_OFF_T $ac_cv_sizeof_off_t
 EOF
 
-echo "$as_me:22631: checking for time_t" >&5
+echo "$as_me:23068: 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 22637 "configure"
+#line 23074 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -22649,16 +23086,16 @@ if (sizeof (time_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22652: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23089: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22655: \$? = $ac_status" >&5
+  echo "$as_me:23092: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22658: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23095: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22661: \$? = $ac_status" >&5
+  echo "$as_me:23098: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_time_t=yes
 else
@@ -22668,10 +23105,10 @@ ac_cv_type_time_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:22671: result: $ac_cv_type_time_t" >&5
+echo "$as_me:23108: result: $ac_cv_type_time_t" >&5
 echo "${ECHO_T}$ac_cv_type_time_t" >&6
 
-echo "$as_me:22674: checking size of time_t" >&5
+echo "$as_me:23111: 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
@@ -22680,7 +23117,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 22683 "configure"
+#line 23120 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -22692,21 +23129,21 @@ int _array_ [1 - 2 * !((sizeof (time_t)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22695: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23132: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22698: \$? = $ac_status" >&5
+  echo "$as_me:23135: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22701: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23138: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22704: \$? = $ac_status" >&5
+  echo "$as_me:23141: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 22709 "configure"
+#line 23146 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -22718,16 +23155,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22721: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23158: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22724: \$? = $ac_status" >&5
+  echo "$as_me:23161: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22727: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23164: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22730: \$? = $ac_status" >&5
+  echo "$as_me:23167: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -22743,7 +23180,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 22746 "configure"
+#line 23183 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -22755,16 +23192,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22758: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23195: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22761: \$? = $ac_status" >&5
+  echo "$as_me:23198: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22764: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23201: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22767: \$? = $ac_status" >&5
+  echo "$as_me:23204: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -22780,7 +23217,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 22783 "configure"
+#line 23220 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -22792,16 +23229,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22795: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23232: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22798: \$? = $ac_status" >&5
+  echo "$as_me:23235: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22801: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23238: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22804: \$? = $ac_status" >&5
+  echo "$as_me:23241: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -22814,12 +23251,12 @@ done
 ac_cv_sizeof_time_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:22817: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:23254: 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 22822 "configure"
+#line 23259 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -22835,15 +23272,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:22838: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23275: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22841: \$? = $ac_status" >&5
+  echo "$as_me:23278: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:22843: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23280: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22846: \$? = $ac_status" >&5
+  echo "$as_me:23283: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_time_t=`cat conftest.val`
 else
@@ -22859,7 +23296,7 @@ else
   ac_cv_sizeof_time_t=0
 fi
 fi
-echo "$as_me:22862: result: $ac_cv_sizeof_time_t" >&5
+echo "$as_me:23299: 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
@@ -22867,13 +23304,13 @@ EOF
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo "$as_me:22870: checking for working alloca.h" >&5
+echo "$as_me:23307: 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 22876 "configure"
+#line 23313 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int
@@ -22885,16 +23322,16 @@ char *p = (char *) alloca (2 * sizeof (int));
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22888: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23325: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22891: \$? = $ac_status" >&5
+  echo "$as_me:23328: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22894: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23331: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22897: \$? = $ac_status" >&5
+  echo "$as_me:23334: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_working_alloca_h=yes
 else
@@ -22904,7 +23341,7 @@ ac_cv_working_alloca_h=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:22907: result: $ac_cv_working_alloca_h" >&5
+echo "$as_me:23344: 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
 
@@ -22914,13 +23351,13 @@ EOF
 
 fi
 
-echo "$as_me:22917: checking for alloca" >&5
+echo "$as_me:23354: 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 22923 "configure"
+#line 23360 "configure"
 #include "confdefs.h"
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -22952,16 +23389,16 @@ char *p = (char *) alloca (1);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22955: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23392: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22958: \$? = $ac_status" >&5
+  echo "$as_me:23395: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22961: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23398: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22964: \$? = $ac_status" >&5
+  echo "$as_me:23401: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_alloca_works=yes
 else
@@ -22971,7 +23408,7 @@ ac_cv_func_alloca_works=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:22974: result: $ac_cv_func_alloca_works" >&5
+echo "$as_me:23411: 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
@@ -22992,13 +23429,13 @@ cat >>confdefs.h <<\EOF
 #define C_ALLOCA 1
 EOF
 
-echo "$as_me:22995: checking whether \`alloca.c' needs Cray hooks" >&5
+echo "$as_me:23432: 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 23001 "configure"
+#line 23438 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -23016,18 +23453,18 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:23019: result: $ac_cv_os_cray" >&5
+echo "$as_me:23456: 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:23024: checking for $ac_func" >&5
+echo "$as_me:23461: 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 23030 "configure"
+#line 23467 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -23058,16 +23495,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23061: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23498: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23064: \$? = $ac_status" >&5
+  echo "$as_me:23501: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23067: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23504: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23070: \$? = $ac_status" >&5
+  echo "$as_me:23507: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -23077,7 +23514,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:23080: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:23517: 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
 
@@ -23091,7 +23528,7 @@ fi
   done
 fi
 
-echo "$as_me:23094: checking stack direction for C alloca" >&5
+echo "$as_me:23531: 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
@@ -23100,7 +23537,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 23103 "configure"
+#line 23540 "configure"
 #include "confdefs.h"
 int
 find_stack_direction ()
@@ -23123,15 +23560,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:23126: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23563: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23129: \$? = $ac_status" >&5
+  echo "$as_me:23566: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:23131: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23568: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23134: \$? = $ac_status" >&5
+  echo "$as_me:23571: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_stack_direction=1
 else
@@ -23143,7 +23580,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:23146: result: $ac_cv_c_stack_direction" >&5
+echo "$as_me:23583: result: $ac_cv_c_stack_direction" >&5
 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
 cat >>confdefs.h <<EOF
@@ -23155,23 +23592,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:23158: checking for $ac_header" >&5
+echo "$as_me:23595: 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 23164 "configure"
+#line 23601 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:23168: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:23605: \"$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:23174: \$? = $ac_status" >&5
+  echo "$as_me:23611: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -23190,7 +23627,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:23193: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:23630: 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
@@ -23203,13 +23640,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:23206: checking for $ac_func" >&5
+echo "$as_me:23643: 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 23212 "configure"
+#line 23649 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -23240,16 +23677,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23243: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23680: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23246: \$? = $ac_status" >&5
+  echo "$as_me:23683: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23249: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23686: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23252: \$? = $ac_status" >&5
+  echo "$as_me:23689: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -23259,7 +23696,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:23262: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:23699: 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
@@ -23271,7 +23708,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:23274: checking for working fork" >&5
+  echo "$as_me:23711: 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
@@ -23294,15 +23731,15 @@ else
       }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:23297: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23734: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23300: \$? = $ac_status" >&5
+  echo "$as_me:23737: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:23302: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23739: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23305: \$? = $ac_status" >&5
+  echo "$as_me:23742: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -23314,7 +23751,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:23317: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:23754: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -23328,12 +23765,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:23331: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:23768: 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:23336: checking for working vfork" >&5
+  echo "$as_me:23773: 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
@@ -23342,7 +23779,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 23345 "configure"
+#line 23782 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -23439,15 +23876,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:23442: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23879: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23445: \$? = $ac_status" >&5
+  echo "$as_me:23882: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:23447: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23884: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23450: \$? = $ac_status" >&5
+  echo "$as_me:23887: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -23459,13 +23896,13 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:23462: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:23899: 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:23468: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:23905: 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
 
@@ -23490,14 +23927,14 @@ EOF
 
 fi
 
-echo "$as_me:23493: checking if we should use fcntl or ioctl" >&5
+echo "$as_me:23930: 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 23500 "configure"
+#line 23937 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -23514,16 +23951,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23517: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23954: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23520: \$? = $ac_status" >&5
+  echo "$as_me:23957: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23523: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23960: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23526: \$? = $ac_status" >&5
+  echo "$as_me:23963: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fionbio=ioctl
 else
@@ -23531,7 +23968,7 @@ else
 cat conftest.$ac_ext >&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 23534 "configure"
+#line 23971 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -23553,16 +23990,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23556: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23993: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23559: \$? = $ac_status" >&5
+  echo "$as_me:23996: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23562: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23999: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23565: \$? = $ac_status" >&5
+  echo "$as_me:24002: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fionbio=fcntl
 else
@@ -23575,20 +24012,20 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:23578: result: $cf_cv_fionbio" >&5
+echo "$as_me:24015: 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:23584: checking for broken/missing definition of remove" >&5
+echo "$as_me:24021: 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 23591 "configure"
+#line 24028 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -23600,23 +24037,23 @@ remove("dummy")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23603: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24040: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23606: \$? = $ac_status" >&5
+  echo "$as_me:24043: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23609: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24046: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23612: \$? = $ac_status" >&5
+  echo "$as_me:24049: \$? = $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 23619 "configure"
+#line 24056 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 		int __unlink(name) { return unlink(name); }
@@ -23629,16 +24066,16 @@ remove("dummy")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23632: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24069: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23635: \$? = $ac_status" >&5
+  echo "$as_me:24072: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23638: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24075: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23641: \$? = $ac_status" >&5
+  echo "$as_me:24078: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_baddef_remove=yes
 else
@@ -23653,20 +24090,20 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:23656: result: $cf_cv_baddef_remove" >&5
+echo "$as_me:24093: 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:23662: checking for lstat" >&5
+echo "$as_me:24099: 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 23669 "configure"
+#line 24106 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -23680,16 +24117,16 @@ lstat(".", (struct stat *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23683: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24120: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23686: \$? = $ac_status" >&5
+  echo "$as_me:24123: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23689: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24126: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23692: \$? = $ac_status" >&5
+  echo "$as_me:24129: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_lstat=yes
 else
@@ -23701,7 +24138,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:23704: result: $ac_cv_func_lstat " >&5
+echo "$as_me:24141: result: $ac_cv_func_lstat " >&5
 echo "${ECHO_T}$ac_cv_func_lstat " >&6
 if test $ac_cv_func_lstat = yes; then
 	cat >>confdefs.h <<\EOF
@@ -23735,13 +24172,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:23738: checking for $ac_func" >&5
+echo "$as_me:24175: 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 23744 "configure"
+#line 24181 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -23772,16 +24209,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23775: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24212: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23778: \$? = $ac_status" >&5
+  echo "$as_me:24215: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23781: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24218: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23784: \$? = $ac_status" >&5
+  echo "$as_me:24221: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -23791,7 +24228,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:23794: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:24231: 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
@@ -23807,13 +24244,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:23810: checking for $ac_func" >&5
+echo "$as_me:24247: 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 23816 "configure"
+#line 24253 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -23844,16 +24281,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23847: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24284: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23850: \$? = $ac_status" >&5
+  echo "$as_me:24287: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23853: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24290: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23856: \$? = $ac_status" >&5
+  echo "$as_me:24293: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -23863,7 +24300,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:23866: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:24303: 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
@@ -23875,7 +24312,7 @@ else
 fi
 done
 
-echo "$as_me:23878: checking for random-integer functions" >&5
+echo "$as_me:24315: 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
@@ -23895,7 +24332,7 @@ do
 	esac
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 23898 "configure"
+#line 24335 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -23914,16 +24351,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:23917: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24354: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23920: \$? = $ac_status" >&5
+  echo "$as_me:24357: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23923: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24360: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23926: \$? = $ac_status" >&5
+  echo "$as_me:24363: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_srand_func=$cf_func
  break
@@ -23935,10 +24372,10 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:23938: result: $cf_cv_srand_func" >&5
+echo "$as_me:24375: 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:23941: checking for range of random-integers" >&5
+	echo "$as_me:24378: 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
@@ -23959,7 +24396,7 @@ else
 			;;
 		esac
 		cat >conftest.$ac_ext <<_ACEOF
-#line 23962 "configure"
+#line 24399 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -23978,16 +24415,16 @@ long x = $cf_cv_rand_max
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23981: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24418: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23984: \$? = $ac_status" >&5
+  echo "$as_me:24421: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23987: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24424: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23990: \$? = $ac_status" >&5
+  echo "$as_me:24427: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -23998,7 +24435,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:24001: result: $cf_cv_rand_max" >&5
+echo "$as_me:24438: result: $cf_cv_rand_max" >&5
 echo "${ECHO_T}$cf_cv_rand_max" >&6
 
 	cf_srand_func=`echo $cf_func | sed -e 's%/.*%%'`
@@ -24029,13 +24466,13 @@ fi
 for ac_func in strstr
 do
 
-echo "$as_me:24032: checking for $ac_func declaration" >&5
+echo "$as_me:24469: 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 24038 "configure"
+#line 24475 "configure"
 #include "confdefs.h"
 #include <string.h>
 int
@@ -24049,20 +24486,20 @@ extern	int	${ac_func}();
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24052: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24489: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24055: \$? = $ac_status" >&5
+  echo "$as_me:24492: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24058: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24495: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24061: \$? = $ac_status" >&5
+  echo "$as_me:24498: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 24065 "configure"
+#line 24502 "configure"
 #include "confdefs.h"
 #include <string.h>
 int
@@ -24076,16 +24513,16 @@ int	(*p)() = ${ac_func};
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24079: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24516: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24082: \$? = $ac_status" >&5
+  echo "$as_me:24519: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24085: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24522: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24088: \$? = $ac_status" >&5
+  echo "$as_me:24525: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -24106,11 +24543,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:24109: result: yes" >&5
+  echo "$as_me:24546: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:24113: result: no" >&5
+  echo "$as_me:24550: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -24125,13 +24562,13 @@ done
 for ac_func in getgrgid getgrnam
 do
 
-echo "$as_me:24128: checking for $ac_func declaration" >&5
+echo "$as_me:24565: 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 24134 "configure"
+#line 24571 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -24147,20 +24584,20 @@ extern	int	${ac_func}();
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24150: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24587: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24153: \$? = $ac_status" >&5
+  echo "$as_me:24590: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24156: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24593: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24159: \$? = $ac_status" >&5
+  echo "$as_me:24596: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 24163 "configure"
+#line 24600 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -24176,16 +24613,16 @@ int	(*p)() = ${ac_func};
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24179: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24616: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24182: \$? = $ac_status" >&5
+  echo "$as_me:24619: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24185: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24622: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24188: \$? = $ac_status" >&5
+  echo "$as_me:24625: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -24206,11 +24643,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:24209: result: yes" >&5
+  echo "$as_me:24646: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:24213: result: no" >&5
+  echo "$as_me:24650: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -24222,14 +24659,14 @@ EOF
 fi
 done
 
-echo "$as_me:24225: checking if TRUE/FALSE are defined" >&5
+echo "$as_me:24662: 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 24232 "configure"
+#line 24669 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -24243,16 +24680,16 @@ int x = TRUE, y = FALSE
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24246: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24683: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24249: \$? = $ac_status" >&5
+  echo "$as_me:24686: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24252: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24689: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24255: \$? = $ac_status" >&5
+  echo "$as_me:24692: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_bool_defs=yes
 else
@@ -24263,7 +24700,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:24266: result: $cf_cv_bool_defs" >&5
+echo "$as_me:24703: result: $cf_cv_bool_defs" >&5
 echo "${ECHO_T}$cf_cv_bool_defs" >&6
 if test "$cf_cv_bool_defs" = no ; then
 	cat >>confdefs.h <<\EOF
@@ -24276,14 +24713,14 @@ EOF
 
 fi
 
-echo "$as_me:24279: checking if external errno is declared" >&5
+echo "$as_me:24716: 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 24286 "configure"
+#line 24723 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -24301,16 +24738,16 @@ int x = (int) errno
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24304: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24741: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24307: \$? = $ac_status" >&5
+  echo "$as_me:24744: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24310: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24747: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24313: \$? = $ac_status" >&5
+  echo "$as_me:24750: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -24321,7 +24758,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:24324: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:24761: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -24336,14 +24773,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:24339: checking if external errno exists" >&5
+echo "$as_me:24776: 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 24346 "configure"
+#line 24783 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -24358,16 +24795,16 @@ errno = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24361: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24798: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24364: \$? = $ac_status" >&5
+  echo "$as_me:24801: \$? = $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:24804: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24370: \$? = $ac_status" >&5
+  echo "$as_me:24807: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_errno=yes
 else
@@ -24378,7 +24815,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:24381: result: $cf_cv_have_errno" >&5
+echo "$as_me:24818: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -24391,7 +24828,7 @@ EOF
 
 fi
 
-echo "$as_me:24394: checking if we can set errno" >&5
+echo "$as_me:24831: 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
@@ -24399,7 +24836,7 @@ else
 
 if test "$cross_compiling" = yes; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 24402 "configure"
+#line 24839 "configure"
 #include "confdefs.h"
 #include <errno.h>
 int
@@ -24411,16 +24848,16 @@ errno = 255
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24414: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24851: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24417: \$? = $ac_status" >&5
+  echo "$as_me:24854: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24420: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24857: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24423: \$? = $ac_status" >&5
+  echo "$as_me:24860: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_set_errno=maybe
 else
@@ -24431,7 +24868,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 24434 "configure"
+#line 24871 "configure"
 #include "confdefs.h"
 
 #include <errno.h>
@@ -24442,15 +24879,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:24445: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24882: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24448: \$? = $ac_status" >&5
+  echo "$as_me:24885: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:24450: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24887: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24453: \$? = $ac_status" >&5
+  echo "$as_me:24890: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_set_errno=yes
 else
@@ -24463,20 +24900,20 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:24466: result: $cf_cv_set_errno" >&5
+echo "$as_me:24903: 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:24472: checking for setlocale()" >&5
+echo "$as_me:24909: 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 24479 "configure"
+#line 24916 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int
@@ -24488,16 +24925,16 @@ setlocale(LC_ALL, "")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24491: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24928: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24494: \$? = $ac_status" >&5
+  echo "$as_me:24931: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24497: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24934: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24500: \$? = $ac_status" >&5
+  echo "$as_me:24937: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_locale=yes
 else
@@ -24509,21 +24946,21 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:24512: result: $cf_cv_locale" >&5
+echo "$as_me:24949: result: $cf_cv_locale" >&5
 echo "${ECHO_T}$cf_cv_locale" >&6
 test $cf_cv_locale = yes && { cat >>confdefs.h <<\EOF
 #define LOCALE 1
 EOF
  }
 
-echo "$as_me:24519: checking if NGROUPS is defined" >&5
+echo "$as_me:24956: 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 24526 "configure"
+#line 24963 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -24542,23 +24979,23 @@ int x = NGROUPS
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24545: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24982: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24548: \$? = $ac_status" >&5
+  echo "$as_me:24985: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24551: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24988: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24554: \$? = $ac_status" >&5
+  echo "$as_me:24991: \$? = $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 24561 "configure"
+#line 24998 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -24577,16 +25014,16 @@ int x = NGROUPS_MAX
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24580: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25017: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24583: \$? = $ac_status" >&5
+  echo "$as_me:25020: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24586: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25023: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24589: \$? = $ac_status" >&5
+  echo "$as_me:25026: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ngroups=NGROUPS_MAX
 else
@@ -24598,7 +25035,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:24601: result: $cf_cv_ngroups" >&5
+echo "$as_me:25038: result: $cf_cv_ngroups" >&5
 echo "${ECHO_T}$cf_cv_ngroups" >&6
 
 fi
@@ -24615,14 +25052,14 @@ EOF
 
 fi
 
-echo "$as_me:24618: checking if external sys_nerr is declared" >&5
+echo "$as_me:25055: 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 24625 "configure"
+#line 25062 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -24640,16 +25077,16 @@ int x = (int) sys_nerr
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24643: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25080: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24646: \$? = $ac_status" >&5
+  echo "$as_me:25083: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24649: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25086: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24652: \$? = $ac_status" >&5
+  echo "$as_me:25089: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_sys_nerr=yes
 else
@@ -24660,7 +25097,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:24663: result: $cf_cv_dcl_sys_nerr" >&5
+echo "$as_me:25100: 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
@@ -24675,14 +25112,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:24678: checking if external sys_nerr exists" >&5
+echo "$as_me:25115: 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 24685 "configure"
+#line 25122 "configure"
 #include "confdefs.h"
 
 #undef sys_nerr
@@ -24697,16 +25134,16 @@ sys_nerr = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24700: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25137: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24703: \$? = $ac_status" >&5
+  echo "$as_me:25140: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24706: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25143: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24709: \$? = $ac_status" >&5
+  echo "$as_me:25146: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_sys_nerr=yes
 else
@@ -24717,7 +25154,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:24720: result: $cf_cv_have_sys_nerr" >&5
+echo "$as_me:25157: 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
@@ -24730,14 +25167,14 @@ EOF
 
 fi
 
-echo "$as_me:24733: checking if external sys_errlist is declared" >&5
+echo "$as_me:25170: 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 24740 "configure"
+#line 25177 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -24755,16 +25192,16 @@ int x = (int) sys_errlist
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24758: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25195: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24761: \$? = $ac_status" >&5
+  echo "$as_me:25198: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24764: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25201: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24767: \$? = $ac_status" >&5
+  echo "$as_me:25204: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_sys_errlist=yes
 else
@@ -24775,7 +25212,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:24778: result: $cf_cv_dcl_sys_errlist" >&5
+echo "$as_me:25215: 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
@@ -24790,14 +25227,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:24793: checking if external sys_errlist exists" >&5
+echo "$as_me:25230: 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 24800 "configure"
+#line 25237 "configure"
 #include "confdefs.h"
 
 #undef sys_errlist
@@ -24812,16 +25249,16 @@ sys_errlist = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24815: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25252: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24818: \$? = $ac_status" >&5
+  echo "$as_me:25255: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24821: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25258: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24824: \$? = $ac_status" >&5
+  echo "$as_me:25261: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_sys_errlist=yes
 else
@@ -24832,7 +25269,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:24835: result: $cf_cv_have_sys_errlist" >&5
+echo "$as_me:25272: 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
@@ -24848,23 +25285,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:24851: checking for $ac_header" >&5
+echo "$as_me:25288: 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 24857 "configure"
+#line 25294 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:24861: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:25298: \"$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:24867: \$? = $ac_status" >&5
+  echo "$as_me:25304: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -24883,7 +25320,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:24886: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:25323: 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
@@ -24893,14 +25330,14 @@ EOF
 fi
 done
 
-echo "$as_me:24896: checking for lastlog path" >&5
+echo "$as_me:25333: 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 24903 "configure"
+#line 25340 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -24920,16 +25357,16 @@ char *path = _PATH_LASTLOG
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24923: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25360: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24926: \$? = $ac_status" >&5
+  echo "$as_me:25363: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24929: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25366: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24932: \$? = $ac_status" >&5
+  echo "$as_me:25369: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_path_lastlog="_PATH_LASTLOG"
 else
@@ -24944,13 +25381,13 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:24947: result: $cf_cv_path_lastlog" >&5
+echo "$as_me:25384: 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:24953: checking for utmp implementation" >&5
+echo "$as_me:25390: 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
@@ -24967,7 +25404,7 @@ cf_utmp_includes="
 #endif
 "
 	cat >conftest.$ac_ext <<_ACEOF
-#line 24970 "configure"
+#line 25407 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -24981,16 +25418,16 @@ struct $cf_header x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24984: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25421: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24987: \$? = $ac_status" >&5
+  echo "$as_me:25424: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24990: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25427: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24993: \$? = $ac_status" >&5
+  echo "$as_me:25430: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -24999,7 +25436,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 25002 "configure"
+#line 25439 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -25013,16 +25450,16 @@ struct $cf_header x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25016: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25453: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25019: \$? = $ac_status" >&5
+  echo "$as_me:25456: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25022: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25459: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25025: \$? = $ac_status" >&5
+  echo "$as_me:25462: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -25037,7 +25474,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:25040: result: $cf_cv_have_utmp" >&5
+echo "$as_me:25477: result: $cf_cv_have_utmp" >&5
 echo "${ECHO_T}$cf_cv_have_utmp" >&6
 
 if test $cf_cv_have_utmp != no ; then
@@ -25050,14 +25487,14 @@ EOF
 EOF
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:25053: checking if ${cf_cv_have_utmp}.ut_host is declared" >&5
+echo "$as_me:25490: 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 25060 "configure"
+#line 25497 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -25071,16 +25508,16 @@ struct $cf_cv_have_utmp x; char *y = &x.ut_host[0]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25074: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25511: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25077: \$? = $ac_status" >&5
+  echo "$as_me:25514: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25080: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25517: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25083: \$? = $ac_status" >&5
+  echo "$as_me:25520: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_host=yes
 else
@@ -25092,7 +25529,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:25095: result: $cf_cv_have_utmp_ut_host" >&5
+echo "$as_me:25532: result: $cf_cv_have_utmp_ut_host" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_host" >&6
 test $cf_cv_have_utmp_ut_host != no && cat >>confdefs.h <<\EOF
 #define HAVE_UTMP_UT_HOST 1
@@ -25101,14 +25538,14 @@ EOF
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:25104: checking if ${cf_cv_have_utmp}.ut_syslen is declared" >&5
+echo "$as_me:25541: 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 25111 "configure"
+#line 25548 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -25122,16 +25559,16 @@ struct $cf_cv_have_utmp x; int y = x.ut_syslen
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25125: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25562: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25128: \$? = $ac_status" >&5
+  echo "$as_me:25565: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25131: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25568: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25134: \$? = $ac_status" >&5
+  echo "$as_me:25571: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_syslen=yes
 else
@@ -25143,7 +25580,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:25146: result: $cf_cv_have_utmp_ut_syslen" >&5
+echo "$as_me:25583: result: $cf_cv_have_utmp_ut_syslen" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_syslen" >&6
 test $cf_cv_have_utmp_ut_syslen != no && cat >>confdefs.h <<\EOF
 #define HAVE_UTMP_UT_SYSLEN 1
@@ -25152,7 +25589,7 @@ EOF
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:25155: checking if ${cf_cv_have_utmp}.ut_name is declared" >&5
+echo "$as_me:25592: 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
@@ -25169,7 +25606,7 @@ cf_utmp_includes="
 "
 for cf_header in ut_name ut_user ; do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 25172 "configure"
+#line 25609 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -25183,16 +25620,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25186: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25623: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25189: \$? = $ac_status" >&5
+  echo "$as_me:25626: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25192: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25629: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25195: \$? = $ac_status" >&5
+  echo "$as_me:25632: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_name=$cf_header
 	 break
@@ -25204,12 +25641,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:25207: result: $cf_cv_have_utmp_ut_name" >&5
+echo "$as_me:25644: result: $cf_cv_have_utmp_ut_name" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_name" >&6
 
 case $cf_cv_have_utmp_ut_name in #(vi
 no) #(vi
-	{ { echo "$as_me:25212: error: Cannot find declaration for ut.ut_name" >&5
+	{ { echo "$as_me:25649: 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; }; }
 	;;
@@ -25223,7 +25660,7 @@ esac
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:25226: checking for exit-status in $cf_cv_have_utmp" >&5
+echo "$as_me:25663: 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
@@ -25236,7 +25673,7 @@ for cf_result in \
 	ut_exit.ut_exit
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 25239 "configure"
+#line 25676 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -25250,16 +25687,16 @@ struct $cf_cv_have_utmp x; long y = x.$cf_result = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25253: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25690: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25256: \$? = $ac_status" >&5
+  echo "$as_me:25693: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25259: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25696: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25262: \$? = $ac_status" >&5
+  echo "$as_me:25699: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_xstatus=$cf_result
 	 break
@@ -25272,7 +25709,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:25275: result: $cf_cv_have_utmp_ut_xstatus" >&5
+echo "$as_me:25712: result: $cf_cv_have_utmp_ut_xstatus" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_xstatus" >&6
 if test $cf_cv_have_utmp_ut_xstatus != no ; then
 	cat >>confdefs.h <<\EOF
@@ -25287,14 +25724,14 @@ fi
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:25290: checking if ${cf_cv_have_utmp}.ut_xtime is declared" >&5
+echo "$as_me:25727: 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 25297 "configure"
+#line 25734 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -25308,23 +25745,23 @@ struct $cf_cv_have_utmp x; long y = x.ut_xtime = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25311: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25748: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25314: \$? = $ac_status" >&5
+  echo "$as_me:25751: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25317: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25754: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25320: \$? = $ac_status" >&5
+  echo "$as_me:25757: \$? = $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 25327 "configure"
+#line 25764 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -25338,16 +25775,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:25341: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25778: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25344: \$? = $ac_status" >&5
+  echo "$as_me:25781: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25347: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25784: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25350: \$? = $ac_status" >&5
+  echo "$as_me:25787: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_xtime=define
 else
@@ -25361,7 +25798,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:25364: result: $cf_cv_have_utmp_ut_xtime" >&5
+echo "$as_me:25801: result: $cf_cv_have_utmp_ut_xtime" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_xtime" >&6
 if test $cf_cv_have_utmp_ut_xtime != no ; then
 	cat >>confdefs.h <<\EOF
@@ -25378,14 +25815,14 @@ fi
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:25381: checking if ${cf_cv_have_utmp}.ut_session is declared" >&5
+echo "$as_me:25818: 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 25388 "configure"
+#line 25825 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -25399,16 +25836,16 @@ struct $cf_cv_have_utmp x; long y = x.ut_session
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25402: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25839: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25405: \$? = $ac_status" >&5
+  echo "$as_me:25842: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25408: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25845: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25411: \$? = $ac_status" >&5
+  echo "$as_me:25848: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_session=yes
 else
@@ -25419,7 +25856,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:25422: result: $cf_cv_have_utmp_ut_session" >&5
+echo "$as_me:25859: result: $cf_cv_have_utmp_ut_session" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_session" >&6
 if test $cf_cv_have_utmp_ut_session != no ; then
 	cat >>confdefs.h <<\EOF
@@ -25429,7 +25866,7 @@ EOF
 fi
 fi
 
-echo "$as_me:25432: checking if $cf_cv_have_utmp is SYSV flavor" >&5
+echo "$as_me:25869: 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
@@ -25437,7 +25874,7 @@ else
 
 test "$cf_cv_have_utmp" = "utmp" && cf_prefix="ut" || cf_prefix="utx"
 cat >conftest.$ac_ext <<_ACEOF
-#line 25440 "configure"
+#line 25877 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -25456,16 +25893,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25459: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25896: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25462: \$? = $ac_status" >&5
+  echo "$as_me:25899: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25465: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25902: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25468: \$? = $ac_status" >&5
+  echo "$as_me:25905: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_sysv_utmp=yes
 else
@@ -25476,7 +25913,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:25479: result: $cf_cv_sysv_utmp" >&5
+echo "$as_me:25916: result: $cf_cv_sysv_utmp" >&5
 echo "${ECHO_T}$cf_cv_sysv_utmp" >&6
 test $cf_cv_sysv_utmp = yes && cat >>confdefs.h <<\EOF
 #define USE_SYSV_UTMP 1
@@ -25484,14 +25921,14 @@ EOF
 
 fi
 
-echo "$as_me:25487: checking if external h_errno exists" >&5
+echo "$as_me:25924: 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 25494 "configure"
+#line 25931 "configure"
 #include "confdefs.h"
 
 #undef h_errno
@@ -25506,16 +25943,16 @@ h_errno = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25509: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25946: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25512: \$? = $ac_status" >&5
+  echo "$as_me:25949: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25515: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25952: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25518: \$? = $ac_status" >&5
+  echo "$as_me:25955: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_h_errno=yes
 else
@@ -25526,7 +25963,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:25529: result: $cf_cv_have_h_errno" >&5
+echo "$as_me:25966: 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
@@ -25539,7 +25976,7 @@ EOF
 
 fi
 
-echo "$as_me:25542: checking if bibp: URLs should be supported" >&5
+echo "$as_me:25979: 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.
@@ -25556,13 +25993,13 @@ else
   use_bibp_urls=yes
 
 fi;
-echo "$as_me:25559: result: $use_bibp_urls" >&5
+echo "$as_me:25996: 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:25565: checking if configuration info should be browsable" >&5
+echo "$as_me:26002: 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.
@@ -25579,13 +26016,13 @@ else
   use_config_info=yes
 
 fi;
-echo "$as_me:25582: result: $use_config_info" >&5
+echo "$as_me:26019: 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:25588: checking if new-style forms-based options screen should be used" >&5
+echo "$as_me:26025: 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.
@@ -25602,13 +26039,13 @@ else
   use_forms_options=yes
 
 fi;
-echo "$as_me:25605: result: $use_forms_options" >&5
+echo "$as_me:26042: 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:25611: checking if old-style options menu should be used" >&5
+echo "$as_me:26048: 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.
@@ -25625,13 +26062,13 @@ else
   use_menu_options=yes
 
 fi;
-echo "$as_me:25628: result: $use_menu_options" >&5
+echo "$as_me:26065: 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:25634: checking if experimental address-list page should be used" >&5
+echo "$as_me:26071: checking if experimental address-list page should be used" >&5
 echo $ECHO_N "checking if experimental address-list page should be used... $ECHO_C" >&6
 
 # Check whether --enable-addrlist-page or --disable-addrlist-page was given.
@@ -25648,13 +26085,13 @@ else
   use_addrlist_page=no
 
 fi;
-echo "$as_me:25651: result: $use_addrlist_page" >&5
+echo "$as_me:26088: result: $use_addrlist_page" >&5
 echo "${ECHO_T}$use_addrlist_page" >&6
 test $use_addrlist_page != no && cat >>confdefs.h <<\EOF
 #define EXP_ADDRLIST_PAGE 1
 EOF
 
-echo "$as_me:25657: checking if experimental charset-selection logic should be used" >&5
+echo "$as_me:26094: checking if experimental charset-selection logic should be used" >&5
 echo $ECHO_N "checking if experimental charset-selection logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-charset-choice or --disable-charset-choice was given.
@@ -25671,13 +26108,13 @@ else
   use_charset_choice=no
 
 fi;
-echo "$as_me:25674: result: $use_charset_choice" >&5
+echo "$as_me:26111: result: $use_charset_choice" >&5
 echo "${ECHO_T}$use_charset_choice" >&6
 test $use_charset_choice != no && cat >>confdefs.h <<\EOF
 #define EXP_CHARSET_CHOICE 1
 EOF
 
-echo "$as_me:25680: checking if experimental CJK logic should be used" >&5
+echo "$as_me:26117: 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.
@@ -25694,13 +26131,13 @@ else
   use_cjk=no
 
 fi;
-echo "$as_me:25697: result: $use_cjk" >&5
+echo "$as_me:26134: 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:25703: checking if experimental Japanese UTF-8 logic should be used" >&5
+echo "$as_me:26140: 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.
@@ -25717,7 +26154,7 @@ else
   use_ja_utf8=no
 
 fi;
-echo "$as_me:25720: result: $use_ja_utf8" >&5
+echo "$as_me:26157: result: $use_ja_utf8" >&5
 echo "${ECHO_T}$use_ja_utf8" >&6
 if test $use_ja_utf8 != no ; then
 	cat >>confdefs.h <<\EOF
@@ -25762,7 +26199,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 25765 "configure"
+#line 26202 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -25774,16 +26211,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25777: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26214: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25780: \$? = $ac_status" >&5
+  echo "$as_me:26217: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25783: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26220: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25786: \$? = $ac_status" >&5
+  echo "$as_me:26223: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -25800,7 +26237,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}:25803: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:26240: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -25841,7 +26278,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 25844 "configure"
+#line 26281 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -25853,16 +26290,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25856: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26293: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25859: \$? = $ac_status" >&5
+  echo "$as_me:26296: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25862: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26299: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25865: \$? = $ac_status" >&5
+  echo "$as_me:26302: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -25879,7 +26316,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}:25882: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:26319: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -25895,7 +26332,7 @@ echo "${as_me-configure}:25882: testing adding $cf_add_incdir to include-path ..
 fi
 
 	else
-{ { echo "$as_me:25898: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:26335: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -25920,7 +26357,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}:25923: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:26360: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -25949,7 +26386,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}:25952: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:26389: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -25958,7 +26395,7 @@ echo "${as_me-configure}:25952: testing adding $cf_add_libdir to library-path ..
 fi
 
 	else
-{ { echo "$as_me:25961: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:26398: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -25969,7 +26406,7 @@ done
 
 fi;
 
-  echo "$as_me:25972: checking for iconv" >&5
+  echo "$as_me:26409: 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
@@ -25980,10 +26417,10 @@ else
 cf_cv_header_path_iconv=
 cf_cv_library_path_iconv=
 
-echo "${as_me-configure}:25983: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me-configure}:26420: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 25986 "configure"
+#line 26423 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -26002,16 +26439,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26005: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26442: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26008: \$? = $ac_status" >&5
+  echo "$as_me:26445: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26011: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26448: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26014: \$? = $ac_status" >&5
+  echo "$as_me:26451: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_find_linkage_iconv=yes
 else
@@ -26020,7 +26457,7 @@ cat conftest.$ac_ext >&5
 
     cf_cv_find_linkage_iconv=no
 
-echo "${as_me-configure}:26023: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me-configure}:26460: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -26128,11 +26565,11 @@ cf_search="$cf_header_path_list $cf_search"
       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}:26131: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me-configure}:26568: 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 26135 "configure"
+#line 26572 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -26151,21 +26588,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26154: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26591: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26157: \$? = $ac_status" >&5
+  echo "$as_me:26594: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26160: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26597: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26163: \$? = $ac_status" >&5
+  echo "$as_me:26600: \$? = $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}:26168: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me-configure}:26605: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
 
             cf_cv_find_linkage_iconv=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -26183,7 +26620,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_iconv" = maybe ; then
 
-echo "${as_me-configure}:26186: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me-configure}:26623: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -26279,13 +26716,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}:26282: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me-configure}:26719: 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 26288 "configure"
+#line 26725 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -26304,21 +26741,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26307: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26744: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26310: \$? = $ac_status" >&5
+  echo "$as_me:26747: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26313: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26750: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26316: \$? = $ac_status" >&5
+  echo "$as_me:26753: \$? = $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}:26321: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me-configure}:26758: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
 
                 cf_cv_find_linkage_iconv=yes
                 cf_cv_library_file_iconv="-liconv"
@@ -26354,7 +26791,7 @@ am_cv_func_iconv="no, consider installing GNU libiconv"
 fi
 
 fi
-echo "$as_me:26357: result: $am_cv_func_iconv" >&5
+echo "$as_me:26794: result: $am_cv_func_iconv" >&5
 echo "${ECHO_T}$am_cv_func_iconv" >&6
 
   if test "$am_cv_func_iconv" = yes; then
@@ -26363,14 +26800,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_ICONV 1
 EOF
 
-    echo "$as_me:26366: checking if the declaration of iconv() needs const." >&5
+    echo "$as_me:26803: 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 26373 "configure"
+#line 26810 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -26395,16 +26832,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26398: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26835: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26401: \$? = $ac_status" >&5
+  echo "$as_me:26838: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26404: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26841: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26407: \$? = $ac_status" >&5
+  echo "$as_me:26844: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_proto_iconv_const=no
 else
@@ -26414,7 +26851,7 @@ am_cv_proto_iconv_const=yes
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:26417: result: $am_cv_proto_iconv_const" >&5
+echo "$as_me:26854: 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
@@ -26456,7 +26893,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 26459 "configure"
+#line 26896 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -26468,16 +26905,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26471: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26908: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26474: \$? = $ac_status" >&5
+  echo "$as_me:26911: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26477: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26914: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26480: \$? = $ac_status" >&5
+  echo "$as_me:26917: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -26494,7 +26931,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}:26497: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:26934: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -26531,7 +26968,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}:26534: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:26971: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -26555,7 +26992,7 @@ curses|slang|ncurses*)
 esac
 
 if test "$use_dft_colors" != no ; then
-echo "$as_me:26558: checking if you want to use default-colors" >&5
+echo "$as_me:26995: 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.
@@ -26572,7 +27009,7 @@ else
   use_dft_colors=no
 
 fi;
-echo "$as_me:26575: result: $use_dft_colors" >&5
+echo "$as_me:27012: result: $use_dft_colors" >&5
 echo "${ECHO_T}$use_dft_colors" >&6
 test $use_dft_colors = "yes" && cat >>confdefs.h <<\EOF
 #define USE_DEFAULT_COLORS 1
@@ -26580,7 +27017,7 @@ EOF
 
 fi
 
-echo "$as_me:26583: checking if experimental keyboard-layout logic should be used" >&5
+echo "$as_me:27020: 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.
@@ -26597,13 +27034,13 @@ else
   use_kbd_layout=no
 
 fi;
-echo "$as_me:26600: result: $use_kbd_layout" >&5
+echo "$as_me:27037: 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:26606: checking if experimental nested-table logic should be used" >&5
+echo "$as_me:27043: 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.
@@ -26620,13 +27057,13 @@ else
   use_nested_tables=no
 
 fi;
-echo "$as_me:26623: result: $use_nested_tables" >&5
+echo "$as_me:27060: 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:26629: checking if progress-bar code should be used" >&5
+echo "$as_me:27066: 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.
@@ -26643,13 +27080,13 @@ else
   use_progressbar=no
 
 fi;
-echo "$as_me:26646: result: $use_progressbar" >&5
+echo "$as_me:27083: 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:26652: checking if scrollbar code should be used" >&5
+echo "$as_me:27089: 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.
@@ -26666,10 +27103,10 @@ else
   use_scrollbar=no
 
 fi;
-echo "$as_me:26669: result: $use_scrollbar" >&5
+echo "$as_me:27106: result: $use_scrollbar" >&5
 echo "${ECHO_T}$use_scrollbar" >&6
 
-echo "$as_me:26672: checking if sessions code should be used" >&5
+echo "$as_me:27109: 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.
@@ -26686,7 +27123,7 @@ else
   use_sessions=no
 
 fi;
-echo "$as_me:26689: result: $use_sessions" >&5
+echo "$as_me:27126: result: $use_sessions" >&5
 echo "${ECHO_T}$use_sessions" >&6
 if test $use_sessions != no ; then
     cat >>confdefs.h <<\EOF
@@ -26696,7 +27133,7 @@ EOF
 	EXTRA_OBJS="$EXTRA_OBJS LYSession\$o"
 fi
 
-echo "$as_me:26699: checking if session-caching code should be used" >&5
+echo "$as_me:27136: 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.
@@ -26713,7 +27150,7 @@ else
   use_session_cache=no
 
 fi;
-echo "$as_me:26716: result: $use_session_cache" >&5
+echo "$as_me:27153: result: $use_session_cache" >&5
 echo "${ECHO_T}$use_session_cache" >&6
 if test $use_session_cache != no ; then
     cat >>confdefs.h <<\EOF
@@ -26722,7 +27159,7 @@ EOF
 
 fi
 
-echo "$as_me:26725: checking if alternative line-edit bindings should be used" >&5
+echo "$as_me:27162: 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.
@@ -26739,13 +27176,13 @@ else
   use_alt_bindings=yes
 
 fi;
-echo "$as_me:26742: result: $use_alt_bindings" >&5
+echo "$as_me:27179: result: $use_alt_bindings" >&5
 echo "${ECHO_T}$use_alt_bindings" >&6
 test $use_alt_bindings != no && cat >>confdefs.h <<\EOF
 #define EXP_ALT_BINDINGS 1
 EOF
 
-echo "$as_me:26748: checking if you want to use extended HTML DTD logic" >&5
+echo "$as_me:27185: 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.
@@ -26762,13 +27199,13 @@ else
   use_ext_htmldtd=yes
 
 fi;
-echo "$as_me:26765: result: $use_ext_htmldtd" >&5
+echo "$as_me:27202: 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:26771: checking if file-upload logic should be used" >&5
+echo "$as_me:27208: 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.
@@ -26785,13 +27222,13 @@ else
   use_file_upload=yes
 
 fi;
-echo "$as_me:26788: result: $use_file_upload" >&5
+echo "$as_me:27225: 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:26794: checking if element-justification logic should be used" >&5
+echo "$as_me:27231: 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.
@@ -26808,13 +27245,13 @@ else
   use_justify_elts=yes
 
 fi;
-echo "$as_me:26811: result: $use_justify_elts" >&5
+echo "$as_me:27248: result: $use_justify_elts" >&5
 echo "${ECHO_T}$use_justify_elts" >&6
 test $use_justify_elts != no && cat >>confdefs.h <<\EOF
 #define EXP_JUSTIFY_ELTS 1
 EOF
 
-echo "$as_me:26817: checking if partial-display should be used" >&5
+echo "$as_me:27254: 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.
@@ -26831,13 +27268,13 @@ else
   use_partial_display=yes
 
 fi;
-echo "$as_me:26834: result: $use_partial_display" >&5
+echo "$as_me:27271: 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:26840: checking if persistent-cookie logic should be used" >&5
+echo "$as_me:27277: 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.
@@ -26854,13 +27291,13 @@ else
   use_filed_cookies=yes
 
 fi;
-echo "$as_me:26857: result: $use_filed_cookies" >&5
+echo "$as_me:27294: 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:26863: checking if html source should be colorized" >&5
+echo "$as_me:27300: 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.
@@ -26877,13 +27314,13 @@ else
   use_prettysrc=yes
 
 fi;
-echo "$as_me:26880: result: $use_prettysrc" >&5
+echo "$as_me:27317: 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:26886: checking if read-progress message should show ETA" >&5
+echo "$as_me:27323: 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.
@@ -26900,13 +27337,13 @@ else
   use_read_eta=yes
 
 fi;
-echo "$as_me:26903: result: $use_read_eta" >&5
+echo "$as_me:27340: 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:26909: checking if source caching should be used" >&5
+echo "$as_me:27346: 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.
@@ -26923,13 +27360,13 @@ else
   use_source_cache=yes
 
 fi;
-echo "$as_me:26926: result: $use_source_cache" >&5
+echo "$as_me:27363: 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:26932: checking if you want to use external commands" >&5
+echo "$as_me:27369: 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.
@@ -26946,7 +27383,7 @@ else
   use_externs=no
 
 fi;
-echo "$as_me:26949: result: $use_externs" >&5
+echo "$as_me:27386: result: $use_externs" >&5
 echo "${ECHO_T}$use_externs" >&6
 if test $use_externs != "no" ; then
 	cat >>confdefs.h <<\EOF
@@ -26956,7 +27393,7 @@ EOF
 	EXTRA_OBJS="$EXTRA_OBJS LYExtern\$o"
 fi
 
-echo "$as_me:26959: checking if you want to use setfont support" >&5
+echo "$as_me:27396: 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.
@@ -26973,7 +27410,7 @@ else
   use_setfont=no
 
 fi;
-echo "$as_me:26976: result: $use_setfont" >&5
+echo "$as_me:27413: result: $use_setfont" >&5
 echo "${ECHO_T}$use_setfont" >&6
 if test $use_setfont = yes ; then
 	case $host_os in
@@ -26984,7 +27421,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:26987: checking for $ac_word" >&5
+echo "$as_me:27424: 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
@@ -27001,7 +27438,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:27004: found $ac_dir/$ac_word" >&5
+   echo "$as_me:27441: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -27012,10 +27449,10 @@ fi
 SETFONT=$ac_cv_path_SETFONT
 
 if test -n "$SETFONT"; then
-  echo "$as_me:27015: result: $SETFONT" >&5
+  echo "$as_me:27452: result: $SETFONT" >&5
 echo "${ECHO_T}$SETFONT" >&6
 else
-  echo "$as_me:27018: result: no" >&5
+  echo "$as_me:27455: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -27083,7 +27520,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:27086: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:27523: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define SETFONT_PATH "$cf_path_prog"
@@ -27100,19 +27537,19 @@ fi
 		SETFONT=built-in
 		test -n "$verbose" && echo "	Assume $host_os has font-switching" 1>&6
 
-echo "${as_me-configure}:27103: testing Assume $host_os has font-switching ..." 1>&5
+echo "${as_me-configure}:27540: 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}:27110: testing Assume $host_os has no font-switching ..." 1>&5
+echo "${as_me-configure}:27547: testing Assume $host_os has no font-switching ..." 1>&5
 
 		;;
 	esac
 	if test -z "$SETFONT" ; then
-		{ echo "$as_me:27115: WARNING: Cannot find a font-setting program" >&5
+		{ echo "$as_me:27552: WARNING: Cannot find a font-setting program" >&5
 echo "$as_me: WARNING: Cannot find a font-setting program" >&2;}
 	elif test "$SETFONT" != unknown ; then
 		cat >>confdefs.h <<\EOF
@@ -27122,7 +27559,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:27125: checking if you want cgi-link support" >&5
+echo "$as_me:27562: 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.
@@ -27138,10 +27575,10 @@ EOF
 else
   enableval=no
 fi;
-echo "$as_me:27141: result: $enableval" >&5
+echo "$as_me:27578: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:27144: checking if you want change-exec support" >&5
+echo "$as_me:27581: 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.
@@ -27158,13 +27595,13 @@ else
   use_change_exec=no
 
 fi;
-echo "$as_me:27161: result: $use_change_exec" >&5
+echo "$as_me:27598: 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:27167: checking if you want exec-links support" >&5
+echo "$as_me:27604: 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.
@@ -27181,13 +27618,13 @@ else
   use_exec_links=$enableval
 
 fi;
-echo "$as_me:27184: result: $use_exec_links" >&5
+echo "$as_me:27621: 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:27190: checking if you want exec-scripts support" >&5
+echo "$as_me:27627: 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.
@@ -27204,13 +27641,13 @@ else
   use_exec_scripts=$enableval
 
 fi;
-echo "$as_me:27207: result: $use_exec_scripts" >&5
+echo "$as_me:27644: 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:27213: checking if you want internal-links feature" >&5
+echo "$as_me:27650: 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.
@@ -27227,13 +27664,13 @@ else
   use_internal_links=no
 
 fi;
-echo "$as_me:27230: result: $use_internal_links" >&5
+echo "$as_me:27667: result: $use_internal_links" >&5
 echo "${ECHO_T}$use_internal_links" >&6
 test $use_internal_links = no && cat >>confdefs.h <<\EOF
 #define DONT_TRACK_INTERNAL_LINKS 1
 EOF
 
-echo "$as_me:27236: checking if you want to fork NSL requests" >&5
+echo "$as_me:27673: 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.
@@ -27250,13 +27687,13 @@ else
   use_nsl_fork=no
 
 fi;
-echo "$as_me:27253: result: $use_nsl_fork" >&5
+echo "$as_me:27690: result: $use_nsl_fork" >&5
 echo "${ECHO_T}$use_nsl_fork" >&6
 test $use_nsl_fork = yes && cat >>confdefs.h <<\EOF
 #define NSL_FORK 1
 EOF
 
-echo "$as_me:27259: checking if you want to log URL requests via syslog" >&5
+echo "$as_me:27696: 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.
@@ -27273,13 +27710,13 @@ else
   use_syslog=no
 
 fi;
-echo "$as_me:27276: result: $use_syslog" >&5
+echo "$as_me:27713: 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:27282: checking if you want to underline links" >&5
+echo "$as_me:27719: 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.
@@ -27296,7 +27733,7 @@ else
   use_underline=no
 
 fi;
-echo "$as_me:27299: result: $use_underline" >&5
+echo "$as_me:27736: result: $use_underline" >&5
 echo "${ECHO_T}$use_underline" >&6
 test $use_underline = yes && cat >>confdefs.h <<\EOF
 #define UNDERLINE_LINKS 1
@@ -27306,7 +27743,7 @@ test $use_underline = no  && cat >>confdefs.h <<\EOF
 #define UNDERLINE_LINKS 0
 EOF
 
-echo "$as_me:27309: checking if help files should be gzip'ed" >&5
+echo "$as_me:27746: 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.
@@ -27323,10 +27760,10 @@ else
   use_gzip_help=no
 
 fi;
-echo "$as_me:27326: result: $use_gzip_help" >&5
+echo "$as_me:27763: result: $use_gzip_help" >&5
 echo "${ECHO_T}$use_gzip_help" >&6
 
-echo "$as_me:27329: checking if you want to use libbz2 for decompression of some bzip2 files" >&5
+echo "$as_me:27766: 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.
@@ -27336,7 +27773,7 @@ if test "${with_bzlib+set}" = set; then
 else
   use_bzlib=no
 fi;
-echo "$as_me:27339: result: $use_bzlib" >&5
+echo "$as_me:27776: result: $use_bzlib" >&5
 echo "${ECHO_T}$use_bzlib" >&6
 
 if test ".$use_bzlib" != ".no" ; then
@@ -27375,7 +27812,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 27378 "configure"
+#line 27815 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -27387,16 +27824,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27390: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27827: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27393: \$? = $ac_status" >&5
+  echo "$as_me:27830: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27396: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27833: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27399: \$? = $ac_status" >&5
+  echo "$as_me:27836: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -27413,7 +27850,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}:27416: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:27853: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -27454,7 +27891,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 27457 "configure"
+#line 27894 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -27466,16 +27903,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27469: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27906: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27472: \$? = $ac_status" >&5
+  echo "$as_me:27909: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27475: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27912: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27478: \$? = $ac_status" >&5
+  echo "$as_me:27915: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -27492,7 +27929,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}:27495: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:27932: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -27508,7 +27945,7 @@ echo "${as_me-configure}:27495: testing adding $cf_add_incdir to include-path ..
 fi
 
 	else
-{ { echo "$as_me:27511: error: cannot find  under $use_bzlib" >&5
+{ { echo "$as_me:27948: error: cannot find  under $use_bzlib" >&5
 echo "$as_me: error: cannot find  under $use_bzlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -27533,7 +27970,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}:27536: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:27973: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -27562,7 +27999,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}:27565: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:28002: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -27571,7 +28008,7 @@ echo "${as_me-configure}:27565: testing adding $cf_add_libdir to library-path ..
 fi
 
 	else
-{ { echo "$as_me:27574: error: cannot find  under $use_bzlib" >&5
+{ { echo "$as_me:28011: error: cannot find  under $use_bzlib" >&5
 echo "$as_me: error: cannot find  under $use_bzlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -27585,10 +28022,10 @@ done
 cf_cv_header_path_bz2=
 cf_cv_library_path_bz2=
 
-echo "${as_me-configure}:27588: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me-configure}:28025: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 27591 "configure"
+#line 28028 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -27605,16 +28042,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27608: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28045: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27611: \$? = $ac_status" >&5
+  echo "$as_me:28048: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27614: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28051: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27617: \$? = $ac_status" >&5
+  echo "$as_me:28054: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_find_linkage_bz2=yes
 else
@@ -27623,7 +28060,7 @@ cat conftest.$ac_ext >&5
 
     cf_cv_find_linkage_bz2=no
 
-echo "${as_me-configure}:27626: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me-configure}:28063: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -27731,11 +28168,11 @@ cf_search="$cf_header_path_list $cf_search"
       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}:27734: testing ... testing $cf_cv_header_path_bz2 ..." 1>&5
+echo "${as_me-configure}:28171: 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 27738 "configure"
+#line 28175 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -27752,21 +28189,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27755: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28192: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27758: \$? = $ac_status" >&5
+  echo "$as_me:28195: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27761: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28198: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27764: \$? = $ac_status" >&5
+  echo "$as_me:28201: \$? = $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}:27769: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5
+echo "${as_me-configure}:28206: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5
 
             cf_cv_find_linkage_bz2=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -27784,7 +28221,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_bz2" = maybe ; then
 
-echo "${as_me-configure}:27787: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me-configure}:28224: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -27792,7 +28229,7 @@ echo "${as_me-configure}:27787: testing Searching for bz2 library in FIND_LINKAG
         CPPFLAGS="$cf_test_CPPFLAGS"
         LIBS="-lbz2  $cf_save_LIBS"
         cat >conftest.$ac_ext <<_ACEOF
-#line 27795 "configure"
+#line 28232 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -27809,21 +28246,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27812: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28249: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27815: \$? = $ac_status" >&5
+  echo "$as_me:28252: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27818: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28255: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27821: \$? = $ac_status" >&5
+  echo "$as_me:28258: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found bz2 library in system" 1>&6
 
-echo "${as_me-configure}:27826: testing ... found bz2 library in system ..." 1>&5
+echo "${as_me-configure}:28263: testing ... found bz2 library in system ..." 1>&5
 
             cf_cv_find_linkage_bz2=yes
 else
@@ -27925,13 +28362,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}:27928: testing ... testing $cf_cv_library_path_bz2 ..." 1>&5
+echo "${as_me-configure}:28365: 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 27934 "configure"
+#line 28371 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -27948,21 +28385,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27951: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28388: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27954: \$? = $ac_status" >&5
+  echo "$as_me:28391: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27957: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28394: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27960: \$? = $ac_status" >&5
+  echo "$as_me:28397: \$? = $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}:27965: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5
+echo "${as_me-configure}:28402: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5
 
                 cf_cv_find_linkage_bz2=yes
                 cf_cv_library_file_bz2="-lbz2"
@@ -28017,7 +28454,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 28020 "configure"
+#line 28457 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -28029,16 +28466,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28032: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28469: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28035: \$? = $ac_status" >&5
+  echo "$as_me:28472: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28038: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28475: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28041: \$? = $ac_status" >&5
+  echo "$as_me:28478: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -28055,7 +28492,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}:28058: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:28495: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -28089,7 +28526,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}:28092: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:28529: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -28100,7 +28537,7 @@ fi
   LIBS="-lbz2 $LIBS"
 
 else
-{ echo "$as_me:28103: WARNING: Cannot find bz2 library" >&5
+{ echo "$as_me:28540: WARNING: Cannot find bz2 library" >&5
 echo "$as_me: WARNING: Cannot find bz2 library" >&2;}
 fi
 
@@ -28110,7 +28547,7 @@ EOF
 
 fi
 
-echo "$as_me:28113: checking if you want to use zlib for decompression of some gzip files" >&5
+echo "$as_me:28550: 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.
@@ -28120,7 +28557,7 @@ if test "${with_zlib+set}" = set; then
 else
   use_zlib=no
 fi;
-echo "$as_me:28123: result: $use_zlib" >&5
+echo "$as_me:28560: result: $use_zlib" >&5
 echo "${ECHO_T}$use_zlib" >&6
 
 if test ".$use_zlib" != ".no" ; then
@@ -28159,7 +28596,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 28162 "configure"
+#line 28599 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -28171,16 +28608,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28174: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28611: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28177: \$? = $ac_status" >&5
+  echo "$as_me:28614: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28180: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28617: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28183: \$? = $ac_status" >&5
+  echo "$as_me:28620: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -28197,7 +28634,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}:28200: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:28637: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -28238,7 +28675,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 28241 "configure"
+#line 28678 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -28250,16 +28687,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28253: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28690: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28256: \$? = $ac_status" >&5
+  echo "$as_me:28693: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28259: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28696: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28262: \$? = $ac_status" >&5
+  echo "$as_me:28699: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -28276,7 +28713,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}:28279: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:28716: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -28292,7 +28729,7 @@ echo "${as_me-configure}:28279: testing adding $cf_add_incdir to include-path ..
 fi
 
 	else
-{ { echo "$as_me:28295: error: cannot find  under $use_zlib" >&5
+{ { echo "$as_me:28732: error: cannot find  under $use_zlib" >&5
 echo "$as_me: error: cannot find  under $use_zlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -28317,7 +28754,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}:28320: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:28757: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -28346,7 +28783,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}:28349: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:28786: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -28355,7 +28792,7 @@ echo "${as_me-configure}:28349: testing adding $cf_add_libdir to library-path ..
 fi
 
 	else
-{ { echo "$as_me:28358: error: cannot find  under $use_zlib" >&5
+{ { echo "$as_me:28795: error: cannot find  under $use_zlib" >&5
 echo "$as_me: error: cannot find  under $use_zlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -28369,10 +28806,10 @@ done
 cf_cv_header_path_z=
 cf_cv_library_path_z=
 
-echo "${as_me-configure}:28372: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me-configure}:28809: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 28375 "configure"
+#line 28812 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -28388,16 +28825,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28391: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28828: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28394: \$? = $ac_status" >&5
+  echo "$as_me:28831: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28397: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28834: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28400: \$? = $ac_status" >&5
+  echo "$as_me:28837: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_find_linkage_z=yes
 else
@@ -28406,7 +28843,7 @@ cat conftest.$ac_ext >&5
 
     cf_cv_find_linkage_z=no
 
-echo "${as_me-configure}:28409: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me-configure}:28846: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -28514,11 +28951,11 @@ cf_search="$cf_header_path_list $cf_search"
       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}:28517: testing ... testing $cf_cv_header_path_z ..." 1>&5
+echo "${as_me-configure}:28954: 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 28521 "configure"
+#line 28958 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -28534,21 +28971,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28537: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28974: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28540: \$? = $ac_status" >&5
+  echo "$as_me:28977: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28543: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28980: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28546: \$? = $ac_status" >&5
+  echo "$as_me:28983: \$? = $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}:28551: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5
+echo "${as_me-configure}:28988: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5
 
             cf_cv_find_linkage_z=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -28566,7 +29003,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_z" = maybe ; then
 
-echo "${as_me-configure}:28569: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me-configure}:29006: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -28574,7 +29011,7 @@ echo "${as_me-configure}:28569: testing Searching for z library in FIND_LINKAGE(
         CPPFLAGS="$cf_test_CPPFLAGS"
         LIBS="-lz  $cf_save_LIBS"
         cat >conftest.$ac_ext <<_ACEOF
-#line 28577 "configure"
+#line 29014 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -28590,21 +29027,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28593: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29030: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28596: \$? = $ac_status" >&5
+  echo "$as_me:29033: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28599: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29036: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28602: \$? = $ac_status" >&5
+  echo "$as_me:29039: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found z library in system" 1>&6
 
-echo "${as_me-configure}:28607: testing ... found z library in system ..." 1>&5
+echo "${as_me-configure}:29044: testing ... found z library in system ..." 1>&5
 
             cf_cv_find_linkage_z=yes
 else
@@ -28706,13 +29143,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}:28709: testing ... testing $cf_cv_library_path_z ..." 1>&5
+echo "${as_me-configure}:29146: 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 28715 "configure"
+#line 29152 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -28728,21 +29165,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28731: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29168: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28734: \$? = $ac_status" >&5
+  echo "$as_me:29171: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28737: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29174: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28740: \$? = $ac_status" >&5
+  echo "$as_me:29177: \$? = $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}:28745: testing ... found z library in $cf_cv_library_path_z ..." 1>&5
+echo "${as_me-configure}:29182: testing ... found z library in $cf_cv_library_path_z ..." 1>&5
 
                 cf_cv_find_linkage_z=yes
                 cf_cv_library_file_z="-lz"
@@ -28797,7 +29234,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 28800 "configure"
+#line 29237 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -28809,16 +29246,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28812: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29249: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28815: \$? = $ac_status" >&5
+  echo "$as_me:29252: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28818: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29255: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28821: \$? = $ac_status" >&5
+  echo "$as_me:29258: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -28835,7 +29272,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}:28838: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:29275: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -28869,7 +29306,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}:28872: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:29309: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -28880,7 +29317,7 @@ fi
   LIBS="-lz $LIBS"
 
 else
-{ echo "$as_me:28883: WARNING: Cannot find z library" >&5
+{ echo "$as_me:29320: WARNING: Cannot find z library" >&5
 echo "$as_me: WARNING: Cannot find z library" >&2;}
 fi
 
@@ -28890,7 +29327,7 @@ EOF
 
 fi
 
-echo "$as_me:28893: checking if you want to exclude FINGER code" >&5
+echo "$as_me:29330: 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.
@@ -28907,13 +29344,13 @@ else
   use_finger=no
 
 fi;
-echo "$as_me:28910: result: $use_finger" >&5
+echo "$as_me:29347: 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:28916: checking if you want to exclude GOPHER code" >&5
+echo "$as_me:29353: 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.
@@ -28930,13 +29367,13 @@ else
   use_gopher=no
 
 fi;
-echo "$as_me:28933: result: $use_gopher" >&5
+echo "$as_me:29370: 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:28939: checking if you want to exclude NEWS code" >&5
+echo "$as_me:29376: 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.
@@ -28953,13 +29390,13 @@ else
   use_news=no
 
 fi;
-echo "$as_me:28956: result: $use_news" >&5
+echo "$as_me:29393: 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:28962: checking if you want to exclude FTP code" >&5
+echo "$as_me:29399: 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.
@@ -28976,7 +29413,7 @@ else
   use_ftp=no
 
 fi;
-echo "$as_me:28979: result: $use_ftp" >&5
+echo "$as_me:29416: result: $use_ftp" >&5
 echo "${ECHO_T}$use_ftp" >&6
 test $use_ftp != "no" && cat >>confdefs.h <<\EOF
 #define DISABLE_FTP 1
@@ -28984,7 +29421,7 @@ EOF
 
 # All DirEd functions that were enabled on compilation can be disabled
 # or modified at run time via DIRED_MENU symbols in lynx.cfg.
-echo "$as_me:28987: checking if directory-editor code should be used" >&5
+echo "$as_me:29424: 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.
@@ -29001,7 +29438,7 @@ else
   use_dired=yes
 
 fi;
-echo "$as_me:29004: result: $use_dired" >&5
+echo "$as_me:29441: result: $use_dired" >&5
 echo "${ECHO_T}$use_dired" >&6
 
 if test ".$use_dired" != ".no" ; then
@@ -29010,7 +29447,7 @@ if test ".$use_dired" != ".no" ; then
 #define DIRED_SUPPORT 1
 EOF
 
-	echo "$as_me:29013: checking if you wish to allow extracting from archives via DirEd" >&5
+	echo "$as_me:29450: 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.
@@ -29026,10 +29463,10 @@ EOF
 else
   enableval=yes
 fi;
-	echo "$as_me:29029: result: $enableval" >&5
+	echo "$as_me:29466: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:29032: checking if DirEd mode should override keys" >&5
+	echo "$as_me:29469: 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.
@@ -29051,10 +29488,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:29054: result: $enableval" >&5
+	echo "$as_me:29491: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:29057: checking if you wish to allow permissions commands via DirEd" >&5
+	echo "$as_me:29494: 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.
@@ -29076,10 +29513,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:29079: result: $enableval" >&5
+	echo "$as_me:29516: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:29082: checking if you wish to allow executable-permission commands via DirEd" >&5
+	echo "$as_me:29519: 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.
@@ -29095,10 +29532,10 @@ EOF
 else
   enableval=yes
 fi;
-	echo "$as_me:29098: result: $enableval" >&5
+	echo "$as_me:29535: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:29101: checking if you wish to allow \"tar\" commands from DirEd" >&5
+	echo "$as_me:29538: 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.
@@ -29120,10 +29557,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:29123: result: $enableval" >&5
+	echo "$as_me:29560: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:29126: checking if you wish to allow \"uudecode\" commands from DirEd" >&5
+	echo "$as_me:29563: 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.
@@ -29145,10 +29582,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:29148: result: $enableval" >&5
+	echo "$as_me:29585: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:29151: checking if you wish to allow \"zip\" and \"unzip\" commands from DirEd" >&5
+	echo "$as_me:29588: 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.
@@ -29170,10 +29607,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:29173: result: $enableval" >&5
+	echo "$as_me:29610: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:29176: checking if you wish to allow \"gzip\" and \"gunzip\" commands from DirEd" >&5
+	echo "$as_me:29613: 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.
@@ -29195,11 +29632,11 @@ else
 EOF
 
 fi;
-	echo "$as_me:29198: result: $enableval" >&5
+	echo "$as_me:29635: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 fi
 
-echo "$as_me:29202: checking if you want long-directory listings" >&5
+echo "$as_me:29639: 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.
@@ -29221,10 +29658,10 @@ else
 EOF
 
 fi;
-echo "$as_me:29224: result: $enableval" >&5
+echo "$as_me:29661: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:29227: checking if parent-directory references are permitted" >&5
+echo "$as_me:29664: 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.
@@ -29240,7 +29677,7 @@ EOF
 else
   enableval=yes
 fi;
-echo "$as_me:29243: result: $enableval" >&5
+echo "$as_me:29680: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 test -z "$TELNET" && TELNET=telnet
@@ -29248,7 +29685,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:29251: checking for $ac_word" >&5
+echo "$as_me:29688: 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
@@ -29265,7 +29702,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:29268: found $ac_dir/$ac_word" >&5
+   echo "$as_me:29705: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -29276,10 +29713,10 @@ fi
 TELNET=$ac_cv_path_TELNET
 
 if test -n "$TELNET"; then
-  echo "$as_me:29279: result: $TELNET" >&5
+  echo "$as_me:29716: result: $TELNET" >&5
 echo "${ECHO_T}$TELNET" >&6
 else
-  echo "$as_me:29282: result: no" >&5
+  echo "$as_me:29719: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -29347,7 +29784,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:29350: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:29787: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define TELNET_PATH "$cf_path_prog"
@@ -29364,7 +29801,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:29367: checking for $ac_word" >&5
+echo "$as_me:29804: 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
@@ -29381,7 +29818,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:29384: found $ac_dir/$ac_word" >&5
+   echo "$as_me:29821: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -29392,10 +29829,10 @@ fi
 TN3270=$ac_cv_path_TN3270
 
 if test -n "$TN3270"; then
-  echo "$as_me:29395: result: $TN3270" >&5
+  echo "$as_me:29832: result: $TN3270" >&5
 echo "${ECHO_T}$TN3270" >&6
 else
-  echo "$as_me:29398: result: no" >&5
+  echo "$as_me:29835: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -29463,7 +29900,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:29466: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:29903: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define TN3270_PATH "$cf_path_prog"
@@ -29480,7 +29917,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:29483: checking for $ac_word" >&5
+echo "$as_me:29920: 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
@@ -29497,7 +29934,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:29500: found $ac_dir/$ac_word" >&5
+   echo "$as_me:29937: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -29508,10 +29945,10 @@ fi
 RLOGIN=$ac_cv_path_RLOGIN
 
 if test -n "$RLOGIN"; then
-  echo "$as_me:29511: result: $RLOGIN" >&5
+  echo "$as_me:29948: result: $RLOGIN" >&5
 echo "${ECHO_T}$RLOGIN" >&6
 else
-  echo "$as_me:29514: result: no" >&5
+  echo "$as_me:29951: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -29579,7 +30016,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:29582: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:30019: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define RLOGIN_PATH "$cf_path_prog"
@@ -29596,7 +30033,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:29599: checking for $ac_word" >&5
+echo "$as_me:30036: 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
@@ -29613,7 +30050,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:29616: found $ac_dir/$ac_word" >&5
+   echo "$as_me:30053: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -29624,10 +30061,10 @@ fi
 MV=$ac_cv_path_MV
 
 if test -n "$MV"; then
-  echo "$as_me:29627: result: $MV" >&5
+  echo "$as_me:30064: result: $MV" >&5
 echo "${ECHO_T}$MV" >&6
 else
-  echo "$as_me:29630: result: no" >&5
+  echo "$as_me:30067: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -29695,7 +30132,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:29698: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:30135: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define MV_PATH "$cf_path_prog"
@@ -29712,7 +30149,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:29715: checking for $ac_word" >&5
+echo "$as_me:30152: 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
@@ -29729,7 +30166,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:29732: found $ac_dir/$ac_word" >&5
+   echo "$as_me:30169: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -29740,10 +30177,10 @@ fi
 GZIP=$ac_cv_path_GZIP
 
 if test -n "$GZIP"; then
-  echo "$as_me:29743: result: $GZIP" >&5
+  echo "$as_me:30180: result: $GZIP" >&5
 echo "${ECHO_T}$GZIP" >&6
 else
-  echo "$as_me:29746: result: no" >&5
+  echo "$as_me:30183: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -29811,7 +30248,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:29814: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:30251: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define GZIP_PATH "$cf_path_prog"
@@ -29828,7 +30265,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:29831: checking for $ac_word" >&5
+echo "$as_me:30268: 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
@@ -29845,7 +30282,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:29848: found $ac_dir/$ac_word" >&5
+   echo "$as_me:30285: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -29856,10 +30293,10 @@ fi
 UNCOMPRESS=$ac_cv_path_UNCOMPRESS
 
 if test -n "$UNCOMPRESS"; then
-  echo "$as_me:29859: result: $UNCOMPRESS" >&5
+  echo "$as_me:30296: result: $UNCOMPRESS" >&5
 echo "${ECHO_T}$UNCOMPRESS" >&6
 else
-  echo "$as_me:29862: result: no" >&5
+  echo "$as_me:30299: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -29927,7 +30364,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:29930: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:30367: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define UNCOMPRESS_PATH "$cf_path_prog"
@@ -29944,7 +30381,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:29947: checking for $ac_word" >&5
+echo "$as_me:30384: 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
@@ -29961,7 +30398,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:29964: found $ac_dir/$ac_word" >&5
+   echo "$as_me:30401: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -29972,10 +30409,10 @@ fi
 UNZIP=$ac_cv_path_UNZIP
 
 if test -n "$UNZIP"; then
-  echo "$as_me:29975: result: $UNZIP" >&5
+  echo "$as_me:30412: result: $UNZIP" >&5
 echo "${ECHO_T}$UNZIP" >&6
 else
-  echo "$as_me:29978: result: no" >&5
+  echo "$as_me:30415: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -30043,7 +30480,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:30046: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:30483: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define UNZIP_PATH "$cf_path_prog"
@@ -30060,7 +30497,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:30063: checking for $ac_word" >&5
+echo "$as_me:30500: 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
@@ -30077,7 +30514,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:30080: found $ac_dir/$ac_word" >&5
+   echo "$as_me:30517: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -30088,10 +30525,10 @@ fi
 BZIP2=$ac_cv_path_BZIP2
 
 if test -n "$BZIP2"; then
-  echo "$as_me:30091: result: $BZIP2" >&5
+  echo "$as_me:30528: result: $BZIP2" >&5
 echo "${ECHO_T}$BZIP2" >&6
 else
-  echo "$as_me:30094: result: no" >&5
+  echo "$as_me:30531: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -30159,7 +30596,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:30162: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:30599: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define BZIP2_PATH "$cf_path_prog"
@@ -30176,7 +30613,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:30179: checking for $ac_word" >&5
+echo "$as_me:30616: 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
@@ -30193,7 +30630,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:30196: found $ac_dir/$ac_word" >&5
+   echo "$as_me:30633: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -30204,10 +30641,10 @@ fi
 TAR=$ac_cv_path_TAR
 
 if test -n "$TAR"; then
-  echo "$as_me:30207: result: $TAR" >&5
+  echo "$as_me:30644: result: $TAR" >&5
 echo "${ECHO_T}$TAR" >&6
 else
-  echo "$as_me:30210: result: no" >&5
+  echo "$as_me:30647: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -30275,7 +30712,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:30278: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:30715: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define TAR_PATH "$cf_path_prog"
@@ -30332,7 +30769,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:30335: checking for $ac_word" >&5
+echo "$as_me:30772: 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
@@ -30349,7 +30786,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:30352: found $ac_dir/$ac_word" >&5
+   echo "$as_me:30789: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -30360,10 +30797,10 @@ fi
 COMPRESS=$ac_cv_path_COMPRESS
 
 if test -n "$COMPRESS"; then
-  echo "$as_me:30363: result: $COMPRESS" >&5
+  echo "$as_me:30800: result: $COMPRESS" >&5
 echo "${ECHO_T}$COMPRESS" >&6
 else
-  echo "$as_me:30366: result: no" >&5
+  echo "$as_me:30803: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -30431,7 +30868,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:30434: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:30871: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define COMPRESS_PATH "$cf_path_prog"
@@ -30448,7 +30885,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:30451: checking for $ac_word" >&5
+echo "$as_me:30888: 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
@@ -30465,7 +30902,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:30468: found $ac_dir/$ac_word" >&5
+   echo "$as_me:30905: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -30476,10 +30913,10 @@ fi
 RM=$ac_cv_path_RM
 
 if test -n "$RM"; then
-  echo "$as_me:30479: result: $RM" >&5
+  echo "$as_me:30916: result: $RM" >&5
 echo "${ECHO_T}$RM" >&6
 else
-  echo "$as_me:30482: result: no" >&5
+  echo "$as_me:30919: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -30547,7 +30984,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:30550: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:30987: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define RM_PATH "$cf_path_prog"
@@ -30564,7 +31001,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:30567: checking for $ac_word" >&5
+echo "$as_me:31004: 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
@@ -30581,7 +31018,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:30584: found $ac_dir/$ac_word" >&5
+   echo "$as_me:31021: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -30592,10 +31029,10 @@ fi
 UUDECODE=$ac_cv_path_UUDECODE
 
 if test -n "$UUDECODE"; then
-  echo "$as_me:30595: result: $UUDECODE" >&5
+  echo "$as_me:31032: result: $UUDECODE" >&5
 echo "${ECHO_T}$UUDECODE" >&6
 else
-  echo "$as_me:30598: result: no" >&5
+  echo "$as_me:31035: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -30663,7 +31100,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:30666: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:31103: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define UUDECODE_PATH "$cf_path_prog"
@@ -30680,7 +31117,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:30683: checking for $ac_word" >&5
+echo "$as_me:31120: 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
@@ -30697,7 +31134,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:30700: found $ac_dir/$ac_word" >&5
+   echo "$as_me:31137: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -30708,10 +31145,10 @@ fi
 ZCAT=$ac_cv_path_ZCAT
 
 if test -n "$ZCAT"; then
-  echo "$as_me:30711: result: $ZCAT" >&5
+  echo "$as_me:31148: result: $ZCAT" >&5
 echo "${ECHO_T}$ZCAT" >&6
 else
-  echo "$as_me:30714: result: no" >&5
+  echo "$as_me:31151: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -30779,7 +31216,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:30782: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:31219: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define ZCAT_PATH "$cf_path_prog"
@@ -30796,7 +31233,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:30799: checking for $ac_word" >&5
+echo "$as_me:31236: 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
@@ -30813,7 +31250,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:30816: found $ac_dir/$ac_word" >&5
+   echo "$as_me:31253: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -30824,10 +31261,10 @@ fi
 ZIP=$ac_cv_path_ZIP
 
 if test -n "$ZIP"; then
-  echo "$as_me:30827: result: $ZIP" >&5
+  echo "$as_me:31264: result: $ZIP" >&5
 echo "${ECHO_T}$ZIP" >&6
 else
-  echo "$as_me:30830: result: no" >&5
+  echo "$as_me:31267: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -30895,7 +31332,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:30898: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:31335: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define ZIP_PATH "$cf_path_prog"
@@ -30922,7 +31359,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:30925: checking for $ac_word" >&5
+echo "$as_me:31362: 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
@@ -30939,7 +31376,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:30942: found $ac_dir/$ac_word" >&5
+   echo "$as_me:31379: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -30950,10 +31387,10 @@ fi
 INSTALL=$ac_cv_path_INSTALL
 
 if test -n "$INSTALL"; then
-  echo "$as_me:30953: result: $INSTALL" >&5
+  echo "$as_me:31390: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 else
-  echo "$as_me:30956: result: no" >&5
+  echo "$as_me:31393: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -31021,7 +31458,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:31024: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:31461: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define INSTALL_PATH "$cf_path_prog"
@@ -31047,7 +31484,7 @@ fi
 
 if test $cf_cv_screen = pdcurses ; then
 
-	echo "$as_me:31050: checking for X" >&5
+	echo "$as_me:31487: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -31144,17 +31581,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 31147 "configure"
+#line 31584 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:31151: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:31588: \"$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:31157: \$? = $ac_status" >&5
+  echo "$as_me:31594: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -31187,7 +31624,7 @@ if test "$ac_x_libraries" = no; then
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >conftest.$ac_ext <<_ACEOF
-#line 31190 "configure"
+#line 31627 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -31199,16 +31636,16 @@ XtMalloc (0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31202: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31639: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31205: \$? = $ac_status" >&5
+  echo "$as_me:31642: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31208: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31645: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31211: \$? = $ac_status" >&5
+  echo "$as_me:31648: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -31246,7 +31683,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:31249: result: $have_x" >&5
+  echo "$as_me:31686: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -31256,7 +31693,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:31259: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:31696: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -31280,11 +31717,11 @@ else
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:31283: checking whether -R must be followed by a space" >&5
+      echo "$as_me:31720: 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 31287 "configure"
+#line 31724 "configure"
 #include "confdefs.h"
 
 int
@@ -31296,16 +31733,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31299: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31736: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31302: \$? = $ac_status" >&5
+  echo "$as_me:31739: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31305: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31742: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31308: \$? = $ac_status" >&5
+  echo "$as_me:31745: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_nospace=yes
 else
@@ -31315,13 +31752,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:31318: result: no" >&5
+	echo "$as_me:31755: 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 31324 "configure"
+#line 31761 "configure"
 #include "confdefs.h"
 
 int
@@ -31333,16 +31770,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31336: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31773: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31339: \$? = $ac_status" >&5
+  echo "$as_me:31776: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31342: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31779: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31345: \$? = $ac_status" >&5
+  echo "$as_me:31782: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_space=yes
 else
@@ -31352,11 +31789,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:31355: result: yes" >&5
+	  echo "$as_me:31792: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:31359: result: neither works" >&5
+	  echo "$as_me:31796: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -31376,7 +31813,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 31379 "configure"
+#line 31816 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -31395,22 +31832,22 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31398: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31835: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31401: \$? = $ac_status" >&5
+  echo "$as_me:31838: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31404: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31841: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31407: \$? = $ac_status" >&5
+  echo "$as_me:31844: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:31413: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:31850: 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
@@ -31418,7 +31855,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 31421 "configure"
+#line 31858 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -31437,16 +31874,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31440: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31877: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31443: \$? = $ac_status" >&5
+  echo "$as_me:31880: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31446: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31883: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31449: \$? = $ac_status" >&5
+  echo "$as_me:31886: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -31457,14 +31894,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:31460: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:31897: 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:31467: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:31904: 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
@@ -31472,7 +31909,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 31475 "configure"
+#line 31912 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -31491,16 +31928,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31494: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31931: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31497: \$? = $ac_status" >&5
+  echo "$as_me:31934: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31500: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31937: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31503: \$? = $ac_status" >&5
+  echo "$as_me:31940: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -31511,7 +31948,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:31514: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:31951: 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"
@@ -31530,13 +31967,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:31533: checking for gethostbyname" >&5
+    echo "$as_me:31970: 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 31539 "configure"
+#line 31976 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname (); below.  */
@@ -31567,16 +32004,16 @@ f = gethostbyname;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31570: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32007: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31573: \$? = $ac_status" >&5
+  echo "$as_me:32010: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31576: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32013: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31579: \$? = $ac_status" >&5
+  echo "$as_me:32016: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -31586,11 +32023,11 @@ ac_cv_func_gethostbyname=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:31589: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:32026: 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:31593: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:32030: 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
@@ -31598,7 +32035,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 31601 "configure"
+#line 32038 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -31617,16 +32054,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31620: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32057: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31623: \$? = $ac_status" >&5
+  echo "$as_me:32060: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31626: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32063: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31629: \$? = $ac_status" >&5
+  echo "$as_me:32066: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -31637,14 +32074,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:31640: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:32077: 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:31647: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:32084: 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
@@ -31652,7 +32089,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 31655 "configure"
+#line 32092 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -31671,16 +32108,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31674: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32111: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31677: \$? = $ac_status" >&5
+  echo "$as_me:32114: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31680: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32117: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31683: \$? = $ac_status" >&5
+  echo "$as_me:32120: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -31691,7 +32128,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:31694: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:32131: 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"
@@ -31707,13 +32144,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:31710: checking for connect" >&5
+    echo "$as_me:32147: 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 31716 "configure"
+#line 32153 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect (); below.  */
@@ -31744,16 +32181,16 @@ f = connect;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31747: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32184: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31750: \$? = $ac_status" >&5
+  echo "$as_me:32187: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31753: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32190: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31756: \$? = $ac_status" >&5
+  echo "$as_me:32193: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_connect=yes
 else
@@ -31763,11 +32200,11 @@ ac_cv_func_connect=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:31766: result: $ac_cv_func_connect" >&5
+echo "$as_me:32203: 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:31770: checking for connect in -lsocket" >&5
+      echo "$as_me:32207: 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
@@ -31775,7 +32212,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 31778 "configure"
+#line 32215 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -31794,16 +32231,16 @@ connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31797: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32234: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31800: \$? = $ac_status" >&5
+  echo "$as_me:32237: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31803: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32240: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31806: \$? = $ac_status" >&5
+  echo "$as_me:32243: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -31814,7 +32251,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:31817: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:32254: 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"
@@ -31823,13 +32260,13 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:31826: checking for remove" >&5
+    echo "$as_me:32263: 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 31832 "configure"
+#line 32269 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove (); below.  */
@@ -31860,16 +32297,16 @@ f = remove;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31863: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32300: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31866: \$? = $ac_status" >&5
+  echo "$as_me:32303: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31869: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32306: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31872: \$? = $ac_status" >&5
+  echo "$as_me:32309: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_remove=yes
 else
@@ -31879,11 +32316,11 @@ ac_cv_func_remove=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:31882: result: $ac_cv_func_remove" >&5
+echo "$as_me:32319: 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:31886: checking for remove in -lposix" >&5
+      echo "$as_me:32323: 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
@@ -31891,7 +32328,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 31894 "configure"
+#line 32331 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -31910,16 +32347,16 @@ remove ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31913: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32350: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31916: \$? = $ac_status" >&5
+  echo "$as_me:32353: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31919: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32356: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31922: \$? = $ac_status" >&5
+  echo "$as_me:32359: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -31930,7 +32367,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:31933: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:32370: 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"
@@ -31939,13 +32376,13 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:31942: checking for shmat" >&5
+    echo "$as_me:32379: 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 31948 "configure"
+#line 32385 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat (); below.  */
@@ -31976,16 +32413,16 @@ f = shmat;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31979: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32416: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31982: \$? = $ac_status" >&5
+  echo "$as_me:32419: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31985: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32422: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31988: \$? = $ac_status" >&5
+  echo "$as_me:32425: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -31995,11 +32432,11 @@ ac_cv_func_shmat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:31998: result: $ac_cv_func_shmat" >&5
+echo "$as_me:32435: 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:32002: checking for shmat in -lipc" >&5
+      echo "$as_me:32439: 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
@@ -32007,7 +32444,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 32010 "configure"
+#line 32447 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -32026,16 +32463,16 @@ shmat ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32029: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32466: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32032: \$? = $ac_status" >&5
+  echo "$as_me:32469: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32035: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32472: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32038: \$? = $ac_status" >&5
+  echo "$as_me:32475: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -32046,7 +32483,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:32049: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:32486: 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"
@@ -32064,7 +32501,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:32067: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:32504: 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
@@ -32072,7 +32509,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 32075 "configure"
+#line 32512 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -32091,16 +32528,16 @@ IceConnectionNumber ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32094: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32531: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32097: \$? = $ac_status" >&5
+  echo "$as_me:32534: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32100: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32537: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32103: \$? = $ac_status" >&5
+  echo "$as_me:32540: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -32111,7 +32548,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:32114: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:32551: 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"
@@ -32129,7 +32566,7 @@ LDFLAGS="$X_LIBS $LDFLAGS"
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me-configure}:32132: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me-configure}:32569: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -32190,7 +32627,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}:32193: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me-configure}:32630: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	CFLAGS="$CFLAGS $cf_new_cflags"
 fi
@@ -32198,7 +32635,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}:32201: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me-configure}:32638: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
 fi
@@ -32206,14 +32643,14 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me-configure}:32209: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me-configure}:32646: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
 
 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
 fi
 
 if test "$cf_check_cflags" != "$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 32216 "configure"
+#line 32653 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -32225,16 +32662,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32228: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32665: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32231: \$? = $ac_status" >&5
+  echo "$as_me:32668: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32234: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32671: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32237: \$? = $ac_status" >&5
+  echo "$as_me:32674: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -32242,12 +32679,12 @@ else
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me-configure}:32245: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me-configure}:32682: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
 
 	 if test "$cf_check_cppflags" != "$CPPFLAGS" ; then
 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
 
-echo "${as_me-configure}:32250: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me-configure}:32687: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_flags"
@@ -32255,13 +32692,13 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:32258: checking for XOpenDisplay" >&5
+echo "$as_me:32695: 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 32264 "configure"
+#line 32701 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char XOpenDisplay (); below.  */
@@ -32292,16 +32729,16 @@ f = XOpenDisplay;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32295: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32732: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32298: \$? = $ac_status" >&5
+  echo "$as_me:32735: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32301: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32738: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32304: \$? = $ac_status" >&5
+  echo "$as_me:32741: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_XOpenDisplay=yes
 else
@@ -32311,13 +32748,13 @@ ac_cv_func_XOpenDisplay=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:32314: result: $ac_cv_func_XOpenDisplay" >&5
+echo "$as_me:32751: 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:32320: checking for XOpenDisplay in -lX11" >&5
+echo "$as_me:32757: 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
@@ -32325,7 +32762,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 32328 "configure"
+#line 32765 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -32344,16 +32781,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32347: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32784: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32350: \$? = $ac_status" >&5
+  echo "$as_me:32787: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32353: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32790: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32356: \$? = $ac_status" >&5
+  echo "$as_me:32793: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -32364,7 +32801,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:32367: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:32804: result: $ac_cv_lib_X11_XOpenDisplay" >&5
 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
 if test $ac_cv_lib_X11_XOpenDisplay = yes; then
   LIBS="-lX11 $LIBS"
@@ -32372,13 +32809,13 @@ fi
 
 fi
 
-echo "$as_me:32375: checking for XtAppInitialize" >&5
+echo "$as_me:32812: 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 32381 "configure"
+#line 32818 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char XtAppInitialize (); below.  */
@@ -32409,16 +32846,16 @@ f = XtAppInitialize;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32412: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32849: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32415: \$? = $ac_status" >&5
+  echo "$as_me:32852: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32418: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32855: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32421: \$? = $ac_status" >&5
+  echo "$as_me:32858: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_XtAppInitialize=yes
 else
@@ -32428,13 +32865,13 @@ ac_cv_func_XtAppInitialize=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:32431: result: $ac_cv_func_XtAppInitialize" >&5
+echo "$as_me:32868: 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:32437: checking for XtAppInitialize in -lXt" >&5
+echo "$as_me:32874: 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
@@ -32442,7 +32879,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 32445 "configure"
+#line 32882 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -32461,16 +32898,16 @@ XtAppInitialize ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32464: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32901: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32467: \$? = $ac_status" >&5
+  echo "$as_me:32904: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32470: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32907: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32473: \$? = $ac_status" >&5
+  echo "$as_me:32910: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xt_XtAppInitialize=yes
 else
@@ -32481,7 +32918,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:32484: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "$as_me:32921: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
 echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6
 if test $ac_cv_lib_Xt_XtAppInitialize = yes; then
   cat >>confdefs.h <<\EOF
@@ -32495,7 +32932,7 @@ fi
 fi
 
 if test $cf_have_X_LIBS = no ; then
-	{ echo "$as_me:32498: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+	{ echo "$as_me:32935: 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
@@ -32505,7 +32942,7 @@ fi
 
 cf_x_athena=${cf_x_athena-Xaw}
 
-echo "$as_me:32508: checking if you want to link with Xaw 3d library" >&5
+echo "$as_me:32945: 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=
 
@@ -32516,14 +32953,14 @@ if test "${with_Xaw3d+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3d
-	echo "$as_me:32519: result: yes" >&5
+	echo "$as_me:32956: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:32522: result: no" >&5
+	echo "$as_me:32959: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:32526: checking if you want to link with neXT Athena library" >&5
+echo "$as_me:32963: 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=
 
@@ -32534,14 +32971,14 @@ if test "${with_neXtaw+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=neXtaw
-	echo "$as_me:32537: result: yes" >&5
+	echo "$as_me:32974: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:32540: result: no" >&5
+	echo "$as_me:32977: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:32544: checking if you want to link with Athena-Plus library" >&5
+echo "$as_me:32981: 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=
 
@@ -32552,14 +32989,14 @@ if test "${with_XawPlus+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=XawPlus
-	echo "$as_me:32555: result: yes" >&5
+	echo "$as_me:32992: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:32558: result: no" >&5
+	echo "$as_me:32995: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:32562: checking for XextCreateExtension in -lXext" >&5
+echo "$as_me:32999: 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
@@ -32567,7 +33004,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 32570 "configure"
+#line 33007 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -32586,16 +33023,16 @@ XextCreateExtension ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32589: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33026: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32592: \$? = $ac_status" >&5
+  echo "$as_me:33029: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32595: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33032: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32598: \$? = $ac_status" >&5
+  echo "$as_me:33035: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
@@ -32606,7 +33043,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:32609: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:33046: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
 echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6
 if test $ac_cv_lib_Xext_XextCreateExtension = yes; then
   LIBS="-lXext $LIBS"
@@ -32628,14 +33065,14 @@ do
 		cf_test=X11/$cf_x_athena_root/SimpleMenu.h
 		if test $cf_path != default ; then
 			CPPFLAGS="-I$cf_path/include $cf_save"
-			echo "$as_me:32631: checking for $cf_test in $cf_path" >&5
+			echo "$as_me:33068: 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:32634: checking for $cf_test" >&5
+			echo "$as_me:33071: checking for $cf_test" >&5
 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
 		fi
 		cat >conftest.$ac_ext <<_ACEOF
-#line 32638 "configure"
+#line 33075 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -32649,16 +33086,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32652: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33089: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32655: \$? = $ac_status" >&5
+  echo "$as_me:33092: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32658: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33095: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32661: \$? = $ac_status" >&5
+  echo "$as_me:33098: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -32667,7 +33104,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-		echo "$as_me:32670: result: $cf_result" >&5
+		echo "$as_me:33107: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 		if test "$cf_result" = yes ; then
 			cf_x_athena_include=$cf_path
@@ -32679,7 +33116,7 @@ echo "${ECHO_T}$cf_result" >&6
 done
 
 if test -z "$cf_x_athena_include" ; then
-	{ echo "$as_me:32682: WARNING: Unable to successfully find Athena header files with test program" >&5
+	{ echo "$as_me:33119: 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_include" != default ; then
 	CPPFLAGS="$CPPFLAGS -I$cf_x_athena_include"
@@ -32704,15 +33141,15 @@ do
 			cf_test=XawSimpleMenuAddGlobalActions
 			if test $cf_path != default ; then
 				LIBS="-L$cf_path/lib $cf_lib $LIBS"
-				echo "$as_me:32707: checking for $cf_lib in $cf_path" >&5
+				echo "$as_me:33144: checking for $cf_lib in $cf_path" >&5
 echo $ECHO_N "checking for $cf_lib in $cf_path... $ECHO_C" >&6
 			else
 				LIBS="$cf_lib $LIBS"
-				echo "$as_me:32711: checking for $cf_test in $cf_lib" >&5
+				echo "$as_me:33148: checking for $cf_test in $cf_lib" >&5
 echo $ECHO_N "checking for $cf_test in $cf_lib... $ECHO_C" >&6
 			fi
 			cat >conftest.$ac_ext <<_ACEOF
-#line 32715 "configure"
+#line 33152 "configure"
 #include "confdefs.h"
 
 int
@@ -32724,16 +33161,16 @@ $cf_test()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32727: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33164: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32730: \$? = $ac_status" >&5
+  echo "$as_me:33167: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32733: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33170: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32736: \$? = $ac_status" >&5
+  echo "$as_me:33173: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -32742,7 +33179,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-			echo "$as_me:32745: result: $cf_result" >&5
+			echo "$as_me:33182: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				cf_x_athena_lib="$cf_lib"
@@ -32754,7 +33191,7 @@ echo "${ECHO_T}$cf_result" >&6
 done
 
 if test -z "$cf_x_athena_lib" ; then
-	{ { echo "$as_me:32757: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+	{ { echo "$as_me:33194: 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
@@ -32769,7 +33206,7 @@ for ac_prog in xcurses-config
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:32772: checking for $ac_word" >&5
+echo "$as_me:33209: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_XCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -32786,7 +33223,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_XCURSES_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:32789: found $ac_dir/$ac_word" >&5
+   echo "$as_me:33226: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -32797,10 +33234,10 @@ fi
 XCURSES_CONFIG=$ac_cv_path_XCURSES_CONFIG
 
 if test -n "$XCURSES_CONFIG"; then
-  echo "$as_me:32800: result: $XCURSES_CONFIG" >&5
+  echo "$as_me:33237: result: $XCURSES_CONFIG" >&5
 echo "${ECHO_T}$XCURSES_CONFIG" >&6
 else
-  echo "$as_me:32803: result: no" >&5
+  echo "$as_me:33240: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -32821,7 +33258,7 @@ LDFLAGS="$LDFLAGS $X_LIBS"
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me-configure}:32824: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me-configure}:33261: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -32882,7 +33319,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}:32885: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me-configure}:33322: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	CFLAGS="$CFLAGS $cf_new_cflags"
 fi
@@ -32890,7 +33327,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}:32893: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me-configure}:33330: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
 fi
@@ -32898,14 +33335,14 @@ fi
 if test -n "$cf_new_extra_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
 
-echo "${as_me-configure}:32901: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me-configure}:33338: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
 
 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
 fi
 
 if test "$cf_check_cflags" != "$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 32908 "configure"
+#line 33345 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -32917,16 +33354,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32920: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33357: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32923: \$? = $ac_status" >&5
+  echo "$as_me:33360: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32926: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33363: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32929: \$? = $ac_status" >&5
+  echo "$as_me:33366: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -32934,12 +33371,12 @@ else
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me-configure}:32937: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me-configure}:33374: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
 
 	 if test "$cf_check_cppflags" != "$CPPFLAGS" ; then
 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
 
-echo "${as_me-configure}:32942: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me-configure}:33379: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_flags"
@@ -32947,7 +33384,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:32950: checking for XOpenDisplay in -lX11" >&5
+echo "$as_me:33387: 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
@@ -32955,7 +33392,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 32958 "configure"
+#line 33395 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -32974,16 +33411,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32977: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33414: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32980: \$? = $ac_status" >&5
+  echo "$as_me:33417: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32983: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33420: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32986: \$? = $ac_status" >&5
+  echo "$as_me:33423: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -32994,13 +33431,13 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:32997: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:33434: result: $ac_cv_lib_X11_XOpenDisplay" >&5
 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
 if test $ac_cv_lib_X11_XOpenDisplay = yes; then
   LIBS="-lX11 $LIBS"
 fi
 
-echo "$as_me:33003: checking for XCurses library" >&5
+echo "$as_me:33440: 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
@@ -33008,7 +33445,7 @@ else
 
 LIBS="-lXCurses $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 33011 "configure"
+#line 33448 "configure"
 #include "confdefs.h"
 
 #include <xcurses.h>
@@ -33023,16 +33460,16 @@ XCursesExit();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33026: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33463: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33029: \$? = $ac_status" >&5
+  echo "$as_me:33466: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33032: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33469: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33035: \$? = $ac_status" >&5
+  echo "$as_me:33472: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_lib_XCurses=yes
 else
@@ -33043,7 +33480,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:33046: result: $cf_cv_lib_XCurses" >&5
+echo "$as_me:33483: result: $cf_cv_lib_XCurses" >&5
 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
 
 fi
@@ -33062,14 +33499,14 @@ EOF
 EOF
 
 else
-	{ { echo "$as_me:33065: error: Cannot link with XCurses" >&5
+	{ { echo "$as_me:33502: error: Cannot link with XCurses" >&5
 echo "$as_me: error: Cannot link with XCurses" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 else
 
-echo "$as_me:33072: checking if we can include termio.h with curses" >&5
+echo "$as_me:33509: 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
@@ -33079,7 +33516,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 33082 "configure"
+#line 33519 "configure"
 #include "confdefs.h"
 
 #include <LYCurses.h>
@@ -33093,16 +33530,16 @@ putchar(0x0a)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33096: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33533: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33099: \$? = $ac_status" >&5
+  echo "$as_me:33536: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33102: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33539: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33105: \$? = $ac_status" >&5
+  echo "$as_me:33542: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termio_and_curses=yes
 else
@@ -33115,7 +33552,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
     rm -f lynx_cfg.h
 
 fi
-echo "$as_me:33118: result: $cf_cv_termio_and_curses" >&5
+echo "$as_me:33555: result: $cf_cv_termio_and_curses" >&5
 echo "${ECHO_T}$cf_cv_termio_and_curses" >&6
 
 test $cf_cv_termio_and_curses = yes && cat >>confdefs.h <<\EOF
@@ -33130,23 +33567,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:33133: checking for $ac_header" >&5
+echo "$as_me:33570: 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 33139 "configure"
+#line 33576 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:33143: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:33580: \"$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:33149: \$? = $ac_status" >&5
+  echo "$as_me:33586: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -33165,7 +33602,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:33168: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:33605: 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
@@ -33175,7 +33612,7 @@ EOF
 fi
 done
 
-echo "$as_me:33178: checking if curses supports alternate-character set" >&5
+echo "$as_me:33615: 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
@@ -33184,7 +33621,7 @@ else
 for mapname in acs_map _acs_map
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 33187 "configure"
+#line 33624 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -33198,16 +33635,16 @@ chtype x = $mapname['l']; $mapname['m'] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33201: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33638: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33204: \$? = $ac_status" >&5
+  echo "$as_me:33641: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33207: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33644: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33210: \$? = $ac_status" >&5
+  echo "$as_me:33647: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_alt_char_set=$mapname
 	 break
@@ -33221,20 +33658,20 @@ done
 
 fi
 
-echo "$as_me:33224: result: $cf_cv_alt_char_set" >&5
+echo "$as_me:33661: 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:33230: checking if curses supports fancy attributes" >&5
+echo "$as_me:33667: 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 33237 "configure"
+#line 33674 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -33252,16 +33689,16 @@ attrset(A_UNDERLINE|A_BOLD|A_REVERSE);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33255: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33692: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33258: \$? = $ac_status" >&5
+  echo "$as_me:33695: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33261: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33698: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33264: \$? = $ac_status" >&5
+  echo "$as_me:33701: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fancy_curses=yes
 else
@@ -33273,13 +33710,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:33276: result: $cf_cv_fancy_curses" >&5
+echo "$as_me:33713: 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:33282: checking for function curses_version" >&5
+echo "$as_me:33719: 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
@@ -33289,7 +33726,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_curses_version=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 33292 "configure"
+#line 33729 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -33302,15 +33739,15 @@ int main()
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:33305: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33742: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33308: \$? = $ac_status" >&5
+  echo "$as_me:33745: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:33310: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33747: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33313: \$? = $ac_status" >&5
+  echo "$as_me:33750: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_func_curses_version=yes
 
@@ -33325,21 +33762,21 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core
 fi
-echo "$as_me:33328: result: $cf_cv_func_curses_version" >&5
+echo "$as_me:33765: result: $cf_cv_func_curses_version" >&5
 echo "${ECHO_T}$cf_cv_func_curses_version" >&6
 test "$cf_cv_func_curses_version" = yes && cat >>confdefs.h <<\EOF
 #define HAVE_CURSES_VERSION 1
 EOF
 
 if test "$cf_cv_ncurses_version" != no ; then
-echo "$as_me:33335: checking for obsolete/broken version of ncurses" >&5
+echo "$as_me:33772: 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 33342 "configure"
+#line 33779 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -33358,16 +33795,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33361: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33798: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33364: \$? = $ac_status" >&5
+  echo "$as_me:33801: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33367: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33804: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33370: \$? = $ac_status" >&5
+  echo "$as_me:33807: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_broken=no
 else
@@ -33379,10 +33816,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:33382: result: $cf_cv_ncurses_broken" >&5
+echo "$as_me:33819: 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:33385: WARNING: hmm... you should get an up-to-date version of ncurses" >&5
+	{ echo "$as_me:33822: WARNING: hmm... you should get an up-to-date version of ncurses" >&5
 echo "$as_me: WARNING: hmm... you should get an up-to-date version of ncurses" >&2;}
 	cat >>confdefs.h <<\EOF
 #define NCURSES_BROKEN 1
@@ -33391,14 +33828,14 @@ EOF
 fi
 fi
 
-echo "$as_me:33394: checking if curses supports color attributes" >&5
+echo "$as_me:33831: 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 33401 "configure"
+#line 33838 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -33418,16 +33855,16 @@ chtype x = COLOR_BLUE;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33421: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33858: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33424: \$? = $ac_status" >&5
+  echo "$as_me:33861: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33427: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33864: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33430: \$? = $ac_status" >&5
+  echo "$as_me:33867: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_color_curses=yes
 else
@@ -33439,7 +33876,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:33442: result: $cf_cv_color_curses" >&5
+echo "$as_me:33879: result: $cf_cv_color_curses" >&5
 echo "${ECHO_T}$cf_cv_color_curses" >&6
 if test $cf_cv_color_curses = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -33459,23 +33896,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:33462: checking for $ac_header" >&5
+echo "$as_me:33899: 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 33468 "configure"
+#line 33905 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:33472: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:33909: \"$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:33478: \$? = $ac_status" >&5
+  echo "$as_me:33915: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -33494,7 +33931,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:33497: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:33934: 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
@@ -33509,23 +33946,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:33512: checking for $ac_header" >&5
+echo "$as_me:33949: 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 33518 "configure"
+#line 33955 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:33522: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:33959: \"$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:33528: \$? = $ac_status" >&5
+  echo "$as_me:33965: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -33544,7 +33981,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:33547: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:33984: 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
@@ -33562,10 +33999,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:33565: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:34002: 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 33568 "configure"
+#line 34005 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -33577,16 +34014,16 @@ struct termios foo; int x = foo.c_iflag
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33580: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34017: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33583: \$? = $ac_status" >&5
+  echo "$as_me:34020: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33586: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34023: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33589: \$? = $ac_status" >&5
+  echo "$as_me:34026: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   termios_bad=no
 else
@@ -33594,7 +34031,7 @@ else
 cat conftest.$ac_ext >&5
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 33597 "configure"
+#line 34034 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -33608,16 +34045,16 @@ struct termios foo; int x = foo.c_iflag
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33611: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34048: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33614: \$? = $ac_status" >&5
+  echo "$as_me:34051: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33617: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34054: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33620: \$? = $ac_status" >&5
+  echo "$as_me:34057: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   termios_bad=unknown
 else
@@ -33632,12 +34069,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-	echo "$as_me:33635: result: $termios_bad" >&5
+	echo "$as_me:34072: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:33640: checking declaration of size-change" >&5
+echo "$as_me:34077: 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
@@ -33652,7 +34089,7 @@ do
     CPPFLAGS="$cf_save_CPPFLAGS"
     test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
     cat >conftest.$ac_ext <<_ACEOF
-#line 33655 "configure"
+#line 34092 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -33696,16 +34133,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33699: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34136: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33702: \$? = $ac_status" >&5
+  echo "$as_me:34139: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33705: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34142: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33708: \$? = $ac_status" >&5
+  echo "$as_me:34145: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_sizechange=yes
 else
@@ -33724,7 +34161,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:33727: result: $cf_cv_sizechange" >&5
+echo "$as_me:34164: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 	cat >>confdefs.h <<\EOF
@@ -33741,14 +34178,14 @@ EOF
 	esac
 fi
 
-echo "$as_me:33744: checking if ttytype is declared in curses library" >&5
+echo "$as_me:34181: 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 33751 "configure"
+#line 34188 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -33760,16 +34197,16 @@ char *x = &ttytype[1]; *x = 1
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33763: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34200: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33766: \$? = $ac_status" >&5
+  echo "$as_me:34203: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33769: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34206: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33772: \$? = $ac_status" >&5
+  echo "$as_me:34209: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_ttytype=yes
 else
@@ -33781,7 +34218,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:33784: result: $cf_cv_have_ttytype" >&5
+echo "$as_me:34221: result: $cf_cv_have_ttytype" >&5
 echo "${ECHO_T}$cf_cv_have_ttytype" >&6
 test $cf_cv_have_ttytype = yes && cat >>confdefs.h <<\EOF
 #define HAVE_TTYTYPE 1
@@ -33789,14 +34226,14 @@ EOF
 
 	if test "$use_wide_curses" = yes ; then
 
-echo "$as_me:33792: checking if curses supports wide characters" >&5
+echo "$as_me:34229: 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 33799 "configure"
+#line 34236 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -33815,16 +34252,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33818: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34255: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33821: \$? = $ac_status" >&5
+  echo "$as_me:34258: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33824: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34261: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33827: \$? = $ac_status" >&5
+  echo "$as_me:34264: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_widec_curses=yes
 else
@@ -33835,7 +34272,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:33838: result: $cf_cv_widec_curses" >&5
+echo "$as_me:34275: result: $cf_cv_widec_curses" >&5
 echo "${ECHO_T}$cf_cv_widec_curses" >&6
 
 if test "$cf_cv_widec_curses" = yes ; then
@@ -33844,14 +34281,14 @@ if test "$cf_cv_widec_curses" = yes ; then
 EOF
 
 	# This is needed on Tru64 5.0 to declare mbstate_t
-	echo "$as_me:33847: checking if we must include wchar.h to declare mbstate_t" >&5
+	echo "$as_me:34284: 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 33854 "configure"
+#line 34291 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -33865,23 +34302,23 @@ mbstate_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33868: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34305: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33871: \$? = $ac_status" >&5
+  echo "$as_me:34308: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33874: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34311: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33877: \$? = $ac_status" >&5
+  echo "$as_me:34314: \$? = $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 33884 "configure"
+#line 34321 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -33896,16 +34333,16 @@ mbstate_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33899: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34336: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33902: \$? = $ac_status" >&5
+  echo "$as_me:34339: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33905: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34342: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33908: \$? = $ac_status" >&5
+  echo "$as_me:34345: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_widec_mbstate=yes
 else
@@ -33917,7 +34354,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:33920: result: $cf_cv_widec_mbstate" >&5
+echo "$as_me:34357: result: $cf_cv_widec_mbstate" >&5
 echo "${ECHO_T}$cf_cv_widec_mbstate" >&6
 
 if test "$cf_cv_widec_mbstate" = yes ; then
@@ -33938,14 +34375,14 @@ fi
 
 	fi
 
-echo "$as_me:33941: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+echo "$as_me:34378: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
 echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6
 if test "${cf_cv_need_xopen_extension+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 33948 "configure"
+#line 34385 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -33962,23 +34399,23 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33965: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34402: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33968: \$? = $ac_status" >&5
+  echo "$as_me:34405: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33971: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34408: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33974: \$? = $ac_status" >&5
+  echo "$as_me:34411: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_xopen_extension=no
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 33981 "configure"
+#line 34418 "configure"
 #include "confdefs.h"
 
 #define _XOPEN_SOURCE_EXTENDED
@@ -33996,16 +34433,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33999: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34436: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34002: \$? = $ac_status" >&5
+  echo "$as_me:34439: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:34005: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34442: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34008: \$? = $ac_status" >&5
+  echo "$as_me:34445: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_xopen_extension=yes
 else
@@ -34017,11 +34454,11 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:34020: result: $cf_cv_need_xopen_extension" >&5
+echo "$as_me:34457: result: $cf_cv_need_xopen_extension" >&5
 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
 test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
 
-echo "$as_me:34024: checking for term.h" >&5
+echo "$as_me:34461: 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
@@ -34034,7 +34471,7 @@ for cf_header in \
 	term.h
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 34037 "configure"
+#line 34474 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -34048,16 +34485,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34051: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34488: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34054: \$? = $ac_status" >&5
+  echo "$as_me:34491: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:34057: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34494: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34060: \$? = $ac_status" >&5
+  echo "$as_me:34497: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_term_header=$cf_header
 	 break
@@ -34070,7 +34507,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:34073: result: $cf_cv_term_header" >&5
+echo "$as_me:34510: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 case $cf_cv_term_header in #(vi
@@ -34121,10 +34558,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:34124: checking for ${cf_func}" >&5
+	echo "$as_me:34561: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me-configure}:34127: testing ${cf_func} ..." 1>&5
+echo "${as_me-configure}:34564: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -34133,7 +34570,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >conftest.$ac_ext <<_ACEOF
-#line 34136 "configure"
+#line 34573 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -34167,16 +34604,16 @@ ${cf_cv_main_return-return}(foo == 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34170: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34607: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34173: \$? = $ac_status" >&5
+  echo "$as_me:34610: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:34176: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34613: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34179: \$? = $ac_status" >&5
+  echo "$as_me:34616: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -34192,7 +34629,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:34195: result: $cf_result" >&5
+	echo "$as_me:34632: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test $cf_result != no; then
 		cat >>confdefs.h <<EOF
@@ -34208,13 +34645,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:34211: checking for $ac_func" >&5
+echo "$as_me:34648: 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 34217 "configure"
+#line 34654 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -34245,16 +34682,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34248: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34685: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34251: \$? = $ac_status" >&5
+  echo "$as_me:34688: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:34254: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34691: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34257: \$? = $ac_status" >&5
+  echo "$as_me:34694: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -34264,7 +34701,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:34267: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:34704: 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
@@ -34278,12 +34715,12 @@ fi
 
 if test $use_color_style != no ; then
 	if test .$cf_cv_color_curses != .yes ; then
-		{ { echo "$as_me:34281: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:34718: 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:34286: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:34723: error: Configuration does not support color-styles" >&5
 echo "$as_me: error: Configuration does not support color-styles" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -34291,7 +34728,7 @@ fi
 
 if test $use_scrollbar != no ; then
 	if test .$cf_cv_fancy_curses != .yes ; then
-		{ echo "$as_me:34294: WARNING: Configuration does not support ACS_xxx definitions" >&5
+		{ echo "$as_me:34731: WARNING: Configuration does not support ACS_xxx definitions" >&5
 echo "$as_me: WARNING: Configuration does not support ACS_xxx definitions" >&2;}
 	else
 		cat >>confdefs.h <<\EOF
@@ -34396,7 +34833,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:34399: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:34836: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -34572,7 +35009,7 @@ cat >>$CONFIG_STATUS <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:34575: error: ambiguous option: $1
+    { { echo "$as_me:35012: 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;}
@@ -34591,7 +35028,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:34594: error: unrecognized option: $1
+  -*) { { echo "$as_me:35031: 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;}
@@ -34644,7 +35081,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:34647: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:35084: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -34808,6 +35245,7 @@ s,@GT_YES@,$GT_YES,;t t
 s,@GT_NO@,$GT_NO,;t t
 s,@INTLDIR_CPPFLAGS@,$INTLDIR_CPPFLAGS,;t t
 s,@NLS_DATADIR@,$NLS_DATADIR,;t t
+s,@PKG_CONFIG@,$PKG_CONFIG,;t t
 s,@NCURSES_CONFIG@,$NCURSES_CONFIG,;t t
 s,@LYNX_LSS_FILE@,$LYNX_LSS_FILE,;t t
 s,@INSTALL_LSS@,$INSTALL_LSS,;t t
@@ -34961,7 +35399,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:34964: creating $ac_file" >&5
+    { echo "$as_me:35402: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -34979,7 +35417,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:34982: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:35420: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -34992,7 +35430,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:34995: error: cannot find input file: $f" >&5
+           { { echo "$as_me:35433: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -35058,7 +35496,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:35061: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:35499: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -35069,7 +35507,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:35072: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:35510: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -35082,7 +35520,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:35085: error: cannot find input file: $f" >&5
+           { { echo "$as_me:35523: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -35200,7 +35638,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:35203: $ac_file is unchanged" >&5
+      { echo "$as_me:35641: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
diff --git a/configure.in b/configure.in
index ee45be33..7a213a02 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $LynxId: configure.in,v 1.171 2008/09/23 22:39:58 tom Exp $
+dnl $LynxId: configure.in,v 1.172 2008/12/10 01:50:54 tom Exp $
 dnl
 dnl Process this file with autoconf to produce a configure script.
 dnl
@@ -446,6 +446,8 @@ fi
 
 CF_INET_ADDR
 
+CF_PKG_CONFIG
+
 if test "x$cf_cv_use_libssl"  != xno ; then
 	CF_SSL($cf_cv_use_libssl)
 elif test "x$cf_cv_use_libgnutls" != xno ; then
diff --git a/docs/CHANGES2.3 b/docs/CHANGES2.3
new file mode 100644
index 00000000..f1a480a2
--- /dev/null
+++ b/docs/CHANGES2.3
@@ -0,0 +1,458 @@
+--- RELEASE of 2.3  (19-May-1994) ---
+5-19-94
+* Better memory allocation routines used for some VMS systems.
+5-19-94
+* Non-interactive (-source) access to documents requiring access authorization
+  not allowed to avoid crashes.
+3-30-94
+* Lynx exports the environment variable LYNX_VERSION on UNIX systems
+  with the current version number as the value.
+3-29-94
+* added "action=" handling to ISINDEX tags.  (Is that in the spec?)
+3-27-94
+* fixed Telnet security problem
+3-19-94
+* added .mailcap and mailcap support as well as mime.types support
+  for the configuration of viewers and extension mappings.
+  The test command is now implemented so that viewers can be conditionally
+  setup.
+3-17-94
+* Revamped the FTP code to recognize different server types and to parse
+  full directory listings (LIST output).  File types, sizes and dates
+  are displayed when possible.
+3-16-94
+* added transparent support for mosaic bookmark files.  Just point
+  Lynx at your existing default mosaic bookmark file and Lynx will
+  handle the rest.  Viewing, addition, and removal are supported.
+3-15-94
+* added second line of reverse video to show multiline links better.
+3-10-94
+* added configurable MIME types and viewers to lynx.cfg.  MIME types
+  and VIEWERS can be configured by following the instructions within
+  the newest lynx.cfg file.
+3-?-94
+* added second %s argument to PRINTER and DOWNLOADER definitions.
+  If a second %s is present in the command definition it will be
+  filled in by a suggested filename which is derived from the URL
+  of the document.  See lynx.cfg for more details.
+3-?-94
+* got code from CERN to fix HTBTree FTP bug.  Large ftp lists should
+  not crash anymore.
+3-9-94
+* added no_proxy environment variable.  set it to a comma delimited list
+  of domains or hosts that should not be proxyed. (Thanks CERN :)
+  USAGE: (UNIX)
+     setenv no_proxy "domain1.dom, domain2.dom, domain3, etc"
+3-?-94
+* Fixed Referer: field handleing so that it doesn't crash on really
+  long URL's
+3-?-94
+* True popup menus are now supported for non-multiple SELECT lists.
+2-28-94
+* fixed the delete-a-bookmark command and bound it to 'r' for remove.
+  (thanks to David Trueman for the fix)
+
+---------- RELEASE of 2.2 ------------------
+2-9-94
+* added 'd' for download current link.  Can be used to force a download
+  of any file.
+* 'r' removed as a comment key.  Use 'c' or reconfigure your keys to
+  add 'r' back in.  (I would like to use 'r' in the future to mean
+  remove current bookmark link)
+* Found the bug in the HTTP redirection code that was causing it
+  not to work.  So HTTP redirection appears to work now!
+* Added Referer: header to HTTP requests to list the URL of
+  the document listing the requsted URL.   Here's an extract from CERN:
+     This optional header field allows the client to specify,
+     for the server's benefit, the address ( URI ) of the document
+     (or element within the document) from which the URI in the
+     request was obtained.
+
+     This allows a server to generate lists of back-links to documents,
+     for interest, logging, etc.  It allows bad links to be traced
+     for maintenance.
+
+2-8-94
+* changed novice line to be displayed on bottom two lines with the
+  status line moved up two lines.
+1-27-94
+* Made configurable keymappings a reality.  Keys can be remapped in
+  the lynx.cfg file.  (diffs from David Trueman)
+* Got code from Foteos to make 'a' work for VMS connection interrupts.
+1-24-94
+* Moving closer towards configurable keymappings.  New keyhandleing
+  code will make it very easy to implement. (diffs from David Trueman)
+1-14-94
+* Lynx FTP now supports PASV code. (fixes to CERN (Dave Raggert?) PASV code
+  from John Ellson)  It is not enabled by default.  Line 43 in
+  WWW/Library/Implementation/HTFTP must be commented out for
+  PASV code to be used.  This was done because not all FTP sites
+  can support PASV FTP.
+1-13-94
+* slight change in forms user interface.  For the better, I hope you will
+  agree.  Text input fields are now active as soon as the cursor pointer
+  is over them.  Therefore you may begin typing into the text field
+  as soon as you come to it.  Tab, and up and down arrow keys will
+  move off of the text input field.  The only problem with this is as
+  follows.  If you are in the habit of using the number keys (keypad)
+  the or h,j,k,l vi keys, as soon as you move over the text link
+  you will begin seeing numbers or hjk or l show up in the text field.
+  In other words, your movement commands are now broken :(  You must
+  use true arrow keys or the tab key to move off of the text field.
+  I've tried this out and it seems to work alright.  I don't think
+  that users unfamiliar with this will have too hard a time figureing
+  it out.  Once you see numbers or letter appearing it becomes fairly
+  obvious whats going on.  I'll put a message at the bottom of the
+  screen saying "use tab or arrow keys to move off of link."
+* added mods by David Trueman to implement -restrictions commandline
+  option.  -restrictions allows a list of services to be disabled
+  selectively. -restrictions takes the form of
+  "lynx -restrictions=[default],[all],[inside_telnet],[outside_telnet],[shell],\
+	[editor],[bookmark],[option_save],[print],[file_url],[download],[exec]"
+
+   all             restricts all options.
+   default         same as commandline option -anonymous.  Disables
+	           default services for anonymous users.  Currently set to,
+	           all restricted except for: inside_telnet, outside_telnet, and
+	           goto.  Defaults settable within userdefs.h
+   inside_telnet   disallow telnets for people coming from inside your
+		   domain.
+   outside_telnet  disallow telnets for people coming from outside your
+		   domain.
+   shell	   disallow shell escapes
+   editor	   disallow editing
+   bookmark	   disallow changing the location of the bookmark file.
+   options_save    disallow saving options in .lynxrc
+   print           disallow most print options
+   goto            disable the 'g' (goto) command.
+   file_url        disallow using G)oto to go to file: URL's
+   download        disallow saving binary files to disk in the download menu.
+   exec            disable execution scripts
+   exec_frozen     disallow the user from changing the execution link
+		   setting in the O)ptions menu.
+1-12-93
+* added new more informative messages for form links.
+1-11-93
+* fixed -dump and -source options so that they work for
+  binary files now.
+* Interruptable I/0 now completely works for UNIX systems.
+  VMS is next.  Just hit an 'a' for abort anytime during a
+  transfer to abort.  If there is a partial file to show, it
+  will be shown.
+* Added command line option -show_curser.  If enabled the curser
+  will not be hidden in the right hand corner but will instead
+  be positioned at the start of the currently selected link.
+  show curser is the default for systems without FANCY_CURSES
+  capibilities, and the default configuration can be changed in
+  userdefs.h
+1-9-93
+* Added NNTP posting capibilities.  Currently uses external inews
+  program which will be included in the utils directory.
+  Would someone like to patch in some freeware inews code, or
+  send me some?
+1-7-93
+* fixed bug in password handling which cuased it to be displayed
+  accidentally :(  (Danny Mayer)
+1-6-94
+* bold and emphasis now use curses underlining to represent
+  ephasized text.  The use of _underline_ chars before and after
+  the text is now removed.
+1-5-94
+* Added configurable download menu so that binary files may
+  be downloaded using any protocal.  Download menu is displayed
+  after selecting a non-displayable file.
+* Added exec links.  4 types currently defined:
+    files ending in:  .csh, .ksh, .sh, (for UNIX)  and .com (for VMS);
+  Use exec link controls to turn on and off exec links.
+* Gopher menues are now within PRE so that spaces are not
+  collapsed in menu entries.
+* added configurable character sets.  Can be set in lynx.cfg
+  by the user in the options screen or in the users .lynxrc file
+  current sets are: ISO Latin I, IBM PC Character set, & 7 bit
+  approximations.  New sets can be added to src/LYCharSets.c
+
+----------RELEASE of Lynx 2.1 and 2.1.1----------------------
+-grey area-
+* Ability to FTP to VMS systems. (Foteos Macrides)
+* Fixed lots of display and interupt problems (Foteos Macrides)
+* The Lynx Bookmark file is now interpreted as an HTML document.
+  Old Lynx bookmark files must be converted using the lynx2html
+  program or deleted.
+* HTML+ forms as implemented by XMosaic now work.
+  fill in the empty spaces and press the submit button to
+  submit the form.
+* The TEXTAREA tag isn't done yet.  It will currently only
+  give a one line text area.  The next version of Lynx will
+  include a true textarea implementation once I figure out a
+  reasonable interface.
+* Incorporated WWWlib 2.14 and fixed up the descrip.mms files.
+  Foteos Macrides made VMS port changes and wrote a really nice
+  build.com script to make compilation on VMS systems really easy.
+  Foteos also ported Lynx to OpenVMS for alpha axp systems.
+* 's' now means search a searchable indexed document through the
+  server, and can no longer be used to search for strings within
+  the displayed document.
+* '/' now only searches through the current displayed document for
+  strings and can not be used for searchable index documents.
+* Capital 'Q' now quits without asking for confirmation.
+* 'm' for Main Menu now askes for confirmation and does NOT clear
+  the history stack.
+* Blockquote style changed slightly.
+* fixed bug with A and other tags messing up formatting
+  withing PRE segments.
+* Verbose Gopher option removed, verbose gopher functionality
+  is now set permenantly on.
+* Default editor is now configurable in the lynx.cfg file.
+* Default bookmark file is now configurable in the lynx.cfg file.
+
+12-15-93
+* ownership is no longer inherited.
+* link rev="owner" href="mailto:ADDRESS" now accepted as well as
+  link rev="made" href="mailto:ADDRESS" to define the URL of the
+  owner or person responsible for the info.
+* 's' now only searches ISINDEX server documents.
+* '/' always means search within the document.
+
+-grey area-
+* still doing massive rewrite.  Debugging!!
+
+11-30-93
+* anonymous users cannot change the bookmark page! (thanks to Jyrki Kuoppal for
+  pointing out a security hole)
+
+-grey area-
+* massive rewrite.  Removed all Lynx internal format code and
+  restructured all the source files.
+
+11-8-93
+* added &nbsp; (non-breaking space), &ensp; and &emsp;
+
+---------- RELEASE of 2.0.12 -----------------
+11-1-93
+* Change HTInit.c so that unsupported types are not sent out
+  in accept parameters.  For non X screen only text/html and
+  application/octet-stream are sent.
+
+10-26-93
+* descriptive title added to files mailed from lynx
+
+10-25-93
+* disabled FTP connection caching to help fix multiple FTP problems
+
+10-23-93
+* added preliminary level 1 forms support.
+
+10-20-93
+* fixed a bunch of gopher holes
+* gopher lists are turned into URL's now instead of lynx
+  internal format document links
+* local documents ending in .html can now be referenced with
+  just a filename and/or path from the command line.
+
+10-19-93
+* Added preloaded searches to gopher URL's.  They previously
+  didn't work.  This is readily apparent as preloaded CSO
+  searches, which alot of people wanted.
+* removed old hytelnet compatibility code which looked in
+  multiple directories to find the correct file.  If you still
+  need this capibility talk to me.
+
+10-12-93
+* The users specified editor is now spawned for mail messages.
+  If no editor is defined or if the user is anonymous, the built-in
+  lynx mail sender is used.
+
+10-11-93
+* changed all static data structures to be dynamic
+  This was a pretty major change of code which may add several
+  bugs.
+* rewrote parse_links routine to make it more efficient and to
+  work with dynamic structures.
+
+10-6-93
+* added progress messages to HTTP transfers.
+
+10-5-93
+* added -cache=# command line option to specify the number
+  of WWW documents cached in memory.
+
+9-28-93
+* added VMS port fixes from Foteos Macrides.  Lynx now
+  compiles and works on VMS!
+* fixed ftp bug in WWWlib that didn't de-escape URL's before
+  sending request to FTP server.
+
+9-21-93
+* fixed coredump bug for some files with no links.
+
+9-3-93
+* Moved many configuration options including printer setup to
+  lynx.cfg file.  The default placement of the lynx.cfg file
+  will be /usr/local/lib & sys$public
+
+9-1-93
+* Removed STARTDIR variable from userdefs.h  STARTDIR is now inferred
+  from the STARTFILE.
+
+8-30-93
+* Fixed bug with only one link selectable out of many on the last line
+  of the display.
+* Ported to SVR4 courtesy of Nickolay Saukh (from Russia, Wow this is
+  really getting around!)
+* Uneditable documents don't get refetched. (Nickolay Saukh)
+* National language support through LOCALE
+  (instead of ISOLATIN1), protected by #ifdef LOCALE (Nickolay Saukh)
+
+------Release of Lynx 2.0.11--------------------------------
+8-27-93
+* Caused major international incident when a large bug was discovered after
+  release. :)
+* Fixed internal document hypertext refernces with URL's.  '#selector'
+  strings now work again.
+
+8-24-93
+* When files come through on pre HTTP/1.0 servers they are now
+  recognized by their file extensions
+
+8-23-93
+* Lynx can now speak to old NCSA pre HTTP/1.0 servers
+* fixed ALT bug that had to do with style changes not
+  happening before the alt was printed.
+
+8-21-93
+* updated the man file lynx.1.
+
+8-19-93
+* updated help and converted it to HTML.  Made a new help location and
+  server.  The new default help file is
+  http://kufacts.cc.ukans.edu/lynx_help/lynx_help_main.html
+
+8-15-93
+* changed '\' to toggle between source and no source.  When you press
+  '\' while viewing a rendered HTML document you will get the HTML source
+  when you press '\' while viewing HTML source you will get the
+  rendered HTML.
+* Added ALT attribute to IMG tag.  When ALT is available the contents
+  are displayed.  When ALT is missing [IMAGE] is displayed.  When
+  ALT="" nothing is displayed.
+
+8-14-93
+* Added document reload command.  CTRL-R when pressed will reload
+  the document into memory and redisplay it, clearing the screen.
+  This is very useful when editing documents, outside of Lynx while
+  using Lynx for rendering.
+* Added source view mode.  '\' when pressed will reload the document
+  and display the HTML source. (doesn't work for gopher directoryies right
+  now, but gopher isn't HTML anyways)
+* fixed bug in LibWWW that caused it not to be able to convert to
+  www/source.
+* fixed bug in LibWWW that caused most binary file transfers to fail
+* added binary file transfer ability.  When binary files are selected
+  the user is prompted for a file name to save to.  The default directory
+  is the one the user started in.
+* Lynx now reloads local HTML files and re-renders them after editing.
+
+??-??-??
+* At some point I added the ability to edit HTML files on the local
+  machine.
+
+8-12-93
+* Added Nested Lists, up to six levels, with different bullets
+  for each level.
+* Due to the fact that nearly everyone seems to use P to mean
+  two returns within the same style, and Mosaic has been kind
+  enough to support this meaning, :( :( :(  I have changed
+  the P tag to reflect this interpretation.  P can be used
+  anywhere and will mean insert two returns.  (i.e., two BR tags)
+
+8-11-93
+* Made the default Mime type for unknown file types on ftp servers
+  to be text/plain.  Previously the WWWLibrary had the default
+  as application/octet-stream which meant that most files could not
+  be viewed.
+* Changed the ADDRESS style to be more like XMosaic
+  Left flush, newline top and bottom
+* The Statusline now displays the URL when retrieving files.
+* added BR (linebreak) tag!
+  The BR tag inserts a line break and maintains the current style!
+  The BR tag may be used anywhere.
+* added HR (horizontal rule tag!)
+  The HR tag puts a horizontal line seperating two bodies of text.
+  The HR tag may be used anywhere.
+
+8-8-93
+* All spaces, tabs and returns are now collapsed down do one
+  space.
+* fixed bug whiched caused certain links beginning at the
+  begining of a line to be bad.
+* added '*' (stars) to unordered lists and numbers to ordered
+  lists.
+* changed dir lists to be more like menu lists.
+* all emphasis, physical and symantic, now have _underlines_
+  around them to show emphasis.
+
+
+RELEASE OF VER 2.0.10 -----------------------------------------------
+
+7-8-93
+Added [IMAGE] in all places where IMG tags appear.
+added WWW_HOME environment variable support.
+fixed searching in WWW.
+removed tildas from mail messages for security reasons.
+added emacs-like key defs.
+changed gopher dir routines and Verbose format of directories
+
+6-30-93
+Forgot to put all kinds of bug fixes and stuff in here during the
+past month.  I have been working on upgrading to the 2.X WWWlibrary
+Today I changed 'g' to mean goto a url, and 'v' to be view the
+bookmark page.
+
+5-30-93
+Fixed problem with ftp: URL not being recognized and not working.
+
+5-28-93
+Tried to remove the use of tabs and replace them with appropriate
+spaces.  This was done to support brain dead curses packages that
+don't handle tabs. (like linux)
+
+5-20-93
+Fixed socket problem which was causing a problem with telnet's
+connecting
+
+5-18-93
+Fixed SUN curses problem, now works with the /usr/5lib routines
+
+4-9-93
+Added an option to turn on link numbering
+
+4-7-93
+Fixed read_rc() bug which caused .lynxrc files to be read incorrectly
+Fixed file cacheing bug which only allowed searching to be performed
+once.  (it cached the answer and displayed that each time a new
+search was requested)
+
+4-2-93
+Fixed VMS I/O bug and TCP routines.
+
+4-1-93
+Ported 2.0 to VMS
+
+3-17-93
+Fixed a bug: Multiply defined procedure async_abort in
+the files get_file and get_bin_file
+
+3-16-93
+Optomized Gopher TCP routines, increased speed by a factor of 10!
+
+3-9-93
+Added WWW support by integrating the WWWlib1.4
+
+2-10-93
+Added home page support and append features.
+
+12-22-92
+Added support for Image types using xloadimage for X-terminals.
+
+12-1-92
+Added gopher binary file types
diff --git a/docs/CHANGES2.4 b/docs/CHANGES2.4
new file mode 100644
index 00000000..19221e36
--- /dev/null
+++ b/docs/CHANGES2.4
@@ -0,0 +1,891 @@
+--- Rename of Lynx2-3-FM and release as Lynx2-4  (08-June-1995) ---
+==============================================================================
+06-08-95
+* All of the changes from lynx2-3-FM are now located at ftp2.cc.ukans.edu.
+  We will call this version lynx2-4 and all new changes will be added here.
+  - JP
+06-05-95
+* Added isc support based on post to lynx-dev from Ami Fischman
+  (a540ami@pic.ucla.edu). - FM
+06-04-95
+* Initialize t1->name before the StrAllocCopy() in LYMainLoop.c for
+  DIRED_SUPPORT tagging. - Rick Mallett (rmallett@ccs.carleton.ca)
+* Don't bother creating a /tmp copy of local files for downloading
+  under the DIRED_SUPPORT, and don't include "Save to disk" in the
+  download menu for such files. - RM
+* Deal with any newlines or tabs in statusline messages, along lines
+  in patch from Peter Marquardt. - FM
+* Various fixes to ensure terminations of strings, along lines suggested
+  by PM. - FM
+* Made HTAlert messages more readable in trace mode.
+* Replaced info.cern.ch with www.w3.org in userdefs.h and lynx.cfg. - GL
+* Allow definition of the global configuration file (lynx.cfg) path and
+  name via a "LYNX_CFG" VMS logical or Unix environment variable.  Will
+  override the "LYNX_CFG_FILE" definition in userdefs.h.  The -cfg command
+  line switch will override those.  SYS$LOGIN (VMS) or '~' (Unix) can be
+  used in the path to treat the global configuration file as a personal
+  configuration file ($HOME will be substituted for '~'). Meets objective
+  in patch posted by Danny Meyer (mayer@ljsrv2.enet.dec.com) but does
+  not seek lynx.cfg in the user's HOME directory without an explicit
+  directive to do so.  Issue a screen message and then exit if the
+  configuration file is not readeable (rather than continuing as if
+  one had been found and read). - FM
+* Added protections from NAMEless INPUT or TEXTAREA tags. - FM
+05-29-95
+* Changed close(*s) typo in HTTCP.c to NETCLOSE(*s).  Caused tight loops if
+  on error *s became stdin. - Peter_Marquardt (wwwutz@cha01.tfh-berlin.de)
+05-20-95
+* Mods of proxying/gatewaying code, replace obsolete info.cern.ch default
+  URL addresses with www.w3.org, and add option to use the new www.w3.org
+  wais search gateway in cover page for wais searches. - FM
+05-10-95
+* If a startfile specified on the command line maps to a MIME type
+  which invokes an alternate display device, allow -homepage, if also
+  specified, to be substituted for startfile on quiting from the display
+  device, rather than forcing an exit due to the original startfile having
+  been neither text/html nor text/plain.  Based on a patch from GL, with
+  protections against possible infinite getfile() loops added. - FM
+* Include -t switch when pico is the editor for reply_by_mail() in
+  LYMail.c. - GL
+05-04-95
+* Oops.  Had zipped the wrong LYReadCFG.c in yesterday's mods. - FM
+05-03-95
+* Do not override any external proxy and no_proxy variables with those
+  in lynx.cfg.  Bug fixes in code for setting proxy variables on Unix,
+  based on patches from Roman Czyborra (czyborra@cs.tu-berlin.de). - FM
+* Fixes for tagging when Lynx jumps to another screen and then comes back,
+  and deal with possibility of screen outputs from compress/decompress
+  utilities. - GL
+* Added support for Sequent's DYNIX/ptx operating system, and bug fixes
+  in HTTCP.c's BSDselect(). - Rodney Barnett (RBarnett@us.teltech.com)
+* Increased limits in select() loops to 5000 tries. - FM
+* Specify /nomember for compilations with DECC.  It's not the default
+  on AXP and the code assumes byte alignment. - FM
+04-19-95
+* Added Alan Hirsh's script (LynxDir:VMSPrint.com) for dealing with busy
+  VMS print queues such that Lynx might otherwise delete the temporary
+  file before it has been queued for printing. - FM
+* Added lots of type casting to the mathematical operations in GridText.c
+  to minimize possible sizing/alignment problems for DECC/AXP (and any
+  Unix flavors that use the Alpha chip). - FM
+04-17-95
+* Use  test=test -z "$LYNX_VERSION"  like  test=test -n "$LYNX_VERSION"
+  in mailcap files simply as flags for non-LYNX versus LYNX environment,
+  without actually bothering to execute a test. - FM
+* Issue "** Bad HTML!!!  Use -trace to diagnose. **" statusline messages
+  when bad HTML is encountered, and suppress those statusline messages in
+  favor of the TRACE messages when -trace is used. - FM
+* Fixed anchor deletion problem in yesterday's ISMAP mods. - FM
+* Removed -ltermcap from AIX makes (AIX doesn't use it). - FM
+04-16-95
+* Send a 0,0 coordinate pair if a user clicks on an ISMAP link, so that
+  it's handled equivalently to clicks on an ISMAP submit button, and
+  (typically) will return the server's default.  Note that the default
+  often is the parent document, and if so, the current document will
+  be returned via redirection (pointlessly 8-).  However, this mod
+  allows the WebMaster to use a pure-text document as the default for
+  Lynx. - FM
+* Protections against crashes for inappropriately positioned form tags. - FM
+* Fixes in handling of configurable INEWS path. - FM
+* Support for VT500 series terminals. - George Cook (cook@wvnvaxa.wvnet.edu)
+04-12-95
+* Makefile tweaks for bsdi and aix4. - FM
+04-11-95
+* Mods for building with BSD Interative (bsdi). - FM
+04-08-95
+* Added translation of HTML entities and decimal escaping for the
+  VALUEs of INPUT and OPTION tags. - FM
+* For TYPE="image" INPUT tags, use "[IMAGE]-Submit" as a pseudo-ALT
+  string, and submit a 0,0 coordinate pair if it's clicked, which
+  typically will invoke the server's default (I guess something is
+  better than nothing. 8-). - FM
+* Handle (possibly multiple) angle brackets in bookmark and showinfo
+  link names. - FM
+* Fixed typo in for-ultrix code in LYMain.c. - FM
+04-04-95
+* Added ability to set proxy environment variables via lynx.cfg. - FM
+04-01-95
+* Added handling of the HTML 3.0 attributes for ISINDEX tags:
+      ISINDEX HREF="reference" PROMPT="string"
+  The ACTION attribute didn't make it into HTML 2.0.  For now, we'll keep
+  supporting it in Lynx by treating it as a synonym for HREF. - FM
+03-31-95
+* Mods for AIX v4.1.1 and addition of make aix4. - FM
+* Added prototype and extern declarations for BSDselect(). - FM
+* Fixed bugs in form_getstr() that could clobber the stack. - GL
+* Fixes for symlink handling. - GL
+* Made LYShowInfo.c aware of the setuid, setgid and sticky file modes,
+  and nicer mode display if the file doesn't have the read bit set. - GL
+03-30-95
+* Fixed glitch in BASE tag handling. - FM
+03-29-95
+* Initialize pointers in add_trusted() of LYGetFile.c before the
+  StrAllocCopy() calls. - FM
+03-26-95
+* Miscellaneous TRACE and related messaging tweaks. - FM
+03-24-95
+* Handle defaulted localhost in file BASE tags, and related tweaks of
+  defaulted localhost handling in file URLs. - FM
+* Use RM_PATH for both file and directory deletions with the DIRED_SUPPORT
+  remove function. - GL
+--- STARTING  2.3-FM ---
+==============================================================================
+03-23-95
+* Designate this code set as lynx2-3-FM to avoid any confusion with the
+  official releases at UKans. - FM
+* Tweaks of code for defaulted localhost in file URLs.  Don't require
+  any host field marker in such URLs - FM
+03-21-95
+* Added handling of defaulted localhost in file URLs. - FM
+* More protections against bad HTML. - FM
+* SYSLOGing enhancements. - GL
+* Suspend curses during my_spawn()'s, and fixes of code for the child
+  and error return detection. - GL
+03-20-95
+* More protections against potentially infinite loops. - FM
+03-16-95
+* Enhancements of 'c'omment and mailto handling. - FM
+* Mods to build.com for enabling submission to BATCH. - FM
+* Ultrix terminal-handling fix. - Roman Czyborra (czyborra@cs.tu-berlin.de)
+03-15-95
+* Fixed bug in for-Unix directory listing code to screen out inaccessible
+  parent directories.  Was also being applied to ftp listings. - FM
+* Made bolding of H1 through H7 headers a lynx.cfg option, with the
+  non-bolding as the compilation default. - FM
+03-13-95
+* Fixed bug in setting link[].lname elements to empty strings for form
+  INPUT_ANCHORs.  Was causing showinfo() to report the links from the
+  previous document (yet another memory leak bites the dust 8-). - FM
+* Numerous fixups of bold and underline handling. - FM
+03-09-95
+* Increased the while() loop limit for select() tries in HTTCP.c to 500. - FM
+* Memory allocation/free fixes in HTAccess.c. - FM
+* Makefile and documentation tweaks. - FM
+03-07-95
+* Implemented HT_BOLD when specified for headers in DefaultStyle.c.  H1 is
+  now uppercase, bold, and centered.  H2 - H7 are lower or mixed case, bold,
+  and progressively indented. - FM
+* Miscellaneous enhancements of menu displays. - FM
+* Allow tabs and '$' in lynxexec commands. - FM
+* More TOUPPER/TOLOWER fixes. - FM
+03-06-95
+* Added ability to set the INEWS path in lynx.cfg. - FM
+03-05-95
+* Separated the newspost URL into newspost versus newsreply, and modified
+  LYNews.c to behave more rationally for new versus followup posting. - FM
+* Added "mode reader" command for news list and article requests. - FM
+* Enabled saving of list_dir_style settings in the user's RC file. - FM
+* Don't restrict rearming SIGINT in LYClean.c for IGNORE_CTRL_C to just
+  SVR4. - FM
+* Added numerous protections against core_dumps/ACCVIOs in HTML.c for bad
+  HTML.  Should also help reduce likelihood of infinite while() loops and
+  a runaway CPU if binary files are mistyped and rendering is attempted. - FM
+* Added (unsigned char) type casts in addch() calls for proper handling of
+  high value ISOLATIN1 characters. - FM
+* Limited the while() loop for select()'s in HTTCP.c to 50 tries, to help
+  reduce likelyhood of a runaway CPU on undetected terminal disconnects. - FM
+* Fixed typo in build.com. - FM
+* Added Craig's lynx_help and about_lynx files for the lynx2-3-7 distribution,
+  updated for lynx2-3-9 BETA. - FM
+--- STARTING  2.3.9 BETA ---
+==============================================================================
+02-20-95
+* Updated doc files and passed on to UKans for archiving on the
+  ftp2.cc.ukans.edu server as 2.3.8 BETA. - FM
+02-17-95
+* Further updates of building procedures for VMS. - FM
+* Further updates of lynx.man, lynx.hlp and documentation.  Indicate
+  that the inside_foo and outside_foo restrictions are not selective
+  on systems which lack utmp. - FM
+* Changed yesterday's DGUX define fo DGUX_OLD, because only older
+  Data General systems need it. - FM
+02-16-95
+* Added Jeff's updates of lynx.man and lynx.hlp, further updated for
+  v2.3.8 - FM
+* Fixed typos in LYMail.c and HTTPC.c. - FM
+* Cleaned up #ifdef'ing for -DIGNORE_CTRL_C. - FM
+* Added -DDGUX for using inet_addr(host).s_addr instead of inet_addr(host)
+  in HTParseInet() of HTTCP.c (Data General may need it). - FM
+* Don't report "-help" as an invalid option. - FM
+02-15-95
+* Handle HTML entities and decimal escaping in ALT strings. - FM
+* Build fixups for TCPWARE. - FM
+02-14-95
+* Added transmission of Accept-Language headers.  A default preferred
+  language is defined in userdefs.h.  It can be overridden via lynx.cfg.
+  Users can change that via the 'o'ptions menu and save their preference
+  in their RC file. - FM
+* Tweak of FIXED record handling on VMS. - FM
+* Defined Unix ZIP_PATH and UNZIP_PATH in userdefs.h. - FM
+02-12-95
+* Added  -localhost  switch for restricting access to files and servers
+  on the local host. - FM
+* Added  -nobrowse   switch for disabling directory browsing. - FM
+* Added  -selective  switch for requiring a .www_browsable file in
+  each directory for browsing access to it.  The enabling files
+  are not included in the directory listings. - FM
+* Fixed up displaying of README files in directory listings on
+  VMS. - FM
+* Replaced all tolower() and toupper() calls with the TOUPPER() and
+  TOLOWER() macros in HTUtils.h (should help deal with some of the
+  strange behavior reported for some flavors of Unix; see header of
+  HTUtils.h). - FM
+Worked in mods from David Trueman (david@cs.dal.ca) - FM:
+* Don't issue the ../ link in Unix local directory listings if the parent
+  directory is not readable (was already dealt with on VMS - FM).
+* Include an Organization: header in Unix news postings, if possible
+  (was already dealt with on VMS - FM).
+* Don't allow the editing of Unix mail headers because that is error
+  prone (no change on VMS; editable pseudo-headers are included for
+  informational purposes, but the real headers are those of the
+  account running Lynx - FM).
+* Don't hardcode the Unix mv command; use MV_PATH define in userdefs.h.
+* Moved the Unix COPY_COMAND define to userdefs.h as COPY_PATH.
+* Completed the Unix ZIP support.
+02-10-95
+* Added code for converting the headers of downloaded binaries on VMS
+  to indicate FIXED 512 record format.  See the documentation in
+  userdefs.h, lynx.cfg and FIXED512.COM for more information. - FM
+02-08-95
+* Fixed glitch in HTInit.c which mis-casted the default MIME type for
+  files with a .sh extension, causing the EXEC_SCRIPT function to be
+  disfunctional. - FM
+* I think I finally have Lynx showing "(p# of N)" properly in the title
+  lines (we'll see if perfection has really been achieved 8-). - FM
+* Extended directory browsing on VMS to the -homepage specification,
+  if included on the command line, e.g., lynx -homepage=sys$login
+  will start up Lynx with the default startfile, but the 'm'ain menu
+  command will yield listings of the home directory. - FM
+* Added -fileversions switch on VMS for including all versions of files
+  in directory browser listings (otherwise, only the highest version is
+  listed, with no version numbers displayed). - FM
+* Modified LYEdit.c to use fopen(filename,"a") instead of access(filename,2)
+  to verify write access for editing files (checking "append" access appears
+  to be a more reliable way to do it across platforms/flavors). - FM
+02-07-95
+* Implemented directory browsing for VMS. - FM
+* Fixed printer command handling to actually prompt for and use a second
+  filename argument if two "%s" strings are in the command map. - FM
+* Added anti-Unix-shell-spoofing code for all of the filename argument
+  handling. - FM
+* Fixed glitch in getenv(DISPLAY) calls on VMS.
+02-04-95
+* Fixed a glitch in BASE support.  Should now work properly when both
+  standard and Lynx-specific hrefs are in the document. - FM
+02-03-95
+* Added support for posting to newsgroups from Lynx on VMS via the
+  ANU-NEWS software. - FM
+* Numerous href parsing enhancements. - FM
+* Enhancements and bug fixes of news displays. - FM
+* Enabled display of Linknames with angle brackets (as for news URLs)
+  in the showinfo page. - FM
+* Ensured that a file URL which is really an ftp URL will yield an
+  "FTP is Disabled" statusline message when it's disabled. - FM
+02-01-95
+* Defined out the LYK_VERSION code and made Control-V a dead key again,
+  since including the Lynx name and version strings in the showinfo ('=')
+  and 'o'ptions displays is adequate, and people on different platforms
+  or flavors associate Control-V with other functions. - FM
+01-31-95
+* Beefed up the BASE support. - FM
+* Made all WWWLib cover pages and menus HTTP/1.0 compliant (to ensure
+  resetting of any BASE tags) and gave them more pizzaz. - FM
+* Trim terminal slashes in ftp paths if not the Welcome directory, so
+  we'll get "Up to" links.  Terminal slashes in file paths still force
+  that directory to be treated as the Welcome directory.  For example,
+   ftp://host/blah/foo/ will have an "Up to blah" link listed, but
+  file://host/blah/foo/ will treat /blah/foo/ as "Welcome" (both ftp
+  and file "Up to" links are blocked by -DNO_PARENT_DIR_REFERENCE). - FM
+* The VMS SOCKETSHR_TCP support can't yet handle telnet, tn3270 or
+  rlogin URL's (Andy Harper is working on it; be patient 8-).  Modified
+  HTTelnet.c to compile properly and behave rationally when such URL's
+  aren't supported. - FM
+* Corrected doc files based on Larry Virden's (lvirden@cas.org) careful
+  (or is it carefull) proof-reading.  Thanks Larry! - FM
+* More type casts for ANSI C compliance. - FM
+01-30-95
+* Added numerous type casts for ANSI C compliance. - FM
+01-29-95
+* Prototyped HTHostName() for yesterday's mods in HTAccess.c. - FM
+* Updated lynx.cfg. - FM
+01-28-95
+* Added lynx name and version to the showinfo page and options menu. - FM
+* Tweaked Danny's news proxying mods for selective no_proxy directives
+  with a port field (119) for news, and added equivalent code for wais
+  (port 210). - FM
+* Updated the INSTALLATION file (I hope people read it 8-). - FM
+* Hadn't included last night's typo fix in the archived fileset. - FM
+01-27-95
+* Added Danny Mayer's (mayer@ljo.dec.com) mods for proper handling of
+  no_proxy directives for news (NNTPSERVER) hosts. - FM
+* Worked in Ari Luotonen's (luotonen@dxcern.cern.ch) mods for sending
+  a "Pragma: no-cache" header for use by a proxy server in conjunction
+  with the RELOAD command. - FM
+* Fixed to handle file URL's appropriately in conjunction with proxying
+  of ftp URL's.  For file URL's on the local host, direct access is
+  attempted, with no ftp attempt if that fails, whether or not proxying
+  is in effect, and whether or not no_proxy directives have been set.
+  Both ftp URL's, and file URL's on a remote host, are sought via ftp
+  without a direct access attempt.  File URL's for remote hosts are
+  converted to ftp URL's before submission to a proxy server, so no
+  special procedure need be implemented to induce the proxy server to
+  act on them (You shouldn't continue using file URL's when you intend
+  ftp, but Lynx will handle such URL's properly when encountered in
+  old documents that use file when ftp is intended.) - FM
+* Fixed typo in yesterday's "psychotherapy". - FM
+01-26-95
+* Escaping of ISINDEX queries needed more tweaks to work properly with
+  high value IsoLatin1 characters. - FM
+* Applied psychotherapy to the schizophrenic behavior that was exhibited
+  when download, upload, print, history or showinfo commands were used
+  during displays of each other's menus or temporary files. - FM
+* Enabled downloading of links from the history page. - FM
+01-25-95
+* Added LYK_VERSION command (^V) for showing version of Lynx. - FM
+* Include file fixes for TCPWARE. - FM
+* Fixed bug in showinfo() which caused core dumps when invoked while
+  positioned on any form field which has a "linkname" but a NULL
+  "filename". - FM
+* Fixed glitch in 'p'rint menu. - FM
+01-24-95
+* Enabled SOCKSification for any Unix flavor via the SITE-LYDEFS,
+  SITE-DEFS and SOCKSLIB definitions in the top-level Makefile.  Added
+  info in INSTALLATION on how to do it for VMS.  Included notes that you
+  are better off building Lynx normally, and instead using a SOCKSified
+  proxy server to get through a firewall. - FM
+* Added instructions in INSTALLATION for setting up proxy service. - FM
+* Fixed multiple submit button handling to distiguish which button was
+  activated when they have the same name, and include only that button's
+  name/value pair in the submission. - FM
+* Figured out how to apply all security and restrictions checks for
+  redirecting URLs returned by ISINDEX searches, and accordingly lifted
+  the bypasses for the previously insecure access types. - FM
+* Added option to use Jerry Whelan's (guru@bradley.edu) BSDselect() for
+  SVR4 systems with the "type any key" problem. - FM
+01-23-95
+* Fixed up escaping of queries in HTSearch(). - FM
+* Updated the sample jumps files. - FM
+* Worked in socksification mods from Reese Ferry (reesef@VNET.IBM.COM) - FM
+* Enabled use of LOCALE for international characters with any Unix flavor
+  (not just sun) via a define in the top level Makefile. - FM
+01-22-95
+* Updated the lynx.cfg configuration file. - FM
+* Implemented BASE handling. - FM
+01-21-95
+* Fixed -cfg switch handling so that the specified, alternate configuration
+  file properly is read instead of the default system file specified in
+  userdefs.h. - FM
+* Made 'p'rint, 'd'ownload and 'u'pload menu lists single spaced. - FM
+* Fixed HTFileFormat() in HTFile.c so that it properly processes the
+  suffix-to-MIME-type mappings when version numbers are in local file
+  URLs on VMS.  We therefore no longer trim off the version number if
+  if was included, and Lynx will now access and process that version
+  rather than only the highest version. - FM
+01-18-95
+* Makefile fixes for convex and linux. - FM
+01-17-95
+* More Makefile fixes. - FM
+01-14-95
+* Fixes for FreeBSD. - FM
+01-12-95
+* Made the "ls -l" emulation in local directory listings a compilation
+  option (see the top level Makefile). - FM
+* Made inclusion of "Up to" parent links in local directory listings a
+  compilation option (see top level Makefile). - FM
+* Message fix for checkmail on Unix. - FM
+* Fixes for SCO with gcc. - FM
+01-11-95
+* Restored original hash table function in HTAnchor.c without (hopefully 8-)
+  reviving anchor deletion problems. - FM
+* Fixed typo in HTAccess.c. - FM
+* Added code in HTFile.c from Timothy Newsham (newsham@aloha.net) for
+  generating long style Unix listings (ls -l). - FM
+01-10-95
+* Escape dashes in lynx.man. - FM
+* Added NetBSD support from Bryan T. Vold (btv@wiley.HealthPartners.COM). - FM
+* Made anchor searches in hash tables case-sensitive (so paths which
+  differ only in their case can be distinguished, as people using the
+  DIRED support kept requesting) without (hopefully 8-) reviving anchor
+  deletion problems. - FM
+01-09-95
+* More Makefile and code fixes for building properly with various systems
+  and compilers. - FM
+01-06-95
+* Numerous fixes for handling signals (e.g., SIGWINCH) received during
+  keystroke fetches, without (hopefully 8-) reviving the problem of
+  runaway CPU's on undetected terminal disconnects. - FM
+* More Makefile and code fixes for building properly with various systems
+  and compilers. - FM
+01-05-95
+* Changed define for syslog() logging to SYSLOG_REQUESTED_URLS and picked up
+  logging of ISINDEX search requests that don't go through getfile(). - FM
+* More fixes for redirection returned via ISINDEX searches. - FM
+* Fixed missing newline character at end of last .lynxrc entry. - FM
+* More Makefile tweaks. - FM
+* More additions in LYCurses.h for compilers which fail to check whether TRUE
+  and FALSE are already defined before defining them in curses.h. - FM
+01-03-95
+* Fix for redirection returned via ISINDEX searches. - FM
+12-29-94
+* Yet more top level Makefile tweaks. - FM
+* Fix bcopy problem for UCX. - Martin Zinser (zinser@vscn.gsi.de)
+* Fix ioctl() problem for UCX. - MZ
+12-27-94
+* More top level Makefile tweaks. - FM
+12-26-94
+* Added Lou Montulli's procedure for PURIFY to the top level Makefile. - FM
+12-23-94
+* Added Lou Montulli's memory leak fixes. - FM
+* Fixed HTLoadedDocumentTitle() call in LYGetFile.c. - FM
+--- RELEASE of 2.3.8 BETA ---
+12-22-94
+* The WFEB code as of 12-15-94 has been archived at UKans as lynx2-3-7,
+  so we'll make this lynx2-3-8 to avoid confusion. - FM
+* Added bookmark_exec restriction for disallowing use of lynxexec URL's
+  in the user's bookmark file or converted Mosaic hotlist. - FM
+* Enable any lynxexec URL in JUMPFILE if EXEC_LINKS has been defined.
+  This allows you to set both LOCAL_EXECUTION_LINKS_ON_BUT_NOT_REMOTE
+  to TRUE and a single TRUSTED_EXEC rule that will always fail (e.g.,
+  TRUSTED_EXEC:none), so that *ONLY* the lynxexec URL's in the jumps
+  file will be acted upon. - FM
+* Disallow lynxexec URL's in G)oto if no_shell is set or if
+  LOCAL_EXECUTION_LINKS_ON_BUT_NOT_REMOTE is TRUE. - FM
+12-21-94
+* Include LYFLAGS in the BSDI_Makefile. - FM
+* Numerous mods based on patches from David Trueman - FM:
+* Changed SUN4 ifdef for implementing the "reverse clear screen hack" to
+  REVERSE_CLEAR_SCREEN_PROBLEM since not all sun4 systems experience this
+  problem.
+* Changed a few messages to use key_for_func() instead of a hard-coded
+  key mapping.
+* Allow control-C as well as control-G to abort or cancel on Unix (as
+  already on VMS).  On VMS, control-C and control-Y evoke a "Do you really
+  want to quit?" prompt, and a 'n'o reply gets handled as if control-G
+  has been entered in the first place.  On Unix, control-C is treated
+  simply as a synonym for control-G, and control-Y is not an interrupt
+  signal.  This seems the best way to handle those control signals, based
+  on what VMSers versus Unixites would expect them to do.
+* Added code to disallow the writing of files beginning with a dot if
+  NO_DOT_FILES is set TRUE in userdefs.h and/or lynx.cfg.
+* Added possibility of logging URL access via syslog() on Unix (ifdef'd
+  with LOGGING).
+* Improved and made more flexible the security for lynxexec URL's.  The
+  default behaviour is the same as now, but source locations and the path
+  (Unix) or name (VMS) of programs to be executed can be restricted via
+  TRUSTED_EXEC rules in the lynx.cfg file.
+* Convert ~ in lynxexec paths to $HOME on Unix.
+* Several changes in DIRED support.  Tidied and consolidated code.  Changed
+  the way tags are freed (fixing a bug where they did not always get cleared
+  properly).  Changed all programs to *_PATH defines.  Changed the display
+  of tags so they work with numbered links.
+* Added another restriction to disallow telnet port specifications in
+  G)oto URL's.
+* A bit of special case code in jump handling.  If key mapping is G, allow it
+  to be typed as "go target".
+* Change strncmp in remap() to strcmp() (bug fix).
+* Report offending bad option in main().
+* In mainloop(), make \r same as \t and \n.
+* Combine LYK_REMOVE code with LYK_DEL_BOOKMARK so that they can share the
+  same key map.
+* If show_cursor is true, position cursor 1 position before the link, which
+  makes it less likely that the link is obscured in defective terminal
+  programs
+12-15-94
+* More fixes in LYno_attr_char_case_strstr() and LYno_attr_char_strstr() - FM
+* People didn't like having to erase the default WHEREIS ('/') search string
+  when it wasn't what they wanted in a new document (though most didn't know
+  that it can be done easily via ^U), and Lynx doesn't have real editing via
+  LYgetstr() (just deletion from the end of the string), so I got rid of the
+  the editing offer.  The previous search string is still buffered across
+  document fetches, and can be used across documents via NEXT ('n').  You
+  also can use WHEREIS without a search string entry to turn off highlighting
+  within the current document, and then NEXT to restore it.  If control-G is
+  used instead of a blank string to cancel a WHEREIS command, it does not
+  turn off the highlighting.  So everything everyone asked for is now
+  possible (once you figure out how to do it 8-). - FM
+12-14-94
+* Oops!  Fixes in tcp.h for MULTINET with DECC/VAX had left SOCKET_ERRNO
+  undefined for all the other VMS TCPIP packages.  That's what I get for
+  working on this stuff too late at night. - FM
+* Additional ANSI compliance fixes in HTTCP.c for builds with DECC/VAX and
+  non-MULTINET VMS TCPIP packages. - FM
+12-13-94
+* Modified searches for strings within the currently displayed document
+  ('/', as opposed to 's' for ISINDEX searches) so that the highlighting of
+  the search string is not retained when the current document is changed,
+  and added recall buffering of the search string so that it's offered as
+  the default for editing or reuse on subsequent '/' commands.  Also, we
+  now force redraws on invokations of such searches so that hits will be
+  highlighted even if they occur on the current page.  Links with hits such
+  that they have embedded highlighting of the search strings will not have
+  the embedded highlighting restored when the cursor is moved onto and then
+  off of them (helps to distinguished whether it's intended or the due to
+  the search), but will be restored whenever the page is redrawn.  All
+  embedded highlighting also is restored when the 'n'ext command is used to
+  repeat the search in the current document, even if the returned hits do not
+  cause a page change.  Note that these searches first search only the links,
+  and position you on the first link with a hit occurring after the current
+  link.  If there were no hits in the links, then the text is searched and
+  the first hit occurring after the current link is positioned at the top of
+  the page.  They never did, and still do not, search both the link and text
+  portions of the document simultaneously.  Also note that ISINDEX searches
+  never have and still do not yield highlighting of the query string(s) in
+  the returned document.
+* Fixed LYno_attr_char_case_strstr() and LYno_attr_char_strstr() in
+  HTStrings.c so that they properly ignore any attribute characters in
+  the comparison string and return a pointer to the correct location
+  of a match with the target string. - FM
+12-12-94
+* Modified FTP gateway to display 230- as well as 250- information/help
+  messages, and on non-Unix as well as Unix systems. - FM
+--- RELEASE of 2.3.7 BETA ---
+12-11-94
+* Further tweaked explanatory comments in the configuration and samples
+  files, and updated the instruction files. - FM
+12-09-94
+* Modifed PassesTest() in HTInit.c to avoid the overhead of system() calls
+  by using getenv() when   test -n "$DISPLAY"   and   test -z "$DISPLAY"
+  commands are encountered in the mailcap file.  Otherwise, needlessly
+  expensive system() calls potentially could be made for virtually every
+  viewer mapping in that file!.  For Lynx, those two strings in the mailcap
+  file now are equivalent to the :XWINDOWS and :NON_XWINDOWS flags,
+  respectively, for VIEWER: assignments in lynx.cfg. - FM
+* Also modified PassesTest() so that it simply treats  test -n "LYNX_VERSION"
+  as success.  Why spawn a system() command to see if Lynx is running, when
+  it obviously is!.  However, that string can be included in the mailcap
+  file for assignments that should be restricted to Lynx if other software
+  also uses the file. - FM
+* The above two mods make it unnecessary to actually use a "test" script for
+  differentially setting viewers in XWINDOWS versus NON_XWINDOWS environments,
+  so VMSers also can use the mailcap files for differential assigments of
+  viewers, without those DCL error messages about "test" which have been
+  mystifying so many people.  However, yesterday's mods do make it possible
+  for VMSers to use a "test" script for checking other environment or system
+  features, and thereby setting viewer switches differentially, analogously
+  to the command line switches for Lynx itself. - FM
+* Modified comments in samples/mailcap to indicate these enhancements. - FM
+* Modified comments in userdefs.h to describe correctly what the Lynx code
+  does as of v2.3:  Any SUFFIX or VIEWER mappings in lynx.cfg will be
+  overridden in src/HTInit.c if they also appear there.  Then, any mappings
+  in mime.type or mailcap will override those from lynx.cfg and src/HTInit.c.
+  The XLOADIMAGE definition is used in src/HTIinit.c, and you can use
+  mailcap, but not lynx.cfg, to override it. - FM
+* Modified comments in lynx.cfg and samples/lynx.cfg to indicate what Lynx
+  really does, and the use of mailcap files to do what lynx.cfg had claimed
+  it could do but doesn't. - FM
+* Fully implemented multiple submit button support for both POST and GET
+  forms. - FM
+* Added LYK_RESUBMIT keymap (with default binding to 'x' and 'X') for forcing
+  submissions of forms to servers (i.e., never use cache).  LYK_ACTIVATE
+  (with default binding to right-arrow and RETURN) still fetches from cache
+  if available.  Statusline help describes these commands when positioned
+  on a submit button. - FM
+12-08-94
+* Fixed HText_submitForm() in GridText.c to handle submitting INPUT types
+  (e.g., type="image") which have name/value pairs. - FM
+* Modified DCLspawn to recognize -1 on failure and 0 or 1 on success as
+  return or exit values of scripts, and report -1 or 0 as it's own return
+  value.  If a "test" script is used on VMS in conjunction with .mailcap
+  for setting viewers, it should return -1 if the test fails and 0 or 1 if
+  it passes (the "test" script can be DCL or an exectutable, and should be
+  defined as a foreign command).  If you don't have a "test" script, don't
+  include that instruction in .mailcap. - FM
+* The tmpaddress pointer in do_www_search() of GridText.c needed to be
+  initalized to NULL. - FM
+12-07-94
+* Made sufficiently ANSI compliant to build with DECC on VMS without using
+  the /stand=vaxc qualifier, and further modified so that Lynx will build
+  and run (extremely well 8-) with DECC/VAX.  Whooh, that took some doing!
+  These mods are also desireable for builds on Unix. - FM
+12-02-94
+* Fixed the query recall buffer in do_www_search() of GridText.c to restore
+  the +'s to spaces and unescape properly. - FM
+* Include file and define fix ups, for SOCKETSHR/NETLIB support and convex
+  builds, in tcp.h, LYShowInfo.c and top level Makefile. - FM
+11-27-94
+* Fixed bugs associated with failure to check the post_data element in
+  addition to the address element when making push/pop decisions for the
+  history stack, and when checking whether a requested document has been
+  loaded successfully.  The address element is insufficient for documents
+  returned by POST'ed forms. - FM
+* Check -trace switch earlier in LYMain.c so that trace messages associated
+  with setting up the Lynx configuration will actually be displayed. - GL
+11-23-94
+* More fix ups for the SOCKETSHR/NETLIB support.  Close to "all set" but needs
+  more field testing with the full range of TCPIP packages for VMS. - FM
+* Added HP_TERMINAL define for the DIM workaround to the REVERSE problem with
+  HP terminals.  If not defined, SNAKE builds will not make that substitution
+  (would be better to do this in a way that checks the terminal at run time,
+  but we'll hold off on that for now). - FM
+--- RELEASE of 2.3.6 BETA ---
+11-21-94
+* Replaced ucx$inetdef.h with socketshr_library:ioctl.h for the
+  SOCKETSHR_TCP builds.  Note that the ioctl.h is not presently included
+  in the binary distribution of SOCKETSHR/NETLIB.  You have to get it from
+  the sources distribution. - FM
+11-18-94
+* Added Andy Harper's (A.Harper@bay.cc.kcl.ac.uk) "first round" support for
+  SOCKETSHR/NETLIB (see SOCKETSHR.ANNOUNCE).  Note that it is presently
+  including ucx$inetdef.h which is not provided with SOCKETSHR or NETLIB
+  source sets, and may not be available to non-UCX sites.  We're checking
+  into how to deal with that. - FM
+* Made recall buffering of shortcuts for the 'J'ump command a configuration
+  file option (in userdefs.h and/or lynx.cfg). - FM
+* Added clearerr() before the GetChar() in LYStrings.c. - FM
+* Made the optional novice help lines conform to the "standard default"
+  key bindings.  Edit them appropriately in userdefs.h if you plan to use
+  other bindings with that feature.
+* Added George Lindholm's (lindholm@ucs.ubc.ca) Makefile patch for making it
+  just a tad easier to set up local compile options. - FM
+* Eliminated serial free() in LYSanctify() of LYGetFile.c. - FM
+* Restricted all "hack to fix reverse clear screen problem" code to
+  SUN4 (had missed one 8-). - FM
+11-15-94
+* Eliminated separate list and atexit deletions of redirecting anchors. - FM
+* Added Rick Dyson's (Dyson@IowaSP.Physics.UIowa.EDU) updates of the
+  descrip.mms files. - FM
+11-12-94
+* Worked in Malcolm MacArthur's (mcscs2mm@zippy.dct.ac.uk) mods for reading
+  a printer's page length from the configuration file and calculating the
+  correct number of pages for the statusline query on whether to continue
+  if the document is longer than 4 printer pages.  Further modified that
+  code to use the current LYlines for the computation when the built in
+  "print to screen" option is selected.  See the comments concerning
+  "PRINTER:" definitions in lynx.cfg for more information. - FM
+* Fixed HTInetStatus() in HTTCP.c to use SOCKET_ERRNO instead of errno,
+  based on the platform/transport-specific definitions in tcp.h.  Thanks
+  to Danny Mayer (mayer@ljo.dec.com) for tracking down this glitch. - FM
+11-10-94
+* Added David Trueman's latest clever enhancement:  The command line option
+  -homepage=URL separates the notion of a home page (or main screen) from
+  the start file.  So,  lynx -homepage=URL1 URL2  will start up with URL2
+  but the MAIN_MENU key will take the user to URL1 rather than URL2.  This
+  is useful for public accounts that start up with an information page or
+  form, that then leads the user to a URL for the actual home page.  The
+  MAIN_MENU key can thereafter be used whenever the user wishes to return
+  to the actual home page. - FM
+* Enlarged string buffer in LYEdit.c to handle large paths. - FM
+* Made 'K'eymap title and descriptions easier to edit for alternate languages
+  (e.g., Dutch or Greek) as required by Dick Wesseling (but, alas, the editing
+  still has to be done in LYKeymap.c, because it's too much to move into
+  userdefs.h; someday Lynx will have real internationalization code 8-) - FM
+* Added titles to tops of jumps files so that the nesting level will be reset
+  on reloads. - FM
+11-09-94
+* More prototyping and include file fixes in LYJump.c and LYMainLoop.c - FM
+11-08-94
+* Prototyping fix in LYJump.c. - FM
+* Miscellaneous fixes in src/descrip.mms. - FM
+* Hadn't included patch for latest LYUtils.c in lynx2-3-5.patches. - FM
+11-07-94
+* At popular request (already 8-), changed the "Jump to:" query to work
+  exactly like the "goto:" query.  The previous entry is recalled, a '?'
+  must be entered explicitly to fetch the shortcut list (with an instruction
+  about that added to the prompt), and a blank entry or Control-G returns
+  the user to the current document. - FM
+--- RELEASE of 2.3.5 BETA ---
+11-05-94
+* Numerous wonderful enhancements based on patches from David Trueman, and
+  entensions of those mods.  Briefly:
+* Implemented 'K'eymap command for showing all of the key bindings currently
+  in effect, with a description of their functions.  This is faster and
+  more helpful than the online help's description of the default key
+  bindings.  Must be uppercase 'K' if VI keys are ON, otherwise the command
+  is case-insensitive.  Try it, you'll love it! - FM
+* Implemented 'J'ump command for using "shortcut" names to access URL's in a
+  local "jumps.html" file that has a sorted DL list which maps each target
+  (shortcut) DT to it's full URL DD (see the sample jumps files added to
+  the distribution).  The URL's could be local or remote resources, or
+  lynxexec or launch file URL's for system utilities (e.g., the shortcut
+  "news" could invoke the news reader, "mail" the mail utility, "swing" the
+  VMS File/Directory Management Utility, etc.).  This feature is enabled by
+  defining JUMPFILE in userdefs.h or lynx.cfg, and can be disabled via at
+  run time via -restrictions=jump as a commandline switch.  Must be uppercase
+  'J' if VI keys are ON, otherwise the command is case-insensitive.  Try it,
+  you'll love this too! - FM
+* Added a CHECKMAIL symbol which if set TRUE in userdefs.h or lynx.cfg will
+  report the existance of unread mail at Lynx startup, and arrivals of new
+  mail, via statusline messages.  VMSers can block unsoliticed system NEWMAIL
+  screen broadcasts ($ SET BROADCAST/NOMAIL) when using this feature.  It
+  can be disabled at run time via the -restrictions=mail switch, which also
+  disables standard mail functions in Lynx, but still allows 'J'umps via a
+  "mail" shortcut to a lynxexec URL for a script which could perform security
+  functions before permitting or rejecting access to the mail utility.  The
+  hackers will really love this! - FM
+* Added ability to toggle the novice help line to show all of the principle
+  commands. - FM
+* Miscellanous bugs and memory leaks found and fixed in conjuction with
+  adding and enhancing the above features. - FM
+* The code may need some tweaking to build and run properly on some flavors
+  of Unix (appears to be all set for VMS). - FM
+11-01-94
+* Fixed bug if editor is dereferenced. - David Trueman (david@cs.dal.ca)
+* Enable alternate boxing of popup windows via defines for BOXVERT and
+  BOXHORI in userdefs.h - Dick Wesseling (ftu@fi.ruu.nl)
+* Check for LYCursesON before making any Curses calls in cleanup() - DW
+10-31-94
+* Looks like the last of the problems deleting anchors has been solved
+  by Dick Wasseling, so the bypass is lifted again. - FM
+* If CANT_EDIT_UNWRITABLE_FILES is defined on Unix, write access is
+  required to edit files (write and delete access are always required
+  on VMS). - Alex Whittaker (alex@biu.icnet.uk)
+* Moved "Press  RETURN ..." text to userdefs.h. - AW
+10-28-94
+* Uncache documents or bookmark file before reloads (via Control-R or
+  'r'emove command) in LYMainLoop.c. - FM
+* Uncache showinfo display or print, download, option, etc, menus before
+  reloading those in GridText.c. - Dick Wesseling (ftu@fi.ruu.nl)
+* Above two fixes still don't completely solve the anchor deletion problem,
+  so we're still bypassing.
+* Enable iso entity translations inside TITLEs - DW
+10-26-94
+* Problems when deleting anchors have been reported, apparently for
+  documents which have been (re)loaded with LYforce_no_cache.  So,
+  we'll retore the bypass until that problem is tracked down. - FM
+10-25-94
+* Added coded for disabling mail for -anonymous via CAN_ANONYMOUS_MAIL in
+  userdefs.h, and via -restrictions=mail (default is enabled). - FM
+10-21-94
+* Added Danny Mayer's (mayer@ljo.dec.com) samples/lynx.com - FM
+10-05-94
+* Modified tcp.h to deal with conflicting typedefing in the MultiNet
+  types.h and time.h versus those for DECC. - FM
+* Define FANCY_CURSES for linux-ncurses. - FM
+09-30-94
+* -restrictions help list in LYMain.c should indicate "option_save" (not
+  "options_save") for disabling the saving of options in .lynxrc. - FM
+09-29-94
+Mods based on patches from George Lindholm (lindholm@ucs.ubc.ca) - FM:
+* Fixed problem when IGNORE_CTRL_C is defined, that was created by the
+  fix for runaway processes on Unix when undetected terminal disconnects
+  occurred.
+* Added options to disable rlogin and/or ftp access.
+09-28-94
+* Use "hack to fix reverse clear screen problem" in GridText.c if SUN4 is
+  defined (still need clarification on the exact nature of the problem
+  to decide if this is the best way to handle it; it bothers me to have
+  this kind of hack in the code 8-) - FM
+Mods based on patches from George Lindholm (lindholm@ucs.ubc.ca) - FM:
+* Move the "quit" text to userdefs.h from LYMainLoop.c for easier
+  customization.
+* Typo fix for buttons submit value in GridText.c
+* Renable SIGINT signal for SVR4 machines if control-c is to be ignored
+  when editing.
+* Solaris fixes for LYCurses.h.
+* Recognize pico as a special editor.
+* Fix -restrictions help text.
+* Fix -telnet and -news options so that they actually do something.
+* Fix upload code so that you can have more than one uploader option,
+  and fix for freeing a static variable.
+* Various prototype fixes.
+* -editor command line option signals that the editor can't be changed.
+* Added a SYSTEM_EDITOR option to lynx.cfg for a locked editor.
+--- RELEASE of 2.3.4 BETA ---
+09-27-94
+* Alas!  I think I've tracked down and fixed all the bugs that were causing
+  ACCVIOs/CoreDumps if anchors were deleted/freed when freeing the cached
+  documents.  So now we do delete/free them.  This plugs a major memory
+  leak in Lynx (which we knew about, but heretofore had to live with). - FM
+* Added Danny Mayer's (mayer@ljo.dec.com) fix so that MIME types are handled
+  case-insensitively. - FM
+* Restored text/html (WWW_HTML) as the default MIME type when an HTTP/1.0
+  server fails to send it in the headers.  This happens because it's the
+  default in Mosaic and developers using that don't realize their server or
+  script code is failing to send it (other MIME types will be caught as an
+  error, and the code will be fixed by the developers).  Garrett's change to
+  application/octet-stream (WWW_UNKNOWN) was technically correct.  You can
+  change it back to that where indicated in HTMIME.c if you prefer that Lynx
+  be technically correct but functionally wrong when dealing with this
+  situation. - FM
+--- RELEASE of 2.3.3 BETA ---
+09-22-94
+* Finished up redirection handling.  Will now handle serial redirections
+  across multiple sites (with an arbitrary limit of 10, to prevent the
+  possibilily of an infinite loop of circular redirections), works properly
+  with redirections via the VALUE fields of OPTION tags, and no longer alters
+  any anchor addresses, avoiding all the problems that caused in the hash
+  table. - FM
+* Worked in Rick Mallett's (rmallett@ccs.carleton.ca) fix for runaway
+  processes on Unix when undetected terminal disconnects occur. - FM
+* Added Eric Jon Rostetter's (ERIC@uoft02.utoledo.edu) code for proper
+  keyboard handling with DEC eightbit terminals. - FM
+* Added David Greer's (david_greer@robelle.com) mods for curses on
+  HP terminals. - FM
+--- RELEASE of 2.3.2 BETA ---
+09-17-94
+* More fix ups of forms structure handling, freeing and redirecting. - FM
+* Fixed problem with free's of startfile, thanks to Dick Wesseling
+  ftu@fi.ruu.nl - FM
+09-14-94
+* More memory leak and redirection fix ups (still not perfect). - FM
+* Various mods to speed up memory management with VAXC on VAXen (still
+  slow compared to DECC on AXPen). - FM
+09-13-94
+* If an ISINDEX document is one returned by a previous search, the 's'
+  command puts up the query which returned it, for editting as a new query
+  (use Control-U to erase, Control-G to abort)  Otherwise, no string is
+  offered in the prompt for a database query.  If the previous query is
+  submitted without modification, a message to use Control-R to resubmit
+  the same query is display (so that the search will not be repeated
+  inadvertantly). - FM
+09-12-94
+* Fixed failure to load the popped menu properly when a gopher search was
+  selected and a NULL string, Control-G, or arrow key is entered to cancel
+  the prompt for a query. - FM
+* Hit lists/documents returned by ISINDEX searches are now always displayed
+  at their tops.  They no longer inherit, inappropriately, the page and link
+  numbers of the previous list/document. - FM
+09-11-94
+* Fixed redirection handling so that the hash tables are updated and the
+  history stack works properly, including with forms that have VALUE
+  fields in OPTION tags that return Location: URL's for searches (e.g.,
+  the CUSI forms at Nexor).  Whew, that took some doing! - FM
+09-05-94
+* Fixed up remaining problems with OPTION VALUE="foo" handling and the
+  associated popup window positioning and scrolling. - FM
+* Fixed bugs and several inadequacies in the history structure and code
+  (still needs some redesigning to deal more effectively with all aspects
+  of documents returned by forms and/or redirection). - FM
+* Now deals properly with anchors in a single document returned by
+  a form. - FM
+* Command line file specs on VMS can now be any valid explicit, wildcarded,
+  partial, or relative VMS specification, and will be converted to a valid
+  file://localhost/ URL, so that partial or relative URL's within the file
+  also will be interpretted properly. - FM
+* Now trims trailing white space and won't get tripped up by '=' characters
+  when reading configuration files. - FM
+* Miscellaneous bug fixes and enhancements. - FM
+* Tracked down and eliminated more memory leaks. - FM
+--- RELEASE of 2.3.1 BETA ---
+7-08-94
+* Correction handling of OPTION VALUE="" implemented.
+* Miscellaneous bugs corrected.
+6-17-94
+* Option to log memory leaks at exit by defining LY_FIND_LEAKS at compilation.
+6-17-94
+* Check amount of allocated memory, rather than just number of documents
+  cached, before deciding to remove the oldest document (implemented for
+  VMS with VAXC, not yet for Unix or VMS with DECC).
+6-16-94
+* VMS bookmark file version numbers are reset on additions of bookmarks.
+6-16-94
+* Gopher URL's with /hGET%20/ are converted to http URL's, as in the UMN
+  Unix/VMS gopher+ client.
+6-16-94
+* Added DIRECT_WAIS support for VMS
+6-16-94
+* Added build support for VMS TCPWare TCP/IP
+5-28-94
+* Increased nesting of HTML elements from 40 to 400.  Hopefully this will limit
+  won't be encountered often.
+5-28-94
+* Modified for handling of Telnet URLs with spaces/other characters in the
+  username.
+5-26-94
+* Began terminating memory leaks with extreme predjudice.
+5-24-94
+* WAIS searches will now work when they are of type "www/present" as opposed
+  to only viewing the source.
+5-23-94
+* Added VMS CMU TCP/IP support, thanks to Andy Harper.
+--- RELEASE of 2.3 (19-May-1994, see CHANGES2-3) ---
diff --git a/docs/CHANGES2.5 b/docs/CHANGES2.5
new file mode 100644
index 00000000..6d2980ca
--- /dev/null
+++ b/docs/CHANGES2.5
@@ -0,0 +1,1696 @@
+--- Rename of Lynx2-4-FM and release as Lynx2-5  (02-May-1996) ---
+==============================================================================
+05-02-96 ---- Release of Lynx2-5 ----
+* Modified documentation, help, and example files based on feedback for
+  yesterday's Lynx2-5 pre-release. - FM
+* Include ";q=0.001" whenever "iso8859-1" or "us-ascii" are autoappended
+  to Accept-charset headers. - FM
+* Added SITE_LIBS symbol in Makefile for convenient linking to any
+  site-specific libraries associated with any site-specific patches. - FM
+* Fixed an unsigned char typecast in GridText.c - FM
+* Eliminated statusline and TRACE warnings about possibly strange formatting
+  when TABLEs are in a document. - FM
+05-01-96
+* Renamed Lynx2-4-FM for pre-release as Lynx2-5
+04-30-96
+* Modified the fatal error messages such that they direct the user to
+  the local system administrator to confirm a bug before reporting it
+  to lynx-dev, and started updated the help and about files for the
+  switch to lynx-dev@sig.net as the primary list server. - FM
+04-28-96
+* Made use of ordered versus unordered lists and inclusion of article dates
+  in listings for news groups compilation and configuration options in
+  userdefs.h and lynx.cfg. - FM
+04-27-96
+* Added -realm switch for restricting URLs to the realm of the startfile.
+  The bookmark and jumps files are always considered as part of the realm.
+  Any execution links or form ACTIONs are permitted if obtained from
+  documents in the realm, but any switches that restrict bookmark operations
+  will still apply.  For example, -book -realm will use the bookmark file
+  as the startfile, and restrict URLs to files in the user's account.  Adding
+  -restrictions=bookmark_exec will block execution links in the bookmark
+  file, but not in other files within the realm (i.e., in the user's
+  account).  If the startfile is an http URL, the realm will be equivalent
+  to that in http authorization procedures.  Can be used with -traversal
+  for restricting the traversal to documents within the starting realm
+  for an http server. - FM
+* Fixed bug in form structure which could cause POST to be treated as
+  GET. - FM
+04-25-96
+* Added code to send Host: headers as described in the 23-Apr-96 HTTP/1.1
+  draft. - FM
+04-23-96
+* Modified HTMIME.c to pass documents with an ISO-8859-3 through -9, EUC-KR,
+  or ISO-2022-KR charset specified in the Content-Type header, to set the
+  flag for not doing 8-bit reverse translations, and to issue a statusline
+  message about the charset instead of forcing a download offer.  Will have
+  garbage in the displays of 8-bit characters if one doesn't have the
+  corresponding charset installed for the terminal, but no harm should be
+  done, and those who do can get the files displayed instead of just being
+  up the creek without a paddle.  Korean escape sequences will still be
+  trashed, since be have no translation functions as for Japanese, and we
+  still force a download offer if there is a mismatch for the supported
+  character sets, so the user can cancel and then modify the terminal setup
+  and charset choice appropriately. - FM
+* Increased the maximum number of attributes for tags (was too small for
+  OBJECT), updated the DTD for SCRIPT, and added the STYLE attribute for
+  all tags which presently, or might someday, accept it. - FM
+04-21-96
+* Modified the news gateway to use an ordered list with the numbers and
+  dates of the articles indicated in newsgroup listings. - FM
+* Fixed the checking and passing of the mailto argument in LYMainLoop.c
+  to mailmsg() in LYMail.c. - FM
+04-20-96
+* Fixed bugs in parsing of nntp and snews partial HREFs, and in the
+  parsing of NNTP message headers for creation of mailto and newspost
+  or newsrepy links. - FM
+04-19-96
+* Added OBJECT and BODYTEXT to the DTD, based on the 12-Apr-96 W3C draft.
+  The code for INSERT is still there, and should be remove if OBJECT
+  becomes a stable replacement.  Code to handle data URLs for OBJECTs
+  not yet attempted. - FM
+* More tweaks for Japanese character handling. - FM
+04-18-96
+* If LINKS_ARE_NUMBERED is on, include the list of references in the
+  outputs of 'p'rint menu options, analogously to the output with
+  -dump. - FM
+04-14-96
+* Mods to report the content of SCRIPT, STYLE and ALIAS blocks in trace
+  mode. - FM
+* Made &die;, &macr; and &trade; synonyms for &uml;, &hibar; and &reg;,
+  respectively. - FM
+* Fixed typo in second line link highlighting code for slang. - ES
+04-13-96
+* More tweaks of Japanese character handling. - FM
+* Reinitialize timeout values after select() calls in LYUtils.c. - ES
+04-12-96
+* More tweaks of Japanese character handling. - FM
+* Tweak of target line and link setting when toggling to image_links mode
+  in LYMainLoop.c. - FM
+* Tweaks of circular buffer handling based on analyses from Mike Castle
+  (mcastle@umr.edu) and Bryan T. Vold (btv@ldl.HealthPartners.COM). - FM
+* Fixed typo for NeXT in tcp.h, based on feedback from LWV - FM
+* Reinitialize timeout values after select() calls in HTTCP.c. - Erik
+  Sundkvist (ess@lysator.liu.se)
+04-11-96
+* More tweaks of Japanese character handling. - FM
+* Added code for handling charset mappings for file and ftp URLs. - FM
+  You can set the mappings via lynx.cfg (or mime.types), e.g.:
+  SUFFIX:.html8R:text/html; charset=KOI8-R
+  SUFFIX:.txt8R:text/plain; charset=KOI8-R
+* Tweak of charset handling in HTMIME.c - FM
+04-09-96
+* Modified news gateway to handle split header lines. - FM
+* Tweaks of authorization header handling to make failures due to bad
+  headers from the http server clear to the Lynx user. - FM
+04-08-96
+* Yet more tweaks of memory management. - FM
+04-07-96
+* Tweaks for handling Japanese received via gateways. - FM
+04-06-96
+* More memory management tweaks. - FM
+04-05-96
+* Updated lynx.man, lynx.hlp and the online help files. - FM
+* Tweaks of INPUT, TEXTAREA and SELECT popup OPTION handling when
+  Japanese character translations are on. - FM
+04-04-96
+* Created new zip.  Yesterday's appears to have been bad. - FM
+04-03-96
+* More optimizations and bug fixes based on patches from JED. - FM
+* More mods for handling keyboard input via SLANG library functions,
+  based on patches from JED.  Note that the code for IGNORE_CTRL_C
+  has been bypassed in those mods, as they presently stand. - FM
+04-02-96
+* Added "first pass" handling of P end tags. - FM
+* Mods of HTCheckForInterrupt() for SLANG, based on patches from JED.
+  Note that the for-SLANG code is not taking possible SOCKSification of
+  Lynx into account. - FM
+* Use 3 for ^C instead of 7 for ^G as the argument for the slang abort
+  key in calls to SLang_init_tty(). - JED
+* Tweaks of make for clix. - AM
+03-31-96
+* More tweaks of memory management. - FM
+03-30-96
+* Added support for Japanese translations of text/plain in addition to
+  text/html documents, and for ALTs and form fields (see 03-26-96 mods).
+  Needs checking.  Also added an LYK_JPN_TOGGLE, mapped to '@' by default,
+  for toggling JAPANESE mode ON and OFF, and code to indicate the situation
+  in the 'o'ptions menu. - FM
+* Added make for ultrix-slang and decstation-slang, and tweaks of LYCgi.c
+  for ultrix. - Alvian Tam (atm@newt.phys.unsw.edu.au)
+* Found and fixed some typos in yesterday's mods. - FM
+03-29-96
+* Added build-slang.com for building Lynx with the SLANG library instead
+  of curses on VMS. - FM
+* Mod to treat an EOF with errno of EINTR when GetChar() is defined as
+  getchar() in LYgetch() as due to a Ctrl-Z suspend, and invoke another
+  character fetch instead of exit on error.  Based on patch from Gregory
+  Neil Shapiro (gshapiro@WPI.EDU). - FM
+* Numerous optimizations and bug fixes based on patches from JED. - FM
+03-28-96
+* More tweaks of SLANG support. - FM
+* Yet more tweaks of the HTList functions and macros, and their associated
+  memory management. - FM
+03-27-96
+* Fixed bug which could cause a crash if links are numbered and you
+  activate a link via a number when there are no links on the currently
+  displayed page. - FM
+* Tweaks of Content-Encoding header handling, and more detailed messages
+  about it in trace mode. - FM
+03-26-96
+* Added code in HTMIME.c for taking into account Content-Encoding headers,
+  so that compressed text/html or text/plain files are not displayed
+  inappropriately based on their Content-Type. - FM
+* Added "first pass" support for Japanese character translations, based on
+  patches for Lynx2-4-1 by Takuya Asada (asada@icsd6.tj.chiba-u.ac.jp).  Is
+  to be checked out by Nelson Henry Eric (nelsonhe@ews07.nara.kindai.ac.jp)
+  because I have no way to check it here.  Translations can be made the
+  default behavior by setting JAPANESE to TRUE in userdefs.h and/or
+  lynx.cfg.  The default can be toggled via a "-jpn" command line switch.
+  If made TRUE by any means, the value of KANJI_CODE set in userdefs.h
+  and or lynx.cfg (EUC, SJIS, or NONE) will be applied, and can be changed
+  via "-euc", "-sjis" or "-ascii" command line switches, for setting Kanji
+  code translations to EUC, Shift JIS, or disabling it, respectively.  Note
+  that Japanese translations are not yet performed in the line editor
+  (LYgetstr() of LYStrings.c and form_getstr() of LYForms.c), for form
+  field values, or for gateways (let's first see if what I've done so far
+  works right 8-) - FM
+* Added "LY" prefix for pop(), pop_num() and push() function names to
+  avoid possible conflicts with the ncurses library functions, and fixed
+  continuation line typo in solaris2 make, based on feedback from PN. - FM
+03-23-96
+* Tweaks of memory management in the CSO/PH gateway. - FM
+* Tweaks of wait() versus waitpid() handling for NeXT, aix4 and mips,
+  based on feedback from PN. - FM
+03-22-96
+* Tweaks of SLANG support for Unix, and finished up code support for it on
+  VMS (but tested only with OpenVMS/AXP).  Haven't yet decided how to add
+  VMS build support for it in the COM and MMS files.  Get the SLANG library
+  code from ftp://space.mit.edu/pub/davis and then add USE_SLANG in the
+  DEFINE list and the path to it's headers in the INCLUDE list for the
+  compilation, and [path]slang.olb/lib in the link list immediately before
+  the OPT file.  We still need the curses library in the OPT file, because
+  that's not just curses functions on VMS and we're using ones not replaced
+  by the SLANG library (Try it, you'll like it! 8-). - FM
+* Tweaks for NeXT, based on feedback from Paul Nevai
+  (nevai@ops.mps.ohio-state.edu). - FM
+03-20-96
+* Tweaks of code for sorting directory listings by date (take into account
+  the 6-month-old time versus year rule on Unix). - FM
+* Tweaks of memory management for HTList-based buffers (use internal
+  allocations, instead of the libwww macros). - FM
+* Added solaris2-slang to Makefile, and tweaks of the sun4 makes. - LWV
+03-19-96
+* Tweak of MAP handling so that the ordered lists are displayed exactly
+  in the order of the resolved AREA tags.
+03-18-96
+* Added SLANG support (for colorized Lynx) based on patches from JED.
+  The make support is for linux and sun4, but it should be portable to
+  other Unix flavors.  I have it working on VMS, but the SLANG interrupt
+  and exit handlers are incompatible with the current ones for VMS in
+  Lynx (and with the VMS debugger), so I haven't yet included SLANG
+  support in build.com or the MMS files. - FM
+03-17-96
+* Tweaks of 'd'ownload menu handling on returns to it from a DOWNLOADER
+  action. - FM
+* Added various anti-crash protections and cleaner code from John E. Davis
+  (davis@space.mit.edu) for trimming trailing white space and finding
+  unescaped colons in LYReadCFG.c, and cleaned up and more fully commented
+  the functions and subfunctions in that and the LYMainLoop.c modules. - FM
+03-16-96
+* Fixed routine which sorts directory listings by date (based on 'o'ptions
+  menu setting) to do it accurately and in reverse chronological order. - FM
+03-15-96
+* Added code to create links for likely URLs in results returned by
+  the CSO/PH and finger gateways.  Try:
+   gopher://ns.bradley.edu:105/2   or:
+      cso://ns.bradley.edu/        and search for David Henderson.
+  Also try:
+   gopher://cegt201.bradley.edu:79/0/w%20davidh   or:
+   finger://cegt201.bradley.edu/w/davidh          as URL.s - FM
+* Added LYK_INTERRUPT handling for the CSO/PH and finger gateways, and
+  made their memory management more efficient. - FM
+* Made the my_spawn() function in LYLocal.c more portable by using
+  waitpid() instead of wait(). - FM
+* Restored the Lynx2-3 behavior of seeking the current position and link
+  on return from 'e'dit.  May be wrong if the file was modified, but it
+  might be in the right ball park, and nothing really bad will happen if
+  it's far off. - FM
+03-14-96
+* Added -reload switch for instructing Lynx to send "Pragma: no-cache" and
+  "Cache-Control: no-cache" headers when requesting the startfile from an
+  http server (doesn't apply to subsequent fetches, or to non-http startfile
+  URLs). - Peter Ekberg (peda@lysator.liu.se)
+* Put the correct LYMain.c, which declares no_change_exec_perms, in the zip
+  (second try, hope I really did 8-). - FM
+03-13-96
+* Yet more tweaks of the CSO/PH gateway. - FM
+* Yet more tweaks of the finger gateway. - FM
+03-12-96
+* Made the URL and command buffering in the finger gateway secure from stack
+  modifications, beautified the HTLoadFinger() and response() functions, and
+  added support for the following URL formats for sending a "", "/w",
+  "username", or "/w username" command to the finger server:
+     finger://host			   finger://@host
+     finger://host/			   finger://@host/
+     finger://host/%2fw			   finger://@host/w
+     finger://host/w                       finger://host/w/
+     finger://host/username[@host]	   finger://username@host
+     finger://host/username[@host]/	   finger://username@host/
+     finger://host/w/username[@host]	   finger://username@host/w
+     finger://host/%2fw%20username[@host]  finger://host/username[@host]/w
+* Replaced the _tolower macro in the CSO/PH gateway with TOLOWER. - FM
+* Tweaks of DIRED_SUPPORT.  Added NO_CHANGE_EXECUTE_PERMS compilation
+  symbol and change_exec_perms restrictions switch for restricting
+  changes of the eXecute permissions to directories, and not files,
+  when OK_PERMIT has been set. - Earl Fogel (fogel@duke.usask.ca) & FM
+* Added make support for Intergraph CLIX (note that some online help files
+  must be edited and renamed to meet this Unix flavor's 14 character file
+  name limit). - Alex Matulich (matuli_a@marlin.navsea.navy.mil)
+03-11-96
+* Added support for using finger://host/w/username to send "/w username"
+  to finger (port 79) servers. - FM
+* Tweaks of alignment handling to deal with (illegally) embedded CENTER
+  containers (typically due to omission of an end tag for the first
+  CENTER of the pair; ugh!). - FM
+03-10-96
+* Added form-based CSO/PH (port 105) gateway.  Can be invoked via a
+  cso://host[:port]/ or gopher://host[:port]/2 URL.  If the gopher
+  format is used and a query token is appended (?[query]), the old
+  ISINDEX-based gateway will be used. - FM
+03-07-96
+* Added NO_FROM_HEADER configuration symbol in lynx.cfg, and -nofrom
+  command line switch, for blocking all transmissions of From headers
+  by Lynx. - FM
+* Added NO_REFERER_HEADER configuration symbol in lynx.cfg, and -noreferer
+  command line switch, for blocking all transmissions of Referer headers
+  by Lynx. - FM
+* Enhancements of the 'o'ptions menu. - FM
+03-06-96
+* Restored the Lynx2-3 behavior of seeking the current document position
+  and link on (^R)eloads.  Will be wrong if the document is actually a
+  changing script output, or SSI with changes in the sizes of inserts,
+  and any form entries will be lost with no warning about that if no
+  form links are in the currently displayed page (and there may be other
+  glitches I don't remember any more).  However, it's correct, and more
+  convenient, most of the time, and nothing really bad will happen if
+  it's wrong. - FM
+03-05-96
+* Added SAVE_SPACE configuration symbol in lynx.cfg, and LYNX_SAVE_SPACE
+  environment variable (Unix) or logical (VMS) for setting a default path
+  prefix in suggested filenames in Save to Disk operations of the 'p'rint
+  and 'd'ownload menus.  If not set, only a filename will be suggested,
+  for saving in the current default directory.  See the INSTALLATION file
+  and lynx.cfg for more information. - FM
+03-02-96
+* If an IMG tag has both ISMAP and USEMAP attributes, create links for
+  both, and use the ALT string, if present, for the USEMAP link.  The
+  server-side script might have a content-rich default set up for non-GUI
+  clients, so we may as well be able to try it, and still have our own
+  USEMAP listing available if it's a site unconcerned about text and
+  braille clients, or GUI clients with image loading turned off. - FM
+* Tweaks of MAP code to maximize efficiency of fetching and processing
+  MAPs from a different document. - FM
+* Make sure the traversal code doesn't get tripped up by any HREFs
+  which contain newline characters due to misparsing (e.g., because a
+  close-double-quote wasn't present where required, and soft_dquotes
+  wasn't toggled ON, or invalid comments were present, and mimimal or
+  historical comment parsing weren't toggled ON). - FM
+* Renamed LYK_RESUBMIT ('x' or 'X') to LYK_NOCACHE and modified it's code
+  so that it applies to normal links as well as form submit buttons.  If
+  used instead of LYK_ACTIVATE, any HText cache from a previous submission
+  or request will be dumped, and the submission or request will be made
+  with the  "Pragma: no-cache"  and  "Cache-Control: no-cache"  headers
+  included, to ensure that a proxy/cache server also will not return a
+  cached copy (assuming it respects either of those headers). - FM
+03-01-96
+* Converted the client-side image MAP code to a protocol which returns
+  a stream, rather than using a temporary file.  This allows saving
+  the link as a bookmark, for fetching the MAP and creating a listing
+  without need to fetch and render the original document.  Also enabled
+  direct downloading of the MAP listing. - FM
+02-29-96
+* Added handling of client-side image MAPs.  If both USEMAP and ISMAP
+  attributes are present, the client-side MAP is used instead of the
+  the server-side script.  The MAPs can be in the same or different
+  documents.  The HREFs of the AREA tags are presented as a list,
+  with their ALTs (if present, otherwise their HREFs) as the link names
+  in the list.  Added a TITLE attribute for MAPs, which will be ignored
+  by GUI clients, but if present will be used by Lynx as an H1 for the
+  list (MAP NAME="welcomemap" TITLE="Welcome Map").  Otherwise, the
+  IMG's ALT (if present, otherwise "[USEMAP]") will be used as an H1
+  in the list.  The MAP's resolved URL also is shown in the list, since
+  the URL for the list is a temporary file. - FM
+02-25-96
+* Added a MINIMAL_COMMENTS configuration symbol, which if set TRUE in
+  lynx.cfg will emulate the Netscape v2.0 comment parsing bug of seeking
+  only a '-->' terminator, and not interpreting '--' pairs as serial
+  comments within the overall comment element.  The compilation default
+  is FALSE, but we'll set it TRUE in lynx.cfg until Netscape gets its
+  comment parsing right, and "decorative" dashes in comment elements
+  cease to be so common in "Enhance for Netscape" pages.  Also added
+  a '-minimal' command line switch for toggling the Mininal or Valid
+  configuration setting, and an LYK_MINIMAL command key toggle (mapped
+  by default to backquote).  Note that setting Historical comments on
+  will override the Minimal or Valid setting (i.e., any '>' will be
+  treated as the terminator of a comment element).  A statusline
+  message indicates whether Historical, Minimal or Valid comment
+  parsing has gone into effect when the LYK_MINIMAL or LYK_HISTORICAL
+  command key toggles are used (i.e., those two toggles in effect are
+  a "troggle"). - FM
+02-22-96
+* Tweak of HTList manipulations. - FM
+* Additions to the online help. - FM
+* Unescape any hex escaped username and/or password in ftp URLs. - FM
+02-20-96
+* Handle timeout disconnects of cached NNTP connections. - FM
+* Allow head or tail match specifications (e.g., comp.infosystems.*
+  or *.unix) in news, nntp and snews URLs (That's illegal, so don't
+  use it in public documents.). - FM
+* Tweak of bookmark handling. - Ismael Cordeiro (ismael@CAM.ORG)
+02-16-96
+* Tweak of the new code for setting a default CHECKED radio button. - FM
+02-15-96
+* Issue a sensible exit message if a non-http URL is used as the startfile
+  with -traversal. - FM
+* Tweaks of bookmark handling. - FM
+* Tweaks of Home_Dir() type casting. - FM
+02-14-96  Happy Valentine's Day!!!
+* Tweaks of charset conversions. - FM
+02-12-96
+* Made inclusion of Unix DIRED_SUPPORT the compilation default, and
+  its refinement easier to understand and set in the Makefile. - Will
+  Mengarini (seldon@eskimo.com) & FM
+* Changed (X) and ( ) to [X] and [ ] for indicating checked or unchecked
+  checkboxes.  For radio buttons, we still use (*) and ( ). - FM
+02-11-96
+* Distinguish checkboxes from radio buttons in the Lynx display by using
+  (X) versus (*), respectively, when they are checked or selected. - FM
+* Make the first radio button in a series with the same NAME checked by
+  default if none of them had CHECKED specified. - FM
+02-09-96
+* Added LYK_HISTORICAL and LYK_SOFT_DQUOTES, mapped by default to the
+  the single- and double-quote keys, respectively, for toggling valid
+  versus "historical" comment parsing, and valid versus "old Mosaic-
+  and Netscape-like" double-quote parsing. - FM
+* Added SCRIPT to the DTD and code to ensure that bad comments in its
+  content don't generate garbage in the display. - FM
+* Added -DSVR4 to the make for solaris2. - KH
+* Use copy instead of rename in descrip.mms for putting lynx.exe in the
+  top directory, as in build.com. - FM
+* Added TITLE attribute to FORM, and code to use it for the Subject in
+  mailto ACTIONs.  It's not in the spec, but better to offer it than
+  to settle into Netscape's ?subject=foo tack-on kludge which breaks
+  mailto for clients which haven't added code to cope with it. - FM
+02-08-96
+* Added -book switch for using the bookmark page as the startfile.  The
+  default or command line startfile will still be set for the 'm'ain screen
+  command, and be used as the startfile if the bookmark page is unavailable
+  or blank. - FM
+* Fixed glitch for Unix in yesterday's LYMail.c mods. - FM
+* Try graceful alternatives if getenv("HOME") returns NULL. - Kenneth Herron
+  (kherron@campus.mci.net) & FM
+02-07-96
+* Added support for the ?subject=foo tack-on kludge to specify the Subject
+  in mailto ACTIONs and HREFs. - FM
+* Convert Explorer's semi-colon Internet address separators to commas
+  before acting on mailto address lists on Unix or VMS. - FM
+* Made EMBED empty again (the W3C container version has been replaced
+  by INSERT, and Netscape still has it empty). - FM
+02-06-96
+* Tweaks of descrip.mms files for VMS. - FM
+02-04-96
+* Fixed caching of news/nntp connections so that we access the correct host
+  when more than one has been specified. - FM
+02-03-96
+* Added ndash and mdash to the entities conversion tables.  The W3C's
+  DTD specifies those, whereas the text descriptions say endash and
+  emdash, so we'll cover all the bases by supporting all four. - FM
+* Reduced the "en" metric for TAB to 2 per column.  Was 12, to be
+  compatible with UdiWWW, but that's pixels.  You can change the enval
+  initialization in HTML.c from 2 to 12 if you want the old behavior. - FM
+* Force use of DECC in build.com if that compiler is installed on VMS,
+  and make sure external logicals don't defeat a choice of DECC via
+  descrip.mms. - FM
+02-02-96
+* Mods to handle lone CRs as newlines when dislaying text/plain files
+  from MAC servers.  Note that they'll stay CRs when downloading, or
+  fetching with -source, but be handled as newlines when the '\' source
+  toggle is used for text/html files and their source is displayed as
+  text/plain. - FM
+01-31-96
+* Added dummy initializers in LYCharSets.c and LYEditmap.c to ensure the
+  modules are linked if the external model is common block and they are
+  placed in a library. - FM
+01-30-96
+* For submissions of forms with a mailto ACTION, allow the user to edit
+  the default Subject string (the TITLE of the document containing the
+  form) via a statusline prompt, or to cancel the submission via Ctrl-G
+  at the prompt, analogously to 'c'omments or for anchors with a mailto
+  HREF. - FM
+01-29-96
+* Typo fixes in HTML.c, LYJump.c and LYGetFile.c. - PM
+01-28-96
+* Tweaks of redirection handling. - FM
+01-27-96
+* Support use of the TITLE attribute for setting the Subject in LINKs with
+  REV="made" or REV="owner" and a mailto HREF, equivalently to its use
+  with anchors in the BODY. - FM
+* Always use the parent document's URL for X-URL in mailto anchors, but
+  still use mailto:address if it was entered as a 'g'oto. - FM
+* Improvements of the code in LYMainLoop.c for checking the types of
+  links (first make sure that there are links to check 8-). - FM
+01-26-96
+* Made LYCharSets.c an object module instead of header for HTML.c, and
+  created LYCharUtils.c with character-related functions from HTML.c,
+  to reduce the size of HTML.c (got a report of memory exhaustion when
+  trying to compile HTML.c). - FM
+* Added BGSOUND to the DTD and code for creating a link to the source
+  when clickable_images is set. - FM
+01-24-96
+* Tweak of URL resolving when http servers return the obsolete file URL
+  format for what are actually ftp URLs (as DEC's servers are doing). - FM
+* Added LYE_LOWER and LYE_UPPER for lower or upper casing lines with the
+  line editor.  Default bindings are Ctrl-K and Ctrl-T, respectively (not
+  "intuitive" but they're the only "safe" non-printing keys left 8-). - FM
+01-23-96
+* Yet more tweaks aimed at getting Lynx to compile across versions of
+  MultiNet through v3.5A and DECC through v5.2 or VAXC.  Pat Rankin
+  is trying to cope with this mess for compilations with MultiNet and
+  his VMS port of GNUC (cross your fingers 8-). - FM
+* Updates of the help and about files. - FM
+* Tweak of sendmail path for BSDI. - Bennett Todd (bet@ritz.mordor.com)
+01-22-96
+* More tweaks for dealing with header conflicts in MultiNet v3.5A with
+  DECC v5.2. - FM
+* Tweak of our kludge to append a 0,0 coordinate pair for ISMAP URLs. - FM
+* Tweaks of base handling in HTML.c. - FM
+01-20-96
+* Mods for builds with NetBSD, or MultiNet v3.5A with DECC v5.2 (they
+  have conficting headers). FM & PR
+01-18-96
+* Improved and corrected the fatal error messages. - FM
+01-17-96
+* Added ability to set the NNTPSERVER environment variable via lynx.cfg if
+  it has not been set externally (analogously to the proxy variables). - FM
+* Tweaks of proxy handling. - FM
+* Modifed the "Accept-Language: " header handling so that is uses the
+  "perferred document lang(G)uage" string without any modifications.
+  This allows the user to specify a comma-separated string with quality
+  values included, exactly to his/her requirements. - FM
+01-16-96
+* Modified the traversal code so that it always outputs to an error file if
+  requests fail or unknown statuses are received from the http server. - FM
+* Added target "sun4-ncurses" to the Makefile. - Bennett E. Todd
+  (bet@nyc.fcmc.com)
+* Tweaks of "preferred document lan(G)uage" and "preferred document c(H)arset"
+  'o'ptions handling.  Send only the preferrence or comma-separated list of
+  preferrences in the "Accept-Language: " and "Accept-Charset: " headers.
+  Append ", en" if "en" isn't present, and ", ISO-8859-1" and/or ", US-ASCII"
+  if those aren't present, rather than relying on servers to honor defaults,
+  but still don't send an "Accept-Charset: " header at all if no preference
+  has been specified by the user. - FM
+* Fixed typos in the about and help files. - FM
+01-15-96
+* Tweaks of bold and underline setting in split_line() of GritText.c. - FM
+* Fixed handling of FORM start tags with no ACTION specified. - FM
+* Tweaks of "IBM PC character set" and added "IBM PC codepage 850"
+  (ISO8859-1, see IBMPC-charsets.announce). - Mike Brown (mike@hyperreal.com)
+* Check in userdefs.h whether LYNX_CGF_FILE has been defined via the
+  Makefile, build.com or descrip.mms. - PG
+* Created CHANGES2-3 with changes through release of Lynx2-3 on 04-19-94,
+  and CHANGES2-4 with subsequent changes through the rename of lynx2-3-FM
+  to Lynx2-4 and its release on 06-18-95, and deleted those sections from
+  this file. - FM
+* Added the new Copyright and links to it in about_lynx.html. - FM
+01-11-96
+* Tweaks of HTWAIS.c for compatibility across versions of FreeWAIS. - FM
+* Unescape any hex escaped percents in mailto URLs and ACTIONs. - FM
+01-10-96
+* Added an LYCheckForProxyURL() function, and a PROXY_URL_TYPE return value
+  for is_url(), so that Lynx can proxy URLs with an unknown scheme if a
+  proxy for the scheme has been set, e.g., if "foo_proxy" has been set
+  to "http://host/", then "foo:blah", where "blah" may or may not begin
+  with a slash, will be handled as "http://host/foo:blah".  Components of
+  "blah" will be checked versus "no_proxy", if set, but since we don't
+  know the default port for scheme "foo", the checks for any ports
+  associated with the no_proxy values may not be reliable (but if we
+  don't proxy, nor know the scheme, nor find "foo:blah" as a local file,
+  the URL would fail, anyway)  - FM
+* Fixed typo in VMSPrint.com. - Paul Farnham (farnham@pasco.wednet.edu)
+01-06-96
+* Tweak of traversal code. - FM
+01-04-96
+* Tweak of dynamic SOCKS mods. - TZ
+01-03-96
+* Added circular recall buffers for JUMP shortcuts.  If multiple jumps
+  files are installed, each has it's own recall buffer.  If Lynx was built
+  with PERMIT_GOTO_FROM_JUMP defined, any random URLs accessed via the JUMP
+  command are placed in the goto circular buffer, not that for shortcuts,
+  and a JUMP entry of the single character ':' for the target is treated
+  as a command to invoke the circular buffer of previously resolved goto
+  URLs (as if 'g'oto followed by Up-Arrow were used). - FM
+* Added GOTOBUFFER, homologous to JUMPBUFFER, for specifying via userdefs.h
+  and/or lynx.cfg whether to offer the previous goto URL, if any, for
+  reuse or editing whenever the 'g'oto command is entered, or simply rely
+  on invoking the circular buffer via the Up-Arrow and Down-Arrow keys for
+  accessing previously resolved goto URLs. - FM
+* Tweak of 'g'oto recall buffering loop in LYMainLoop.c. - AH
+01-02-96
+* Added circular recall buffering for 'g'oto URLs.  Is invoked (if previous
+  URLs have been entered) via Up-Arrow or Down-Arrow after entering the
+  'g'oto command. - FM
+* Added circular recall buffering for WHEREIS queries.  Buffer is shared with
+  that for ISINDEX queries, and invoked via Up-Arrow or Down-Arrow following
+  the WHEREIS ('/') command.  The 'n'ext command still uses the last WHEREIS
+  query, not necessarily the last entry in the recall buffer, which might
+  have been entered via a 's'earch command for an ISINDEX document. - FM
+* Extended treatment of FORMs which have only one INPUT (TYPE="text") field
+  for user entries as SUBMITting on press of RETURN in that field, so that
+  this behavior is retained if INPUT TYPE="hidden" fields are present. - FM
+* Tweaks of bookmark deletion sanity checks. - DT
+01-01-96 (Happy New Year!!!!)
+* Added circular recall buffer for ISINDEX queries.  Up-Arrow will cylce
+  you from the most current query in the list to previous ones, and roll
+  from the oldest to the most current.  Down-Arrow will cycle from the
+  oldest query to subsequent ones, and roll from the most current to the
+  oldest.  If a previous query is reused, it is removed from the recall
+  buffer and reinserted as the most current.- FM
+* Plugged memory leaks in LYUtils.c and LYJump.c. - FM
+12-30-95
+* Added LOCALHOST_ALIAS symbols for lynx.cfg which can be set to local
+  host aliases or to trusted hosts at other sites which will be accepted
+  as "local" when the -localhost switch is set. - FM
+* Added the endash and emdash entities. - FM
+12-29-95
+* Use exit(0) versus exit(-1) more consistently for normal versus abnormal
+  exits, respectively. - FM
+12-26-95
+* Tweak of RELOAD handling for lynxcgi URLs. - FM
+* More anti-crash protections for bad HTML. - FM
+* Tweak of dynamic SOCKS mods. - TZ
+12-23-95
+* Tweaks of directory building on VMS. - FM
+* Tweaks of log file declarations for direct wais builds. - FM
+* Tweak of DIRED_SUPPORT mods so that non-TAG entries don't show up when
+  there are tagged files. - DT
+12-22-95
+* Added HTMake_VMS_name() to HTFTP.c for use by Unix as well as VMS with
+  VMS ftp servers. - FM
+* Added INSERT and ALIAS to the DTD, updated PARAM and OVERLAY, and made
+  FIG a paragraphing block, all as described in the 12-21-95 W3C working
+  draft for INSERT.  In contrast to FIG, the INSERT and "heritage" EMBED
+  and APPLET elements invoke paragraphing only if their content displayed
+  by Lynx dictates it.  The rules for resolving the sources for INSERTs or
+  for handling its ISMAP attribute are extremely complicated, and are not
+  implemented.  Let's wait to see how people in the "real world" try to
+  make sense of them and actually use INSERT (if they do 8-).  We still
+  create source links in "clickable_image" mode for the "heritage" versions
+  of FIG, OVERLAY, EMBED and APPLET markup, and send a 0,0 cooridinate pair
+  for IMG with the ISMAP attribute.  See comments in HTML.c - FM
+12-21-95
+* Fixed bug in yesterday's ftp password-handling mods that could cause a
+  crash, and handle ftp://user:@host/path as specified in RFC 1738. - FM
+* Added protection against crashes for SELECT tags without the (required)
+  NAME attribute. - FM
+* Added code in HTFTP.c for recognizing MS Windows (Chameleon NEWT) servers
+  and parsing their LIST output (tested on ftp://emoryi.jpl.nasa.gov/) - FM
+* Another typo fix for VMS GNUC in HTFinger.c. - FM
+* Modified HTFTP.c to use personal_mail_address, if available, for the
+  password with anoymous FTP.  It will still use "user@" (trim off the
+  host) if the host does not contain a dot and thus could not be a fully
+  qualified domain name, so it will work with Unix servers such as
+  ftp.uu.net (see get_connection() in HTFTP.c), but this will cause it
+  to fail with MS Windows servers. - FM
+* Added lots more info to the trace output for the ftp gateway. - FM
+12-20-95
+* Modified HTFTP.c to handle a hex escaped slash (%2F) following the
+  "punctuation" slash according to the strict provisions of RFC 1738
+  when connected to VMS ftp servers, so that a device can be in the
+  path and not be mishandled as a subdirectory, e.g., the URL
+     ftp://user:password@host/%2Fsys$common/syshlp
+  will create a directory listing for sys$common:[syshlp]. - FM
+* Fixed typo for VMS GNUC in HTFinger.c. - FM
+12-19-95
+* Enhancements of Unix DIRED_SUPPORT (see header of LYLocal.c). - DT
+12-18-95
+* Tweaks of element and entity structure alignments. - FM
+12-17-95
+* Tweaks of APPLET CODEBASE attribute resolving. - FM
+* Added support for a -nosocks command line switch to turn off SOCKS proxy
+  usage if Lynx was SOCKSified. - Thomas Zerucha (tz@execpc.com)
+12-16-95
+* Added the APPLET element and attributes to the DTD, and code for
+  creating links to the Applet code via image_links - FM
+* Added code to handle password fields in telnet URLs. - FM
+* Expanded EMBED as an "attribute soup" (for compatibility with
+  old versions of Netscape). - FM
+12-15-95
+* Added PARAM, and its attributes in the W3C draft for EMBED, to the DTD,
+  and code in HTML.c to minimize the possiblity of an INPUT belonging to
+  an EMBED being misassociated with a standard FORM container. - FM
+* Added "first pass" EMBED handling.  Should be OK with both the W3C
+  container version and the Netscape "attribute soup" version (we'll
+  see 8-).  The clickable_image switch and toggle ('*') are now misnomers.
+  They will cause creation of links to the EMBED SRCs whether they are
+  images or not. - FM
+* Enhancements of Unix uploading (see header of LYUpload.c). - GL
+12-14-95
+* Modified LYUnEscapeEntities() and LYExpandString() in HTML.c to make
+  it more likely that they'll be handled correctly across flavors of
+  compilers. - FM
+* Changed NETSCAPE_QUOTES and -netscape_quotes to SOFT_DQUOTES and
+  -soft_dquotes. - FM
+* Added '&' to the exclusion list for VMS suggested file names. - FM
+12-13-95
+* Added CAN_ANONYMOUS_GOTO_TELNET_PORT symbol which if set TRUE in
+  userdefs.h will allow anonymous users to specify a port in 'g'oto
+  commands for telnet URLs. - FM
+* Added NETSCAPE_QUOTES symbol which if set TRUE in lynx.cfg will cause
+  Lynx to emulate the Netscape bug of treating  '>' as a co-terminator
+  of a double-quoted attribute value and the tag which contains it. - FM
+* Forgot to define FORM_LINK_RESUBMIT_MESSAGE in the distribution's
+  userdefs.h for yesterday's mods. - FM
+* Forgot to put the HTFile.c with the LIST_FORMAT mods into the
+  distribution (maybe I should just concentrate on Christmas 8-). - FM
+12-12-95
+* Changed handling of the no-cache META directive so that it applies to
+  the document which contains the META tag, rather than to any form submit
+  buttons within it.  The form's CGI script should return a stream which
+  contains the directive to force resubmissions, and any (e.g., ISINDEX)
+  script or (e.g., foo.shtml) document can include the directive to
+  force reloading by Lynx. - FM
+* Added ALWAYS_RESUBMIT_FORMS symbol in userdefs.h and lynx.cfg for setting
+  forced resubmissions of forms, and a -resubmit_forms command line switch
+  for toggling the default. - FM
+12-11-95
+* Moved values of LYStrings.h function key definitions from 0x80 - 0x8D to
+  0x100 - 0x10D and modified all the structures and functions in LYKeymap.c
+  and LYEditmap.c accordingly. - FM
+* Added the KOI8-R (Russian) character set. - Andrey A. Chernov
+  (ache@astral.msk.su).
+* Replace gets() with fgets() for the Unix setup() in LYCurses.c - AAC
+* Tweaks for building with FreeBSD. - AAC & FM
+* Added handling of META directives for ISO-8859-2 and KOI8-R if the
+  document is text/html and a server header didn't already set the
+  charset. - AAC & FM
+12-10-95
+* Tweaks of memory management. - FM
+* Made the LONG_LIST parameters for Unix local directory listings
+  configurable via userdefs.h and lynx.cfg - DT
+12-09-95
+* Added code for re-computing and retaining the current link if it is still
+  on the page when using the LYK_UP_TWO and LYK_DOWN_TWO commands. - FM
+* Added support for nested emphasis tags (they're all still displayed as
+  HT_UNDERLINE, but no longer terminated prematurely). - FM
+12-08-95
+* Added more suffix maps in HTInit.c. - FM
+* Tweak of META attribute definitions. - FM
+12-06-95
+* Don't reject LYNXKEYMAP and lynxcgi URLs with the -localhost switch. - FM
+12-05-95
+* Made the loaded_texts list in GridText.c functionally "circular", so
+  that returning to a cached document causes it to be treated as the most
+  current, and dumps of cache, when necessary to load a new document, are
+  done for the least recently viewed rather than least recently fetched
+  document. - FM
+* Show the METHOD and ACTION in showinfo() of LYShowInfo.c if invoked when
+  the cursor is positioned on a submit button. - FM
+* If the user mode is advanced, keep showing the URL in the statusline
+  when Lynx is in forms mode but the link is not a form field. - FM
+12-03-95
+* Tweaks of code for submissions of forms with only a single INPUT
+  (TYPE="text") field. - FM
+12-02-95
+* Treat any META directives with a NAME or HTTP-EQUIV value of "Pragma"
+  or "Cache-Control" and a CONTROL value of "no-cache" as an instruction
+  always to resubmit any form(s) in the document. - FM
+* Added parsing of META directives.  Functions can be added where indicated
+  in HTML.c. - FM
+* Include the HTTP/1.1 "Cache-Control: no-cache" header together with the
+  HTTP/1.0 "Pragma: no-cache" header for reload or resubmit requests. - FM
+* Fixed bug in the check for an all-space ALT in IMG when creating a
+  link for its SRC. - FM
+* Fixed parsing of square-bracketted DOCTYPE fields. - FM
+12-01-95
+* Improvments of logic for indentations within lists. - FM
+11-30-95
+* For resiliency, treat upper case letters as equivalent to lower case in
+  scheme names (e.g., allow "HTTP" as well as "http"), by converting them
+  to the appropriate case before entering them into the anchor hash table
+  or otherwise acting on them. - FM
+* Added ability to change the default reply to the "really quit" prompt
+  from "[Y]" to "[N]" via a compilation symbol in userdefs.h. - DT
+11-29-95
+* Added ALIGN attribute for HR (default is "center"). - FM
+11-28-95
+* If a form has a single field, and it's INPUT TYPE="text", treat
+  RETURN as a submit command for it. - FM
+* Added START as a synonym for the SEQNUM attribute in OL. - FM
+11-27-95
+* Enhancements of the wais gateway. - FM
+11-26-95
+* Fixed up HREF, ACTION and SRC resolving to be conformant with RFC 1808
+  (except that we don't yet support a ";params" field). - FM
+11-25-95
+* Tweaks of yesterday's jumps file mods. - FM
+11-24-95
+* Enhancements of 'J'umps file handling, including ability to install
+  multiple jumps files mapped to different keys and associated with
+  different statusline prompts and recall buffers. - DT & FM
+* Deal with ALTs that have only spaces when in clickable_image mode. - FM
+* Worked in WM's mods to make the REVERSE_CLEAR_SCREEN_PROBLEM workaround
+  a configuration option via ENABLE_SCROLLBACK in lynx.cfg and a command
+  line toggle (-enable_scrollback), for use with comm programs which have
+  screen display buffers that can be accessed for review independently
+  of the Lynx commands (see comments in lynx.cfg). - FM
+11-23-95
+* Use the BASE, if present, instead of the original document URL, as the
+  default ACTION for forms. - FM
+* Tweaks of paragraph alignment handling. - FM
+* Make sure we don't realloc() a NULL env pointer in LYCgi.c. - DT
+* Cancel bookmark deletion if the line does not have a complete link or if
+  there is more than one link on the line. - DT
+11-21-95
+* Fixed bad logic in the setting of bold and/or underline starting points
+  in new lines created via split_line() of GridText.c. - FM
+* Added case KEY_BACKSPACE in LYgetch() of LYStrings.c. - GL
+11-19-95
+* Fixed problem of SELECT causing all immediately following white space
+  to be ignored. - FM
+* More tweaks of paragraphing, and handling of labeled blocks within
+  PRE blocks. - FM
+11-18-95
+* Added INFOSECS, MESSAGESECS and ALERTSECS symbols in userdefs.h and
+  lynx.cfg for setting the durations of statusline pauses (important when
+  using Lynx with a braille-based access).  See comments in userdefs.h and
+  lynx.cfg for more information. - FM
+* More tweaks of paragraph handling. - FM
+* Include the Reference lists is crawl output files if the -number_links
+  switch was included and the -nolist switch wasn't. - FM
+11-17-95
+* Tweaks of finger and telnet gateways. - FM
+* Added handling of MARQUEE equivalently to BANNER. - FM
+* Various tweaks of 8-bit character and related HTML handling (OLs
+  or ULs without attributes or some wrong combinations were crashing
+  Lynx). - FM
+11-16-95
+* Implemented the ID attribute for TAB, and the TO and INDENT attributes
+  when its ALIGN attribute is "left" (the default) and the style's
+  alignment is HT_LEFT (the default).  If these conditions don't apply,
+  or if the TAB target is outside the current margins or would overlap
+  prior text, a collapsible space is inserted instead of TABing.  The
+  INDENT values are in "en" units, treated as 12 per column.  Added
+  tabtest.html in the test subdirectory to illustrate TABing. - FM
+11-15-95
+* Added the HTML 3.0 DTD structures and definitions for SPOT, and fully
+  implemented it (use SPOT ID="foo" as SGML_EMPTY instead of named anchors
+  with no content). - FM
+* Added the HTML 3.0 DTD structures and definitions for TAB.  For now, it
+  simply puts a collapsible space in the text stream if the TO attribute
+  is present. - FM
+* Added the top-level HTML 3.0 DTD structures and definitions for MATH, and
+  implemented it's ID attribute.  The markup is captured as HTML_LITTERAL,
+  and until we have a processor, is output as is, in brackets to alert the
+  user about the situation. - FM
+11-14-95
+* Tweaks of LYK_UP_LINK and LYK_DOWN_LINK handling, and added them to the
+  default mapping as '<' and '>'. - FM
+* Tweaks of LYK_TOOLBAR handling. - FM
+11-13-95
+* Added LYK_TOOLBAR (mapped by default to '#') for jumping up to the pseudo
+  Toolbar or Banner if present in the current document.  Using '#' instead
+  of Home to jump there allows you to Left-Arrow back to where you were in
+  the current document.  Set up a BANNER in about_lynx-dev.html to serve
+  as an example of this feature. - FM
+* Added the HTML 3.0 DTD structures and definitions for BANNER, implemented
+  its ID attribute, and set it up to act as a pseudo Toolbar if one hasn't
+  been set up already via REL attributes of LINKs. - FM
+* Tweaks of paragraphing for CAPTION, CREDIT, FOOTNOTE, and NOTE. - FM
+11-12-95
+* Handle (i.e., ignore) any P that immediately follows an LI, DT or DD. - FM
+* Cancel any file fetch and viewer spawn or launch during traverals. - FM
+11-11-95
+* Added finger gateway (finger://host[/request]) based on patches from
+  Martin Hamilton (martin@mrrl.lut.ac.uk). - FM
+* Added LYE_TAB for mapping keys to act as LYE_ENTER, but return '\t' so
+  that the behavior of TAB is emulated in TEXTAREAs, and mapped Do to
+  LYE_TAB in the default binding. - FM
+* Fixed glitch in handling of DEC extended characters which contain two
+  digits (affected Do and Find). - FM
+* Better documented that disabling access to hidden (dot) files also
+  disables ability to create such files via Lynx. - FM
+11-10-95
+* Added handling of mailto as a form ACTION.  See http://www.q-d.com/swc.htm
+  for software to extract and unescape the mailed content. - FM
+* Added lynxprog URL handling, which is identical to lynxexec URL handling
+  except that the user is not prompted to enter RETURN before returning
+  to Lynx.  Use lynxprog for scripts or programs such as mail which do not
+  need an enforced pause to let the user read the screen output. - FM
+* Removed code in HTFile.c for treating ',' as a synomym of '.' for
+  hidden files (nobody seems to know why that was being done 8-). - FM
+* Moved inclusions from LYBookmark to tcp.h. - FM
+11-08-95
+* Extend optional hidden (dot) file/directory support to Unix, and embellished
+  it on VMS and Unix with regulation via a command line switch and 'o'ptions
+  menu setting.  See userdefs.h and lynx.cfg for more information. - GL & FM
+* Added support on Unix for straight tar files and a compile time option that
+  disables the ability to extract files from an archive file (since there is
+  no control over the files extracted). - GL
+11-07-95
+* More tweaks of 8-bit character handling. - FM
+* Added "Macintosh (8 bit)" character set. - Neil K. Guy
+  (nkg@freenet.vancouver.bc.ca)
+* Added "Example Lynx Optimized User Home Page" to the online 'h'elp. - FM
+11-05-95
+* Fixed Cc: header handling for email on Unix. - FM
+11-04-95
+* Reference the current character set for any raw 8-bit characters in
+  text/plain streams (but don't translate named or decimal escaped
+  entities, since that's specific for text/html). - FM
+* Block any illegal control or escape characters in text/plain streams,
+  to avoid problems if a binary ftp or local file was mistyped and sent
+  to the screen as that Content-type. - FM
+* Eliminated mod in SGML.c which emulated Netscape's bug of treating '>'
+  as both a close-double-quote and close-tag (Netscape v2.0 fixed its
+  bug, so hopefully the bad HTML with it will go away. 8-). - FM
+11-02-95
+* Assume an ISO-8859-1 character set for all local files.  If it's
+  actually ISO-8859-2 and the terminal is using that, set the Lynx
+  CharSet option to "ISO Latin 1" so that 8-bit characters will be
+  sent raw to the terminal. - FM
+* Added Martin Ramsch's iso8859-1.html to the test subdirectory.
+  Use it to complete the conversion tables in LYCharSets.c. - FM
+* Don't block insertion of a lead space for INPUTs in PRE blocks, so
+  alignments will be compatible with those of graphic clients. - FM
+* Don't block all access to the 'p'rint menu for the print restriction
+  (should still offer printer options which have the TRUE flag set;
+   all access is still blocked for -validate). - FM
+* Replaced the STDfoo_FILENO symbols in LYCgi.c with the more portable
+  fileno(stdfoo). - WM
+* Added NCURSESINCDIR compilation symbol for setting the path to the
+  NCURSES header file in LYCurses.h to that of the latest version. - GL
+* Tweaks of interrupt handling on VMS.
+10-31-95
+* Added more suffix maps in HTInit.c. - FM
+* Mods in LYCgi.c which hopefully makes the code more portable across
+  Unix flavors. - FM
+10-28-95
+* Tweaks of global flag initializations and resets in HTML.c. - FM
+* Added RESOLVLIB symbol in the top Makefile for including -lresolv
+  in the LIBS= list, if needed, for SUN 3 or 4 OS, and comments about
+  that in the Makefile, and INSTALLATION and PROBLEMS files based on an
+  explanation from Will Mengarini (seldon@eskimo.com). - FM
+10-27-95
+* Mods of top level Makefile:  Added NOPORT compilation symbol for forcing
+  use of PASV in ftp URLs.  Added NO_S_IFSOCK compilation symbol for Unix
+  flavors which lack an S_IFSOCK definition for lstat(). - FM
+* Reload the current document whenever the character set is changed. - FM
+* Don't reference entities for raw (or decimal escaped) 8-bit characters
+  if the document is not text/html, or for any local files if the charset
+  is Latin. - FM
+* Made Ctrl-H a synonym for DELETE instead of Left-Arrow in the line
+  editor. - FM
+10-25-95
+* Handle all characters in strings for the new line editor as unsigned
+  so they don't go negative if 8-bit. - DW
+* Restored proper handling of the MAXLENGTH attribute in INPUTs for
+  strings entered with the new line editor. - FM
+10-24-95
+* Deal with all non-printing characters when setting up the SELECT
+  pop-up window strings. - FM
+* Handle raw 8-bit characters via reference to the ISO-LATIN1 named
+  entities so they in turn can be referenced to the currently selected
+  character set. - FM
+* Yet more tweaks of non-breaking space handling. - FM
+10-22-95
+* Improved treatment of the startpage URL with -traversal so that it only
+  blocks traversals of links on other servers.  Any links on the same
+  http server which shouldn't be traversed may be blocked via explicit
+  and/or wildcarded entries in REJECT.DAT.  Updated CRAWL.announce to
+  make this more clear. - FM
+* Typo fixes in top-level Makefile. - Steve Jeske (jeske@pa.dec.com)
+10-21-95
+* Handle decimal escaped entities via reference to the ISO-LATIN1 named
+  entities so they in turn can be referenced to the currently selected
+  character set. - FM
+10-20-95
+* Tweaks of formatting for LONG_LIST directory lists and README file
+  inclusions in HTFile.c and HTVMSUtils.c. - FM
+* Tweaks of decimal escaped non-breaking space handling in HTML.c. - FM
+* Force unescaping of hidden VALUEs for INPUTs as ISO-LATIN1. - FM
+* Added ".shtml" and ".htmlx" as text/html extensions in HTInit.c. - FM
+10-18-95
+* Made parsing of the name and address out of the NNTP From: header more
+  reliable in HTNews.c. - FM
+* Added "LYNX_TEMP_SPACE" environment variable (Unix) or VMS logical,
+  which if present at run time will be used instead of the the TEMP_SPACE
+  definition in userdefs.h as the path prefix for temporary files. - FM
+10-17-95
+* Added TYPE attritute for OL, and coordinated it with the SEQNUM and
+  CONTINUE attributes.  The default TYPE is "1" (Arabic numbers), and
+  SEQNUM values for it can range from -29997 to the system's maximum
+  integer.  The Alphabetic TYPEs are "A" (upper case) and "a" (lower
+  case), and can range from 1 (" A." or " a.") to 18278 ("ZZZ." or
+  "zzz.").  The Roman TYPES are "I" (upper case) and "i" (lower case),
+  and can range from 1 (" I." or " i.") to 3000 ("MMM." or  "mmm.").
+  SEQNUM values should always be Arabic, and will be converted to
+  other types (e.g., SEQNUM="27" TYPE="a" will yield "aa." for the
+  next LI). The CONTINUE attribute will cause the sequence and TYPE
+  of the preceding OL to be continued for LIs in the current OL. - FM
+10-16-95
+* Treat a value of "*" for "no_proxy" as a global override of any
+  existing proxy variables. - FM
+10-15-95
+* Deal with raw or decimal escaped non-breaking space characters in
+  SGML_character() of SGML.c and LYUnEscapeEntities() of HTML.c. - FM
+10-14-95
+* Updated info about lynx-dev in lynx.man and lynx.hlp. - FM
+* Don't force LINKS_ARE_NUMBERED in dumps if -nolist was included. - FM
+* Output the References list for dumps with OL-style numbering. - FM
+* More tweaks of "anti-spoof" handling for telnet URLs. - FM
+10-13-95
+* Block direct access to the telnet prompt for telnet URLs entered without
+  a host field. - FM
+* Include the TRUSTED flag in spawns for OpenVMS/AXP v6.1 or greater. - FM
+10-12-95
+* Convert any strings in news articles that look like URLs into links. - FM
+* Use the Followup header in news articles, if present, for followups.
+  Otherwise, use the Newsgroups header.  - FM
+* Ignore any invalid ISO 646 7-bit control characters or ISO 8859 8-bit
+  control characters in SGML_character() of SGML.c. - FM
+10-11-95
+* Typo fix in HTTCP.c for non-MULTINET VMS builds. - Gary Chow (garyc@mrs.com)
+10-09-95
+* Assume the root as path in HTParse() of HTParse.c if the access and host
+  but no path are given, and the access is http, https, or ftp. - FM
+10-05-95
+* Make sure the FREE(x) macro gets defined for HTTCP.c. - FM
+10-04-95
+* Mods in HTTCP.c to prevent string buffer overruns. - FM
+* Prevent possible string buffer underrun for terminal white space trims
+  in GridText.c. - Renato Buda (renato@peoplebank.co.uk)
+10-01-95
+* Updated the listserv and archive addresses in the about and help files. - FM
+09-30-95
+* Added support for Windows_NT FTP servers. - FM
+* Added ability to send a self copy of mail via a Cc: header on Unix
+  (sending of self copies is set via the mail software itself on VMS). - FM
+* Tweaks of SOCKET_ERRNO handling in HTTCP.C. - FM
+* Include unistd.h more consistently on Unix (via tcp.h) if NO_UNISTD_H
+  is not defined. - FM
+* Modified the FreeBSD and NetBSD libwww Makefiles to use the
+  CommonMakefile. - FM
+* Makefile addition (snake3) for the HP-UX purchased compiler. - Andy
+  Finkenstadt (genie@panix.com)
+09-29-95
+* Deal with HTAlert.c function calls to LYgetstr(), e.g., for a password,
+  when doing a -dump or -source non-interactive fetch. - FM
+* Output HTAlert() messages to both stderr and stdout in TRACE mode. - FM
+09-28-95
+* Added a description of the line editor's default key bindings to the
+  help file set. - FM
+* Tweaks of the line editor. - FM
+* Declare DCLspawn_exception() in LYCurses.c as unsigned int only for
+  DECC (otherwise as int, for VAXC and GNUC). - FM
+09-27-95
+* Added common line editor for forms and prompted queries, with configurable
+  line editor key bindings.  See LYStrings.h and LYEditmap.c for the default
+  configuration. - DW & FM
+* Tweaks of build.com's symbol assignments when in batch mode. - MM
+09-22-95
+* Added ISO-8859-2 CharSet, and mods for Accept-Charsets handling based
+  on patches from Mark Martinec (Mark.Martinec@nsc.ijs.si). - FM
+09-19-95
+* Tweaks of OL attribute handling.  Allow negative SEQNUM values.  Keep
+  better track of CONTINUE versus non-CONTINUE OL sequences within nests.
+  Allow CONTINUE in the first OL of a new nest, set to the last LI count
+  of the previous nest (at any depth in that previous nest). - FM
+09-17-95
+* Tweak of LYUnEscapeEntities() in HTML.c. - DW & FM
+* Another tweak of groupid handling in LYShowInfo.c. - DW
+* More fixes of 7-bit character approximations. - DW
+* More help and about file tweaks. - DSL
+09-16-95
+* Added the HTML 3.0 DTD structures and definitions for DIV, and implemented
+  its ALIGN and ID attributes.  I think I have it behaving rationally if it
+  is used together with CENTER, LEFT and/or RIGHT (Though they're all treated
+  as DIVs by Lynx, and shouldn't be embedded in each other, somebody will do
+  that anyway!. 8-). - FM
+* Added the HTML 3.0 DTD structures and definitions for FN (Footnote).  It
+  should be handled as a popup window, but for now, it's implemented as a
+  labelled block and has the same style and behavior as a NOTE with an ID
+  attribute. - FM
+* Some compilers can't handle the continuation line in yesterday's
+  LYCurses.h.  Made it one long line. - FM
+09-16-95
+* Further enhanced the online help and about files. - FM
+* Added -DNO_FILIO_H to Makefile for SCO. - FM
+* Worked in stuff from 14-Sep-95 lynx2-4-2 upgrade. - FM:
+--------------------------------------------------------
+  09-06-95
+  * Added patch to compile Lynx on BSDI with Ncurses package. -RK
+  09-06-95
+  * Ported Lynx to DG-UX. - RK
+--------------------------------------------------------
+09-12-95
+* Further modified HTNews.c so that it returns unmodified news messages
+  when the display is toggled to source ('\') or when downloading them,
+  so uuencoded messages always can be saved without corruption, and so
+  I also changed the SCAN_FOR_BURIED_NEWS_REFS compilation default to
+  TRUE. - FM
+* Simplified a compound if() in HTParse.c which may have been giving the
+  AIX v4.1 compiler a headache. - FM
+09-11-95
+* Eliminated distinct style sheets for CAPTION and CREDIT so their content
+  will inherit the current style, and added HTML_EnsureDoubleSpace() and
+  HTML_ResetParagraphAlignment() in HTML.c for coping with the absence of
+  distinct style sheets for those elements, and for FIG.
+09-10-95
+* Added SCAN_FOR_BURIED_NEWS_REFS configuration symbol in lynx.cfg, with
+  a compilation default of FALSE, and a -buried_news switch for toggling
+  the default.  When TRUE, Lynx scans the bodies of news articles for
+  references and converts them to news links, but creates false news
+  links if any email addresses are enclosed in angle brackets, and can
+  trash uuencoded messages. - FM
+* Eliminated distinct style sheet for FIG so its content will inherit the
+  current style and display appropriately within lists.  Should be OK if
+  people use valid HTML 3.0 in it's content for non-graphic clients. - FM
+* Added links for the W3C HTML 2.0 and 3.0 specifications and for the
+  HAL HTML validation service to the Lynx help file set.
+* Made the BOLD_NAME_ANCHORS compilation symbols FALSE by default.  Most
+  documents now include emphasis tags for NAME (ID) anchors if it's desired,
+  because the most common graphic clients don't emphasize them by default,
+  so we should adjust to that in Lynx as well (IMHO 8-).  Added emphasis
+  tags for the NAME anchors in the Lynx help files. - FM
+* Eliminated forced uppercasing of H1 headers.  Most documents have mixed
+  casing and we should preserve it (IMHO 8-).  Added a BOLD_H1 configuration
+  symbol, set FALSE by default, for making H1 headers bold even if BOLD_HEADERS
+  is FALSE.  Modify the two configuration symbols in lynx.cfg for the pattern
+  or header emphasis which pleases you. - FM
+* Tweak of list paragraphing.  Added HText_PeviousLineSize() in GridText.c
+  for determining if the previous line had only non-printing characters. - FM
+09-09-95
+* Impelemented true paragraphing and the P ALIGN attribute within lists (UL,
+  OL and DL blocks) and within ADDRESS blocks.  Paragraphs within lists have
+  one blank line inserted.  Within ADDRESS blocks, a newline will be created
+  if needed, but no blank lines are inserted.  Use BR, not P, to force extra
+  newlines within blocks.  Do not place a P immediately following the LI or
+  DD tags.  Alignments of P blocks are done with respect to the "second line"
+  margins of LI or DD elements. - FM
+09-08-95
+* Convert '~' to getenv("HOME") in file URLs whether or not DIRED_SUPPORT
+  is defined. - FM
+* Tweak of TR and more tweaks of HR handling.  Added HText_LastLineSize()
+  and HText_TrueLineSize() functions in GridText.c for determining if
+  lines have only non-printing characters in decisions on whether to
+  insert additional newlines. - FM
+09-07-95
+* Act on Page-Up, Page-Down, Home, End, Find and Select in the form_getstr()
+  editor (hoping they have their default mappings 8-).  Also act on Remove
+  and Control-D as delete keys in that line editor (as in the LYgetstr()
+  line editor). - FM
+* Tweak of HR handling. - FM
+* Mods to prevent creating multiple copies of temporary printer files. - FM
+* More fixes for NeXT.  Temporary files for VIEWER, DOWNLOADER or PRINTER
+  commands on NeXT all have the ".html" default suffix replaced with ones
+  indicative of the Content-type. - FM
+09-06-95
+* Mods to prevent creating multiple copies of temporary viewer or downloader
+  files. - FM
+* Fixes for NeXT. - FM
+09-05-95
+* Enabled the -help switch when no configuration file is available and
+  Lynx would otherwise exit (i.e., it now outputs the help message before
+  it exits). - FM
+* Documented the -child switch. - FM
+* Fixed and documented the -nolog switch. - FM
+* Changed the -linknums switch to -number_links, fixed the code to work,
+  and documented the switch. - FM
+* Made handling of escaped colons (\:) in VIEWER commands reliable. - FM
+09-04-95
+* Implemented the PLAIN attribute for UL, and the SEQNUM and CONTINUE
+  attributes for OL. - FM
+* Updated the DTD structures and definitions for DD, DL, DT, LI, OL and UL
+  to HTML 3.0, added LH, and implemented full HTML 3.0 ID handling for those,
+  and B, BLINK, BR, CENTER, CITE, CODE, DFN, DIR, EM, FORM, KBD, I, LEFT,
+  LISTING, MENU, PLAINTEXT, PRE, RIGHT, SAMP, STRONG, TT, U, VAR and XMP
+  (some of which are obsoleted in HTML 3.0, but what the heck 8-). - FM
+09-03-95
+* Made bolding of NAME (ID) anchor contents configurable in lynx.cfg. - FM
+09-02-95
+* Tweaks of FIG and OVERLAY handling:  Only put up [FIGURE] (and +[OVERLAY])
+  links if clickable_images is set.  Assume P ALIGN="left" if contained
+  text does not begin with an explicit tag that sets an alignment. - FM
+* Implemented full HTML 3.0 ID handling for IMG. - FM
+* Tweaks for FreeBSD. - Masafumi NAKANE (t94303mn@sfc.keio.ac.jp)
+08-31-95
+* Added support for using a TITLE attribute as the subject in anchors with a
+  mailto HREF (A HREF="mailto:address" TITLE="RE: subject"). - FM
+08-30-95
+* Implemented full HTML 3.0 ID handling for A, ADDRESS, BLOCKQUOTE, BQ,
+  CAPTION, CREDIT, FIG, H1 - H6, HR, INPUT, NOTE, OPTION, P, SELECT, TABLE,
+  TD, TEXTAREA, TH and TR. - FM
+* Updated the DTD structures and definitions for ADDRESS to HTML 3.0. - FM
+* Block insertion of any escape sequence characters or substitutes when
+  editing form INPUTs or TEXTAREAs. - FM
+08-29-95
+* Tweak of ALIGN attribute handling in paragraphs. - FM
+* Protect against hanging on escape sequences if received (illegally) in
+  documents typed as text/plain or text/html. - FM
+08-28-95
+* Declared DCLspawn_exception() as an unsigned int to keep DECC happy. - FM
+08-27-95
+* Give LYUpload() a return value (because LYLocal.c has been testing for
+  one all these years 8-). - FM
+* Force reload on return from 'o'ptions menu if HTfileSortMethod or
+  keypad_mode are changed. - FM
+* Force no cache of keymap display whenever vi_keys or emacs_keys are
+  changed. - FM
+* Added Remove and Control-D as Delete synonyms for removing characters to
+  the left of the cursor in the LYgetstr() line editor, and Control-F as
+  Right-arrow synonym for moving the cursor to the right. - FM
+08-24-95
+* Modified prompted string editing via LYgetstr() along lines in patch
+  from PM (editing of form INPUT and TEXTAREA strings is unchanged).
+  Here's how the prompted string editing works:  Left-arrow and Backspace
+  (Control-H) move the cursor to the left, and Right-arrow to the right,
+  within the string.  Characters are INSERTed at the cursor position.
+  Delete removes characters to the left of the cursor.  Home, Find and
+  Control-A move the cursor to the beginning of the string.  End, Select
+  and Control-E move the cursor to the end.  Control-U erases the string.
+  Control-G cancels at any time.  Return accepts if a string is present,
+  or cancels if it was fully erased or never entered.  A right-curley
+  brace appears in the right-most column when the string has segment(s)
+  scrolled off screen, and if left scrolled, the cursor sits on it for
+  further editing with the above command keys (or acceptance via Return).
+  Long strings scroll both left and right between the prompt string and
+  right-curley brace.  Had to modify 17 files to make this line editor
+  crash safe (I hope people like it!  8-). - FM
+08-22-95
+* Use a macro in parse_arg() of LYMain.c to ensure proper handling of
+  switches which take a value and might have a space instead of an '='
+  between the name and value. - DW
+* Insulate any system RTL's getline() from the one in HTInit.c. - DW
+* Enabled editing of titles when adding bookmarks. - FM
+08-21-95
+* Fixed the IBM PC character set in LYCharSets.c (Note:  The PC-set has the
+  currency symbol but it is a control character - ^O - so there is a chance
+  that curses or the user's terminal may discard it.  Did not fix the
+  Icelandic characters). - DW
+* Check whether getpwuid() and getgrid() have returned NULL pointers in
+  LYShowInfo.c. - DW
+* Break up the too elaborate, compound assignment statements in LYList.c
+  so no compilers get tripped up by evaluation order effects. - DW
+* Worked in mods from DW to cope with CR, CRLF or LF all as EOL in HTML.c
+  and GridText.c (not sure if they take into account all of the consequences
+  of Lou's "big cheat" in GridText.c, but they appear to, so far). - FM
+* Explicitly preserve the Lynx bookmark file mode on Unix. - DSL
+08-20-95
+* More documentation and help updates. - FM
+08-19-95
+* Updated INSTALLATION and comments in userdefs.h and lynx.cfg. - FM
+* If save to disk was done via the download menu, and a VMS rename() attempt
+  succeeded so we don't spawn a COPY, we no longer can access the file via
+  the download menu, so pop in that situation. - FM
+* Worked in stuff from 16-Aug-95 lynx2-4-2 upgrade.  Most had already been
+  added to lynx2-4-FM.  This is the new stuff. - FM:
+---------------------------------------------------
+  08-16-95
+  * Applied patch from Peter van Heusden (pch@ucthpx.uct.ac.za) to fix
+    a bug when lynx encounters an OPTION tag before the style is
+    ever updated. - CL
+  08-09-95
+  * Added some tweaks to Makefile and LYCurses.h to get lynx to properly
+    compile on ISC.  Thanks to Robert Salter (salter1@master.nsbf.nasa.gov).
+---------------------------------------------------
+08-18-95
+* Added a -validate switch for turning off everything except http URLs,
+  helpfiles, and secure menus in Lynx.  Can be used with -dump in CGI
+  scripts, but is intended for use with anonymous telnet logins.  In the
+  latter case, the user can start with his/her server's or userdir homepage,
+  and validate everything, while able to manipulate the display features
+  (e.g., whether or not links are numbered) and turn on trace (Control-T,
+  then Control-R to reload) when a "Bad HTML" document is encountered.  The
+  telnet approach is particularly useful when used with the 'l'ist feature.
+  When used with -dump, compare it with versus without -nolist. - FM
+* Added a missing curley brace in EF's (08-16-95) patches. - FM
+08-17-95
+* Added HISTORICAL_COMMENTS symbol which if set TRUE in lynx.cfg will cause
+  Lynx to revert to the "historical" behavior of treating any '>' as a
+  comment terminator instead of (a valid) '-->', and a -historical switch
+  for toggling the default behavior. - FM
+* Added a -nolist switch for turning off the link list feature in dumps. - FM
+* Modified SGML.c so that it still substitutes the expected end tag if a
+  different one is encountered (e.g, due to a document having interdigitated
+  instead of validly embedded tags), but doesn't do a wind down of the
+  element stack.  This gives it a better chance of recovering from bad
+  HTML, and the sanity checks I've added thus far in HTML.c appear to still
+  be adequate for avoiding crashes (we'll see 8-). - FM
+08-16-95
+* Mods to support within-document anchors in documents returned via
+  lynxcgi scripts. - FM
+* Worked in EF's patches to handle changes of keymaps under DIRED_SUPPORT
+  with OK_OVERRIDE, and to give the user some feedback during an Install
+  command. - FM
+08-15-95
+* Don't include a Referer header for 'g'oto URLs. - FM
+* Added patches from PR for compilations with VMS port of GNUC:  Modified
+  several prototypes to avoid GNUC warnings about conflicts with ones in
+  lib$routines.h, and added code in HTVMS_WaisUI.c to deal with an obscure
+  glitch for GNUC v2.6.[123] and v2.7.0 (not present in v2.6.0 or earlier,
+  and fixed in v2.7.1). - FM
+* Worked in code from PR as LYVMS_FixedLengthRecords() in HTFWriter.c to
+  change attributes of binary files on VMS from Stream_LF to FIXED 512,
+  no implied carriage control, best try contiguous.  Replaces the spawn
+  to execute FIXED512.COM. - FM
+08-14-95
+* Modified TEXTAREA handling to succeed or fail on bad HTML equivalently
+  to Netscape. - FM
+08-12-95
+* Mods to avoid crashes and to do something reasonable with OPTION strings
+  that are wider than the available popup window width.  Truncation is
+  indicated by omission of a terminating ']' in the window link, and the
+  window, when popped up, is made equal to the screen width (but we can't
+  wrap the strings within the window, so they're truncated if they still
+  don't fit). - FM
+* Mods to handle INPUT fields that are packaged in PRE and would extend past
+  the wrap column.  No way to make that perfect without a major redesign,
+  but it's better now. - FM
+08-10-95
+* Handle 'g'oto entries equivalently to STARTFILE and HOMEPAGE, i.e., if
+  the user's entry isn't a URL, convert it to a file URL if it's a file
+  or directory on the local system, otherwise convert it to an http URL.
+  For example, "~/" will be converted to a file URL for listing the HOME
+  directory (on both Unix and VMS), and "www.netscape.com" will become
+  "http://www.netscape.com". - FM
+* Fix LYCurses.h to deal with definitions of TRUE and FALSE in cursesX.h
+  on ultrix. - Brian Exelbierd (bex@ncsu.edu)
+* Made SYSTEM_MAIL, and MAIL_ADRS on VMS, configurable in lynx.cfg. - FM
+08-08-95
+* Fixed two initialization problems that could account for reports of
+  inappropriate HEAD requests in pops of cached documents. - FM
+* More tweaks for coping with bad HTML. - FM
+* Fixed bug in code for bypassing bad SUFFIX: or VIEWER: entries. - FM
+08-06-95
+* Added code in GridText.c to deal with syntactically OK but symantically
+  nonsensical uses of ALT="" in IMG tags (i.e., when the IMG is structured
+  to provide the anchor for a link, and so the anchor ends up with nothing
+  but nonprinting characters for bolding), and removed the forcing of an
+  "[ISMAP]" pseudo-ALT in HTML.c.  The show_anchor element in TextAnchor
+  structures is now set to NO whenever an anchor does not have any
+  printing characters. - FM
+* Modified HTML.c to issue only one "Bad HTML" statusline message per
+  document (unless it's one of those unbelievably bad CGI script outputs
+  that are functionally multiple, concatenated documents 8-), and similarly
+  for "Table in Form" and "Form in Table" informational messages. - FM
+* Don't bother prompting whether to send a HEAD request for the current
+  document if there are no links on the page (but still prompt if the user
+  makes a HEAD request when positioned on an inappropriate form link). - FM
+08-05-95
+* Added code in SGML.c for storing Identfiers (e.g., !DOCTYPE) and Comments
+  (i.e., tags beginning with !--) and for reporting them in trace mode.
+  Serves as a model for actually using them someday (i.e, functions for
+  analyzing them could be called where we presently just invoke a trace
+  output to stderr). - FM
+08-03-95
+* Modified SGML.c to handle comments as in the current specs, and put
+  Paul Gilmartin's (pg@sweng.stortek.com) TestComment.html in the
+  test subdirectory. - FM
+* Added binary extensions in HTInit.c that were giving people problems
+  on FTP servers. - FM
+08-02-95
+* Added explicit check for CMU in telnet support with SOCKETSHR-built
+  images. - SB
+* Added -link switch for setting the count in lnk#.dat files with -crawl
+  (needed if you interrupt a traversal and want to pick up again where
+  you left off). - DM
+* More tweaks of -traversal code and Makefile.  All known bugs appear to
+  have been dealt with at this point.  Updated lynx.man, lynx.hlp and
+  help files to include the -traversal and -crawl switches. - FM
+08-01-95
+* Changed the SEQUENT compilation sympbol to PTX2 and added a ptx2 procedure
+  to the Makefile for Sequent Symmetry DYNIX/ptx v2, because more current
+  versions reportedly have solved the problems which the conditional
+  compilation attempted to address. - FM
+* Force in the "[ISMAP]" pseudo-ALT if someone uses ALT="" for an IMG tag
+  that has ISMAP specified. - FM
+* Tweaks of the -traversal code (still experimental). - DM & FM
+07-31-95
+* Worked in code from David Mathog (mathog@seqaxp.bio.caltech.edu) for
+  implementing the TRAVERSAL function from old versions of Lynx, but via
+  a command line switch (-traversal) instead of in a separately compiled
+  executable, and for a CRAWL function, invoked via a command line switch
+  (-crawl), which allows Lynx to be used as the front end for a Web Crawler.
+  See CRAWL.announce for more information. - FM
+* More tweaks of LYCurses.c and LYCgi.c for GNUC on VMS. - SB
+* More tweaks of src/Makefile. - DSL
+07-30-95
+* Tweaks of yesterday's Makefile and descrip.mms files. - FM
+07-29-95
+* Tweak in HTFTP.c to ensure that Lynx doesn't sit around waiting for an
+  FTP server's good-bye message if the server closes the connection itself
+  and doesn't send one. - FM
+* Added GNUC support to the VMS descrip.mms files. - FM
+* Tweaks of HTWAIS.c socket handling on VMS (I can't reproduce a reported
+  problem with SOCKETSHR/NetLIB, but these tweaks might help). - FM
+* Added my guesses at code for HTTelnet.c to implement telnet, tn3270 and
+  rlogin support, if available, when building with SOCKETSHR/NetLIB on
+  VMS. - FM
+07-28-95
+* Mods for Sequent Symmetry DYNIX/ptx - Mark Kolmar (mkolmar@ccs.nslsilus.org)
+* Added GL's lynxcgi patches posted to lynx-dev, plus some tweaks. - FM
+* Worked in GL's lynxcgi mods as in Lynx2-4-2:
+  --------------------------------------------
+   Added George Lindholm's LYNXCGI feature.  This allows lynx to bypass
+   http daemons to run local CGI scripts using a URL of the form
+   "lynxcgi:/path/cgi-script".  To implement in Lynx, LYNXCGI_LINKS
+   must be uncommented in userdefs.h and TRUSTED_LYNXCGI must be fixed
+   in lynx.cfg.  It doesn't handle redirection or mime-types and
+   scripts should probably generate partial URLs when referring back to
+   itself.  If the file you're going after isn't an executable then it
+   will be loaded as regular file.  This makes it possible to go back
+   and forth between cgi-scripts and .html files.
+   I changed the way TRUSTED_LYNXCGIs are recorded because they don't
+   work quite the same as TRUSTED_EXECs do.  Also, George says it works
+   fine on SunOS and Solaris, and it seems to work fine on Linux. - CL
+  --------------------------------------------
+* Don't block access to the download menu when both no_download and
+  no_disk_save are set if any of the download commands have always_enabled
+  set (ie. present a reduced menu, with those still available). - FM
+* More tweaks of help and html files. - DSL
+07-26-95
+* Added support for GNUC in the VMS .com files.  Should now compile and link
+  automatically for GNUC via build.com, but that needs testing. - FM
+* Reorganized VMS option files into ones for the transport and ones for the
+  compiler, with corresponding updates of the .com and .mms files. - FM
+* Tweaks of mods for GNUC on VMS, based on further discussions with
+  SB. - FM
+* Tweaks of -help output. - Daniel S. Lewart (d-lewart@uiuc.edu)
+07-25-95
+* Ugh!!  Blew it for Unix when setting up the GLOBALDEF/GLOBALREF definitions
+  in tcp.h for VAXC vs. DECC vs. GNUC on VMS this morning (I'm a night
+  person 8-). - FM
+* Worked in code for compiling with the VMS port of GNUC, based on patches
+  from Sterling Bjorndahl (bjorndahl@augustana.ab.ca) and advice from
+  Pat Rankin (rankin@eql.caltech.edu).  Needs testing, and the linking
+  procedure still needs to be addressed explicitly. - FM
+* Prevent possibility of a null pointer dereference if an ISMAP anchor
+  fetch fails. - David Trueman (david@cs.dal.ca)
+07-21-95
+* Added LYK_HEAD (mapped by default to ']') to send HEAD requests for the
+  current document or link (always sent with LYforce_no_cache). - FM
+* More lynx.man, lynx.hlp, help file and documentation updates. - FM
+07-19-95
+* Put back "-mime_headers" with mods like those in lynx2-4-2, i.e., so that
+  a source dump is forced.  Both "-mine_headers" and "-head" show the status
+  line as well as the MIME headers. - FM
+* Modified "-error_file" to show the complete status line, as well as the
+  URL and METHOD, and to concatenate entries instead of creating separate
+  files for each request. - FM
+* Updated the lynx.man, lynx.hlp and lynx_help files. - FM
+07-18-95
+* Changed "-mime_headers" to "-head" and implemented it as a HEAD request
+  for fetching the MIME headers as text/plain. - FM
+07-17-95
+* Removed 00DIFFERENT from this distribution. - FM
+* Made use of _underline_ format in dumps optional via SUBSTITUTE_UNDERSCORES
+  definitions in userdefs.h and/or lynx.cfg, and added a "-underscore"
+  command line switch for toggling the default on or off. - FM
+* Use system("exec $SHELL") for spawning the default shell on Unix. - Paul
+  Gilmartin (pg@sweng.stortek.com)
+* Fixed typo in check for news vs. nntp URLs in HTNews.c. - Wilson Cheung
+  (wcheung@netcom.com)
+* Added code to the VMS setup() for dealing with curses conficts if someone
+  used -post_data or -get_data without specifying -dump under conditions
+  which require it, so it's not forced in LYMain.c as on Unix.  If fact,
+  -get_data and -post_data are very useful in interactive invokations. - FM
+* Fixed memory leak in the -post_data and -get_data handling. - FM
+* Added LYNX_HOST_NAME in userdefs.h and lynx.cfg for defining an alias
+  which will be treated equivalently to "localhost" and HTHostName (the
+  fully qualified domain name of the system running Lynx) in checks for
+  URLs on the local host (e.g., when the -localhost switch is set). - FM
+* Added in or improved descriptions for the new switches in the Lynx
+  command line help and Lynx_users_guide.html. - FM
+07-16-95
+* Tweaks of yesterday's startfile and -homepage mods, and added treatment
+  of '~' as SYS$LOGIN when used as the lead character on VMS (e.g., on
+  VMS as on Unix,  lynx ~/  will create a listing of the login directory
+  for the account running lynx). - FM
+* Worked in stuff from 13-Jul-95 lynx2-4-1 upgrade.  Most had already been
+  added to lynx2-4-FM.  This is the new stuff. - FM:
+---------------------------------------------------
+   07-13-95
+* Added some command line patches from Peter Brooks - CL:
+  (pbrooks@micromind.com).  The new command lines are:
+	-post_data, -get_data = send form data from stdin and dumps results.
+	-auth=ID:PASSWD = sets authorization stuff at startup.
+	-mime_header = prints mime header with -source.
+	-noredir = prevents automatic redirection
+	-error_file=file = prints HTTP status code to file.  (Not sure of
+		his motivation on this one, something to do with SlipKnot,
+		I think.)
+	(Replaced Peter's strdup()'s with more portable code. - FM)
+   07-11-95
+* Added Erik Olson's (olson@phys.washngton.edu) patch to use the
+  _underline_ format when using the -dump option. - CL
+  (Kept the old code, #ifdef'ed out, to make this optional someday. - FM)
+   07-07-95
+* Fixed a bug in local_dired.  Specifically, a pointer to a fixed array
+  was being fed into StrAllocCopy as the destination.  Linux was choking
+  on this although OSF/1 and AIX seemed to handle it better. - CL
+---------------------------------------------------
+07-15-95
+* If a command line "startfile" and/or -homepage is not a URL, and can't
+  be located as a file or directory on the local system, treat it as an
+  http URL, e.g., www.wfeb.edu will be treated as http://www.wfeb.edu - FM
+07-13-95
+* Added nntp URL handling (nntp://news_host[:port]/path).  Made it read
+  access only (use news URLs for both read and post access). - FM
+07-12-95
+* Added code for proxying https and snews URLs.  The Netsite proxy server
+  can proxy them without need for SSL code in the clients themselves, i.e.,
+  for Lynx as publically distributed (need client-resident SSL code and
+  tunneling for the CERN proxy server, sorry). - FM
+* Added the CONNECT protocol to our local code, so that SSL URLs can be
+  tunneled through proxy servers, and reorganized some code so that patches
+  for the SSL hooks can be applied easily if NSA regulations are relaxed. - FM
+07-11-95
+* More tweaks of alignment code. - FM
+* Fixed bad code for removing trailing white space in GridText.c, LYrcFile.c,
+  LYReadCFG.c and LYUtils.c. - FM
+* Added snews and nttp protocols, which simply inform the user that they
+  aren't implemented. - FM
+* The claim is that even mere hooks to the RSA and SSL libraries are
+  objectionable to the NSA, so I removed then from the public distribution,
+  but left in the https protocol, which simply informs the user that it
+  isn't implemented. - FM
+07-08-95
+* Worked in Lou Montulli's (montulli@netscape.com) code for https URL
+  handling into the Common Library.  To actually use it, you have to
+  get the RSA and SSL libraries, which are restricted to US citizens
+  (it works if you are and do 8-).  I can't include those in this
+  distribution, because by US law that would in turn restrict it to
+  US citizens. - FM
+* Tweaks of paragraph alignment code. - FM
+07-07-95
+* If we are not allowed to change the status of the "lynxexec
+  execution of links" from the option screen then we shouldn't be
+  allowed to change it from the .lynxrc file either. - GL
+* Added George Lindholm's patch to add uudecode support to Lynx's file
+  manager.  Unfortunately, uudecode puts the uudecoded file in the
+  current working directory, namely the directory where lynx is started.
+  I haven't thought of a workaround yet, so I made lynx print a
+  statusline message informing the user. - CL
+07-06-95
+* Modified redirection-handling code in HTTP.c to ensure that we get all of
+  the headers before trying to track down the Location: header. - FM
+* For move's or rename's in the local DIRED code, don't write the new file
+  name into the same buffer as the old. - Earl Fogel (fogel@duke.usask.ca)
+07-05-95
+* Added GL's mods to use a stream-based procedure for displaying the
+  current Lynx keymap.  Faster and more efficient than the temporary
+  file-based procedure. - FM
+07-04-95 (Enjoy the fireworks!!!  8-)
+* More mods of SGML/HTML parsing to help recover from bad HTML. - FM
+* Fixed some cryptic initialization problems in the Common Library's
+  centering and right alignment code, that we're now using, by changing
+  the malloc's in HTChunk.c to calloc's. - FM
+* Secured some unsafe code in the LYstrncpy() function. - FM
+* Increased the connect() and select() while()-looping limit in HTTCP.c
+  to 30,000 tries. - FM
+* Tweak of HR WIDTH attribute handling. - FM
+07-03-95
+* Updated the DTD structures and definitions for HR to HTML 3.0, plus
+  its Netscape WIDTH and SIZE attributes, and implemented WIDTH, e.g.,
+  HR WIDTH="50%" yields a centered horizontal rule half the width
+  between the current left and right margins. - FM
+* Fixed problem of header end tags not yielding line breaks when embedded
+  in CENTER, LEFT or RIGHT tags. - FM
+07-02-95
+* Added MAKE_PSEUDO_ALTS_FOR_INLINES in userdefs.h and lynx.cfg which can
+  be defined FALSE to treat inlines without an ALT string as having ALT=""
+  instead of inserting the pseudo-ALT string "[INLINE]" into the document.
+  The configuration file default can be toggled via a -pseudo_inlines
+  command line switch, and the user can toggle the inclusion of pseudo-ALT
+  strings on or off at run time via LYK_INLINE_TOGGLE (mapped by default
+  to '['). - FM
+* Made the -image_links command line switch a toggle for the configuration
+  file default setting. - FM
+* Enabled processing of forms that use TABLE for formatting.  I don't see any
+  risk of crashes, and they might end up usable.  Messages warn the user that
+  the display of the form may be strange. - FM
+* Relaxed anti-crash protections for forms with bad HTML (usually due
+  to interdigitated instead of embedded tags, written by providers with
+  Netscape or Mosaic clients, which are insensitive to such fundamentally
+  bad HTML).  I got the code to still work with several bad forms on the
+  Net, and if a crash should occur, the user has been tipped off via the
+  statusline or trace message about the nature of the problem. - FM
+07-01-95
+* Restored the meaning of the P element to be the beginning of a paragraph,
+  updated its structures and definitions in the DTD to HTML 3.0, and
+  implemented its ALIGN attribute (left, center, right).  Note that it
+  no longer forces double spacing (you'll get the spacing defined in
+  the stylesheet for the current element, which may or may not be
+  double) and empty paragraphs (serial Ps) will not yield additional
+  newlines (use serial BRs for that). - FM
+* If both download options and disk saves are restricted, don't fetch
+  binary files with a download offer when their links are activated
+  (just issue a statusline message that the file can't be displayed),
+  and issue a "disabled" statusline message for any overt 'd'ownload
+  attemps. - FM
+* For disk saves in LYDownload.c, on VMS attempt a rename() first, and then
+  a spawned DCL copy if that fails. - FM
+* Added memory exhaustion checks for all mallocs, reallocs and callocs in
+  the LYfoo modules. - FM
+* Added CL's realloc() substitute for AIX and ultrix in GridText.c. - FM
+* Map extensions .html3 and .ht3 to text/html in HTInit.c. - FM
+06-29-95
+* Added code to enable creation of links for all images.  Can be made the
+  default by setting MAKE_LINKS_FOR_ALL_IMAGES to TRUE in userdefs.h and/or
+  lynx.cfg (not advised).  Can be implemented for the session via a command
+  line switch, -image_links, e.g., use  lynx -dump -image_links  to get links
+  for all images, as well as standard links, listed in the output.  Can be
+  toggled on and off at run time via LYK_IMAGE_TOGGLE (mapped by default to
+  '*').  Use that in conjuction with the LYK_LIST command to get a list of
+  links that includes all images, e.g., for adding them as bookmarks.  The
+  toggle also invokes a reload, so that the change will be implemented for
+  the current and any future documents, but if you return to cached
+  documents, those will need to be reloaded explicitly.  See comments in
+  userdefs.h and lynx.cfg for more information. - FM
+* Don't restrict use of Control-T for toggling trace mode to advanced
+  usermode (i.e., make it available in all usermodes, so people might
+  follow the instructions in "BAD HTML" statusline messages to check
+  the document in trace mode). - FM
+* Modified LYList.c to indicate the anchor NAME/ID, if present, following
+  the TITLE, if known, in interactive 'l'ists.
+* Modified SGML.c to treat '>' as both a close-double-quote and close-tag.
+  Now Lynx acts like Netscape, in that respect, so all that bad HTML
+  Netscape users are generating will not bother Lynx. - FM
+06-28-95
+* Oops, missed an initialization in this morning's centering and right
+  alignment mods. - FM
+* Fixed up HTML.c to bypass HTML 3.0 attribute checks for start tags generated
+  by the Common Library's non-http access types (gopher, ftp, news, wais)
+  Could crash, otherwise.  - FM
+* Fixed up GridText.c code to take non-printing control characters properly
+  into account when formatting centered or right-aligned text. - FM
+* Mods to improve appropriate carryover or cancelling of alignment attributes
+  across successive elements. - FM
+* Implemented Netscape LEFT and RIGHT extensions, homologously to CENTER. - FM
+* Implemented Netscape BLINK extension as HT_UNDERLINE. - FM
+06-26-95
+* Updated the DTD structures and definitions for H1 - H6 to HTML 3.0 and
+  implemented their ALIGN attribute (left, right and center). - FM
+* Implemented the Netscape CENTER extension. - FM
+06-25-95
+* Updated the DTD structures and definitions for FORM, INPUT, TEXTAREA,
+  SELECT and OPTION to HTML 3.0. - FM
+* Implemented the HTML 3.0 DISABLED attribute for FORM elements. - FM
+* INPUT type "scribble" implemented as "text" according to the HTML 3.0
+  recommendation for non-GUI clients. - FM
+* Added protections against problems with INPUT types "range" and "file"
+  until they're implemented (will be tricky, but do-able 8-). - FM
+06-23-95
+* Added all ISO8859-1 entities to the DTD. - FM
+06-22-95
+* Updated the DTD structures and definitions for A and IMG to HTML 3.0, and
+  implemented their ID attribute. - FM
+* Tweaks of FIG handling. - FM
+* It is somehow inappropriate to teach our users to write correct HTML and
+  to tell them to always check it before publishing, when Lynx's on-line
+  help gives such a bad example :-} (not to mention versions from a couple
+  of months back).  Better now. - Mark Martinec (Mark.Martinec@nsc.ijs.si)
+06-20-95
+* Made the DTD structures and definitions for the HTML 3.0 elements
+  BQ, CAPTION, CREDIT, FIG, NOTE and OVERLAY complete, and added
+  those for STYLE, TABLE, TD, TH and TR.
+* Tweaks of yesterday's HTML 3.0 additions (still just "first pass"). - FM
+* Added code for avoiding potential problems with stylesheets and tables
+  in HTML 3.0 documents. - FM
+06-19-95
+* Added "first pass" handling of HTML 3.0 elements BQ, CAPTION, CREDIT,
+  FIG, NOTE and OVERLAY. - FM
+06-17-95
+* Close the configuration file on completion of the big while() in
+  LYReadCFG.c. - PM
+* Added 00DIFFERENT to keep track of files in this code set which
+  presently differ from those in the latest development code set
+  at UKans (currently, lynx2-4-1.zip of 15-Jun-95). - FM
+* Tweak of the pseudo-toolbar code.  The 'l'ist command now displays the
+  TITLE (or RelValue, if TITLE is defaulted) of those links if they have
+  never been accessed, or their actual HTML titles if accessed, at the
+  top of the links list, so you can use that command instead of LYK_HOME
+  to reach the toolbar links at any time, and then left-arrow to where
+  you were in the current document instead of having to page back down
+  to that location. - FM
+06-16-95
+* Added LINK REL="RelValue" HREF="foo" TITLE="TitleValue" HTML 3.0
+  handling (as in http://www.hpl.hp.co.uk/people/dsr/html3/dochead.html
+  of 28-Mar-95).  The HREF and REL values are required (the LINK will be
+  ignored if either is missing or has a zero-length value). TITLE is
+  optional, i.e., the RelValue will be used as the link name if TITLE
+  is omitted.  Currently registered toolbar RelValues are:  Home, ToC,
+  Index, Glossary, Copyright, Up, Next, Previous, Help, and Bookmark.
+  The Bookmark links are intended to have TITLEs (e.g., "Order Form").
+  The others have RelValues that yield self-evident link names.  The LINKs
+  should be placed in the HEAD section, so they'll be displayed in a manner
+  simulating a toolbar (but not a real one, since we don't have Windows and
+  mouse support; use your LYK_HOME command to access it at any time 8-).
+  The BODY should have a line-breaking element (e.g, H1) to set them off.
+  For now, the Banner RelValue is treated like another toolbar element.
+  The StyleSheet RelValue is ignored, since we don't yet have loadable
+  stylesheet handling. - FM
+* Fixed up the 06-13-95 NO_ANONYMOUS_EMAIL patch to be appropriate for
+  VMS - FM.
+06-14-95
+* Added LYK_LIST command ('l' or 'L'; must be uppercase if VI keys are on)
+  for creating an ACTIVATEable list of references (links) in the current
+  document.  If LINKS_ARE_NUMBERED is on, it's a UL, otherwise it's an
+  OL.  Visited links have the TITLE displayed, otherwise the HREF is
+  displayed. - FM
+* Added code to append a list of references (links), if present in the
+  document, when -dump is used.  Dumps are done with LINKS_ARE_NUMBERED
+  turned on.  The reference list is numbered, and always shows the HREFs,
+  so that they can be referenced to the links in the document. - FM
+* Updated help files. - FM
+--- lynx2-4-1 on ftp2.cc.ukans.edu (added to lynx2-4-FM on 06-16-95)
+06-13-95
+* Added George Lindholm's patch to add -r (recurse) to the zip call in DIRED.
+  - JP
+06-12-95
+* Added George Lindholm's new file permission patch.  Here's his description:
+  "Here is a rewamped version of my earlier file permission patch.  This version
+   uses a html page to prompt for user input (rather than having the user
+   enter a obscure unix chmod string) using checkboxes." - JP
+* Added George Lindholm's addition of a compiler flag (NO_ANONYMOUS_EMAIL).
+  If NO_ANONYMOUS_EMAIL is set the user will not be able to add their own
+  from header.  This will only work if the mail package being used will
+  add this information. - JP
+--- lynx2-4-1 on ftp2.cc.ukans.edu
+06-09-95
+* Replaced info.cern.ch with www.w3.org in html and make files.  Designated
+  this code as 2.4-FM, for local use. - FM
+--- STARTING  2.4-FM ---
+--- Rename of Lynx2-3-FM and release as Lynx2-4  (08-June-1995) ---
+    (see CHANGES2-4 and CHANGES2-3)
diff --git a/docs/FM.announce b/docs/FM.announce
new file mode 100644
index 00000000..0b2652bf
--- /dev/null
+++ b/docs/FM.announce
@@ -0,0 +1,72 @@
+LYNX FILE MANAGEMENT SUPPORT
+
+New facilities have been added since Lynx 2-3 to provide support
+for managing files on the local filesystem.  These facilities allow
+the user to delete, rename, and re-locate files and/or directories and
+to create and/or upload new files and directories.  This will mainly
+be of interest to systems administrators who are interested in running
+lynx as a restricted shell in order to provide controlled access to a
+range of services (as in a freenet). It may also be of use at sites
+where some of the users are experiencing difficulty with the raw Unix
+interface.
+
+Support for the new facilities is enabled at compile time by defining
+the variable `DIRED_SUPPORT' in the `MCFLAGS' list in the Lynx
+Makefile, and in the WWW makefile `CommonMakefile'.  Runtime support
+for disabling the facilities is provided by way of the restriction
+`dired_support' which can be set on the command line for a particular
+session.
+
+The Makefile also provides additional compile time flags for
+controlling the extent and application of the file management
+facilities; specifically, `OK_TAR' which enables support for creating
+and expanding tar archives, `OK_GZIP' which enables use of gzip to
+compress and decompress files, and `OK_OVERRIDE' which allows access
+to the file management facilities directly from the keyboard in
+addition to access by way of a file management menu.
+
+There are two possible modes of operation; the first in which a single
+file management menu is invoked via the `f', or `F' key; the second,
+in which the more often used facilities are made available directly
+from the keyboard in addition to access via the menu.  The second
+method provides a much better user interface but requires re-mapping
+some of the keys from their standard lynx interpretation, temporarily
+when file management mode is in effect.  For example, if OK_OVERRIDE is
+defined at compile-time, then the line at the bottom of the screen, in
+novice mode, will be
+
+  C)reate  D)ownload  E)dit  F)ull menu  M)odify  R)emove  T)ag  U)pload
+
+rather than the standard second noviceline,
+
+  H)elp O)ptions P)rint G)o M)ain screen Q)uit /=search [delete]=history list
+
+when the user is browsing part of the file system.  If OK_OVERRIDE is not
+defined then all access to file management functionality must be by way
+of the menu.  The only exception is that the facility to tag files for
+subsequent removal and/or re-location is always available directly from
+the keyboard using `t', and `T'.
+
+This is a first release of the file management enhancements and suggestions
+for improvements are welcome.  Among the enhancements which are currently
+being considered are facilities for changing file access attributes, and
+a facility for listing and extracting part of an archive.
+
+In order to use the file management facilities you may either point
+the program at a directory on the command line or point the program at
+an html file which contains a link of the following form:
+
+   <a href="file://localhost/~/"> Manage Personal Directory ? </a>
+
+where the anchor `file://localhost/~/' implies a reference to
+/home/username.  Because the `~/' in a file URL is converted to
+`/home/username' regardless of origin, these facilities also work when
+the anchor shown above is served from an http server as well.  In
+either case the reference is to files on the local system and not
+files in the domain of the server.
+
+By default the file listing is in standard Unix mixed format, but you
+may use the Options menu to select WWW `directories first' format, or
+`files first' format if you prefer.
+
+Rick Mallett, Carleton University, Ottawa Canada. (rmallett@ccs.carleton.ca)
diff --git a/docs/IBMPC-charsets.announce b/docs/IBMPC-charsets.announce
new file mode 100644
index 00000000..1431cdf3
--- /dev/null
+++ b/docs/IBMPC-charsets.announce
@@ -0,0 +1,74 @@
+
+Summary
+=======
+This document is primarily for people who will be using Lynx
+on a remote UNIX or VMS system via an MS-DOS based terminal program.
+
+
+General Information
+===================
+Lynx comes with built-in translation tables to map the 8-bit character codes or
+character entities coming in from an HTML document to their equivalent codes,
+where possible, for various character sets.
+
+IMPORTANT:  you should choose display character set in Lynx Options Menu
+according to your font installed locally.  Probably it would be cpXXX. Please
+contact lynx-dev mailing list if you want any new codepage not listed there.
+
+Note that all points of the connection between the display at your end and Lynx
+at the remote end must be 8-bit clean.  If the high bit is being stripped at
+any point in between, the only character set you can use (effectively) in Lynx
+will be "7 bit approximations".  More on that later.
+
+
+MS-DOS character set weirdness
+==============================
+MS-DOS uses a bass-ackwards character set in which half the normal characters
+have been replaced by pseudo-graphic line and box-drawing characters, and in
+which almost all of the international characters are mapped to nonstandard
+numbers.  It also contains Greek letters.
+
+Further confusing matters, there is more than one MS-DOS character set.  The
+character sets are referred to as "codepages," each of which has a unique
+number.  IBM PCs and compatibles come with one hardware-based default codepage
+and a keyboard to match.  In the US market the hardware codepage is 437.  PCs
+destined for other regions of the world often have a different default codepage
+which contains characters for other languages and keyboards.  Under MS-DOS, one
+can load different codepages into memory and use one of them instead of the
+hardware default.
+
+If you are using Lynx through an MS-DOS based terminal program or telnet
+client, you should use an appropriate DOS codepage in Lynx and you need not any
+translation within terminal program (this is different from old-style behavior
+and works better because of superior Lynx translation support).
+
+Check your display by accessing Martin Ramsch's ISO-8859-1 table
+(iso8859-1.html in the Lynx distribution's test subdirectory).
+
+Ramsch's table describes each entity and shows examples of each.  It should be
+immediately obvious that you are either seeing what you are supposed to, or
+you're not.  If you see box and line-drawing characters and mismatched letters
+and so on, you are likely displaying 7 bit data, not 8.  Ensure that all points
+of your connection are 8-bit clean:
+
+	On any remote UNIX systems you must pass through, do
+		'stty cs8 -istrip' or 'stty pass8'.  'stty -a' should list
+		your settings.
+	On any remote VMS systems, do 'set terminal /eightbit'.
+	Make sure your terminal program or telnet client is not filtering
+		8-bit data.  You may found the choice between "VT-100 strict"
+		and "VT-100 relaxed" emulation mode - use relaxed.
+		Note:  Procomm for DOS has a confusing "Use 7 bit or 8 bit
+		ANSI" setting -- this has to do with ANSI sequences.  If set to
+		8 bit, some 8-bit character sequences, including those passed
+		by Lynx as well as those which are for your terminal type
+		(vt100, etc.) will be processed by Procomm as ANSI screen
+		control codes and will most likely result in a garbled display.
+		Set it to 7 bit.
+	If going through a dialup terminal server, you may have to set the
+		terminal server itself to pass 8 bit data.  How to do this
+		varies with the make of the server, and in some cases only a
+		system admin in charge of the box will have the authorization
+		to do that.
+	SLIP or PPP connections should already be 8-bit clean.
+
diff --git a/docs/SOCKETSHR.announce b/docs/SOCKETSHR.announce
new file mode 100644
index 00000000..4c08a018
--- /dev/null
+++ b/docs/SOCKETSHR.announce
@@ -0,0 +1,67 @@
+LYNX SUPPORT FOR SOCKETSHR/NETLIB			28-AUG-1996
+---------------------------------
+
+
+What is SocketShr?
+------------------
+
+SOCKETSHR is Eckhart Meyer's socket library interface to the MadGoat NETLIB
+package, which provides a vendor-independent interface to the VMS TCP/IP
+transports.  Using this, the same image will run over any of the available
+packages, including UCX, Multinet, CMU, Pathway access and TCPWARE.
+
+SocketShr and NETLIB are separately available libraries that MUST be installed
+before LYNX can use them.
+
+
+How to get NETLIB and SOCKETSHR
+-------------------------------
+
+FTP:
+
+   ftp://ftp.kcl.ac.uk/default/socketshr.*
+   ftp://ftp.wku.edu/fileserv/socketshr.zip
+   ftp://ftp.spc.edu/macro32/savesets/socketshr.zip
+
+   ftp://ftp.kcl.ac.uk/madgoat/netlib.*
+   ftp://ftp.wku.edu/madgoat/netlib017.zip
+   ftp://ftp.spc.edu/macro32/savesets/netlib017.zip
+
+
+By E-Mail:
+   send the following commands in a mail message:
+
+     SEND SOCKETSHR.PACKAGE
+     SEND NETLIB.PACKAGE
+
+   To:
+     vmsserv @ kcl.ac.uk
+
+Other server's may also contain these packages.
+
+NETLIB is copyright of MadGoat Software; SOCKETSHR is copyright of Eckhart
+meyer.
+
+
+Preliminary Setup of SOCKETSHR
+------------------------------
+
+Once SOCKETSHR has been installed, TWO logical names should be defined:
+
+    SOCKETSHR 		Point to the appropriate shareable image
+    SOCKETSHR_LIBRARY	Point to the directory containing SOCKETSHR.H
+    			and IOCTL.H
+
+Both should be defined /system /exec
+
+
+Building LYNX
+-------------
+
+Run the BUILD.COM procedures and select the SOCKETSHR_TCP option.  This will
+build an image that will run over the SOCKETSHR/NETLIB routines.
+
+
+Andy Harper
+Kings College London
+A.Harper@bay.cc.kcl.ac.uk
diff --git a/docs/djgpp.key b/docs/djgpp.key
new file mode 100644
index 00000000..0ce8631a
--- /dev/null
+++ b/docs/djgpp.key
@@ -0,0 +1,214 @@
+                      DJGPP Keyhandler Keymaps
+
+Control_A            0x001
+Control_B            0x002
+Control_C            0x003
+Control_D            0x004
+Control_E            0x005
+Control_F            0x006
+Control_G            0x007
+BackSpace            0x008
+Control_H            0x008
+Tab                  0x009
+Control_I            0x009
+LineFeed             0x00a
+Control_J            0x00a
+Control_K            0x00b
+Control_L            0x00c
+Return               0x00d
+Control_M            0x00d
+Control_N            0x00e
+Control_O            0x00f
+Control_P            0x010
+Control_Q            0x011
+Control_R            0x012
+Control_S            0x013
+Control_T            0x014
+Control_U            0x015
+Control_V            0x016
+Control_W            0x017
+Control_X            0x018
+Control_Y            0x019
+Control_Z            0x01a
+Control_LBracket     0x01b
+Escape               0x01b
+Control_BackSlash    0x01c
+Control_RBracket     0x01d
+Control_Caret        0x01e
+Control_Underscore   0x01f
+Space                0x020
+ExclamationPoint     0x021
+DoubleQuote          0x022
+Hash                 0x023
+Dollar               0x024
+Percent              0x025
+Ampersand            0x026
+Quote                0x027
+LParen               0x028
+RParen               0x029
+Star                 0x02a
+Plus                 0x02b
+Comma                0x02c
+Dash                 0x02d
+Period               0x02e
+Slash                0x02f
+Colon                0x03a
+SemiColon            0x03b
+LAngle               0x03c
+Equals               0x03d
+RAngle               0x03e
+QuestionMark         0x03f
+At                   0x040
+LBracket             0x05b
+BackSlash            0x05c
+RBracket             0x05d
+Caret                0x05e
+UnderScore           0x05f
+BackQuote            0x060
+LBrace               0x07b
+Pipe                 0x07c
+RBrace               0x07d
+Tilde                0x07e
+Control_Backspace    0x07f
+BackTab              0x10f
+Alt_Q                0x110
+Alt_W                0x111
+Alt_E                0x112
+Alt_R                0x113
+Alt_T                0x114
+Alt_Y                0x115
+Alt_U                0x116
+Alt_I                0x117
+Alt_O                0x118
+Alt_P                0x119
+Alt_LBracket         0x11a
+Alt_RBracket         0x11b
+Alt_Return           0x11c
+Alt_A                0x11e
+Alt_S                0x11f
+Alt_D                0x120
+Alt_F                0x121
+Alt_G                0x122
+Alt_H                0x123
+Alt_J                0x124
+Alt_K                0x125
+Alt_L                0x126
+Alt_Semicolon        0x127
+Alt_Quote            0x128
+Alt_Backquote        0x129
+Alt_Backslash        0x12b
+Alt_Z                0x12c
+Alt_X                0x12d
+Alt_C                0x12e
+Alt_V                0x12f
+Alt_B                0x130
+Alt_N                0x131
+Alt_M                0x132
+Alt_Comma            0x133
+Alt_Period           0x134
+Alt_Slash            0x135
+Alt_KPStar           0x137
+F2                   0x13c
+F3                   0x13d
+F4                   0x13e
+F5                   0x13f
+F6                   0x140
+F7                   0x141
+F8                   0x142
+F9                   0x143
+F10                  0x144
+Alt_KPMinus          0x14a
+Center               0x14c
+Alt_KPPlus           0x14e
+Shift_F1             0x154
+Shift_F2             0x155
+Shift_F3             0x156
+Shift_F4             0x157
+Shift_F5             0x158
+Shift_F6             0x159
+Shift_F7             0x15a
+Shift_F8             0x15b
+Shift_F9             0x15c
+Shift_F10            0x15d
+Control_F1           0x15e
+Control_F2           0x15f
+Control_F3           0x160
+Control_F4           0x161
+Control_F5           0x162
+Control_F6           0x163
+Control_F7           0x164
+Control_F8           0x165
+Control_F9           0x166
+Control_F10          0x167
+Alt_F1               0x168
+Alt_F2               0x169
+Alt_F3               0x16a
+Alt_F4               0x16b
+Alt_F5               0x16c
+Alt_F6               0x16d
+Alt_F7               0x16e
+Alt_F8               0x16f
+Alt_F9               0x170
+Alt_F10              0x171
+Control_Print	     0x172
+Control_Left         0x173
+Control_Right        0x174
+Control_End          0x175
+Control_PageDown     0x176
+Control_Home         0x177
+Alt_1                0x178
+Alt_2                0x179
+Alt_3                0x17a
+Alt_4                0x17b
+Alt_5                0x17c
+Alt_6                0x17d
+Alt_7                0x17e
+Alt_8                0x17f
+Alt_9                0x180
+Alt_0                0x181
+Alt_Dash             0x182
+Alt_Equals           0x183
+Control_PageUp       0x184
+F11                  0x185
+F12                  0x186
+Shift_F11            0x187
+Shift_F12            0x188
+Control_F11          0x189
+Control_F12          0x18a
+Alt_F11              0x18b
+Alt_F12              0x18c
+Control_Up           0x18d
+Control_KPDash       0x18e
+Control_Center       0x18f
+Control_KPPlus       0x190
+Control_Down         0x191
+Control_Insert       0x192
+Control_Delete       0x193
+Control_KPSlash      0x195
+Control_KPStar       0x196
+Alt_EHome            0x197
+Alt_EUp              0x198
+Alt_EPageUp          0x199
+Alt_ELeft            0x19b
+Alt_ERight           0x19d
+Alt_EEnd             0x19f
+Alt_EDown            0x1a0
+Alt_EPageDown        0x1a1
+Alt_EInsert          0x1a2
+Alt_EDelete          0x1a3
+Alt_KPSlash          0x1a4
+Alt_Tab              0x1a5
+Alt_Enter            0x1a6
+Alt_Escape           0x1a7
+Control_At           0x1a8
+Alt_Backspace        0x1a9
+Control_ELeft        0x273
+Control_ERight       0x274
+Control_EEnd         0x275
+Control_EPageDown    0x276
+Control_EHome        0x277
+Control_EPageUp      0x284
+Control_EUp          0x28d
+Control_EDown        0x291
+Control_EInsert      0x292
+Control_EDelete      0x293
diff --git a/docs/slang.key b/docs/slang.key
new file mode 100644
index 00000000..73108802
--- /dev/null
+++ b/docs/slang.key
@@ -0,0 +1,4 @@
+                   S-Lang Keymaps for DOS
+
+F0		0x200
+F(X)		(SL_KEY_F0 + X) /* If X>1 */
diff --git a/makefile.msc b/makefile.msc
index f6f7e23e..c780a50f 100644
--- a/makefile.msc
+++ b/makefile.msc
@@ -1,4 +1,4 @@
-# $LynxId: makefile.msc,v 1.18 2008/09/22 21:44:21 tom Exp $
+# $LynxId: makefile.msc,v 1.19 2008/09/25 00:25:16 tom Exp $
 #
 # Makefile for `Lynx' browser for Microsoft Visual C++ 4.2 or later
 #
@@ -117,7 +117,7 @@ CFLAGS   = /nologo /MT /W3 /GX /Zi /c
 LDFLAGS  = /debug /nologo /subsystem:console /incremental:no /machine:I386
 !endif
 
-LIBS     = kernel32.lib user32.lib wsock32.lib /NODEFAULTLIB:libc\
+LIBS     = kernel32.lib user32.lib wsock32.lib advapi32.lib /NODEFAULTLIB:libc\
  $(ETC_LIB)\$(SCREEN_LIB).lib $(ETC_LIB)\zlib.lib dirent.obj $(SSL_LIBS)
 
 COMPILE = $(CC) $(CFLAGS) $(INCLUDES) $(DEFS)
diff --git a/samples/keepviewer b/samples/keepviewer
new file mode 100755
index 00000000..f5c0b2c1
--- /dev/null
+++ b/samples/keepviewer
@@ -0,0 +1,20 @@
+#!/bin/sh
+# This script can be invoked as a wrapper for an external viewer by lynx, e.g., 
+# given this line in lynx.cfg
+#	XLOADIMAGE_COMMAND:keepviewer xli %s &
+# it will invoke xli on a hardlink to the file (which is assumed to be in the
+# temporary directory created by lynx), and clean up when the viewer exits.
+#
+# Parameters:
+#	$1 is viewer
+#	$2 is filename
+if test $# = 2 ; then
+	chmod 600 $2
+	myfile=`echo $2 | sed -e 's@\(.*/tmp/\)\([^/]*/\)\?\(.*\)@\1my\3@'`
+	ln $2 $myfile || exit 1
+	trap "rm -f $myfile" 0 1 2 5 15
+	eval $1 $myfile
+else
+	echo "Usage: keepviewer <viewer> <filename>"
+	exit 1
+fi
diff --git a/samples/mime.types b/samples/mime.types
new file mode 100644
index 00000000..6393c307
--- /dev/null
+++ b/samples/mime.types
@@ -0,0 +1,26 @@
+# example mime.types file.
+# see the NCSA X Mosaic documentation at
+# http://www.ncsa.uiuc.edu/SDG/Software/Mosaic/Docs/extension-map.html
+# for more details
+# [Lynx uses mime.types mapping for ftp and local files only,
+# http server does specify MIME type in the Content-Type header].
+
+application/postscript         ai eps ps
+application/rtf                rtf
+application/x-tex              tex
+application/x-texinfo          texinfo texi
+application/x-troff            t tr roff
+audio/basic                    au snd
+audio/x-aiff                   aif aiff aifc
+audio/x-wav                    wav
+image/gif                      gif
+image/ief                      ief
+image/jpeg                     jpeg jpg jpe
+image/tiff                     tiff tif
+image/x-xwindowdump            xwd
+text/html                      html
+text/plain                     txt c cc h
+video/mpeg                     mpeg mpg mpe
+video/quicktime                qt mov
+video/x-msvideo                avi
+video/x-sgi-movie              movie
diff --git a/src/LYMainLoop.c b/src/LYMainLoop.c
index a1b060ec..0329f974 100644
--- a/src/LYMainLoop.c
+++ b/src/LYMainLoop.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYMainLoop.c,v 1.154 2008/12/07 22:10:34 tom Exp $
+ * $LynxId: LYMainLoop.c,v 1.155 2008/12/09 00:14:47 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTAccess.h>
@@ -5229,7 +5229,7 @@ int mainloop(void)
 {
 #if defined(WIN_EX)		/* 1997/10/08 (Wed) 14:52:06 */
     char sjis_buff[MAX_LINE];
-    char temp_buff[sizeof(sjis_buffer) * 4];
+    char temp_buff[sizeof(sjis_buff) * 4];
 #endif
     int c = 0;
     int real_c = 0;
diff --git a/src/LYReadCFG.c b/src/LYReadCFG.c
index 3f259e45..f39f2309 100644
--- a/src/LYReadCFG.c
+++ b/src/LYReadCFG.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYReadCFG.c,v 1.130 2008/12/07 20:52:27 tom Exp $
+ * $LynxId: LYReadCFG.c,v 1.131 2008/12/09 01:01:34 tom Exp $
  */
 #ifndef NO_RULES
 #include <HTRules.h>
@@ -381,7 +381,7 @@ The special strings 'nocolor' or 'default', or\n")
 		Color_Strings[i], Color_Strings[i + 1],
 		Color_Strings[i + 2], Color_Strings[i + 3]);
     }
-    fprintf(stderr, "%s\n%s\n", gettext("Offending line:"), error_line);
+    fprintf(stderr, "%s\nCOLOR:%s\n", gettext("Offending line:"), error_line);
     exit_immediately(EXIT_FAILURE);
 }
 #endif /* defined(USE_COLOR_TABLE) || defined(EXP_ASSUMED_COLOR) */
diff --git a/src/chrtrans/dmcs_uni.tbl b/src/chrtrans/dmcs_uni.tbl
new file mode 100644
index 00000000..51072fad
--- /dev/null
+++ b/src/chrtrans/dmcs_uni.tbl
@@ -0,0 +1,233 @@
+#The MIME name of this charset.
+Mdec-mcs
+
+#Name as a Display Charset (used on Options screen)
+ODEC Multinational
+
+#
+#   Name:             DEC Multinational (dec-mcs) [to unicode]
+#   Date:             29 October 1997
+#   Author:           Fote
+#
+#   1999-01-01	various corrections, verified against actual DEC VT220
+#		Christian "naddy" Weisgerber <naddy@mips.rhein-neckar.de>
+#
+##################
+
+#0x20    U+0020  # SPACE
+#0x21    U+0021  # EXCLAMATION MARK
+#0x22    U+0022  # QUOTATION MARK
+#0x23    U+0023  # NUMBER SIGN
+#0x24    U+0024  # DOLLAR SIGN
+#0x25    U+0025  # PERCENT SIGN
+#0x26    U+0026  # AMPERSAND
+#0x27    U+0027  # APOSTROPHE
+#0x28    U+0028  # LEFT PARENTHESIS
+#0x29    U+0029  # RIGHT PARENTHESIS
+#0x2A    U+002A  # ASTERISK
+#0x2B    U+002B  # PLUS SIGN
+#0x2C    U+002C  # COMMA
+#0x2D    U+002D  # HYPHEN-MINUS
+#0x2E    U+002E  # FULL STOP
+#0x2F    U+002F  # SOLIDUS
+#0x30    U+0030  # DIGIT ZERO
+#0x31    U+0031  # DIGIT ONE
+#0x32    U+0032  # DIGIT TWO
+#0x33    U+0033  # DIGIT THREE
+#0x34    U+0034  # DIGIT FOUR
+#0x35    U+0035  # DIGIT FIVE
+#0x36    U+0036  # DIGIT SIX
+#0x37    U+0037  # DIGIT SEVEN
+#0x38    U+0038  # DIGIT EIGHT
+#0x39    U+0039  # DIGIT NINE
+#0x3A    U+003A  # COLON
+#0x3B    U+003B  # SEMICOLON
+#0x3C    U+003C  # LESS-THAN SIGN
+#0x3D    U+003D  # EQUALS SIGN
+#0x3E    U+003E  # GREATER-THAN SIGN
+#0x3F    U+003F  # QUESTION MARK
+#0x40    U+0040  # COMMERCIAL AT
+#0x41    U+0041  # LATIN CAPITAL LETTER A
+#0x42    U+0042  # LATIN CAPITAL LETTER B
+#0x43    U+0043  # LATIN CAPITAL LETTER C
+#0x44    U+0044  # LATIN CAPITAL LETTER D
+#0x45    U+0045  # LATIN CAPITAL LETTER E
+#0x46    U+0046  # LATIN CAPITAL LETTER F
+#0x47    U+0047  # LATIN CAPITAL LETTER G
+#0x48    U+0048  # LATIN CAPITAL LETTER H
+#0x49    U+0049  # LATIN CAPITAL LETTER I
+#0x4A    U+004A  # LATIN CAPITAL LETTER J
+#0x4B    U+004B  # LATIN CAPITAL LETTER K
+#0x4C    U+004C  # LATIN CAPITAL LETTER L
+#0x4D    U+004D  # LATIN CAPITAL LETTER M
+#0x4E    U+004E  # LATIN CAPITAL LETTER N
+#0x4F    U+004F  # LATIN CAPITAL LETTER O
+#0x50    U+0050  # LATIN CAPITAL LETTER P
+#0x51    U+0051  # LATIN CAPITAL LETTER Q
+#0x52    U+0052  # LATIN CAPITAL LETTER R
+#0x53    U+0053  # LATIN CAPITAL LETTER S
+#0x54    U+0054  # LATIN CAPITAL LETTER T
+#0x55    U+0055  # LATIN CAPITAL LETTER U
+#0x56    U+0056  # LATIN CAPITAL LETTER V
+#0x57    U+0057  # LATIN CAPITAL LETTER W
+#0x58    U+0058  # LATIN CAPITAL LETTER X
+#0x59    U+0059  # LATIN CAPITAL LETTER Y
+#0x5A    U+005A  # LATIN CAPITAL LETTER Z
+#0x5B    U+005B  # LEFT SQUARE BRACKET
+#0x5C    U+005C  # REVERSE SOLIDUS
+#0x5D    U+005D  # RIGHT SQUARE BRACKET
+#0x5E    U+005E  # CIRCUMFLEX ACCENT
+#0x5F    U+005F  # LOW LINE
+#0x60    U+0060  # GRAVE ACCENT
+#0x61    U+0061  # LATIN SMALL LETTER A
+#0x62    U+0062  # LATIN SMALL LETTER B
+#0x63    U+0063  # LATIN SMALL LETTER C
+#0x64    U+0064  # LATIN SMALL LETTER D
+#0x65    U+0065  # LATIN SMALL LETTER E
+#0x66    U+0066  # LATIN SMALL LETTER F
+#0x67    U+0067  # LATIN SMALL LETTER G
+#0x68    U+0068  # LATIN SMALL LETTER H
+#0x69    U+0069  # LATIN SMALL LETTER I
+#0x6A    U+006A  # LATIN SMALL LETTER J
+#0x6B    U+006B  # LATIN SMALL LETTER K
+#0x6C    U+006C  # LATIN SMALL LETTER L
+#0x6D    U+006D  # LATIN SMALL LETTER M
+#0x6E    U+006E  # LATIN SMALL LETTER N
+#0x6F    U+006F  # LATIN SMALL LETTER O
+#0x70    U+0070  # LATIN SMALL LETTER P
+#0x71    U+0071  # LATIN SMALL LETTER Q
+#0x72    U+0072  # LATIN SMALL LETTER R
+#0x73    U+0073  # LATIN SMALL LETTER S
+#0x74    U+0074  # LATIN SMALL LETTER T
+#0x75    U+0075  # LATIN SMALL LETTER U
+#0x76    U+0076  # LATIN SMALL LETTER V
+#0x77    U+0077  # LATIN SMALL LETTER W
+#0x78    U+0078  # LATIN SMALL LETTER X
+#0x79    U+0079  # LATIN SMALL LETTER Y
+#0x7A    U+007A  # LATIN SMALL LETTER Z
+#0x7B    U+007B  # LEFT CURLY BRACKET
+#0x7C    U+007C  # VERTICAL LINE
+#0x7D    U+007D  # RIGHT CURLY BRACKET
+#0x7E    U+007E  # TILDE
+#
+0x20-0x7E       idem	# ASCII
+
+0xA1    U+00A1  # inverted exclamation mark (&#161;) - iexcl
+0xA2    U+00A2  # cent sign (&#162;) - cent
+0xA3    U+00A3  # pound sign (&#163;) - pound
+0xA5    U+00A5  # yen sign (&#165;) - yen
+# broken vertical bar (&#166;) - brvbar, brkbar
+U+00A6:|
+0xA7    U+00A7  # section sign (&#167;) - sect
+0xA8    U+00A4  # currency sign (&#164;) - curren
+# spacing diaresis (&#168;) - uml, die
+U+00A8:"
+0xA9    U+00A9  # copyright sign (&#169;) - copy
+0xAA    U+00AA  # feminine ordinal indicator (&#170;) - ordf
+0xAB    U+00AB  # angle quotation mark, left (&#171;) - laquo
+# negation sign (&#172); - not
+U+00AC:NOT
+# soft hyphen (&#173;) - shy
+#U+00AD
+# circled R registered sign (&#174;) - reg
+U+00AE:(R)
+# spacing macron (&#175;) - hibar, macr
+U+00AF:-
+0xB0    U+00B0  # degree sign (&#176;) - deg
+0xB1    U+00B1  # plus-or-minus sign (&#177;) - plusmn
+0xB2    U+00B2  # superscript 2 (&#178;) - sup2
+0xB3    U+00B3  # superscript 3 (&#179;) - sup3
+#spacing acute (&#180;) - acute
+U+00B4:'
+0xB5    U+00B5  # micro sign (&#181;) - micro
+0xB6    U+00B6  # paragraph sign (&#182;) - para
+0xB7    U+00B7 # middle dot (&#183;) - middot
+# spacing cedilla (&#184;) - cedil
+U+00B8:,
+0xB9    U+00B9  # superscript 1 (&#185;) - sup1
+0xBA    U+00BA  # masculine ordinal indicator (&#186;) - ordm
+0xBB    U+00BB  # angle quotation mark, right (&#187;) - raquo
+0xBC    U+00BC  # fraction 1/4 (&#188;) - frac14
+0xBD    U+00BD  # fraction 1/2 (&#189;) - frac12
+# fraction 3/4 (&#190;) - frac34
+U+00BE: 3/4
+0xBF    U+00BF  # inverted question mark (&#191;) - iquest
+0xC0    U+00C0  # capital A, grave accent (&#192;) - Agrave
+0xC1    U+00C1  # capital A, acute accent (&#193;) - Aacute
+0xC2    U+00C2  # capital A, circumflex accent (&#194;) - Acirc
+0xC3    U+00C3  # capital A, tilde (&#195;) - Atilde
+0xC4    U+00C4  # capital A, dieresis or umlaut mark (&#196;) - Auml
+0xC5    U+00C5  # capital A, ring (&#197;) - Aring
+0xC6    U+00C6  # capital AE diphthong (ligature) (&#198;) - AElig
+0xC7    U+00C7  # capital C, cedilla (&#199;) - Ccedil
+0xC8    U+00C8  # capital E, grave accent (&#200;) - Egrave
+0xC9    U+00C9  # capital E, acute accent (&#201;) - Eacute
+0xCA    U+00CA  # capital E, circumflex accent (&#202;) - Ecirc
+0xCB    U+00CB  # capital E, dieresis or umlaut mark (&#203;) - Euml
+0xCC    U+00CC  # capital I, grave accent (&#204;) - Igrave
+0xCD    U+00CD  # capital I, acute accent (&#205;) - Iacute
+0xCE    U+00CE  # capital I, circumflex accent (&#206;) - Icirc
+0xCF    U+00CF  # capital I, dieresis or umlaut mark (&#207;) - Iuml
+# capital Eth, Icelandic (&#208;) - ETH */
+U+00D0:DH
+#      Dj  # capital D with stroke - Dstrok
+0xD1    U+00D1  # capital N, tilde (&#209;) - Ntilde
+0xD2    U+00D2  # capital O, grave accent (&#210;) - Ograve
+0xD3    U+00D3  # capital O, acute accent (&#211;) - Oacute
+0xD4    U+00D4  # capital O, circumflex accent (&#212;) - Ocirc
+0xD5    U+00D5  # capital O, tilde (&#213;) - Otilde
+0xD6    U+00D6  # capital O, dieresis or umlaut mark (&#214;) - Ouml
+0xD7    U+0152  # captial OE ligature (&#338;) - OElig
+# multiplication sign (&#215;) - times
+U+00D7:*
+0xD8    U+00D8  # capital O, slash (&#216;) - Oslash
+0xD9    U+00D9  # capital U, grave accent (&#217;) - Ugrave
+0xDA    U+00DA  # capital U, acute accent (&#218;) - Uacute
+0xDB    U+00DB  # capital U, circumflex accent (&#219;) - Ucirc
+0xDC    U+00DC  # capital U, dieresis or umlaut mark (&#220;) - Uuml
+0xDD    U+0178  # capital Y, dieresis or umlaut mark (&#376;) - Yuml
+# capital Y, acute accent (&#221;) - Yacute
+U+00DD:Y'
+# capital THORN, Icelandic (&#222;) - THORN */
+U+00DE:TH
+0xDF    U+00DF  # small sharp s, German (sz ligature) (&#223;) - szlig
+0xE0    U+00E0  # small a, grave accent (&#224;) - agrave
+0xE1    U+00E1  # small a, acute accent (&#225;) - aacute
+0xE2    U+00E2  # small a, circumflex accent (&#226;) - acirc
+0xE3    U+00E3  # small a, tilde (&#227;) - atilde
+0xE4    U+00E4  # small a, dieresis or umlaut mark (&#228;) - auml
+0xE5    U+00E5  # small a, ring (&#229;) - aring
+0xE6    U+00E6  # small ae diphthong (ligature) (&#230;) - aelig
+0xE7    U+00E7  # small c, cedilla (&#231;) - ccedil
+0xE8    U+00E8  # small e, grave accent (&#232;) - egrave
+0xE9    U+00E9  # small e, acute accent (&#233;) - eacute
+0xEA    U+00EA  # small e, circumflex accent (&#234;) - ecirc
+0xEB    U+00EB  # small e, dieresis or umlaut mark (&#235;) - euml
+0xEC    U+00EC  # small i, grave accent (&#236;) - igrave
+0xED    U+00ED  # small i, acute accent (&#237;) - iacute
+0xEE    U+00EE  # small i, circumflex accent (&#238;) - icirc
+0xEF    U+00EF  # small i, dieresis or umlaut mark (&#239;) - iuml
+# small eth, Icelandic (&#240;) - eth
+U+00F0:dh
+0xF1    U+00F1  # small n, tilde (&#241;) - ntilde
+0xF2    U+00F2  # small o, grave accent (&#242;) - ograve
+0xF3    U+00F3  # small o, acute accent (&#243;) - oacute
+0xF4    U+00F4  # small o, circumflex accent (&#244;) - ocirc
+0xF5    U+00F5  # small o, tilde (&#245;) - otilde
+0xF6    U+00F6  # small o, dieresis or umlaut mark (&#246;) - ouml
+0xF7    U+0153  # small oe ligature (&#339;) - oelig
+# division sign (&#247;) - divide
+U+00F7:/
+0xF8    U+00F8  # small o, slash (&#248;) - oslash
+0xF9    U+00F9  # small u, grave accent (&#249;) - ugrave
+0xFA    U+00FA  # small u, acute accent (&#250;) - uacute
+0xFB    U+00FB  # small u, circumflex accent (&#251;) - ucirc
+0xFC    U+00FC  # small u, dieresis or umlaut mark (&#252;) - uuml
+0xFD    U+00FF  # small y, dieresis or umlaut mark (&#255;) - yuml
+# small y, acute accent (&#253;) - yacute
+U+00FD:y'
+# small thorn, Icelandic (&#254;) - thorn
+U+00FE:th
+#
+# TRADE MARK SIGN
+U+2122:(TM)
diff --git a/src/chrtrans/hp_uni.tbl b/src/chrtrans/hp_uni.tbl
new file mode 100644
index 00000000..58025511
--- /dev/null
+++ b/src/chrtrans/hp_uni.tbl
@@ -0,0 +1,212 @@
+# The MIME name of this charset.
+Mhp-roman8
+
+# Name as a Display Charset (used on Options screen)
+OHP Roman8
+
+# This is not the default font!
+D0
+
+#
+# Name:		HP Roman8 to Unicode
+# Date:		1999-01-09
+# Authors:	Christian "naddy" Weisgerber <naddy@mips.rhein-neckar.de>
+#		Mapping by Roman Czyborra,
+#		<URL:http://czyborra.com/charsets/codepages.html#HP-Roman8>
+#
+
+0x20-0x7E idem	#	ASCII
+
+#0x20	U+0020	#	SPACE
+#0x21	U+0021	#	EXCLAMATION MARK
+#0x22	U+0022	#	QUOTATION MARK
+#0x23	U+0023	#	NUMBER SIGN
+#0x24	U+0024	#	DOLLAR SIGN
+#0x25	U+0025	#	PERCENT SIGN
+#0x26	U+0026	#	AMPERSAND
+#0x27	U+0027	#	APOSTROPHE
+#0x28	U+0028	#	LEFT PARENTHESIS
+#0x29	U+0029	#	RIGHT PARENTHESIS
+#0x2A	U+002A	#	ASTERISK
+#0x2B	U+002B	#	PLUS SIGN
+#0x2C	U+002C	#	COMMA
+#0x2D	U+002D	#	HYPHEN-MINUS
+#0x2E	U+002E	#	FULL STOP
+#0x2F	U+002F	#	SOLIDUS
+#0x30	U+0030	#	DIGIT ZERO
+#0x31	U+0031	#	DIGIT ONE
+#0x32	U+0032	#	DIGIT TWO
+#0x33	U+0033	#	DIGIT THREE
+#0x34	U+0034	#	DIGIT FOUR
+#0x35	U+0035	#	DIGIT FIVE
+#0x36	U+0036	#	DIGIT SIX
+#0x37	U+0037	#	DIGIT SEVEN
+#0x38	U+0038	#	DIGIT EIGHT
+#0x39	U+0039	#	DIGIT NINE
+#0x3A	U+003A	#	COLON
+#0x3B	U+003B	#	SEMICOLON
+#0x3C	U+003C	#	LESS-THAN SIGN
+#0x3D	U+003D	#	EQUALS SIGN
+#0x3E	U+003E	#	GREATER-THAN SIGN
+#0x3F	U+003F	#	QUESTION MARK
+#0x40	U+0040	#	COMMERCIAL AT
+#0x41	U+0041	#	LATIN CAPITAL LETTER A
+#0x42	U+0042	#	LATIN CAPITAL LETTER B
+#0x43	U+0043	#	LATIN CAPITAL LETTER C
+#0x44	U+0044	#	LATIN CAPITAL LETTER D
+#0x45	U+0045	#	LATIN CAPITAL LETTER E
+#0x46	U+0046	#	LATIN CAPITAL LETTER F
+#0x47	U+0047	#	LATIN CAPITAL LETTER G
+#0x48	U+0048	#	LATIN CAPITAL LETTER H
+#0x49	U+0049	#	LATIN CAPITAL LETTER I
+#0x4A	U+004A	#	LATIN CAPITAL LETTER J
+#0x4B	U+004B	#	LATIN CAPITAL LETTER K
+#0x4C	U+004C	#	LATIN CAPITAL LETTER L
+#0x4D	U+004D	#	LATIN CAPITAL LETTER M
+#0x4E	U+004E	#	LATIN CAPITAL LETTER N
+#0x4F	U+004F	#	LATIN CAPITAL LETTER O
+#0x50	U+0050	#	LATIN CAPITAL LETTER P
+#0x51	U+0051	#	LATIN CAPITAL LETTER Q
+#0x52	U+0052	#	LATIN CAPITAL LETTER R
+#0x53	U+0053	#	LATIN CAPITAL LETTER S
+#0x54	U+0054	#	LATIN CAPITAL LETTER T
+#0x55	U+0055	#	LATIN CAPITAL LETTER U
+#0x56	U+0056	#	LATIN CAPITAL LETTER V
+#0x57	U+0057	#	LATIN CAPITAL LETTER W
+#0x58	U+0058	#	LATIN CAPITAL LETTER X
+#0x59	U+0059	#	LATIN CAPITAL LETTER Y
+#0x5A	U+005A	#	LATIN CAPITAL LETTER Z
+#0x5B	U+005B	#	LEFT SQUARE BRACKET
+#0x5C	U+005C	#	REVERSE SOLIDUS
+#0x5D	U+005D	#	RIGHT SQUARE BRACKET
+#0x5E	U+005E	#	CIRCUMFLEX ACCENT
+#0x5F	U+005F	#	LOW LINE
+#0x60	U+0060	#	GRAVE ACCENT
+#0x61	U+0061	#	LATIN SMALL LETTER A
+#0x62	U+0062	#	LATIN SMALL LETTER B
+#0x63	U+0063	#	LATIN SMALL LETTER C
+#0x64	U+0064	#	LATIN SMALL LETTER D
+#0x65	U+0065	#	LATIN SMALL LETTER E
+#0x66	U+0066	#	LATIN SMALL LETTER F
+#0x67	U+0067	#	LATIN SMALL LETTER G
+#0x68	U+0068	#	LATIN SMALL LETTER H
+#0x69	U+0069	#	LATIN SMALL LETTER I
+#0x6A	U+006A	#	LATIN SMALL LETTER J
+#0x6B	U+006B	#	LATIN SMALL LETTER K
+#0x6C	U+006C	#	LATIN SMALL LETTER L
+#0x6D	U+006D	#	LATIN SMALL LETTER M
+#0x6E	U+006E	#	LATIN SMALL LETTER N
+#0x6F	U+006F	#	LATIN SMALL LETTER O
+#0x70	U+0070	#	LATIN SMALL LETTER P
+#0x71	U+0071	#	LATIN SMALL LETTER Q
+#0x72	U+0072	#	LATIN SMALL LETTER R
+#0x73	U+0073	#	LATIN SMALL LETTER S
+#0x74	U+0074	#	LATIN SMALL LETTER T
+#0x75	U+0075	#	LATIN SMALL LETTER U
+#0x76	U+0076	#	LATIN SMALL LETTER V
+#0x77	U+0077	#	LATIN SMALL LETTER W
+#0x78	U+0078	#	LATIN SMALL LETTER X
+#0x79	U+0079	#	LATIN SMALL LETTER Y
+#0x7A	U+007A	#	LATIN SMALL LETTER Z
+#0x7B	U+007B	#	LEFT CURLY BRACKET
+#0x7C	U+007C	#	VERTICAL LINE
+#0x7D	U+007D	#	RIGHT CURLY BRACKET
+#0x7E	U+007E	#	TILDE
+
+0xA0	U+00A0	#	NO-BREAK SPACE
+0xA1	U+00C0	#	LATIN CAPITAL LETTER A WITH GRAVE
+0xA2	U+00C2	#	LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+0xA3	U+00C8	#	LATIN CAPITAL LETTER E WITH GRAVE
+0xA4	U+00CA	#	LATIN CAPITAL LETTER E WITH CIRCUMFLEX
+0xA5	U+00CB	#	LATIN CAPITAL LETTER E WITH DIAERESIS
+0xA6	U+00CE	#	LATIN CAPITAL LETTER I WITH CIRCUMFLEX
+0xA7	U+00CF	#	LATIN CAPITAL LETTER I WITH DIAERESIS
+0xA8	U+00B4	#	ACUTE ACCENT
+0xA9	U+02CB	#	MODIFIER LETTER GRAVE ACCENT
+0xAA	U+02C6	#	MODIFIER LETTER CIRCUMFLEX ACCENT
+0xAB	U+00A8	#	DIAERESIS
+0xAC	U+02DC	#	SMALL TILDE
+0xAD	U+00D9	#	LATIN CAPITAL LETTER U WITH GRAVE
+0xAE	U+00DB	#	LATIN CAPITAL LETTER U WITH CIRCUMFLEX
+0xAF	U+20A4	#	LIRA SIGN
+0xB0	U+00AF	#	MACRON
+0xB1	U+00DD	#	LATIN CAPITAL LETTER Y WITH ACUTE
+0xB2	U+00FD	#	LATIN SMALL LETTER Y WITH ACUTE
+0xB3	U+00B0	#	DEGREE SIGN
+0xB4	U+00C7	#	LATIN CAPITAL LETTER C WITH CEDILLA
+0xB5	U+00E7	#	LATIN SMALL LETTER C WITH CEDILLA
+0xB6	U+00D1	#	LATIN CAPITAL LETTER N WITH TILDE
+0xB7	U+00F1	#	LATIN SMALL LETTER N WITH TILDE
+0xB8	U+00A1	#	INVERTED EXCLAMATION MARK
+0xB9	U+00BF	#	INVERTED QUESTION MARK
+0xBA	U+00A4	#	CURRENCY SIGN
+0xBB	U+00A3	#	POUND SIGN
+0xBC	U+00A5	#	YEN SIGN
+0xBD	U+00A7	#	SECTION SIGN
+0xBE	U+0192	#	LATIN SMALL LETTER F WITH HOOK
+0xBF	U+00A2	#	CENT SIGN
+0xC0	U+00E2	#	LATIN SMALL LETTER A WITH CIRCUMFLEX
+0xC1	U+00EA	#	LATIN SMALL LETTER E WITH CIRCUMFLEX
+0xC2	U+00F4	#	LATIN SMALL LETTER O WITH CIRCUMFLEX
+0xC3	U+00FB	#	LATIN SMALL LETTER U WITH CIRCUMFLEX
+0xC4	U+00E1	#	LATIN SMALL LETTER A WITH ACUTE
+0xC5	U+00E9	#	LATIN SMALL LETTER E WITH ACUTE
+0xC6	U+00F3	#	LATIN SMALL LETTER O WITH ACUTE
+0xC7	U+00FA	#	LATIN SMALL LETTER U WITH ACUTE
+0xC8	U+00E0	#	LATIN SMALL LETTER A WITH GRAVE
+0xC9	U+00E8	#	LATIN SMALL LETTER E WITH GRAVE
+0xCA	U+00F2	#	LATIN SMALL LETTER O WITH GRAVE
+0xCB	U+00F9	#	LATIN SMALL LETTER U WITH GRAVE
+0xCC	U+00E4	#	LATIN SMALL LETTER A WITH DIAERESIS
+0xCD	U+00EB	#	LATIN SMALL LETTER E WITH DIAERESIS
+0xCE	U+00F6	#	LATIN SMALL LETTER O WITH DIAERESIS
+0xCF	U+00FC	#	LATIN SMALL LETTER U WITH DIAERESIS
+0xD0	U+00C5	#	LATIN CAPITAL LETTER A WITH RING ABOVE
+0xD1	U+00EE	#	LATIN SMALL LETTER I WITH CIRCUMFLEX
+0xD2	U+00D8	#	LATIN CAPITAL LETTER O WITH STROKE
+0xD3	U+00C6	#	LATIN CAPITAL LETTER AE
+0xD4	U+00E5	#	LATIN SMALL LETTER A WITH RING ABOVE
+0xD5	U+00ED	#	LATIN SMALL LETTER I WITH ACUTE
+0xD6	U+00F8	#	LATIN SMALL LETTER O WITH STROKE
+0xD7	U+00E6	#	LATIN SMALL LETTER AE
+0xD8	U+00C4	#	LATIN CAPITAL LETTER A WITH DIAERESIS
+0xD9	U+00EC	#	LATIN SMALL LETTER I WITH GRAVE
+0xDA	U+00D6	#	LATIN CAPITAL LETTER O WITH DIAERESIS
+0xDB	U+00DC	#	LATIN CAPITAL LETTER U WITH DIAERESIS
+0xDC	U+00C9	#	LATIN CAPITAL LETTER E WITH ACUTE
+0xDD	U+00EF	#	LATIN SMALL LETTER I WITH DIAERESIS
+0xDE	U+00DF	#	LATIN SMALL LETTER SHARP S
+0xDF	U+00D4	#	LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+0xE0	U+00C1	#	LATIN CAPITAL LETTER A WITH ACUTE
+0xE1	U+00C3	#	LATIN CAPITAL LETTER A WITH TILDE
+0xE2	U+00E3	#	LATIN SMALL LETTER A WITH TILDE
+0xE3	U+00D0	#	LATIN CAPITAL LETTER ETH
+0xE4	U+00F0	#	LATIN SMALL LETTER ETH
+0xE5	U+00CD	#	LATIN CAPITAL LETTER I WITH ACUTE
+0xE6	U+00CC	#	LATIN CAPITAL LETTER I WITH GRAVE
+0xE7	U+00D3	#	LATIN CAPITAL LETTER O WITH ACUTE
+0xE8	U+00D2	#	LATIN CAPITAL LETTER O WITH GRAVE
+0xE9	U+00D5	#	LATIN CAPITAL LETTER O WITH TILDE
+0xEA	U+00F5	#	LATIN SMALL LETTER O WITH TILDE
+0xEB	U+0160	#	LATIN CAPITAL LETTER S WITH CARON
+0xEC	U+0161	#	LATIN SMALL LETTER S WITH CARON
+0xED	U+00DA	#	LATIN CAPITAL LETTER U WITH ACUTE
+0xEE	U+0178	#	LATIN CAPITAL LETTER Y WITH DIAERESIS
+0xEF	U+00FF	#	LATIN SMALL LETTER Y WITH DIAERESIS
+0xF0	U+00DE	#	LATIN CAPITAL LETTER THORN
+0xF1	U+00FE	#	LATIN SMALL LETTER THORN
+0xF2	U+00B7	#	MIDDLE DOT
+0xF3	U+00B5	#	MICRO SIGN
+0xF4	U+00B6	#	PILCROW SIGN
+0xF5	U+00BE	#	VULGAR FRACTION THREE QUARTERS
+0xF6	U+2014	#	EM DASH
+0xF7	U+00BC	#	VULGAR FRACTION ONE QUARTER
+0xF8	U+00BD	#	VULGAR FRACTION ONE HALF
+0xF9	U+00AA	#	FEMININE ORDINAL INDICATOR
+0xFA	U+00BA	#	MASCULINE ORDINAL INDICATOR
+0xFB	U+00AB	#	LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+0xFC	U+25A0	#	BLACK SQUARE
+0xFD	U+00BB	#	RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+0xFE	U+00B1	#	PLUS-MINUS SIGN
+
+## EOF ##
diff --git a/src/chrtrans/iso15_uni.tbl b/src/chrtrans/iso15_uni.tbl
new file mode 100644
index 00000000..efb5bf23
--- /dev/null
+++ b/src/chrtrans/iso15_uni.tbl
@@ -0,0 +1,216 @@
+# The MIME name of this charset.
+Miso-8859-15
+
+# Name as a Display Charset (used on Options screen)
+OWestern (ISO-8859-15)
+
+# This is not the default font!
+D0
+
+#Codepage number
+#?
+
+#
+# Name:		ISO 8859-15 Latin 9 (1998) to Unicode
+# Date:		1999-01-01
+# Authors:	Christian "naddy" Weisgerber <naddy@mips.rhein-neckar.de>
+#
+# Remarks:	Latin 9 is identical to Latin 1	except for
+#		code positions A4, A6, A8, B4, B8, BC, BD, BE
+
+0x20-0x7E idem	#	ASCII
+
+#0x20	U+0020	#	SPACE
+#0x21	U+0021	#	EXCLAMATION MARK
+#0x22	U+0022	#	QUOTATION MARK
+#0x23	U+0023	#	NUMBER SIGN
+#0x24	U+0024	#	DOLLAR SIGN
+#0x25	U+0025	#	PERCENT SIGN
+#0x26	U+0026	#	AMPERSAND
+#0x27	U+0027	#	APOSTROPHE
+#0x28	U+0028	#	LEFT PARENTHESIS
+#0x29	U+0029	#	RIGHT PARENTHESIS
+#0x2A	U+002A	#	ASTERISK
+#0x2B	U+002B	#	PLUS SIGN
+#0x2C	U+002C	#	COMMA
+#0x2D	U+002D	#	HYPHEN-MINUS
+#0x2E	U+002E	#	FULL STOP
+#0x2F	U+002F	#	SOLIDUS
+#0x30	U+0030	#	DIGIT ZERO
+#0x31	U+0031	#	DIGIT ONE
+#0x32	U+0032	#	DIGIT TWO
+#0x33	U+0033	#	DIGIT THREE
+#0x34	U+0034	#	DIGIT FOUR
+#0x35	U+0035	#	DIGIT FIVE
+#0x36	U+0036	#	DIGIT SIX
+#0x37	U+0037	#	DIGIT SEVEN
+#0x38	U+0038	#	DIGIT EIGHT
+#0x39	U+0039	#	DIGIT NINE
+#0x3A	U+003A	#	COLON
+#0x3B	U+003B	#	SEMICOLON
+#0x3C	U+003C	#	LESS-THAN SIGN
+#0x3D	U+003D	#	EQUALS SIGN
+#0x3E	U+003E	#	GREATER-THAN SIGN
+#0x3F	U+003F	#	QUESTION MARK
+#0x40	U+0040	#	COMMERCIAL AT
+#0x41	U+0041	#	LATIN CAPITAL LETTER A
+#0x42	U+0042	#	LATIN CAPITAL LETTER B
+#0x43	U+0043	#	LATIN CAPITAL LETTER C
+#0x44	U+0044	#	LATIN CAPITAL LETTER D
+#0x45	U+0045	#	LATIN CAPITAL LETTER E
+#0x46	U+0046	#	LATIN CAPITAL LETTER F
+#0x47	U+0047	#	LATIN CAPITAL LETTER G
+#0x48	U+0048	#	LATIN CAPITAL LETTER H
+#0x49	U+0049	#	LATIN CAPITAL LETTER I
+#0x4A	U+004A	#	LATIN CAPITAL LETTER J
+#0x4B	U+004B	#	LATIN CAPITAL LETTER K
+#0x4C	U+004C	#	LATIN CAPITAL LETTER L
+#0x4D	U+004D	#	LATIN CAPITAL LETTER M
+#0x4E	U+004E	#	LATIN CAPITAL LETTER N
+#0x4F	U+004F	#	LATIN CAPITAL LETTER O
+#0x50	U+0050	#	LATIN CAPITAL LETTER P
+#0x51	U+0051	#	LATIN CAPITAL LETTER Q
+#0x52	U+0052	#	LATIN CAPITAL LETTER R
+#0x53	U+0053	#	LATIN CAPITAL LETTER S
+#0x54	U+0054	#	LATIN CAPITAL LETTER T
+#0x55	U+0055	#	LATIN CAPITAL LETTER U
+#0x56	U+0056	#	LATIN CAPITAL LETTER V
+#0x57	U+0057	#	LATIN CAPITAL LETTER W
+#0x58	U+0058	#	LATIN CAPITAL LETTER X
+#0x59	U+0059	#	LATIN CAPITAL LETTER Y
+#0x5A	U+005A	#	LATIN CAPITAL LETTER Z
+#0x5B	U+005B	#	LEFT SQUARE BRACKET
+#0x5C	U+005C	#	REVERSE SOLIDUS
+#0x5D	U+005D	#	RIGHT SQUARE BRACKET
+#0x5E	U+005E	#	CIRCUMFLEX ACCENT
+#0x5F	U+005F	#	LOW LINE
+#0x60	U+0060	#	GRAVE ACCENT
+#0x61	U+0061	#	LATIN SMALL LETTER A
+#0x62	U+0062	#	LATIN SMALL LETTER B
+#0x63	U+0063	#	LATIN SMALL LETTER C
+#0x64	U+0064	#	LATIN SMALL LETTER D
+#0x65	U+0065	#	LATIN SMALL LETTER E
+#0x66	U+0066	#	LATIN SMALL LETTER F
+#0x67	U+0067	#	LATIN SMALL LETTER G
+#0x68	U+0068	#	LATIN SMALL LETTER H
+#0x69	U+0069	#	LATIN SMALL LETTER I
+#0x6A	U+006A	#	LATIN SMALL LETTER J
+#0x6B	U+006B	#	LATIN SMALL LETTER K
+#0x6C	U+006C	#	LATIN SMALL LETTER L
+#0x6D	U+006D	#	LATIN SMALL LETTER M
+#0x6E	U+006E	#	LATIN SMALL LETTER N
+#0x6F	U+006F	#	LATIN SMALL LETTER O
+#0x70	U+0070	#	LATIN SMALL LETTER P
+#0x71	U+0071	#	LATIN SMALL LETTER Q
+#0x72	U+0072	#	LATIN SMALL LETTER R
+#0x73	U+0073	#	LATIN SMALL LETTER S
+#0x74	U+0074	#	LATIN SMALL LETTER T
+#0x75	U+0075	#	LATIN SMALL LETTER U
+#0x76	U+0076	#	LATIN SMALL LETTER V
+#0x77	U+0077	#	LATIN SMALL LETTER W
+#0x78	U+0078	#	LATIN SMALL LETTER X
+#0x79	U+0079	#	LATIN SMALL LETTER Y
+#0x7A	U+007A	#	LATIN SMALL LETTER Z
+#0x7B	U+007B	#	LEFT CURLY BRACKET
+#0x7C	U+007C	#	VERTICAL LINE
+#0x7D	U+007D	#	RIGHT CURLY BRACKET
+#0x7E	U+007E	#	TILDE
+
+0xA0	U+00A0	#	NO-BREAK SPACE
+0xA1	U+00A1	#	INVERTED EXCLAMATION MARK
+0xA2	U+00A2	#	CENT SIGN
+0xA3	U+00A3	#	POUND SIGN
+0xA4	U+20AC	#	EURO SIGN
+0xA5	U+00A5	#	YEN SIGN
+0xA6	U+0160	#	LATIN CAPITAL LETTER S WITH CARON
+0xA7	U+00A7	#	SECTION SIGN
+0xA8	U+0161	#	LATIN SMALL LETTER S WITH CARON
+0xA9	U+00A9	#	COPYRIGHT SIGN
+0xAA	U+00AA	#	FEMININE ORDINAL INDICATOR
+0xAB	U+00AB	#	LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
+0xAC	U+00AC	#	NOT SIGN
+0xAD	U+00AD	#	SOFT HYPHEN
+0xAE	U+00AE	#	REGISTERED SIGN
+0xAF	U+00AF	#	MACRON
+0xB0	U+00B0	#	DEGREE SIGN
+0xB1	U+00B1	#	PLUS-MINUS SIGN
+0xB2	U+00B2	#	SUPERSCRIPT TWO
+0xB3	U+00B3	#	SUPERSCRIPT THREE
+0xB4	U+017D	#	LATIN CAPITAL LETTER Z WITH CARON
+0xB5	U+00B5	#	MICRO SIGN
+0xB6	U+00B6	#	PILCROW SIGN
+0xB7	U+00B7	#	MIDDLE DOT
+0xB8	U+017D	#	LATIN SMALL LETTER Z WITH CARON
+0xB9	U+00B9	#	SUPERSCRIPT ONE
+0xBA	U+00BA	#	MASCULINE ORDINAL INDICATOR
+0xBB	U+00BB	#	RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
+0xBC	U+0152	#	LATIN CAPITAL LIGATURE OE
+0xBD	U+0153	#	LATIN SMALL LIGATURE OE
+0xBE	U+0178	#	LATIN CAPITAL LETTER Y WITH DIAERESIS
+0xBF	U+00BF	#	INVERTED QUESTION MARK
+0xC0	U+00C0	#	LATIN CAPITAL LETTER A WITH GRAVE
+0xC1	U+00C1	#	LATIN CAPITAL LETTER A WITH ACUTE
+0xC2	U+00C2	#	LATIN CAPITAL LETTER A WITH CIRCUMFLEX
+0xC3	U+00C3	#	LATIN CAPITAL LETTER A WITH TILDE
+0xC4	U+00C4	#	LATIN CAPITAL LETTER A WITH DIAERESIS
+0xC5	U+00C5	#	LATIN CAPITAL LETTER A WITH RING ABOVE
+0xC6	U+00C6	#	LATIN CAPITAL LETTER AE
+0xC7	U+00C7	#	LATIN CAPITAL LETTER C WITH CEDILLA
+0xC8	U+00C8	#	LATIN CAPITAL LETTER E WITH GRAVE
+0xC9	U+00C9	#	LATIN CAPITAL LETTER E WITH ACUTE
+0xCA	U+00CA	#	LATIN CAPITAL LETTER E WITH CIRCUMFLEX
+0xCB	U+00CB	#	LATIN CAPITAL LETTER E WITH DIAERESIS
+0xCC	U+00CC	#	LATIN CAPITAL LETTER I WITH GRAVE
+0xCD	U+00CD	#	LATIN CAPITAL LETTER I WITH ACUTE
+0xCE	U+00CE	#	LATIN CAPITAL LETTER I WITH CIRCUMFLEX
+0xCF	U+00CF	#	LATIN CAPITAL LETTER I WITH DIAERESIS
+0xD0	U+00D0	#	LATIN CAPITAL LETTER ETH
+0xD1	U+00D1	#	LATIN CAPITAL LETTER N WITH TILDE
+0xD2	U+00D2	#	LATIN CAPITAL LETTER O WITH GRAVE
+0xD3	U+00D3	#	LATIN CAPITAL LETTER O WITH ACUTE
+0xD4	U+00D4	#	LATIN CAPITAL LETTER O WITH CIRCUMFLEX
+0xD5	U+00D5	#	LATIN CAPITAL LETTER O WITH TILDE
+0xD6	U+00D6	#	LATIN CAPITAL LETTER O WITH DIAERESIS
+0xD7	U+00D7	#	MULTIPLICATION SIGN
+0xD8	U+00D8	#	LATIN CAPITAL LETTER O WITH STROKE
+0xD9	U+00D9	#	LATIN CAPITAL LETTER U WITH GRAVE
+0xDA	U+00DA	#	LATIN CAPITAL LETTER U WITH ACUTE
+0xDB	U+00DB	#	LATIN CAPITAL LETTER U WITH CIRCUMFLEX
+0xDC	U+00DC	#	LATIN CAPITAL LETTER U WITH DIAERESIS
+0xDD	U+00DD	#	LATIN CAPITAL LETTER Y WITH ACUTE
+0xDE	U+00DE	#	LATIN CAPITAL LETTER THORN
+0xDF	U+00DF	#	LATIN SMALL LETTER SHARP S
+0xE0	U+00E0	#	LATIN SMALL LETTER A WITH GRAVE
+0xE1	U+00E1	#	LATIN SMALL LETTER A WITH ACUTE
+0xE2	U+00E2	#	LATIN SMALL LETTER A WITH CIRCUMFLEX
+0xE3	U+00E3	#	LATIN SMALL LETTER A WITH TILDE
+0xE4	U+00E4	#	LATIN SMALL LETTER A WITH DIAERESIS
+0xE5	U+00E5	#	LATIN SMALL LETTER A WITH RING ABOVE
+0xE6	U+00E6	#	LATIN SMALL LETTER AE
+0xE7	U+00E7	#	LATIN SMALL LETTER C WITH CEDILLA
+0xE8	U+00E8	#	LATIN SMALL LETTER E WITH GRAVE
+0xE9	U+00E9	#	LATIN SMALL LETTER E WITH ACUTE
+0xEA	U+00EA	#	LATIN SMALL LETTER E WITH CIRCUMFLEX
+0xEB	U+00EB	#	LATIN SMALL LETTER E WITH DIAERESIS
+0xEC	U+00EC	#	LATIN SMALL LETTER I WITH GRAVE
+0xED	U+00ED	#	LATIN SMALL LETTER I WITH ACUTE
+0xEE	U+00EE	#	LATIN SMALL LETTER I WITH CIRCUMFLEX
+0xEF	U+00EF	#	LATIN SMALL LETTER I WITH DIAERESIS
+0xF0	U+00F0	#	LATIN SMALL LETTER ETH
+0xF1	U+00F1	#	LATIN SMALL LETTER N WITH TILDE
+0xF2	U+00F2	#	LATIN SMALL LETTER O WITH GRAVE
+0xF3	U+00F3	#	LATIN SMALL LETTER O WITH ACUTE
+0xF4	U+00F4	#	LATIN SMALL LETTER O WITH CIRCUMFLEX
+0xF5	U+00F5	#	LATIN SMALL LETTER O WITH TILDE
+0xF6	U+00F6	#	LATIN SMALL LETTER O WITH DIAERESIS
+0xF7	U+00F7	#	DIVISION SIGN
+0xF8	U+00F8	#	LATIN SMALL LETTER O WITH STROKE
+0xF9	U+00F9	#	LATIN SMALL LETTER U WITH GRAVE
+0xFA	U+00FA	#	LATIN SMALL LETTER U WITH ACUTE
+0xFB	U+00FB	#	LATIN SMALL LETTER U WITH CIRCUMFLEX
+0xFC	U+00FC	#	LATIN SMALL LETTER U WITH DIAERESIS
+0xFD	U+00FD	#	LATIN SMALL LETTER Y WITH ACUTE
+0xFE	U+00FE	#	LATIN SMALL LETTER THORN
+0xFF	U+00FF	#	LATIN SMALL LETTER Y WITH DIAERESIS
+
+## EOF ##
diff --git a/src/chrtrans/koi8u_uni.tbl b/src/chrtrans/koi8u_uni.tbl
new file mode 100644
index 00000000..2c13845b
--- /dev/null
+++ b/src/chrtrans/koi8u_uni.tbl
@@ -0,0 +1,154 @@
+# Options screen name for this character set
+OUkrainian Cyrillic (KOI8-U)
+
+# MIME name for this charset
+Mkoi8-u
+
+#Codepage number
+#?
+
+0x20-0x7f       idem
+# Based on a table received from "Denis V. Dmitrienko" <denis@null.net>
+# (verified against RFC2319).
+# KOI8-U home page: <http://www.net.ua/KOI8-U>
+#
+# Quoted from RFC2319:
+#   The upper part of the KOI8-U Character Set contains all Russian
+#   letters defined in KOI8-R and four Ukrainian letters (#164, #180 -
+#   ukr. ie, #166, #182 - ukr. i, #167, #183 - ukr. yi, #173, #189 - ukr.
+#   ghe  with upturn) which locations are compliant with ISO-IR-111.
+#
+#   BOX DRAWINGS elements in the other positions (that are not used by
+#   Ukrainian letters) are the same as in KOI8-R character set.
+#
+#
+#hex unicode # description
+#--- U+---- # ---------------
+0x80 U+2500 # BOX DRAWINGS  LIGHT HORIZONTAL
+0x81 U+2502 # BOX DRAWINGS  LIGHT VERTICAL
+0x82 U+250C # BOX DRAWINGS  LIGHT DOWN AND RIGHT
+0x83 U+2510 # BOX DRAWINGS  LIGHT DOWN AND LEFT
+0x84 U+2514 # BOX DRAWINGS  LIGHT UP AND RIGHT
+0x85 U+2518 # BOX DRAWINGS  LIGHT UP AND LEFT
+0x86 U+251C # BOX DRAWINGS  LIGHT VERTICAL AND RIGHT
+0x87 U+2524 # BOX DRAWINGS  LIGHT VERTICAL AND LEFT
+0x88 U+252C # BOX DRAWINGS  LIGHT DOWN AND HORIZONTAL
+0x89 U+2534 # BOX DRAWINGS  LIGHT UP AND HORIZONTAL
+0x8A U+253C # BOX DRAWINGS  LIGHT VERTICAL AND HORIZONTAL
+0x8B U+2580 # UPPER HALF BLOCK
+0x8C U+2584 # LOWER HALF BLOCK
+0x8D U+2588 # FULL BLOCK
+0x8E U+258C # LEFT HALF BLOCK
+0x8F U+2590 # RIGHT HALF BLOCK
+0x90 U+2591 # LIGHT SHADE
+0x91 U+2592 # MEDIUM SHADE
+0x92 U+2593 # DARK SHADE
+0x93 U+2320 # TOP HALF INTEGRAL
+0x94 U+25A0 # BLACK SQUARE
+0x95 U+2219 # BULLET OPERATOR
+0x96 U+221A # SQUARE ROOT
+0x97 U+2248 # ALMOST EQUAL TO
+0x98 U+2264 # LESS THAN OR EQUAL TO
+0x99 U+2265 # GREATER THAN OR EQUAL TO
+0x9A U+00A0 # NO-BREAK SPACE
+0x9B U+2321 # BOTTOM HALF INTEGRAL
+0x9C U+00B0 # DEGREE SIGN
+0x9D U+00B2 # SUPERSCRIPT TWO
+0x9E U+00B7 # MIDDLE DOT
+0x9F U+00F7 # DIVISION SIGN
+0xA0 U+2550 # BOX DRAWINGS  DOUBLE HORIZONTAL
+0xA1 U+2551 # BOX DRAWINGS  DOUBLE VERTICAL
+0xA2 U+2552 # BOX DRAWINGS  DOWN SINGLE AND RIGHT DOUBLE
+0xA3 U+0451 # CYRILLIC SMALL LETTER IO
+0xA4 U+0454 # CYRILLIC SMALL LETTER UKRAINIAN IE
+0xA5 U+2554 # BOX DRAWINGS  DOUBLE DOWN AND RIGHT
+0xA6 U+0456 # CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
+0xA7 U+0457 # CYRILLIC SMALL LETTER YI (UKRAINIAN)
+0xA8 U+2557 # BOX DRAWINGS  DOUBLE DOWN AND LEFT
+0xA9 U+2558 # BOX DRAWINGS  UP SINGLE AND RIGHT DOUBLE
+0xAA U+2559 # BOX DRAWINGS  UP DOUBLE AND RIGHT SINGLE
+0xAB U+255A # BOX DRAWINGS  DOUBLE UP AND RIGHT
+0xAC U+255B # BOX DRAWINGS  UP SINGLE AND LEFT DOUBLE
+0xAD U+0491 # CYRILLIC SMALL LETTER GHE WITH UPTURN
+0xAE U+255D # BOX DRAWINGS  DOUBLE UP AND LEFT
+0xAF U+255E # BOX DRAWINGS  VERTICAL SINGLE AND RIGHT DOUBLE
+0xB0 U+255F # BOX DRAWINGS  VERTICAL DOUBLE AND RIGHT SINGLE
+0xB1 U+2560 # BOX DRAWINGS  DOUBLE VERTICAL AND RIGHT
+0xB2 U+2561 # BOX DRAWINGS  VERTICAL SINGLE AND LEFT DOUBLE
+0xB3 U+0401 # CYRILLIC CAPITAL LETTER IO
+0xB4 U+0404 # CYRILLIC CAPITAL LETTER UKRAINIAN IE
+0xB5 U+2563 # BOX DRAWINGS DOUBLE VERTICAL AND LEFT
+0xB6 U+0406 # CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I
+0xB7 U+0407 # CYRILLIC CAPITAL LETTER YI (UKRAINIAN)
+0xB8 U+2566 # BOX DRAWINGS  DOUBLE DOWN AND HORIZONTAL
+0xB9 U+2567 # BOX DRAWINGS  UP SINGLE AND HORIZONTAL DOUBLE
+0xBA U+2568 # BOX DRAWINGS  UP DOUBLE AND HORIZONTAL SINGLE
+0xBB U+2569 # BOX DRAWINGS  DOUBLE UP AND HORIZONTAL
+0xBC U+256A # BOX DRAWINGS  VERTICAL SINGLE AND HORIZONTAL DOUBLE
+0xBD U+0490 # CYRILLIC CAPITAL LETTER GHE WITH UPTURN
+0xBE U+256C # BOX DRAWINGS  DOUBLE VERTICAL AND HORIZONTAL
+0xBF U+00A9 # COPYRIGHT SIGN
+0xC0 U+044E # CYRILLIC SMALL LETTER YU
+0xC1 U+0430 # CYRILLIC SMALL LETTER A
+0xC2 U+0431 # CYRILLIC SMALL LETTER BE
+0xC3 U+0446 # CYRILLIC SMALL LETTER TSE
+0xC4 U+0434 # CYRILLIC SMALL LETTER DE
+0xC5 U+0435 # CYRILLIC SMALL LETTER IE
+0xC6 U+0444 # CYRILLIC SMALL LETTER EF
+0xC7 U+0433 # CYRILLIC SMALL LETTER GHE
+0xC8 U+0445 # CYRILLIC SMALL LETTER KHA
+0xC9 U+0438 # CYRILLIC SMALL LETTER I
+0xCA U+0439 # CYRILLIC SMALL LETTER SHORT I
+0xCB U+043A # CYRILLIC SMALL LETTER KA
+0xCC U+043B # CYRILLIC SMALL LETTER EL
+0xCD U+043C # CYRILLIC SMALL LETTER EM
+0xCE U+043D # CYRILLIC SMALL LETTER EN
+0xCF U+043E # CYRILLIC SMALL LETTER O
+0xD0 U+043F # CYRILLIC SMALL LETTER PE
+0xD1 U+044F # CYRILLIC SMALL LETTER YA
+0xD2 U+0440 # CYRILLIC SMALL LETTER ER
+0xD3 U+0441 # CYRILLIC SMALL LETTER ES
+0xD4 U+0442 # CYRILLIC SMALL LETTER TE
+0xD5 U+0443 # CYRILLIC SMALL LETTER U
+0xD6 U+0436 # CYRILLIC SMALL LETTER ZHE
+0xD7 U+0432 # CYRILLIC SMALL LETTER VE
+0xD8 U+044C # CYRILLIC SMALL LETTER SOFT SIGN
+0xD9 U+044B # CYRILLIC SMALL LETTER YERU
+0xDA U+0437 # CYRILLIC SMALL LETTER ZE
+0xDB U+0448 # CYRILLIC SMALL LETTER SHA
+0xDC U+044D # CYRILLIC SMALL LETTER E
+0xDD U+0449 # CYRILLIC SMALL LETTER SHCHA
+0xDE U+0447 # CYRILLIC SMALL LETTER CHE
+0xDF U+044A # CYRILLIC SMALL LETTER HARD SIGN
+0xE0 U+042E # CYRILLIC CAPITAL LETTER YU
+0xE1 U+0410 # CYRILLIC CAPITAL LETTER A
+0xE2 U+0411 # CYRILLIC CAPITAL LETTER BE
+0xE3 U+0426 # CYRILLIC CAPITAL LETTER TSE
+0xE4 U+0414 # CYRILLIC CAPITAL LETTER DE
+0xE5 U+0415 # CYRILLIC CAPITAL LETTER IE
+0xE6 U+0424 # CYRILLIC CAPITAL LETTER EF
+0xE7 U+0413 # CYRILLIC CAPITAL LETTER GHE
+0xE8 U+0425 # CYRILLIC CAPITAL LETTER KHA
+0xE9 U+0418 # CYRILLIC CAPITAL LETTER I
+0xEA U+0419 # CYRILLIC CAPITAL LETTER SHORT I
+0xEB U+041A # CYRILLIC CAPITAL LETTER KA
+0xEC U+041B # CYRILLIC CAPITAL LETTER EL
+0xED U+041C # CYRILLIC CAPITAL LETTER EM
+0xEE U+041D # CYRILLIC CAPITAL LETTER EN
+0xEF U+041E # CYRILLIC CAPITAL LETTER O
+0xF0 U+041F # CYRILLIC CAPITAL LETTER PE
+0xF1 U+042F # CYRILLIC CAPITAL LETTER YA
+0xF2 U+0420 # CYRILLIC CAPITAL LETTER ER
+0xF3 U+0421 # CYRILLIC CAPITAL LETTER ES
+0xF4 U+0422 # CYRILLIC CAPITAL LETTER TE
+0xF5 U+0423 # CYRILLIC CAPITAL LETTER U
+0xF6 U+0416 # CYRILLIC CAPITAL LETTER ZHE
+0xF7 U+0412 # CYRILLIC CAPITAL LETTER VE
+0xF8 U+042C # CYRILLIC CAPITAL LETTER SOFT SIGN
+0xF9 U+042B # CYRILLIC CAPITAL LETTER YERU
+0xFA U+0417 # CYRILLIC CAPITAL LETTER ZE
+0xFB U+0428 # CYRILLIC CAPITAL LETTER SHA
+0xFC U+042D # CYRILLIC CAPITAL LETTER E
+0xFD U+0429 # CYRILLIC CAPITAL LETTER SHCHA
+0xFE U+0427 # CYRILLIC CAPITAL LETTER CHE
+0xFF U+042A # CYRILLIC CAPITAL LETTER HARD SIGN
diff --git a/src/chrtrans/mnem_suni.tbl b/src/chrtrans/mnem_suni.tbl
new file mode 100644
index 00000000..02bd8ea8
--- /dev/null
+++ b/src/chrtrans/mnem_suni.tbl
@@ -0,0 +1,1861 @@
+#The MIME name of this charset.
+Mmnem
+
+#Name as a Display Charset (used on Options screen)
+ORFC1345 Mnem
+
+# U+0020: SP
+U+0021:!
+U+0022:"
+U+0023: Nb
+U+0024: DO
+U+0025:%
+U+0026:&&
+U+0027:'
+U+0028:(
+U+0029:)
+U+002a:*
+U+002b:+
+U+002c:,
+U+002d:-
+U+002e:.
+U+002f:/
+U+0030:0
+U+0031:1
+U+0032:2
+U+0033:3
+U+0034:4
+U+0035:5
+U+0036:6
+U+0037:7
+U+0038:8
+U+0039:9
+U+003a::
+U+003b:;
+U+003c:<
+U+003d:=
+U+003e:>
+U+003f:?
+U+0040: At
+U+0041:A
+U+0042:B
+U+0043:C
+U+0044:D
+U+0045:E
+U+0046:F
+U+0047:G
+U+0048:H
+U+0049:I
+U+004a:J
+U+004b:K
+U+004c:L
+U+004d:M
+U+004e:N
+U+004f:O
+U+0050:P
+U+0051:Q
+U+0052:R
+U+0053:S
+U+0054:T
+U+0055:U
+U+0056:V
+U+0057:W
+U+0058:X
+U+0059:Y
+U+005a:Z
+U+005b: <(
+U+005c: //
+U+005d: )>
+U+005e: '>
+U+005f:_
+U+0060: '!
+U+0061:a
+U+0062:b
+U+0063:c
+U+0064:d
+U+0065:e
+U+0066:f
+U+0067:g
+U+0068:h
+U+0069:i
+U+006a:j
+U+006b:k
+U+006c:l
+U+006d:m
+U+006e:n
+U+006f:o
+U+0070:p
+U+0071:q
+U+0072:r
+U+0073:s
+U+0074:t
+U+0075:u
+U+0076:v
+U+0077:w
+U+0078:x
+U+0079:y
+U+007a:z
+U+007b: (!
+U+007c: !!
+U+007d: !)
+U+007e: '?
+U+00a0: NS
+U+00a1: !I
+U+00a2: Ct
+U+00a3: Pd
+U+00a4: Cu
+U+00a5: Ye
+U+00a6: BB
+U+00a7: SE
+U+00a8: ':
+U+00a9: Co
+U+00aa: -a
+U+00ab: <<
+U+00ac: NO
+U+00ad: --
+U+00ae: Rg
+U+00af: 'm
+U+00b0: DG
+U+00b1: +-
+U+00b2: 2S
+U+00b3: 3S
+U+00b4: ''
+U+00b5: My
+U+00b6: PI
+U+00b7: .M
+U+00b8: ',
+U+00b9: 1S
+U+00ba: -o
+U+00bb: >>
+U+00bc: 14
+U+00bd: 12
+U+00be: 34
+U+00bf: ?I
+U+00c0: A!
+U+00c1: A'
+U+00c2: A>
+U+00c3: A?
+U+00c4: A:
+U+00c5: AA
+U+00c6: AE
+U+00c7: C,
+U+00c8: E!
+U+00c9: E'
+U+00ca: E>
+U+00cb: E:
+U+00cc: I!
+U+00cd: I'
+U+00ce: I>
+U+00cf: I:
+U+00d0: D-
+U+00d1: N?
+U+00d2: O!
+U+00d3: O'
+U+00d4: O>
+U+00d5: O?
+U+00d6: O:
+U+00d7: *X
+U+00d8: O/
+U+00d9: U!
+U+00da: U'
+U+00db: U>
+U+00dc: U:
+U+00dd: Y'
+U+00de: TH
+U+00df: ss
+U+00e0: a!
+U+00e1: a'
+U+00e2: a>
+U+00e3: a?
+U+00e4: a:
+U+00e5: aa
+U+00e6: ae
+U+00e7: c,
+U+00e8: e!
+U+00e9: e'
+U+00ea: e>
+U+00eb: e:
+U+00ec: i!
+U+00ed: i'
+U+00ee: i>
+U+00ef: i:
+U+00f0: d-
+U+00f1: n?
+U+00f2: o!
+U+00f3: o'
+U+00f4: o>
+U+00f5: o?
+U+00f6: o:
+U+00f7: -:
+U+00f8: o/
+U+00f9: u!
+U+00fa: u'
+U+00fb: u>
+U+00fc: u:
+U+00fd: y'
+U+00fe: th
+U+00ff: y:
+U+0100: A-
+U+0101: a-
+U+0102: A(
+U+0103: a(
+U+0104: A;
+U+0105: a;
+U+0106: C'
+U+0107: c'
+U+0108: C>
+U+0109: c>
+U+010a: C.
+U+010b: c.
+U+010c: C<
+U+010d: c<
+U+010e: D<
+U+010f: d<
+U+0110: D/
+U+0111: d/
+U+0112: E-
+U+0113: e-
+U+0114: E(
+U+0115: e(
+U+0116: E.
+U+0117: e.
+U+0118: E;
+U+0119: e;
+U+011a: E<
+U+011b: e<
+U+011c: G>
+U+011d: g>
+U+011e: G(
+U+011f: g(
+U+0120: G.
+U+0121: g.
+U+0122: G,
+U+0123: g,
+U+0124: H>
+U+0125: h>
+U+0126: H/
+U+0127: h/
+U+0128: I?
+U+0129: i?
+U+012a: I-
+U+012b: i-
+U+012c: I(
+U+012d: i(
+U+012e: I;
+U+012f: i;
+U+0130: I.
+U+0131: i.
+U+0132: IJ
+U+0133: ij
+U+0134: J>
+U+0135: j>
+U+0136: K,
+U+0137: k,
+U+0138: kk
+U+0139: L'
+U+013a: l'
+U+013b: L,
+U+013c: l,
+U+013d: L<
+U+013e: l<
+U+013f: L.
+U+0140: l.
+U+0141: L/
+U+0142: l/
+U+0143: N'
+U+0144: n'
+U+0145: N,
+U+0146: n,
+U+0147: N<
+U+0148: n<
+U+0149: 'n
+U+014a: NG
+U+014b: ng
+U+014c: O-
+U+014d: o-
+U+014e: O(
+U+014f: o(
+U+0150: O"
+U+0151: o"
+U+0152: OE
+U+0153: oe
+U+0154: R'
+U+0155: r'
+U+0156: R,
+U+0157: r,
+U+0158: R<
+U+0159: r<
+U+015a: S'
+U+015b: s'
+U+015c: S>
+U+015d: s>
+U+015e: S,
+U+015f: s,
+U+0160: S<
+U+0161: s<
+U+0162: T,
+U+0163: t,
+U+0164: T<
+U+0165: t<
+U+0166: T/
+U+0167: t/
+U+0168: U?
+U+0169: u?
+U+016a: U-
+U+016b: u-
+U+016c: U(
+U+016d: u(
+U+016e: U0
+U+016f: u0
+U+0170: U"
+U+0171: u"
+U+0172: U;
+U+0173: u;
+U+0174: W>
+U+0175: w>
+U+0176: Y>
+U+0177: y>
+U+0178: Y:
+U+0179: Z'
+U+017a: z'
+U+017b: Z.
+U+017c: z.
+U+017d: Z<
+U+017e: z<
+U+01a0: O9
+U+01a1: o9
+U+01a2: OI
+U+01a3: oi
+U+01a6: yr
+U+01af: U9
+U+01b0: u9
+U+01b5: Z/
+U+01b6: z/
+U+01b7: ED
+U+01cd: A<
+U+01ce: a<
+U+01cf: I<
+U+01d0: i<
+U+01d1: O<
+U+01d2: o<
+U+01d3: U<
+U+01d4: u<
+U+01d5: _U:-_
+U+01d6: _u:-_
+U+01d7: _U:'_
+U+01d8: _u:'_
+U+01d9: _U:<_
+U+01da: _u:<_
+U+01db: _U:!_
+U+01dc: _u:!_
+U+01de: A1
+U+01df: a1
+U+01e0: A7
+U+01e1: a7
+U+01e2: A3
+U+01e3: a3
+U+01e4: G/
+U+01e5: g/
+U+01e6: G<
+U+01e7: g<
+U+01e8: K<
+U+01e9: k<
+U+01ea: O;
+U+01eb: o;
+U+01ec: O1
+U+01ed: o1
+U+01ee: EZ
+U+01ef: ez
+U+01f0: j<
+U+01f4: G'
+U+01f5: g'
+U+01fa: _AA'_
+U+01fb: _aa'_
+U+01fc: _AE'_
+U+01fd: _ae'_
+U+01fe: _O/'_
+U+01ff: _o/'_
+U+02bf: ;S
+U+02c7: '<
+U+02d8: '(
+U+02d9: '.
+U+02da: '0
+U+02db: ';
+U+02dd: '"
+U+0386: A%
+U+0388: E%
+U+0389: Y%
+U+038a: I%
+U+038c: O%
+U+038e: U%
+U+038f: W%
+U+0390: i3
+U+0391: A*
+U+0392: B*
+U+0393: G*
+U+0394: D*
+U+0395: E*
+U+0396: Z*
+U+0397: Y*
+U+0398: H*
+U+0399: I*
+U+039a: K*
+U+039b: L*
+U+039c: M*
+U+039d: N*
+U+039e: C*
+U+039f: O*
+U+03a0: P*
+U+03a1: R*
+U+03a3: S*
+U+03a4: T*
+U+03a5: U*
+U+03a6: F*
+U+03a7: X*
+U+03a8: Q*
+U+03a9: W*
+U+03aa: J*
+U+03ab: V*
+U+03ac: a%
+U+03ad: e%
+U+03ae: y%
+U+03af: i%
+U+03b0: u3
+U+03b1: a*
+U+03b2: b*
+U+03b3: g*
+U+03b4: d*
+U+03b5: e*
+U+03b6: z*
+U+03b7: y*
+U+03b8: h*
+U+03b9: i*
+U+03ba: k*
+U+03bb: l*
+U+03bc: m*
+U+03bd: n*
+U+03be: c*
+U+03bf: o*
+U+03c0: p*
+U+03c1: r*
+U+03c2: *s
+U+03c3: s*
+U+03c4: t*
+U+03c5: u*
+U+03c6: f*
+U+03c7: x*
+U+03c8: q*
+U+03c9: w*
+U+03ca: j*
+U+03cb: v*
+U+03cc: o%
+U+03cd: u%
+U+03ce: w%
+U+03d8: 'G
+U+03d9: ,G
+U+03da: T3
+U+03db: t3
+U+03dc: M3
+U+03dd: m3
+U+03de: K3
+U+03df: k3
+U+03e0: P3
+U+03e1: p3
+U+03f4: '%
+U+03f5: j3
+U+0401: IO
+U+0402: D%
+U+0403: G%
+U+0404: IE
+U+0405: DS
+U+0406: II
+U+0407: YI
+U+0408: J%
+U+0409: LJ
+U+040a: NJ
+U+040b: Ts
+U+040c: KJ
+U+040e: V%
+U+040f: DZ
+U+0410: A=
+U+0411: B=
+U+0412: V=
+U+0413: G=
+U+0414: D=
+U+0415: E=
+U+0416: Z%
+U+0417: Z=
+U+0418: I=
+U+0419: J=
+U+041a: K=
+U+041b: L=
+U+041c: M=
+U+041d: N=
+U+041e: O=
+U+041f: P=
+U+0420: R=
+U+0421: S=
+U+0422: T=
+U+0423: U=
+U+0424: F=
+U+0425: H=
+U+0426: C=
+U+0427: C%
+U+0428: S%
+U+0429: Sc
+U+042a: ="
+U+042b: Y=
+U+042c: %"
+U+042d: JE
+U+042e: JU
+U+042f: JA
+U+0430: a=
+U+0431: b=
+U+0432: v=
+U+0433: g=
+U+0434: d=
+U+0435: e=
+U+0436: z%
+U+0437: z=
+U+0438: i=
+U+0439: j=
+U+043a: k=
+U+043b: l=
+U+043c: m=
+U+043d: n=
+U+043e: o=
+U+043f: p=
+U+0440: r=
+U+0441: s=
+U+0442: t=
+U+0443: u=
+U+0444: f=
+U+0445: h=
+U+0446: c=
+U+0447: c%
+U+0448: s%
+U+0449: sc
+U+044a: ='
+U+044b: y=
+U+044c: %'
+U+044d: je
+U+044e: ju
+U+044f: ja
+U+0451: io
+U+0452: d%
+U+0453: g%
+U+0454: ie
+U+0455: ds
+U+0456: ii
+U+0457: yi
+U+0458: j%
+U+0459: lj
+U+045a: nj
+U+045b: ts
+U+045c: kj
+U+045e: v%
+U+045f: dz
+U+0462: Y3
+U+0463: y3
+U+046a: O3
+U+046b: o3
+U+0472: F3
+U+0473: f3
+U+0474: V3
+U+0475: v3
+U+0480: C3
+U+0481: c3
+U+0490: G3
+U+0491: g3
+U+05d0: A+
+U+05d1: B+
+U+05d2: G+
+U+05d3: D+
+U+05d4: H+
+U+05d5: W+
+U+05d6: Z+
+U+05d7: X+
+U+05d8: Tj
+U+05d9: J+
+U+05da: K%
+U+05db: K+
+U+05dc: L+
+U+05dd: M%
+U+05de: M+
+U+05df: N%
+U+05e0: N+
+U+05e1: S+
+U+05e2: E+
+U+05e3: P%
+U+05e4: P+
+U+05e5: Zj
+U+05e6: ZJ
+U+05e7: Q+
+U+05e8: R+
+U+05e9: Sh
+U+05ea: T+
+U+060c: ,+
+U+061b: ;+
+U+061f: ?+
+U+0621: H'
+U+0622: aM
+U+0623: aH
+U+0624: wH
+U+0625: ah
+U+0626: yH
+U+0627: a+
+U+0628: b+
+U+0629: tm
+U+062a: t+
+U+062b: tk
+U+062c: g+
+U+062d: hk
+U+062e: x+
+U+062f: d+
+U+0630: dk
+U+0631: r+
+U+0632: z+
+U+0633: s+
+U+0634: sn
+U+0635: c+
+U+0636: dd
+U+0637: tj
+U+0638: zH
+U+0639: e+
+U+063a: i+
+U+0640: ++
+U+0641: f+
+U+0642: q+
+U+0643: k+
+U+0644: l+
+U+0645: m+
+U+0646: n+
+U+0647: h+
+U+0648: w+
+U+0649: j+
+U+064a: y+
+U+064b: :+
+U+064c: "+
+U+064d: =+
+U+064e: /+
+U+064f: '+
+U+0650: 1+
+U+0651: 3+
+U+0652: 0+
+U+0670: aS
+U+067e: p+
+U+06a4: v+
+U+06af: gf
+U+06f0: 0a
+U+06f1: 1a
+U+06f2: 2a
+U+06f3: 3a
+U+06f4: 4a
+U+06f5: 5a
+U+06f6: 6a
+U+06f7: 7a
+U+06f8: 8a
+U+06f9: 9a
+U+1e00: _A-0_
+U+1e01: _a-0_
+U+1e02: B.
+U+1e03: b.
+U+1e04: _B-._
+U+1e05: _b-._
+U+1e06: B_
+U+1e07: b_
+U+1e08: _C,'_
+U+1e09: _c,'_
+U+1e0a: D.
+U+1e0b: d.
+U+1e0c: _D-._
+U+1e0d: _d-._
+U+1e0e: D_
+U+1e0f: d_
+U+1e10: D,
+U+1e11: d,
+U+1e12: _D->_
+U+1e13: _d->_
+U+1e14: _E-!_
+U+1e15: _e-!_
+U+1e16: _E-'_
+U+1e17: _e-'_
+U+1e18: _E->_
+U+1e19: _e->_
+U+1e1a: _E-?_
+U+1e1b: _e-?_
+U+1e1c: _E,(_
+U+1e1d: _e,(_
+U+1e1e: F.
+U+1e1f: f.
+U+1e20: G-
+U+1e21: g-
+U+1e22: H.
+U+1e23: h.
+U+1e24: _H-._
+U+1e25: _h-._
+U+1e26: H:
+U+1e27: h:
+U+1e28: H,
+U+1e29: h,
+U+1e2a: _H-(_
+U+1e2b: _h-(_
+U+1e2c: _I-?_
+U+1e2d: _i-?_
+U+1e2e: _I:'_
+U+1e2f: _i:'_
+U+1e30: K'
+U+1e31: k'
+U+1e32: _K-._
+U+1e33: _k-._
+U+1e34: K_
+U+1e35: k_
+U+1e36: _L-._
+U+1e37: _l-._
+U+1e38: _L--._
+U+1e39: _l--._
+U+1e3a: L_
+U+1e3b: l_
+U+1e3c: _L->_
+U+1e3d: _l->_
+U+1e3e: M'
+U+1e3f: m'
+U+1e40: M.
+U+1e41: m.
+U+1e42: _M-._
+U+1e43: _m-._
+U+1e44: N.
+U+1e45: n.
+U+1e46: _N-._
+U+1e47: _n-._
+U+1e48: N_
+U+1e49: n_
+U+1e4a: _N->_
+U+1e4b: _N->_
+U+1e4c: _O?'_
+U+1e4d: _o?'_
+U+1e4e: _O?:_
+U+1e4f: _o?:_
+U+1e50: _O-!_
+U+1e51: _o-!_
+U+1e52: _O-'_
+U+1e53: _o-'_
+U+1e54: P'
+U+1e55: p'
+U+1e56: P.
+U+1e57: p.
+U+1e58: R.
+U+1e59: r.
+U+1e5a: _R-._
+U+1e5b: _r-._
+U+1e5c: _R--._
+U+1e5d: _r--._
+U+1e5e: R_
+U+1e5f: r_
+U+1e60: S.
+U+1e61: s.
+U+1e62: _S-._
+U+1e63: _s-._
+U+1e64: _S'._
+U+1e65: _s'._
+U+1e66: _S<._
+U+1e67: _s<._
+U+1e68: _S.-._
+U+1e69: _S.-._
+U+1e6a: T.
+U+1e6b: t.
+U+1e6c: _T-._
+U+1e6d: _t-._
+U+1e6e: T_
+U+1e6f: t_
+U+1e70: _T->_
+U+1e71: _t->_
+U+1e72: _U--:_
+U+1e73: _u--:_
+U+1e74: _U-?_
+U+1e75: _u-?_
+U+1e76: _U->_
+U+1e77: _u->_
+U+1e78: _U?'_
+U+1e79: _u?'_
+U+1e7a: _U-:_
+U+1e7b: _u-:_
+U+1e7c: V?
+U+1e7d: v?
+U+1e7e: _V-._
+U+1e7f: _v-._
+U+1e80: W!
+U+1e81: w!
+U+1e82: W'
+U+1e83: w'
+U+1e84: W:
+U+1e85: w:
+U+1e86: W.
+U+1e87: w.
+U+1e88: _W-._
+U+1e89: _w-._
+U+1e8a: X.
+U+1e8b: x.
+U+1e8c: X:
+U+1e8d: x:
+U+1e8e: Y.
+U+1e8f: y.
+U+1e90: Z>
+U+1e91: z>
+U+1e92: _Z-._
+U+1e93: _z-._
+U+1e94: Z_
+U+1e95: z_
+U+1e96: h_
+U+1e97: t:
+U+1e98: w0
+U+1e99: y0
+U+1ea0: _A-._
+U+1ea1: _a-._
+U+1ea2: A2
+U+1ea3: a2
+U+1ea4: _A>'_
+U+1ea5: _a>'_
+U+1ea6: _A>!_
+U+1ea7: _a>!_
+U+1ea8: _A>2_
+U+1ea9: _a>2_
+U+1eaa: _A>?_
+U+1eab: _a>?_
+U+1eac: _A>-._
+U+1ead: _a>-._
+U+1eae: _A('_
+U+1eaf: _a('_
+U+1eb0: _A(!_
+U+1eb1: _a(!_
+U+1eb2: _A(2_
+U+1eb3: _a(2_
+U+1eb4: _A(?_
+U+1eb5: _a(?_
+U+1eb6: _A(-._
+U+1eb7: _a(-._
+U+1eb8: _E-._
+U+1eb9: _e-._
+U+1eba: E2
+U+1ebb: e2
+U+1ebc: E?
+U+1ebd: e?
+U+1ebe: _E>'_
+U+1ebf: _e>'_
+U+1ec0: _E>!_
+U+1ec1: _e>!_
+U+1ec2: _E>2_
+U+1ec3: _e>2_
+U+1ec4: _E>?_
+U+1ec5: _e>?_
+U+1ec6: _E>-._
+U+1ec7: _e>-._
+U+1ec8: I2
+U+1ec9: i2
+U+1eca: _I-._
+U+1ecb: _i-._
+U+1ecc: _O-._
+U+1ecd: _o-._
+U+1ece: O2
+U+1ecf: o2
+U+1ed0: _O>'_
+U+1ed1: _o>'_
+U+1ed2: _O>!_
+U+1ed3: _o>!_
+U+1ed4: _O>2_
+U+1ed5: _o>2_
+U+1ed6: _O>?_
+U+1ed7: _o>?_
+U+1ed8: _O>-._
+U+1ed9: _o>-._
+U+1eda: _O9'_
+U+1edb: _o9'_
+U+1edc: _O9!_
+U+1edd: _o9!_
+U+1ede: _O92_
+U+1edf: _o92_
+U+1ee0: _O9?_
+U+1ee1: _o9?_
+U+1ee2: _O9-._
+U+1ee3: _o9-._
+U+1ee4: _U-._
+U+1ee5: _u-._
+U+1ee6: U2
+U+1ee7: u2
+U+1ee8: _U9'_
+U+1ee9: _u9'_
+U+1eea: _U9!_
+U+1eeb: _u9!_
+U+1eec: _U92_
+U+1eed: _u92_
+U+1eee: _U9?_
+U+1eef: _u9?_
+U+1ef0: _U9-._
+U+1ef1: _u9-._
+U+1ef2: Y!
+U+1ef3: y!
+U+1ef4: _Y-._
+U+1ef5: _y-._
+U+1ef6: Y2
+U+1ef7: y2
+U+1ef8: Y?
+U+1ef9: y?
+U+1f00: ;'
+U+1f01: ,'
+U+1f02: ;!
+U+1f03: ,!
+U+1f04: ?;
+U+1f05: ?,
+U+1f06: !:
+U+1f07: ?:
+U+2002: 1N
+U+2003: 1M
+U+2004: 3M
+U+2005: 4M
+U+2006: 6M
+U+2009: 1T
+U+200a: 1H
+U+2010: -1
+U+2013: -N
+U+2014: -M
+U+2015: -3
+U+2016: !2
+U+2017: =2
+U+2018: '6
+U+2019: '9
+U+201a: .9
+U+201b: 9'
+U+201c: "6
+U+201d: "9
+U+201e: :9
+U+201f: 9"
+U+2020: /-
+U+2021: /=
+U+2025: ..
+U+2030: %0
+U+2032: 1'
+U+2033: 2'
+U+2034: 3'
+U+2035: 1"
+U+2036: 2"
+U+2037: 3"
+U+2038: Ca
+U+2039: <1
+U+203a: >1
+U+203b: :X
+U+203c: _!*2_
+U+203e: '-
+U+2044: /f
+U+2070: 0S
+U+2074: 4S
+U+2075: 5S
+U+2076: 6S
+U+2077: 7S
+U+2078: 8S
+U+2079: 9S
+U+207a: +S
+U+207b: -S
+U+207c: =S
+U+207d: (S
+U+207e: )S
+U+207f: nS
+U+2080: 0s
+U+2081: 1s
+U+2082: 2s
+U+2083: 3s
+U+2084: 4s
+U+2085: 5s
+U+2086: 6s
+U+2087: 7s
+U+2088: 8s
+U+2089: 9s
+U+208a: +s
+U+208b: -s
+U+208c: =s
+U+208d: (s
+U+208e: )s
+U+20a4: Li
+U+20a7: Pt
+U+20a9: W=
+U+2103: oC
+U+2105: co
+U+2109: oF
+U+2116: N0
+U+2117: PO
+U+211e: Rx
+U+2120: SM
+U+2122: TM
+U+2126: Om
+U+212b: AO
+U+2153: 13
+U+2154: 23
+U+2155: 15
+U+2156: 25
+U+2157: 35
+U+2158: 45
+U+2159: 16
+U+215a: 56
+U+215b: 18
+U+215c: 38
+U+215d: 58
+U+215e: 78
+U+2160: 1R
+U+2161: 2R
+U+2162: 3R
+U+2163: 4R
+U+2164: 5R
+U+2165: 6R
+U+2166: 7R
+U+2167: 8R
+U+2168: 9R
+U+2169: aR
+U+216a: bR
+U+216b: cR
+U+216c: _50R_
+U+216d: _100R_
+U+216e: _500R_
+U+216f: _1000R_
+U+2170: 1r
+U+2171: 2r
+U+2172: 3r
+U+2173: 4r
+U+2174: 5r
+U+2175: 6r
+U+2176: 7r
+U+2177: 8r
+U+2178: 9r
+U+2179: ar
+U+217a: br
+U+217b: cr
+U+217c: _50r_
+U+217d: _100r_
+U+217e: _500r_
+U+217f: _1000r_
+U+2180: _1000RCD_
+U+2181: _5000R_
+U+2182: _10000R_
+U+2190: <-
+U+2191: -!
+U+2192: ->
+U+2193: -v
+U+2194: <>
+U+2195: UD
+U+2196: _<!!_
+U+2197: _//>_
+U+2198: _!!>_
+U+2199: _<//_
+U+21d0: <=
+U+21d2: =>
+U+21d4: ==
+U+2200: FA
+U+2202: dP
+U+2203: TE
+U+2205: /0
+U+2206: DE
+U+2207: NB
+U+2208: (-
+U+220b: -)
+U+220f: *P
+U+2211: +Z
+U+2212: -2
+U+2213: -+
+U+2217: *-
+U+2218: Ob
+U+2219: Sb
+U+221a: RT
+U+221d: 0(
+U+221e: 00
+U+221f: -L
+U+2220: -V
+U+2225: PP
+U+2227: AN
+U+2228: OR
+U+2229: (U
+U+222a: )U
+U+222b: In
+U+222c: DI
+U+222e: Io
+U+2234: .:
+U+2235: :.
+U+2236: :R
+U+2237: ::
+U+223c: ?1
+U+223e: CG
+U+2243: ?-
+U+2245: ?=
+U+2248: ?2
+U+224c: =?
+U+2253: HI
+U+2260: !=
+U+2261: =3
+U+2264: =<
+U+2265: >=
+U+226a: <*
+U+226b: *>
+U+226e: !<
+U+226f: !>
+U+2282: (C
+U+2283: )C
+U+2286: (_
+U+2287: )_
+U+2299: 0.
+U+229a: 02
+U+22a5: -T
+U+22c5: .P
+U+22ee: :3
+U+22ef: .3
+U+2302: Eh
+U+2308: <7
+U+2309: >7
+U+230a: 7<
+U+230b: 7>
+U+2310: NI
+U+2312: (A
+U+2315: TR
+U+2320: Iu
+U+2321: Il
+U+2329: </
+U+232a: />
+U+2423: Vs
+U+2440: 1h
+U+2441: 3h
+U+2442: 2h
+U+2443: 4h
+U+2446: 1j
+U+2447: 2j
+U+2448: 3j
+U+2449: 4j
+U+2460: _1-o_
+U+2461: _2-o_
+U+2462: _3-o_
+U+2463: _4-o_
+U+2464: _5-o_
+U+2465: _6-o_
+U+2466: _7-o_
+U+2467: _8-o_
+U+2468: _9-o_
+U+2469: _10-o_
+U+246a: _11-o_
+U+246b: _12-o_
+U+246c: _13-o_
+U+246d: _14-o_
+U+246e: _15-o_
+U+246f: _16-o_
+U+2470: _17-o_
+U+2471: _18-o_
+U+2472: _19-o_
+U+2473: _20-o_
+U+2474: _(1)_
+U+2475: _(2)_
+U+2476: _(3)_
+U+2477: _(4)_
+U+2478: _(5)_
+U+2479: _(6)_
+U+247a: _(7)_
+U+247b: _(8)_
+U+247c: _(9)_
+U+247d: _(10)_
+U+247e: _(11)_
+U+247f: _(12)_
+U+2480: _(13)_
+U+2481: _(14)_
+U+2482: _(15)_
+U+2483: _(16)_
+U+2484: _(17)_
+U+2485: _(18)_
+U+2486: _(19)_
+U+2487: _(20)_
+U+2488: 1.
+U+2489: 2.
+U+248a: 3.
+U+248b: 4.
+U+248c: 5.
+U+248d: 6.
+U+248e: 7.
+U+248f: 8.
+U+2490: 9.
+U+2491: _10._
+U+2492: _11._
+U+2493: _12._
+U+2494: _13._
+U+2495: _14._
+U+2496: _15._
+U+2497: _16._
+U+2498: _17._
+U+2499: _18._
+U+249a: _19._
+U+249b: _20._
+U+249c: _(a)_
+U+249d: _(b)_
+U+249e: _(c)_
+U+249f: _(d)_
+U+24a0: _(e)_
+U+24a1: _(f)_
+U+24a2: _(g)_
+U+24a3: _(h)_
+U+24a4: _(i)_
+U+24a5: _(j)_
+U+24a6: _(k)_
+U+24a7: _(l)_
+U+24a8: _(m)_
+U+24a9: _(n)_
+U+24aa: _(o)_
+U+24ab: _(p)_
+U+24ac: _(q)_
+U+24ad: _(r)_
+U+24ae: _(s)_
+U+24af: _(t)_
+U+24b0: _(u)_
+U+24b1: _(v)_
+U+24b2: _(w)_
+U+24b3: _(x)_
+U+24b4: _(y)_
+U+24b5: _(z)_
+U+24b6: _A-o_
+U+24b7: _B-o_
+U+24b8: _C-o_
+U+24b9: _D-o_
+U+24ba: _E-o_
+U+24bb: _F-o_
+U+24bc: _G-o_
+U+24bd: _H-o_
+U+24be: _I-o_
+U+24bf: _J-o_
+U+24c0: _K-o_
+U+24c1: _L-o_
+U+24c2: _M-o_
+U+24c3: _N-o_
+U+24c4: _O-o_
+U+24c5: _P-o_
+U+24c6: _Q-o_
+U+24c7: _R-o_
+U+24c8: _S-o_
+U+24c9: _T-o_
+U+24ca: _U-o_
+U+24cb: _V-o_
+U+24cc: _W-o_
+U+24cd: _X-o_
+U+24ce: _Y-o_
+U+24cf: _Z-o_
+U+24d0: _a-o_
+U+24d1: _b-o_
+U+24d2: _c-o_
+U+24d3: _d-o_
+U+24d4: _e-o_
+U+24d5: _f-o_
+U+24d6: _g-o_
+U+24d7: _h-o_
+U+24d8: _i-o_
+U+24d9: _j-o_
+U+24da: _k-o_
+U+24db: _l-o_
+U+24dc: _m-o_
+U+24dd: _n-o_
+U+24de: _o-o_
+U+24df: _p-o_
+U+24e0: _q-o_
+U+24e1: _r-o_
+U+24e2: _s-o_
+U+24e3: _t-o_
+U+24e4: _u-o_
+U+24e5: _v-o_
+U+24e6: _w-o_
+U+24e7: _x-o_
+U+24e8: _y-o_
+U+24e9: _z-o_
+U+24ea: _0-o_
+U+2500: hh
+U+2501: HH
+U+2502: vv
+U+2503: VV
+U+2504: 3-
+U+2505: 3_
+U+2506: 3!
+U+2507: 3/
+U+2508: 4-
+U+2509: 4_
+U+250a: 4!
+U+250b: 4/
+U+250c: dr
+U+250d: dR
+U+250e: Dr
+U+250f: DR
+U+2510: dl
+U+2511: dL
+U+2512: Dl
+U+2513: LD
+U+2514: ur
+U+2515: uR
+U+2516: Ur
+U+2517: UR
+U+2518: ul
+U+2519: uL
+U+251a: Ul
+U+251b: UL
+U+251c: vr
+U+251d: vR
+U+251e: _Udr_
+U+251f: _uDr_
+U+2520: Vr
+U+2521: _UdR_
+U+2522: _uDR_
+U+2523: VR
+U+2524: vl
+U+2525: vL
+U+2526: _Udl_
+U+2527: _uDl_
+U+2528: Vl
+U+2529: _UdL_
+U+252a: _uDL_
+U+252b: VL
+U+252c: dh
+U+252d: _dLr_
+U+252e: _dlR_
+U+252f: dH
+U+2530: Dh
+U+2531: _DLr_
+U+2532: _DlR_
+U+2533: DH
+U+2534: uh
+U+2535: _uLr_
+U+2536: _ulR_
+U+2537: uH
+U+2538: Uh
+U+2539: _ULr_
+U+253a: _UlR_
+U+253b: UH
+U+253c: vh
+U+253d: _vLr_
+U+253e: _vlR_
+U+253f: vH
+U+2540: _Udh_
+U+2541: _uDh_
+U+2542: Vh
+U+2543: _UdLr_
+U+2544: _UdlR_
+U+2545: _uDLr_
+U+2546: _uDlR_
+U+2547: _UdH_
+U+2548: _uDH_
+U+2549: _VLr_
+U+254a: _VlR_
+U+254b: VH
+U+2571: FD
+U+2572: BD
+U+2580: TB
+U+2584: LB
+U+2588: FB
+U+258c: lB
+U+2590: RB
+U+2591: .S
+U+2592: :S
+U+2593: ?S
+U+25a0: fS
+U+25a1: OS
+U+25a2: RO
+U+25a3: Rr
+U+25a4: RF
+U+25a5: RY
+U+25a6: RH
+U+25a7: RZ
+U+25a8: RK
+U+25a9: RX
+U+25aa: sB
+U+25ac: SR
+U+25ad: Or
+U+25b2: UT
+U+25b3: uT
+U+25b6: PR
+U+25b7: Tr
+U+25bc: Dt
+U+25bd: dT
+U+25c0: PL
+U+25c1: Tl
+U+25c6: Db
+U+25c7: Dw
+U+25ca: LZ
+U+25cb: 0m
+U+25ce: 0o
+U+25cf: 0M
+U+25d0: 0L
+U+25d1: 0R
+U+25d8: Sn
+U+25d9: Ic
+U+25e2: Fd
+U+25e3: Bd
+U+2605: *2
+U+2606: *1
+U+260e: _TEL_
+U+260f: _tel_
+U+261c: <H
+U+261e: >H
+U+263a: 0u
+U+263b: 0U
+U+263c: SU
+U+2640: Fm
+U+2642: Ml
+U+2660: cS
+U+2661: cH
+U+2662: cD
+U+2663: cC
+U+2664: _cS-_
+U+2665: _cH-_
+U+2666: _cD-_
+U+2667: _cC-_
+U+2669: Md
+U+266a: M8
+U+266b: M2
+U+266c: _M16_
+U+266d: Mb
+U+266e: Mx
+U+266f: MX
+U+2713: OK
+U+2717: XX
+U+2720: -X
+U+3000: IS
+U+3001: ,_
+U+3002: ._
+U+3003: +"
+U+3004: +_
+U+3005: *_
+U+3006: ;_
+U+3007: 0_
+U+300a: <+
+U+300b: >+
+U+300c: <'
+U+300d: >'
+U+300e: <"
+U+300f: >"
+U+3010: ("
+U+3011: )"
+U+3012: =T
+U+3013: =_
+U+3014: ('
+U+3015: )'
+U+3016: (I
+U+3017: )I
+U+301c: -?
+U+3020: _=T:)_
+U+3041: A5
+U+3042: a5
+U+3043: I5
+U+3044: i5
+U+3045: U5
+U+3046: u5
+U+3047: E5
+U+3048: e5
+U+3049: O5
+U+304a: o5
+U+304b: ka
+U+304c: ga
+U+304d: ki
+U+304e: gi
+U+304f: ku
+U+3050: gu
+U+3051: ke
+U+3052: ge
+U+3053: ko
+U+3054: go
+U+3055: sa
+U+3056: za
+U+3057: si
+U+3058: zi
+U+3059: su
+U+305a: zu
+U+305b: se
+U+305c: ze
+U+305d: so
+U+305e: zo
+U+305f: ta
+U+3060: da
+U+3061: ti
+U+3062: di
+U+3063: tU
+U+3064: tu
+U+3065: du
+U+3066: te
+U+3067: de
+U+3068: to
+U+3069: do
+U+306a: na
+U+306b: ni
+U+306c: nu
+U+306d: ne
+U+306e: no
+U+306f: ha
+U+3070: ba
+U+3071: pa
+U+3072: hi
+U+3073: bi
+U+3074: pi
+U+3075: hu
+U+3076: bu
+U+3077: pu
+U+3078: he
+U+3079: be
+U+307a: pe
+U+307b: ho
+U+307c: bo
+U+307d: po
+U+307e: ma
+U+307f: mi
+U+3080: mu
+U+3081: me
+U+3082: mo
+U+3083: yA
+U+3084: ya
+U+3085: yU
+U+3086: yu
+U+3087: yO
+U+3088: yo
+U+3089: ra
+U+308a: ri
+U+308b: ru
+U+308c: re
+U+308d: ro
+U+308e: wA
+U+308f: wa
+U+3090: wi
+U+3091: we
+U+3092: wo
+U+3093: n5
+U+3094: vu
+U+309b: "5
+U+309c: 05
+U+309d: *5
+U+309e: +5
+U+30a1: a6
+U+30a2: A6
+U+30a3: i6
+U+30a4: I6
+U+30a5: u6
+U+30a6: U6
+U+30a7: e6
+U+30a8: E6
+U+30a9: o6
+U+30aa: O6
+U+30ab: Ka
+U+30ac: Ga
+U+30ad: Ki
+U+30ae: Gi
+U+30af: Ku
+U+30b0: Gu
+U+30b1: Ke
+U+30b2: Ge
+U+30b3: Ko
+U+30b4: Go
+U+30b5: Sa
+U+30b6: Za
+U+30b7: Si
+U+30b8: Zi
+U+30b9: Su
+U+30ba: Zu
+U+30bb: Se
+U+30bc: Ze
+U+30bd: So
+U+30be: Zo
+U+30bf: Ta
+U+30c0: Da
+U+30c1: Ti
+U+30c2: Di
+U+30c3: TU
+U+30c4: Tu
+U+30c5: Du
+U+30c6: Te
+U+30c7: De
+U+30c8: To
+U+30c9: Do
+U+30ca: Na
+U+30cb: Ni
+U+30cc: Nu
+U+30cd: Ne
+U+30ce: No
+U+30cf: Ha
+U+30d0: Ba
+U+30d1: Pa
+U+30d2: Hi
+U+30d3: Bi
+U+30d4: Pi
+U+30d5: Hu
+U+30d6: Bu
+U+30d7: Pu
+U+30d8: He
+U+30d9: Be
+U+30da: Pe
+U+30db: Ho
+U+30dc: Bo
+U+30dd: Po
+U+30de: Ma
+U+30df: Mi
+U+30e0: Mu
+U+30e1: Me
+U+30e2: Mo
+U+30e3: YA
+U+30e4: Ya
+U+30e5: YU
+U+30e6: Yu
+U+30e7: YO
+U+30e8: Yo
+U+30e9: Ra
+U+30ea: Ri
+U+30eb: Ru
+U+30ec: Re
+U+30ed: Ro
+U+30ee: WA
+U+30ef: Wa
+U+30f0: Wi
+U+30f1: We
+U+30f2: Wo
+U+30f3: N6
+U+30f4: Vu
+U+30f5: KA
+U+30f6: KE
+U+30f7: Va
+U+30f8: Vi
+U+30f9: Ve
+U+30fa: Vo
+U+30fb: .6
+U+30fc: -6
+U+30fd: *6
+U+30fe: +6
+U+3105: b4
+U+3106: p4
+U+3107: m4
+U+3108: f4
+U+3109: d4
+U+310a: t4
+U+310b: n4
+U+310c: l4
+U+310d: g4
+U+310e: k4
+U+310f: h4
+U+3110: j4
+U+3111: q4
+U+3112: x4
+U+3113: zh
+U+3114: ch
+U+3115: sh
+U+3116: r4
+U+3117: z4
+U+3118: c4
+U+3119: s4
+U+311a: a4
+U+311b: o4
+U+311c: e4
+U+311d: _eh4_
+U+311e: ai
+U+311f: ei
+U+3120: au
+U+3121: ou
+U+3122: an
+U+3123: en
+U+3124: aN
+U+3125: eN
+U+3126: er
+U+3127: i4
+U+3128: u4
+U+3129: iu
+U+312a: v4
+U+312b: nG
+U+312c: gn
+U+321c: _(JU)_
+U+3220: 1c
+U+3221: 2c
+U+3222: 3c
+U+3223: 4c
+U+3224: 5c
+U+3225: 6c
+U+3226: 7c
+U+3227: 8c
+U+3228: 9c
+U+3229: _10c_
+U+327f: _KSC_
+U+fb00: ff
+U+fb01: fi
+U+fb02: fl
+U+fb03: _ffi_
+U+fb04: _ffl_
+U+fb05: ft
+U+fb06: st
+U+fe7d: _3+;_
+U+fe82: _aM._
+U+fe84: _aH._
+U+fe8d: _a+-_
+U+fe8e: _a+._
+U+fe8f: _b+-_
+U+fe90: _b+,_
+U+fe91: _b+;_
+U+fe92: _b+._
+U+fe93: _tm-_
+U+fe94: _tm._
+U+fe95: _t+-_
+U+fe96: _t+,_
+U+fe97: _t+;_
+U+fe98: _t+._
+U+fe99: _tk-_
+U+fe9a: _tk,_
+U+fe9b: _tk;_
+U+fe9c: _tk._
+U+fe9d: _g+-_
+U+fe9e: _g+,_
+U+fe9f: _g+;_
+U+fea0: _g+._
+U+fea1: _hk-_
+U+fea2: _hk,_
+U+fea3: _hk;_
+U+fea4: _hk._
+U+fea5: _x+-_
+U+fea6: _x+,_
+U+fea7: _x+;_
+U+fea8: _x+._
+U+fea9: _d+-_
+U+feaa: _d+._
+U+feab: _dk-_
+U+feac: _dk._
+U+fead: _r+-_
+U+feae: _r+._
+U+feaf: _z+-_
+U+feb0: _z+._
+U+feb1: _s+-_
+U+feb2: _s+,_
+U+feb3: _s+;_
+U+feb4: _s+._
+U+feb5: _sn-_
+U+feb6: _sn,_
+U+feb7: _sn;_
+U+feb8: _sn._
+U+feb9: _c+-_
+U+feba: _c+,_
+U+febb: _c+;_
+U+febc: _c+._
+U+febd: _dd-_
+U+febe: _dd,_
+U+febf: _dd;_
+U+fec0: _dd._
+U+fec1: _tj-_
+U+fec2: _tj,_
+U+fec3: _tj;_
+U+fec4: _tj._
+U+fec5: _zH-_
+U+fec6: _zH,_
+U+fec7: _zH;_
+U+fec8: _zH._
+U+fec9: _e+-_
+U+feca: _e+,_
+U+fecb: _e+;_
+U+fecc: _e+._
+U+fecd: _i+-_
+U+fece: _i+,_
+U+fecf: _i+;_
+U+fed0: _i+._
+U+fed1: _f+-_
+U+fed2: _f+,_
+U+fed3: _f+;_
+U+fed4: _f+._
+U+fed5: _q+-_
+U+fed6: _q+,_
+U+fed7: _q+;_
+U+fed8: _q+._
+U+fed9: _k+-_
+U+feda: _k+,_
+U+fedb: _k+;_
+U+fedc: _k+._
+U+fedd: _l+-_
+U+fede: _l+,_
+U+fedf: _l+;_
+U+fee0: _l+._
+U+fee1: _m+-_
+U+fee2: _m+,_
+U+fee3: _m+;_
+U+fee4: _m+._
+U+fee5: _n+-_
+U+fee6: _n+,_
+U+fee7: _n+;_
+U+fee8: _n+._
+U+fee9: _h+-_
+U+feea: _h+,_
+U+feeb: _h+;_
+U+feec: _h+._
+U+feed: _w+-_
+U+feee: _w+._
+U+feef: _j+-_
+U+fef0: _j+._
+U+fef1: _y+-_
+U+fef2: _y+,_
+U+fef3: _y+;_
+U+fef4: _y+._
+U+fef5: _lM-_
+U+fef6: _lM._
+U+fef7: _lH-_
+U+fef8: _lH._
+U+fef9: _lh-_
+U+fefa: _lh._
+U+fefb: _la-_
+U+fefc: _la._
+U+0000: NU
+U+0001: SH
+U+0002: SX
+U+0003: EX
+U+0004: ET
+U+0005: EQ
+U+0006: AK
+U+0007: BL
+U+0008: BS
+U+0009: HT
+# U+000a: LF
+U+000b: VT
+U+000c: FF
+U+000d: CR
+U+000e: SO
+U+000f: SI
+U+0010: DL
+U+0011: D1
+U+0012: D2
+U+0013: D3
+U+0014: D4
+U+0015: NK
+U+0016: SY
+U+0017: EB
+U+0018: CN
+U+0019: EM
+U+001a: SB
+U+001b: EC
+U+001c: FS
+U+001d: GS
+U+001e: RS
+U+001f: US
+U+007f: DT
+U+0080: PA
+U+0081: HO
+U+0082: BH
+U+0083: NH
+U+0084: IN
+U+0085: NL
+U+0086: SA
+U+0087: ES
+U+0088: HS
+U+0089: HJ
+U+008a: VS
+U+008b: PD
+U+008c: PU
+U+008d: RI
+U+008e: S2
+U+008f: S3
+U+0090: DC
+U+0091: P1
+U+0092: P2
+U+0093: TS
+U+0094: CC
+U+0095: MW
+U+0096: SG
+U+0097: EG
+U+0098: SS
+U+0099: GC
+U+009a: SC
+U+009b: CI
+U+009c: ST
+U+009d: OC
+U+009e: PM
+U+009f: AC
+# Characters in Private Use Area (e000-f8ff) do not have ussigned numbers
+# according Unicode 2.0
diff --git a/src/chrtrans/rfc_suni.tbl b/src/chrtrans/rfc_suni.tbl
new file mode 100644
index 00000000..65fa17ed
--- /dev/null
+++ b/src/chrtrans/rfc_suni.tbl
@@ -0,0 +1,1958 @@
+# Generated from the mnemonic file found under ftp://dkuug.dk/i18n/
+# then hand-tweaked
+# perl -n -e \
+# 'if (s|<([^ \t]+)>\s+<U([\dA-Z]{4})>\s.*$|U+\L\2\E:\1|) {s|/?(.)|\1|g&&print}'\
+# mnemonic,ds
+
+#The MIME name of this charset.
+Mmnemonic+ascii+0
+
+#Name as a Display Charset (used on Options screen)
+ORFC 1345 w/o Intro
+
+# Don't fall back to default table for unicode -> 8bit
+Fallback NO
+
+U+0020:SP
+U+0021:!
+U+0022:"
+U+0023:Nb
+U+0024:DO
+U+0025:%
+U+0026:&
+U+0027:'
+U+0028:(
+U+0029:)
+U+002a:*
+U+002b:+
+U+002c:,
+U+002d:-
+U+002e:.
+U+002f:/
+U+0030:0
+U+0031:1
+U+0032:2
+U+0033:3
+U+0034:4
+U+0035:5
+U+0036:6
+U+0037:7
+U+0038:8
+U+0039:9
+U+003a::
+U+003b:;
+U+003c:<
+U+003d:=
+U+003e:>
+U+003f:?
+U+0040:At
+U+0041:A
+U+0042:B
+U+0043:C
+U+0044:D
+U+0045:E
+U+0046:F
+U+0047:G
+U+0048:H
+U+0049:I
+U+004a:J
+U+004b:K
+U+004c:L
+U+004d:M
+U+004e:N
+U+004f:O
+U+0050:P
+U+0051:Q
+U+0052:R
+U+0053:S
+U+0054:T
+U+0055:U
+U+0056:V
+U+0057:W
+U+0058:X
+U+0059:Y
+U+005a:Z
+U+005b:<(
+U+005c://
+U+005d:)>
+U+005e:'>
+U+005f:_
+U+0060:'!
+U+0061:a
+U+0062:b
+U+0063:c
+U+0064:d
+U+0065:e
+U+0066:f
+U+0067:g
+U+0068:h
+U+0069:i
+U+006a:j
+U+006b:k
+U+006c:l
+U+006d:m
+U+006e:n
+U+006f:o
+U+0070:p
+U+0071:q
+U+0072:r
+U+0073:s
+U+0074:t
+U+0075:u
+U+0076:v
+U+0077:w
+U+0078:x
+U+0079:y
+U+007a:z
+U+007b:(!
+U+007c:!!
+U+007d:!)
+U+007e:'?
+U+00a0:NS
+U+00a1:!I
+U+00a2:Ct
+U+00a3:Pd
+U+00a4:Cu
+U+00a5:Ye
+U+00a6:BB
+U+00a7:SE
+U+00a8:':
+U+00a9:Co
+U+00aa:-a
+U+00ab:<<
+U+00ac:NO
+U+00ad:--
+U+00ae:Rg
+U+00af:'m
+U+00b0:DG
+U+00b1:+-
+U+00b2:2S
+U+00b3:3S
+U+00b4:''
+U+00b5:My
+U+00b6:PI
+U+00b7:.M
+U+00b8:',
+U+00b9:1S
+U+00ba:-o
+U+00bb:>>
+U+00bc:14
+U+00bd:12
+U+00be:34
+U+00bf:?I
+U+00c0:A!
+U+00c1:A'
+U+00c2:A>
+U+00c3:A?
+U+00c4:A:
+U+00c5:AA
+U+00c6:AE
+U+00c7:C,
+U+00c8:E!
+U+00c9:E'
+U+00ca:E>
+U+00cb:E:
+U+00cc:I!
+U+00cd:I'
+U+00ce:I>
+U+00cf:I:
+U+00d0:D-
+U+00d1:N?
+U+00d2:O!
+U+00d3:O'
+U+00d4:O>
+U+00d5:O?
+U+00d6:O:
+U+00d7:*X
+U+00d8:O/
+U+00d9:U!
+U+00da:U'
+U+00db:U>
+U+00dc:U:
+U+00dd:Y'
+U+00de:TH
+U+00df:ss
+U+00e0:a!
+U+00e1:a'
+U+00e2:a>
+U+00e3:a?
+U+00e4:a:
+U+00e5:aa
+U+00e6:ae
+U+00e7:c,
+U+00e8:e!
+U+00e9:e'
+U+00ea:e>
+U+00eb:e:
+U+00ec:i!
+U+00ed:i'
+U+00ee:i>
+U+00ef:i:
+U+00f0:d-
+U+00f1:n?
+U+00f2:o!
+U+00f3:o'
+U+00f4:o>
+U+00f5:o?
+U+00f6:o:
+U+00f7:-:
+U+00f8:o/
+U+00f9:u!
+U+00fa:u'
+U+00fb:u>
+U+00fc:u:
+U+00fd:y'
+U+00fe:th
+U+00ff:y:
+U+0100:A-
+U+0101:a-
+U+0102:A(
+U+0103:a(
+U+0104:A;
+U+0105:a;
+U+0106:C'
+U+0107:c'
+U+0108:C>
+U+0109:c>
+U+010a:C.
+U+010b:c.
+U+010c:C<
+U+010d:c<
+U+010e:D<
+U+010f:d<
+U+0110:D/
+U+0111:d/
+U+0112:E-
+U+0113:e-
+U+0114:E(
+U+0115:e(
+U+0116:E.
+U+0117:e.
+U+0118:E;
+U+0119:e;
+U+011a:E<
+U+011b:e<
+U+011c:G>
+U+011d:g>
+U+011e:G(
+U+011f:g(
+U+0120:G.
+U+0121:g.
+U+0122:G,
+U+0123:g,
+U+0124:H>
+U+0125:h>
+U+0126:H/
+U+0127:h/
+U+0128:I?
+U+0129:i?
+U+012a:I-
+U+012b:i-
+U+012c:I(
+U+012d:i(
+U+012e:I;
+U+012f:i;
+U+0130:I.
+U+0131:i.
+U+0132:IJ
+U+0133:ij
+U+0134:J>
+U+0135:j>
+U+0136:K,
+U+0137:k,
+U+0138:kk
+U+0139:L'
+U+013a:l'
+U+013b:L,
+U+013c:l,
+U+013d:L<
+U+013e:l<
+U+013f:L.
+U+0140:l.
+U+0141:L/
+U+0142:l/
+U+0143:N'
+U+0144:n'
+U+0145:N,
+U+0146:n,
+U+0147:N<
+U+0148:n<
+U+0149:'n
+U+014a:NG
+U+014b:ng
+U+014c:O-
+U+014d:o-
+U+014e:O(
+U+014f:o(
+U+0150:O"
+U+0151:o"
+U+0152:OE
+U+0153:oe
+U+0154:R'
+U+0155:r'
+U+0156:R,
+U+0157:r,
+U+0158:R<
+U+0159:r<
+U+015a:S'
+U+015b:s'
+U+015c:S>
+U+015d:s>
+U+015e:S,
+U+015f:s,
+U+0160:S<
+U+0161:s<
+U+0162:T,
+U+0163:t,
+U+0164:T<
+U+0165:t<
+U+0166:T/
+U+0167:t/
+U+0168:U?
+U+0169:u?
+U+016a:U-
+U+016b:u-
+U+016c:U(
+U+016d:u(
+U+016e:U0
+U+016f:u0
+U+0170:U"
+U+0171:u"
+U+0172:U;
+U+0173:u;
+U+0174:W>
+U+0175:w>
+U+0176:Y>
+U+0177:y>
+U+0178:Y:
+U+0179:Z'
+U+017a:z'
+U+017b:Z.
+U+017c:z.
+U+017d:Z<
+U+017e:z<
+U+017f:s1
+U+0187:C2
+U+0188:c2
+U+0191:F2
+U+0192:f2
+U+0198:K2
+U+0199:k2
+U+01a0:O9
+U+01a1:o9
+U+01a2:OI
+U+01a3:oi
+U+01a6:yr
+U+01af:U9
+U+01b0:u9
+U+01b5:Z/
+U+01b6:z/
+U+01b7:ED
+U+01cd:A<
+U+01ce:a<
+U+01cf:I<
+U+01d0:i<
+U+01d1:O<
+U+01d2:o<
+U+01d3:U<
+U+01d4:u<
+U+01d5:U:-
+U+01d6:u:-
+U+01d7:U:'
+U+01d8:u:'
+U+01d9:U:<
+U+01da:u:<
+U+01db:U:!
+U+01dc:u:!
+U+01de:A1
+U+01df:a1
+U+01e0:A7
+U+01e1:a7
+U+01e2:A3
+U+01e3:a3
+U+01e4:G/
+U+01e5:g/
+U+01e6:G<
+U+01e7:g<
+U+01e8:K<
+U+01e9:k<
+U+01ea:O;
+U+01eb:o;
+U+01ec:O1
+U+01ed:o1
+U+01ee:EZ
+U+01ef:ez
+U+01f0:j<
+U+01f4:G'
+U+01f5:g'
+U+01fa:AA'
+U+01fb:aa'
+U+01fc:AE'
+U+01fd:ae'
+U+01fe:O/'
+U+01ff:o/'
+U+0200:A!!
+U+0201:a!!
+U+0202:A)
+U+0203:a)
+U+0204:E!!
+U+0205:e!!
+U+0206:E)
+U+0207:e)
+U+0208:I!!
+U+0209:i!!
+U+020a:I)
+U+020b:i)
+U+020c:O!!
+U+020d:o!!
+U+020e:O)
+U+020f:o)
+U+0210:R!!
+U+0211:r!!
+U+0212:R)
+U+0213:r)
+U+0214:U!!
+U+0215:u!!
+U+0216:U)
+U+0217:u)
+U+0292:ed
+U+02bb:;S
+U+02c6:1>
+U+02c7:'<
+U+02c9:1-
+U+02cb:1!
+U+02d8:'(
+U+02d9:'.
+U+02da:'0
+U+02db:';
+U+02dc:1?
+U+02dd:'"
+U+0374:'G
+U+0375:,G
+U+037a:j3
+U+037e:?%
+U+0384:'*
+U+0385:'%
+U+0386:A%
+U+0387:.*
+U+0388:E%
+U+0389:Y%
+U+038a:I%
+U+038c:O%
+U+038e:U%
+U+038f:W%
+U+0390:i3
+U+0391:A*
+U+0392:B*
+U+0393:G*
+U+0394:D*
+U+0395:E*
+U+0396:Z*
+U+0397:Y*
+U+0398:H*
+U+0399:I*
+U+039a:K*
+U+039b:L*
+U+039c:M*
+U+039d:N*
+U+039e:C*
+U+039f:O*
+U+03a0:P*
+U+03a1:R*
+U+03a3:S*
+U+03a4:T*
+U+03a5:U*
+U+03a6:F*
+U+03a7:X*
+U+03a8:Q*
+U+03a9:W*
+U+03aa:J*
+U+03ab:V*
+U+03ac:a%
+U+03ad:e%
+U+03ae:y%
+U+03af:i%
+U+03b0:u3
+U+03b1:a*
+U+03b2:b*
+U+03b3:g*
+U+03b4:d*
+U+03b5:e*
+U+03b6:z*
+U+03b7:y*
+U+03b8:h*
+U+03b9:i*
+U+03ba:k*
+U+03bb:l*
+U+03bc:m*
+U+03bd:n*
+U+03be:c*
+U+03bf:o*
+U+03c0:p*
+U+03c1:r*
+U+03c2:*s
+U+03c3:s*
+U+03c4:t*
+U+03c5:u*
+U+03c6:f*
+U+03c7:x*
+U+03c8:q*
+U+03c9:w*
+U+03ca:j*
+U+03cb:v*
+U+03cc:o%
+U+03cd:u%
+U+03ce:w%
+U+03d0:b3
+U+03da:T3
+U+03db:t3
+U+03dc:M3
+U+03dd:m3
+U+03de:K3
+U+03df:k3
+U+03e0:P3
+U+03e1:p3
+U+0401:IO
+U+0402:D%
+U+0403:G%
+U+0404:IE
+U+0405:DS
+U+0406:II
+U+0407:YI
+U+0408:J%
+U+0409:LJ
+U+040a:NJ
+U+040b:Ts
+U+040c:KJ
+U+040e:V%
+U+040f:DZ
+U+0410:A=
+U+0411:B=
+U+0412:V=
+U+0413:G=
+U+0414:D=
+U+0415:E=
+U+0416:Z%
+U+0417:Z=
+U+0418:I=
+U+0419:J=
+U+041a:K=
+U+041b:L=
+U+041c:M=
+U+041d:N=
+U+041e:O=
+U+041f:P=
+U+0420:R=
+U+0421:S=
+U+0422:T=
+U+0423:U=
+U+0424:F=
+U+0425:H=
+U+0426:C=
+U+0427:C%
+U+0428:S%
+U+0429:Sc
+U+042a:="
+U+042b:Y=
+U+042c:%"
+U+042d:JE
+U+042e:JU
+U+042f:JA
+U+0430:a=
+U+0431:b=
+U+0432:v=
+U+0433:g=
+U+0434:d=
+U+0435:e=
+U+0436:z%
+U+0437:z=
+U+0438:i=
+U+0439:j=
+U+043a:k=
+U+043b:l=
+U+043c:m=
+U+043d:n=
+U+043e:o=
+U+043f:p=
+U+0440:r=
+U+0441:s=
+U+0442:t=
+U+0443:u=
+U+0444:f=
+U+0445:h=
+U+0446:c=
+U+0447:c%
+U+0448:s%
+U+0449:sc
+U+044a:='
+U+044b:y=
+U+044c:%'
+U+044d:je
+U+044e:ju
+U+044f:ja
+U+0451:io
+U+0452:d%
+U+0453:g%
+U+0454:ie
+U+0455:ds
+U+0456:ii
+U+0457:yi
+U+0458:j%
+U+0459:lj
+U+045a:nj
+U+045b:ts
+U+045c:kj
+U+045e:v%
+U+045f:dz
+U+0462:Y3
+U+0463:y3
+U+046a:O3
+U+046b:o3
+U+0472:F3
+U+0473:f3
+U+0474:V3
+U+0475:v3
+U+0480:C3
+U+0481:c3
+U+0490:G3
+U+0491:g3
+U+05d0:A+
+U+05d1:B+
+U+05d2:G+
+U+05d3:D+
+U+05d4:H+
+U+05d5:W+
+U+05d6:Z+
+U+05d7:X+
+U+05d8:Tj
+U+05d9:J+
+U+05da:K%
+U+05db:K+
+U+05dc:L+
+U+05dd:M%
+U+05de:M+
+U+05df:N%
+U+05e0:N+
+U+05e1:S+
+U+05e2:E+
+U+05e3:P%
+U+05e4:P+
+U+05e5:Zj
+U+05e6:ZJ
+U+05e7:Q+
+U+05e8:R+
+U+05e9:Sh
+U+05ea:T+
+U+060c:,+
+U+061b:;+
+U+061f:?+
+U+0621:H'
+U+0622:aM
+U+0623:aH
+U+0624:wH
+U+0625:ah
+U+0626:yH
+U+0627:a+
+U+0628:b+
+U+0629:tm
+U+062a:t+
+U+062b:tk
+U+062c:g+
+U+062d:hk
+U+062e:x+
+U+062f:d+
+U+0630:dk
+U+0631:r+
+U+0632:z+
+U+0633:s+
+U+0634:sn
+U+0635:c+
+U+0636:dd
+U+0637:tj
+U+0638:zH
+U+0639:e+
+U+063a:i+
+U+0640:++
+U+0641:f+
+U+0642:q+
+U+0643:k+
+U+0644:l+
+U+0645:m+
+U+0646:n+
+U+0647:h+
+U+0648:w+
+U+0649:j+
+U+064a:y+
+U+064b::+
+U+064c:"+
+U+064d:=+
+U+064e:/+
+U+064f:'+
+U+0650:1+
+U+0651:3+
+U+0652:0+
+U+0660:0a
+U+0661:1a
+U+0662:2a
+U+0663:3a
+U+0664:4a
+U+0665:5a
+U+0666:6a
+U+0667:7a
+U+0668:8a
+U+0669:9a
+U+0670:aS
+U+067e:p+
+U+0681:hH
+U+0686:tc
+U+0698:zj
+U+06a4:v+
+U+06af:gf
+U+1e00:A-0
+U+1e01:a-0
+U+1e02:B.
+U+1e03:b.
+U+1e04:B-.
+U+1e05:b-.
+U+1e06:B_
+U+1e07:b_
+U+1e08:C,'
+U+1e09:c,'
+U+1e0a:D.
+U+1e0b:d.
+U+1e0c:D-.
+U+1e0d:d-.
+U+1e0e:D_
+U+1e0f:d_
+U+1e10:D,
+U+1e11:d,
+U+1e12:D->
+U+1e13:d->
+U+1e14:E-!
+U+1e15:e-!
+U+1e16:E-'
+U+1e17:e-'
+U+1e18:E->
+U+1e19:e->
+U+1e1a:E-?
+U+1e1b:e-?
+U+1e1c:E,(
+U+1e1d:e,(
+U+1e1e:F.
+U+1e1f:f.
+U+1e20:G-
+U+1e21:g-
+U+1e22:H.
+U+1e23:h.
+U+1e24:H-.
+U+1e25:h-.
+U+1e26:H:
+U+1e27:h:
+U+1e28:H,
+U+1e29:h,
+U+1e2a:H-(
+U+1e2b:h-(
+U+1e2c:I-?
+U+1e2d:i-?
+U+1e2e:I:'
+U+1e2f:i:'
+U+1e30:K'
+U+1e31:k'
+U+1e32:K-.
+U+1e33:k-.
+U+1e34:K_
+U+1e35:k_
+U+1e36:L-.
+U+1e37:l-.
+U+1e38:L--.
+U+1e39:l--.
+U+1e3a:L_
+U+1e3b:l_
+U+1e3c:L->
+U+1e3d:l->
+U+1e3e:M'
+U+1e3f:m'
+U+1e40:M.
+U+1e41:m.
+U+1e42:M-.
+U+1e43:m-.
+U+1e44:N.
+U+1e45:n.
+U+1e46:N-.
+U+1e47:n-.
+U+1e48:N_
+U+1e49:n_
+U+1e4a:N->
+U+1e4b:n->
+U+1e4c:O?'
+U+1e4d:o?'
+U+1e4e:O?:
+U+1e4f:o?:
+U+1e50:O-!
+U+1e51:o-!
+U+1e52:O-'
+U+1e53:o-'
+U+1e54:P'
+U+1e55:p'
+U+1e56:P.
+U+1e57:p.
+U+1e58:R.
+U+1e59:r.
+U+1e5a:R-.
+U+1e5b:r-.
+U+1e5c:R--.
+U+1e5d:r--.
+U+1e5e:R_
+U+1e5f:r_
+U+1e60:S.
+U+1e61:s.
+U+1e62:S-.
+U+1e63:s-.
+U+1e64:S'.
+U+1e65:s'.
+U+1e66:S<.
+U+1e67:s<.
+U+1e68:S.-.
+U+1e69:s.-.
+U+1e6a:T.
+U+1e6b:t.
+U+1e6c:T-.
+U+1e6d:t-.
+U+1e6e:T_
+U+1e6f:t_
+U+1e70:T->
+U+1e71:t->
+U+1e72:U--:
+U+1e73:u--:
+U+1e74:U-?
+U+1e75:u-?
+U+1e76:U->
+U+1e77:u->
+U+1e78:U?'
+U+1e79:u?'
+U+1e7a:U-:
+U+1e7b:u-:
+U+1e7c:V?
+U+1e7d:v?
+U+1e7e:V-.
+U+1e7f:v-.
+U+1e80:W!
+U+1e81:w!
+U+1e82:W'
+U+1e83:w'
+U+1e84:W:
+U+1e85:w:
+U+1e86:W.
+U+1e87:w.
+U+1e88:W-.
+U+1e89:w-.
+U+1e8a:X.
+U+1e8b:x.
+U+1e8c:X:
+U+1e8d:x:
+U+1e8e:Y.
+U+1e8f:y.
+U+1e90:Z>
+U+1e91:z>
+U+1e92:Z-.
+U+1e93:z-.
+U+1e94:Z_
+U+1e95:z_
+U+1e96:h_
+U+1e97:t:
+U+1e98:w0
+U+1e99:y0
+U+1ea0:A-.
+U+1ea1:a-.
+U+1ea2:A2
+U+1ea3:a2
+U+1ea4:A>'
+U+1ea5:a>'
+U+1ea6:A>!
+U+1ea7:a>!
+U+1ea8:A>2
+U+1ea9:a>2
+U+1eaa:A>?
+U+1eab:a>?
+U+1eac:A>-.
+U+1ead:a>-.
+U+1eae:A('
+U+1eaf:a('
+U+1eb0:A(!
+U+1eb1:a(!
+U+1eb2:A(2
+U+1eb3:a(2
+U+1eb4:A(?
+U+1eb5:a(?
+U+1eb6:A(-.
+U+1eb7:a(-.
+U+1eb8:E-.
+U+1eb9:e-.
+U+1eba:E2
+U+1ebb:e2
+U+1ebc:E?
+U+1ebd:e?
+U+1ebe:E>'
+U+1ebf:e>'
+U+1ec0:E>!
+U+1ec1:e>!
+U+1ec2:E>2
+U+1ec3:e>2
+U+1ec4:E>?
+U+1ec5:e>?
+U+1ec6:E>-.
+U+1ec7:e>-.
+U+1ec8:I2
+U+1ec9:i2
+U+1eca:I-.
+U+1ecb:i-.
+U+1ecc:O-.
+U+1ecd:o-.
+U+1ece:O2
+U+1ecf:o2
+U+1ed0:O>'
+U+1ed1:o>'
+U+1ed2:O>!
+U+1ed3:o>!
+U+1ed4:O>2
+U+1ed5:o>2
+U+1ed6:O>?
+U+1ed7:o>?
+U+1ed8:O>-.
+U+1ed9:o>-.
+U+1eda:O9'
+U+1edb:o9'
+U+1edc:O9!
+U+1edd:o9!
+U+1ede:O92
+U+1edf:o92
+U+1ee0:O9?
+U+1ee1:o9?
+U+1ee2:O9-.
+U+1ee3:o9-.
+U+1ee4:U-.
+U+1ee5:u-.
+U+1ee6:U2
+U+1ee7:u2
+U+1ee8:U9'
+U+1ee9:u9'
+U+1eea:U9!
+U+1eeb:u9!
+U+1eec:U92
+U+1eed:u92
+U+1eee:U9?
+U+1eef:u9?
+U+1ef0:U9-.
+U+1ef1:u9-.
+U+1ef2:Y!
+U+1ef3:y!
+U+1ef4:Y-.
+U+1ef5:y-.
+U+1ef6:Y2
+U+1ef7:y2
+U+1ef8:Y?
+U+1ef9:y?
+U+1fbf:,,
+U+1fc0:?*
+U+1fc1:?:
+U+1fcd:,!
+U+1fce:,'
+U+1fcf:?,
+U+1fdd:;!
+U+1fde:;'
+U+1fdf:?;
+U+1fed:!:
+U+1fef:!*
+U+1ffe:;;
+U+2002:1N
+U+2003:1M
+U+2004:3M
+U+2005:4M
+U+2006:6M
+U+200e:LR
+U+200f:RL
+U+2009:1T
+U+200a:1H
+U+2010:-1
+U+2013:-N
+U+2014:-M
+U+2015:-3
+U+2016:!2
+U+2017:=2
+U+2018:'6
+U+2019:'9
+U+201a:.9
+U+201b:9'
+U+201c:"6
+U+201d:"9
+U+201e::9
+U+201f:9"
+U+2020:/-
+U+2021:/=
+U+2022:Sb
+U+2025:..
+U+2026:.3
+U+2030:%0
+U+2032:1'
+U+2033:2'
+U+2034:3'
+U+2035:1"
+U+2036:2"
+U+2037:3"
+U+2038:Ca
+U+2039:<1
+U+203a:>1
+U+203b::X
+U+203c:!*2
+U+203e:'-
+U+2044:/f
+U+2070:0S
+U+2074:4S
+U+2075:5S
+U+2076:6S
+U+2077:7S
+U+2078:8S
+U+2079:9S
+U+207a:+S
+U+207b:-S
+U+207c:=S
+U+207d:(S
+U+207e:)S
+U+207f:nS
+U+2080:0s
+U+2081:1s
+U+2082:2s
+U+2083:3s
+U+2084:4s
+U+2085:5s
+U+2086:6s
+U+2087:7s
+U+2088:8s
+U+2089:9s
+U+208a:+s
+U+208b:-s
+U+208c:=s
+U+208d:(s
+U+208e:)s
+U+20a3:Ff
+U+20a4:Li
+U+20a7:Pt
+U+20a9:W=
+U+2103:oC
+U+2105:co
+U+2109:oF
+U+2116:N0
+U+2117:PO
+U+211e:Rx
+U+2120:SM
+U+2122:TM
+U+2126:Om
+U+212b:AO
+U+2153:13
+U+2154:23
+U+2155:15
+U+2156:25
+U+2157:35
+U+2158:45
+U+2159:16
+U+215a:56
+U+215b:18
+U+215c:38
+U+215d:58
+U+215e:78
+U+2160:1R
+U+2161:2R
+U+2162:3R
+U+2163:4R
+U+2164:5R
+U+2165:6R
+U+2166:7R
+U+2167:8R
+U+2168:9R
+U+2169:aR
+U+216a:bR
+U+216b:cR
+U+216c:50R
+U+216d:100R
+U+216e:500R
+U+216f:1000R
+U+2170:1r
+U+2171:2r
+U+2172:3r
+U+2173:4r
+U+2174:5r
+U+2175:6r
+U+2176:7r
+U+2177:8r
+U+2178:9r
+U+2179:ar
+U+217a:br
+U+217b:cr
+U+217c:50r
+U+217d:100r
+U+217e:500r
+U+217f:1000r
+U+2180:1000RCD
+U+2181:5000R
+U+2182:10000R
+U+2190:<-
+U+2191:-!
+U+2192:->
+U+2193:-v
+U+2194:<>
+U+2195:UD
+U+2196:<!!
+U+2197://>
+U+2198:!!>
+U+2199:<//
+U+21a8:UD-
+U+21c0:>V
+U+21d0:<=
+U+21d2:=>
+U+21d4:==
+U+2200:FA
+U+2202:dP
+U+2203:TE
+U+2205:/0
+U+2206:DE
+U+2207:NB
+U+2208:(-
+U+220b:-)
+U+220f:*P
+U+2211:+Z
+U+2212:-2
+U+2213:-+
+U+2214:.+
+U+2217:*-
+U+2218:Ob
+U+2219:sb
+U+221a:RT
+U+221d:0(
+U+221e:00
+U+221f:-L
+U+2220:-V
+U+2225:PP
+U+2227:AN
+U+2228:OR
+U+2229:(U
+U+222a:)U
+U+222b:In
+U+222c:DI
+U+222e:Io
+U+2234:.:
+U+2235::.
+U+2236::R
+U+2237:::
+U+223c:?1
+U+223e:CG
+U+2243:?-
+U+2245:?=
+U+2248:?2
+U+224c:=?
+U+2253:HI
+U+2260:!=
+U+2261:=3
+U+2264:=<
+U+2265:>=
+U+226a:<*
+U+226b:*>
+U+226e:!<
+U+226f:!>
+U+2282:(C
+U+2283:)C
+U+2286:(_
+U+2287:)_
+U+2299:0.
+U+229a:02
+U+22a5:-T
+U+22c5:.P
+U+22ee::3
+U+2302:Eh
+U+2308:<7
+U+2309:>7
+U+230a:7<
+U+230b:7>
+U+2310:NI
+U+2312:(A
+U+2315:TR
+U+2318:88
+U+2320:Iu
+U+2321:Il
+U+2329:</
+U+232a:/>
+U+2423:Vs
+U+2440:1h
+U+2441:3h
+U+2442:2h
+U+2443:4h
+U+2446:1j
+U+2447:2j
+U+2448:3j
+U+2449:4j
+U+2460:1-o
+U+2461:2-o
+U+2462:3-o
+U+2463:4-o
+U+2464:5-o
+U+2465:6-o
+U+2466:7-o
+U+2467:8-o
+U+2468:9-o
+U+2469:10-o
+U+246a:11-o
+U+246b:12-o
+U+246c:13-o
+U+246d:14-o
+U+246e:15-o
+U+246f:16-o
+U+2470:17-o
+U+2471:18-o
+U+2472:19-o
+U+2473:20-o
+U+2474:(1)
+U+2475:(2)
+U+2476:(3)
+U+2477:(4)
+U+2478:(5)
+U+2479:(6)
+U+247a:(7)
+U+247b:(8)
+U+247c:(9)
+U+247d:(10)
+U+247e:(11)
+U+247f:(12)
+U+2480:(13)
+U+2481:(14)
+U+2482:(15)
+U+2483:(16)
+U+2484:(17)
+U+2485:(18)
+U+2486:(19)
+U+2487:(20)
+U+2488:1.
+U+2489:2.
+U+248a:3.
+U+248b:4.
+U+248c:5.
+U+248d:6.
+U+248e:7.
+U+248f:8.
+U+2490:9.
+U+2491:10.
+U+2492:11.
+U+2493:12.
+U+2494:13.
+U+2495:14.
+U+2496:15.
+U+2497:16.
+U+2498:17.
+U+2499:18.
+U+249a:19.
+U+249b:20.
+U+249c:(a)
+U+249d:(b)
+U+249e:(c)
+U+249f:(d)
+U+24a0:(e)
+U+24a1:(f)
+U+24a2:(g)
+U+24a3:(h)
+U+24a4:(i)
+U+24a5:(j)
+U+24a6:(k)
+U+24a7:(l)
+U+24a8:(m)
+U+24a9:(n)
+U+24aa:(o)
+U+24ab:(p)
+U+24ac:(q)
+U+24ad:(r)
+U+24ae:(s)
+U+24af:(t)
+U+24b0:(u)
+U+24b1:(v)
+U+24b2:(w)
+U+24b3:(x)
+U+24b4:(y)
+U+24b5:(z)
+U+24b6:A-o
+U+24b7:B-o
+U+24b8:C-o
+U+24b9:D-o
+U+24ba:E-o
+U+24bb:F-o
+U+24bc:G-o
+U+24bd:H-o
+U+24be:I-o
+U+24bf:J-o
+U+24c0:K-o
+U+24c1:L-o
+U+24c2:M-o
+U+24c3:N-o
+U+24c4:O-o
+U+24c5:P-o
+U+24c6:Q-o
+U+24c7:R-o
+U+24c8:S-o
+U+24c9:T-o
+U+24ca:U-o
+U+24cb:V-o
+U+24cc:W-o
+U+24cd:X-o
+U+24ce:Y-o
+U+24cf:Z-o
+U+24d0:a-o
+U+24d1:b-o
+U+24d2:c-o
+U+24d3:d-o
+U+24d4:e-o
+U+24d5:f-o
+U+24d6:g-o
+U+24d7:h-o
+U+24d8:i-o
+U+24d9:j-o
+U+24da:k-o
+U+24db:l-o
+U+24dc:m-o
+U+24dd:n-o
+U+24de:o-o
+U+24df:p-o
+U+24e0:q-o
+U+24e1:r-o
+U+24e2:s-o
+U+24e3:t-o
+U+24e4:u-o
+U+24e5:v-o
+U+24e6:w-o
+U+24e7:x-o
+U+24e8:y-o
+U+24e9:z-o
+U+24ea:0-o
+U+2500:hh
+U+2501:HH-
+U+2502:vv
+U+2503:VV-
+U+2504:3-
+U+2505:3_
+U+2506:3!
+U+2507:3/
+U+2508:4-
+U+2509:4_
+U+250a:4!
+U+250b:4/
+U+250c:dr
+U+250d:dR-
+U+250e:Dr-
+U+250f:DR-
+U+2510:dl
+U+2511:dL-
+U+2512:Dl-
+U+2513:LD-
+U+2514:ur
+U+2515:uR-
+U+2516:Ur-
+U+2517:UR-
+U+2518:ul
+U+2519:uL-
+U+251a:Ul-
+U+251b:UL-
+U+251c:vr
+U+251d:vR-
+U+251e:Udr
+U+251f:uDr
+U+2520:Vr-
+U+2521:UdR
+U+2522:uDR
+U+2523:VR-
+U+2524:vl
+U+2525:vL-
+U+2526:Udl
+U+2527:uDl
+U+2528:Vl-
+U+2529:UdL
+U+252a:uDL
+U+252b:VL-
+U+252c:dh
+U+252d:dLr
+U+252e:dlR
+U+252f:dH-
+U+2530:Dh-
+U+2531:DLr
+U+2532:DlR
+U+2533:DH-
+U+2534:uh
+U+2535:uLr
+U+2536:ulR
+U+2537:uH-
+U+2538:Uh-
+U+2539:ULr
+U+253a:UlR
+U+253b:UH-
+U+253c:vh
+U+253d:vLr
+U+253e:vlR
+U+253f:vH-
+U+2540:Udh
+U+2541:uDh
+U+2542:Vh-
+U+2543:UdLr
+U+2544:UdlR
+U+2545:uDLr
+U+2546:uDlR
+U+2547:UdH
+U+2548:uDH
+U+2549:VLr
+U+254a:VlR
+U+254b:VH-
+U+2550:HH
+U+2551:VV
+U+2552:dR
+U+2553:Dr
+U+2554:DR
+U+2555:dL
+U+2556:Dl
+U+2557:LD
+U+2558:uR
+U+2559:Ur
+U+255a:UR
+U+255b:uL
+U+255c:Ul
+U+255d:UL
+U+255e:vR
+U+255f:Vr
+U+2560:VR
+U+2561:vL
+U+2562:Vl
+U+2563:VL
+U+2564:dH
+U+2565:Dh
+U+2566:DH
+U+2567:uH
+U+2568:Uh
+U+2569:UH
+U+256a:vH
+U+256b:Vh
+U+256c:VH
+U+2571:FD
+U+2572:BD
+U+2580:TB
+U+2584:LB
+U+2588:FB
+U+258c:lB
+U+2590:RB
+U+2591:.S
+U+2592::S
+U+2593:?S
+U+25a0:fS
+U+25a1:OS
+U+25a2:RO
+U+25a3:Rr
+U+25a4:RF
+U+25a5:RY
+U+25a6:RH
+U+25a7:RZ
+U+25a8:RK
+U+25a9:RX
+U+25aa:sB
+U+25ac:SR
+U+25ad:Or
+U+25b2:UT
+U+25b3:uT
+U+25b7:Tr
+U+25ba:PR
+U+25bc:Dt
+U+25bd:dT
+U+25c1:Tl
+U+25c4:PL
+U+25c6:Db
+U+25c7:Dw
+U+25ca:LZ
+U+25cb:0m
+U+25ce:0o
+U+25cf:0M
+U+25d0:0L
+U+25d1:0R
+U+25d8:Sn
+U+25d9:Ic
+U+25e2:Fd
+U+25e3:Bd
+U+25ef:Ci
+U+2605:*2
+U+2606:*1
+U+260e:TEL
+U+260f:tel
+U+261c:<H
+U+261e:>H
+U+263a:0u
+U+263b:0U
+U+263c:SU
+U+2640:Fm
+U+2642:Ml
+U+2660:cS
+U+2661:cH
+U+2662:cD
+U+2663:cC
+U+2664:cS-
+U+2665:cH-
+U+2666:cD-
+U+2667:cC-
+U+2669:Md
+U+266a:M8
+U+266b:M2
+U+266c:M16
+U+266d:Mb
+U+266e:Mx
+U+266f:MX
+U+2713:OK
+U+2717:XX
+U+2720:-X
+U+3000:IS
+U+3001:,_
+U+3002:._
+U+3003:+"
+U+3004:JIS
+U+3005:*_
+U+3006:;_
+U+3007:0_
+U+300a:<+
+U+300b:>+
+U+300c:<'
+U+300d:>'
+U+300e:<"
+U+300f:>"
+U+3010:("
+U+3011:)"
+U+3012:=T
+U+3013:=_
+U+3014:('
+U+3015:)'
+U+3016:(I
+U+3017:)I
+U+301c:-?
+U+3020:=T:)
+U+3041:A5
+U+3042:a5
+U+3043:I5
+U+3044:i5
+U+3045:U5
+U+3046:u5
+U+3047:E5
+U+3048:e5
+U+3049:O5
+U+304a:o5
+U+304b:ka
+U+304c:ga
+U+304d:ki
+U+304e:gi
+U+304f:ku
+U+3050:gu
+U+3051:ke
+U+3052:ge
+U+3053:ko
+U+3054:go
+U+3055:sa
+U+3056:za
+U+3057:si
+U+3058:zi
+U+3059:su
+U+305a:zu
+U+305b:se
+U+305c:ze
+U+305d:so
+U+305e:zo
+U+305f:ta
+U+3060:da
+U+3061:ti
+U+3062:di
+U+3063:tU
+U+3064:tu
+U+3065:du
+U+3066:te
+U+3067:de
+U+3068:to
+U+3069:do
+U+306a:na
+U+306b:ni
+U+306c:nu
+U+306d:ne
+U+306e:no
+U+306f:ha
+U+3070:ba
+U+3071:pa
+U+3072:hi
+U+3073:bi
+U+3074:pi
+U+3075:hu
+U+3076:bu
+U+3077:pu
+U+3078:he
+U+3079:be
+U+307a:pe
+U+307b:ho
+U+307c:bo
+U+307d:po
+U+307e:ma
+U+307f:mi
+U+3080:mu
+U+3081:me
+U+3082:mo
+U+3083:yA
+U+3084:ya
+U+3085:yU
+U+3086:yu
+U+3087:yO
+U+3088:yo
+U+3089:ra
+U+308a:ri
+U+308b:ru
+U+308c:re
+U+308d:ro
+U+308e:wA
+U+308f:wa
+U+3090:wi
+U+3091:we
+U+3092:wo
+U+3093:n5
+U+3094:vu
+U+309b:"5
+U+309c:05
+U+309d:*5
+U+309e:+5
+U+30a1:a6
+U+30a2:A6
+U+30a3:i6
+U+30a4:I6
+U+30a5:u6
+U+30a6:U6
+U+30a7:e6
+U+30a8:E6
+U+30a9:o6
+U+30aa:O6
+U+30ab:Ka
+U+30ac:Ga
+U+30ad:Ki
+U+30ae:Gi
+U+30af:Ku
+U+30b0:Gu
+U+30b1:Ke
+U+30b2:Ge
+U+30b3:Ko
+U+30b4:Go
+U+30b5:Sa
+U+30b6:Za
+U+30b7:Si
+U+30b8:Zi
+U+30b9:Su
+U+30ba:Zu
+U+30bb:Se
+U+30bc:Ze
+U+30bd:So
+U+30be:Zo
+U+30bf:Ta
+U+30c0:Da
+U+30c1:Ti
+U+30c2:Di
+U+30c3:TU
+U+30c4:Tu
+U+30c5:Du
+U+30c6:Te
+U+30c7:De
+U+30c8:To
+U+30c9:Do
+U+30ca:Na
+U+30cb:Ni
+U+30cc:Nu
+U+30cd:Ne
+U+30ce:No
+U+30cf:Ha
+U+30d0:Ba
+U+30d1:Pa
+U+30d2:Hi
+U+30d3:Bi
+U+30d4:Pi
+U+30d5:Hu
+U+30d6:Bu
+U+30d7:Pu
+U+30d8:He
+U+30d9:Be
+U+30da:Pe
+U+30db:Ho
+U+30dc:Bo
+U+30dd:Po
+U+30de:Ma
+U+30df:Mi
+U+30e0:Mu
+U+30e1:Me
+U+30e2:Mo
+U+30e3:YA
+U+30e4:Ya
+U+30e5:YU
+U+30e6:Yu
+U+30e7:YO
+U+30e8:Yo
+U+30e9:Ra
+U+30ea:Ri
+U+30eb:Ru
+U+30ec:Re
+U+30ed:Ro
+U+30ee:WA
+U+30ef:Wa
+U+30f0:Wi
+U+30f1:We
+U+30f2:Wo
+U+30f3:N6
+U+30f4:Vu
+U+30f5:KA
+U+30f6:KE
+U+30f7:Va
+U+30f8:Vi
+U+30f9:Ve
+U+30fa:Vo
+U+30fb:.6
+U+30fc:-6
+U+30fd:*6
+U+30fe:+6
+U+3105:b4
+U+3106:p4
+U+3107:m4
+U+3108:f4
+U+3109:d4
+U+310a:t4
+U+310b:n4
+U+310c:l4
+U+310d:g4
+U+310e:k4
+U+310f:h4
+U+3110:j4
+U+3111:q4
+U+3112:x4
+U+3113:zh
+U+3114:ch
+U+3115:sh
+U+3116:r4
+U+3117:z4
+U+3118:c4
+U+3119:s4
+U+311a:a4
+U+311b:o4
+U+311c:e4
+U+311d:eh4
+U+311e:ai
+U+311f:ei
+U+3120:au
+U+3121:ou
+U+3122:an
+U+3123:en
+U+3124:aN
+U+3125:eN
+U+3126:er
+U+3127:i4
+U+3128:u4
+U+3129:iu
+U+312a:v4
+U+312b:nG
+U+312c:gn
+U+321c:(JU)
+U+3220:1c
+U+3221:2c
+U+3222:3c
+U+3223:4c
+U+3224:5c
+U+3225:6c
+U+3226:7c
+U+3227:8c
+U+3228:9c
+U+3229:10c
+U+327f:KSC
+U+33c2:am
+U+33d8:pm
+U+fb00:ff
+U+fb01:fi
+U+fb02:fl
+U+fb03:ffi
+U+fb04:ffl
+U+fb05:St
+U+fb06:st
+U+fe7d:3+;
+U+fe82:aM.
+U+fe84:aH.
+U+fe88:ah.
+U+fe8d:a+-
+U+fe8e:a+.
+U+fe8f:b+-
+U+fe90:b+.
+U+fe91:b+,
+U+fe92:b+;
+U+fe93:tm-
+U+fe94:tm.
+U+fe95:t+-
+U+fe96:t+.
+U+fe97:t+,
+U+fe98:t+;
+U+fe99:tk-
+U+fe9a:tk.
+U+fe9b:tk,
+U+fe9c:tk;
+U+fe9d:g+-
+U+fe9e:g+.
+U+fe9f:g+,
+U+fea0:g+;
+U+fea1:hk-
+U+fea2:hk.
+U+fea3:hk,
+U+fea4:hk;
+U+fea5:x+-
+U+fea6:x+.
+U+fea7:x+,
+U+fea8:x+;
+U+fea9:d+-
+U+feaa:d+.
+U+feab:dk-
+U+feac:dk.
+U+fead:r+-
+U+feae:r+.
+U+feaf:z+-
+U+feb0:z+.
+U+feb1:s+-
+U+feb2:s+.
+U+feb3:s+,
+U+feb4:s+;
+U+feb5:sn-
+U+feb6:sn.
+U+feb7:sn,
+U+feb8:sn;
+U+feb9:c+-
+U+feba:c+.
+U+febb:c+,
+U+febc:c+;
+U+febd:dd-
+U+febe:dd.
+U+febf:dd,
+U+fec0:dd;
+U+fec1:tj-
+U+fec2:tj.
+U+fec3:tj,
+U+fec4:tj;
+U+fec5:zH-
+U+fec6:zH.
+U+fec7:zH,
+U+fec8:zH;
+U+fec9:e+-
+U+feca:e+.
+U+fecb:e+,
+U+fecc:e+;
+U+fecd:i+-
+U+fece:i+.
+U+fecf:i+,
+U+fed0:i+;
+U+fed1:f+-
+U+fed2:f+.
+U+fed3:f+,
+U+fed4:f+;
+U+fed5:q+-
+U+fed6:q+.
+U+fed7:q+,
+U+fed8:q+;
+U+fed9:k+-
+U+feda:k+.
+U+fedb:k+,
+U+fedc:k+;
+U+fedd:l+-
+U+fede:l+.
+U+fedf:l+,
+U+fee0:l+;
+U+fee1:m+-
+U+fee2:m+.
+U+fee3:m+,
+U+fee4:m+;
+U+fee5:n+-
+U+fee6:n+.
+U+fee7:n+,
+U+fee8:n+;
+U+fee9:h+-
+U+feea:h+.
+U+feeb:h+,
+U+feec:h+;
+U+feed:w+-
+U+feee:w+.
+U+feef:j+-
+U+fef0:j+.
+U+fef1:y+-
+U+fef2:y+.
+U+fef3:y+,
+U+fef4:y+;
+U+fef5:lM-
+U+fef6:lM.
+U+fef7:lH-
+U+fef8:lH.
+U+fef9:lh-
+U+fefa:lh.
+U+fefb:la-
+U+fefc:la.
+U+0000:NU
+U+0001:SH
+U+0002:SX
+U+0003:EX
+U+0004:ET
+U+0005:EQ
+U+0006:AK
+U+0007:BL
+U+0008:BS
+U+0009:HT
+U+000a:LF
+U+000b:VT
+U+000c:FF
+U+000d:CR
+U+000e:SO
+U+000f:SI
+U+0010:DL
+U+0011:D1
+U+0012:D2
+U+0013:D3
+U+0014:D4
+U+0015:NK
+U+0016:SY
+U+0017:EB
+U+0018:CN
+U+0019:EM
+U+001a:SB
+U+001b:EC
+U+001c:FS
+U+001d:GS
+U+001e:RS
+U+001f:US
+U+007f:DT
+U+0080:PA
+U+0081:HO
+U+0082:BH
+U+0083:NH
+U+0084:IN
+U+0085:NL
+U+0086:SA
+U+0087:ES
+U+0088:HS
+U+0089:HJ
+U+008a:VS
+U+008b:PD
+U+008c:PU
+U+008d:RI
+U+008e:S2
+U+008f:S3
+U+0090:DC
+U+0091:P1
+U+0092:P2
+U+0093:TS
+U+0094:CC
+U+0095:MW
+U+0096:SG
+U+0097:EG
+U+0098:SS
+U+0099:GC
+U+009a:SC
+U+009b:CI
+U+009c:ST
+U+009d:OC
+U+009e:PM
+U+009f:AC
+# Characters in Private Use Area (e000-f8ff) do not have ussigned numbers
+# according Unicode 2.0
diff --git a/src/chrtrans/utf8_uni.tbl b/src/chrtrans/utf8_uni.tbl
new file mode 100644
index 00000000..88ad4925
--- /dev/null
+++ b/src/chrtrans/utf8_uni.tbl
@@ -0,0 +1,35 @@
+#
+# This one is not really much of a "translation table", it mostly just
+# tells Lynx that "utf-8" is Unicode/UCS2 encoded in UTF8.  Note that
+# "unicode-1-1-utf-8" and "utf8" are treated as synonyms.
+#
+#The MIME name of this charset.
+Mutf-8
+
+#Name as a Display Charset (used on Options screen)
+OUNICODE (UTF-8)
+
+# Some kind of raw Unicode?
+# Use 6 for for really "raw" 16bit UCS-2, 7 for UTF-8, ...
+
+# most of these codes currently don't make much sense in a *.tbl file,
+# but for completeness (from UCDefs.h):
+#  #define UCT_ENC_7BIT 0
+#  #define UCT_ENC_8BIT 1
+#  #define UCT_ENC_8859 2
+#  #define UCT_ENC_8BIT_C0 3
+#  #define UCT_ENC_MAYBE2022 4
+#  #define UCT_ENC_CJK 5
+#  #define UCT_ENC_16BIT 6
+#  #define UCT_ENC_UTF8 7
+
+R 7
+
+#Shall this become the "default" translation?
+#There has to be exactly one table marked as "default".
+Default NO
+
+# Don't fall back to default table for unicode -> 8bit
+Fallback NO
+
+0x20-0x7f	idem
diff --git a/src/chrtrans/viscii_uni.tbl b/src/chrtrans/viscii_uni.tbl
new file mode 100644
index 00000000..617f1e1f
--- /dev/null
+++ b/src/chrtrans/viscii_uni.tbl
@@ -0,0 +1,300 @@
+#
+# Unicode mapping table for VISCII 1.1 fonts and charset=viscii,
+# described in RFC 1456.
+# See also <URL:http://www.trichlor.org/vietstd/report/rep92.htm>,
+# also for testing.
+# The 6 characters encoded in the C0 control region should not
+# be passed through to the terminal but be mapped to VIQR strings.
+# THe two changed mappings of MacVISCII are recognized in documents.
+
+# [convert with makeuctb]
+#
+#The MIME name of this charset.
+Mviscii
+
+#Name as a Display Charset (used on Options screen).
+OVietnamese (VISCII)
+
+# Special 'enc' flag to signal that some C0 characters are used.
+# Tables with R3 should properly map the allowed C0 control chars!
+#
+# most of these codes currently don't make much sense in a *.tbl file,
+# but for completeness (from UCDefs.h):
+#  #define UCT_ENC_7BIT 0
+#  #define UCT_ENC_8BIT 1
+#  #define UCT_ENC_8859 2
+#  #define UCT_ENC_8BIT_C0 3
+#  #define UCT_ENC_MAYBE2022 4
+#  #define UCT_ENC_CJK 5
+#  #define UCT_ENC_16BIT 6
+#  #define UCT_ENC_UTF8 7
+
+R 3
+
+#0x00	U+0000
+#0x01	U+0001
+#0x03	U+0003
+#0x04	U+0004
+#0x07	U+0007
+#0x08	U+0008
+0x09	U+0009
+0x0a	U+000a
+#0x0b	U+000b
+0x0c	U+000c
+U+000c " "
+0x0d	U+000d
+#0x0e	U+000e
+#0x0f	U+000f
+#0x10	U+0010
+#0x11	U+0011
+#0x12	U+0012
+#0x13	U+0013
+#0x15	U+0015
+#0x16	U+0016
+#0x17	U+0017
+#0x18	U+0018
+0x1a	U+001a
+U+001a:^Z
+#0x1b	U+001b
+#0x1c	U+001c
+#0x1d	U+001d
+#0x1f	U+001f
+#0x20	U+0020
+#0x21	U+0021
+#0x22	U+0022
+#0x23	U+0023
+#0x24	U+0024
+#0x25	U+0025
+#0x26	U+0026
+#0x27	U+0027
+#0x28	U+0028
+#0x29	U+0029
+#0x2a	U+002a
+#0x2b	U+002b
+#0x2c	U+002c
+#0x2d	U+002d
+#0x2e	U+002e
+#0x2f	U+002f
+#0x30	U+0030
+#0x31	U+0031
+#0x32	U+0032
+#0x33	U+0033
+#0x34	U+0034
+#0x35	U+0035
+#0x36	U+0036
+#0x37	U+0037
+#0x38	U+0038
+#0x39	U+0039
+#0x3a	U+003a
+#0x3b	U+003b
+#0x3c	U+003c
+#0x3d	U+003d
+#0x3e	U+003e
+#0x3f	U+003f
+#0x40	U+0040
+#0x41	U+0041
+#0x42	U+0042
+#0x43	U+0043
+#0x44	U+0044
+#0x45	U+0045
+#0x46	U+0046
+#0x47	U+0047
+#0x48	U+0048
+#0x49	U+0049
+#0x4a	U+004a
+#0x4b	U+004b
+#0x4c	U+004c
+#0x4d	U+004d
+#0x4e	U+004e
+#0x4f	U+004f
+#0x50	U+0050
+#0x51	U+0051
+#0x52	U+0052
+#0x53	U+0053
+#0x54	U+0054
+#0x55	U+0055
+#0x56	U+0056
+#0x57	U+0057
+#0x58	U+0058
+#0x59	U+0059
+#0x5a	U+005a
+#0x5b	U+005b
+#0x5c	U+005c
+#0x5d	U+005d
+#0x5e	U+005e
+#0x5f	U+005f
+#0x60	U+0060
+#0x61	U+0061
+#0x62	U+0062
+#0x63	U+0063
+#0x64	U+0064
+#0x65	U+0065
+#0x66	U+0066
+#0x67	U+0067
+#0x68	U+0068
+#0x69	U+0069
+#0x6a	U+006a
+#0x6b	U+006b
+#0x6c	U+006c
+#0x6d	U+006d
+#0x6e	U+006e
+#0x6f	U+006f
+#0x70	U+0070
+#0x71	U+0071
+#0x72	U+0072
+#0x73	U+0073
+#0x74	U+0074
+#0x75	U+0075
+#0x76	U+0076
+#0x77	U+0077
+#0x78	U+0078
+#0x79	U+0079
+#0x7a	U+007a
+#0x7b	U+007b
+#0x7c	U+007c
+#0x7d	U+007d
+#0x7e	U+007e
+#0x7f	U+007f
+0xc0	U+00c0
+0xc1	U+00c1
+0xc2	U+00c2
+0xc3	U+00c3
+0xc8	U+00c8
+0xc9	U+00c9
+0xca	U+00ca
+0xcc	U+00cc
+0xcd	U+00cd
+0xd2	U+00d2
+0xd3	U+00d3
+0xd4	U+00d4
+0xa0	U+00d5
+0xd9	U+00d9
+0xda	U+00da
+0xdd	U+00dd
+0xe0	U+00e0
+0xe1	U+00e1
+0xe2	U+00e2
+0xe3	U+00e3
+0xe8	U+00e8
+0xe9	U+00e9
+0xea	U+00ea
+0xec	U+00ec
+0xed	U+00ed
+0xf2	U+00f2
+0xf3	U+00f3
+0xf4	U+00f4
+0xf5	U+00f5
+0xf9	U+00f9
+0xfa	U+00fa
+0xfd	U+00fd
+0xc5	U+0102
+0xe5	U+0103
+0xd0	U+0110
+0xf0	U+0111 U+00f0  # "edh" is similar enough to map it here
+0xce	U+0128
+0xee	U+0129
+0x9d	U+0168
+0xfb	U+0169
+0xb4	U+01a0
+0xbd	U+01a1
+0xbf	U+01af
+0xdf	U+01b0
+0x80	U+1ea0
+0xd5	U+1ea1
+0xc4	U+1ea2
+0xe4	U+1ea3
+0x84	U+1ea4
+0xa4	U+1ea5
+0x85	U+1ea6
+0xa5	U+1ea7
+0x86	U+1ea8
+0xa6	U+1ea9
+0x06	U+1eaa
+U+1eaa "\302~"  # A with circumflex (same code as in iso-8859-1) and tilde
+0xe7	U+1eab
+0x87	U+1eac
+0xa7	U+1ead
+0x81	U+1eae
+0xa1	U+1eaf
+0x82	U+1eb0
+0xa2	U+1eb1
+0x02	U+1eb2
+U+1eb2:A(?
+0xc6	U+1eb3
+0x05	U+1eb4
+U+1eb4:A(~
+0xc7	U+1eb5
+0x83	U+1eb6
+0xa3	U+1eb7
+0x89	U+1eb8
+0xa9	U+1eb9
+0xcb	U+1eba
+0xeb	U+1ebb
+0x88	U+1ebc
+0xa8	U+1ebd
+0x8a	U+1ebe
+0xaa	U+1ebf
+0x8b	U+1ec0
+0xab	U+1ec1
+0x8c	U+1ec2
+0xac	U+1ec3
+0x8d	U+1ec4
+0xad	U+1ec5
+0x8e	U+1ec6
+0xae	U+1ec7
+0x9b	U+1ec8
+0xef	U+1ec9
+0x98	U+1eca
+0xb8	U+1ecb
+0x9a	U+1ecc
+0xf7	U+1ecd
+0x99	U+1ece
+0xf6	U+1ecf
+0x8f	U+1ed0
+0xaf	U+1ed1
+0x90	U+1ed2
+0xb0	U+1ed3
+0x91	U+1ed4
+0xb1	U+1ed5
+0x92	U+1ed6
+0xb2	U+1ed7
+0x93	U+1ed8
+0xb5	U+1ed9
+0x95	U+1eda
+0xbe	U+1edb
+0x96	U+1edc
+0xb6	U+1edd
+0x97	U+1ede
+0xb7	U+1edf
+0xb3	U+1ee0
+0xde	U+1ee1
+0x94	U+1ee2
+0xfe	U+1ee3
+0x9e	U+1ee4
+0xf8	U+1ee5
+0x9c	U+1ee6
+0xfc	U+1ee7
+0xba	U+1ee8
+0xd1	U+1ee9
+0xbb	U+1eea
+0xd7	U+1eeb
+0xbc	U+1eec
+0xd8	U+1eed
+0xff	U+1eee
+0xe6	U+1eef
+0xb9	U+1ef0
+0xf1	U+1ef1
+0x9f	U+1ef2
+0xcf	U+1ef3
+0x18	U+1ef4   # MacVISCII
+0x1e	U+1ef4
+U+1ef4:Y.
+0xdc	U+1ef5
+0x17	U+1ef6   # MacVISCII
+0x14	U+1ef6
+U+1ef6:Y?
+0xd6	U+1ef7
+0x19	U+1ef8
+U+1ef8:Y~
+0xdb	U+1ef9
+
generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2024-12-12 02:11:37 +0000