about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorThomas E. Dickey <dickey@invisible-island.net>2015-06-02 00:39:46 -0400
committerThomas E. Dickey <dickey@invisible-island.net>2015-06-02 00:39:46 -0400
commitc8fc934ded2a7a1d17af09fa2ff220b8f33a8546 (patch)
tree2334232c811469ef4be36b3d50062c7479781c7f
parent8bbc1032fd7c8d3bfc33738e5c127d0ddb93803b (diff)
downloadlynx-snapshots-c8fc934ded2a7a1d17af09fa2ff220b8f33a8546.tar.gz
snapshot of project "lynx", label v2-8-9dev_6b
-rw-r--r--CHANGES13
-rw-r--r--config.hin3
-rwxr-xr-xconfigure5203
-rw-r--r--configure.in3
-rw-r--r--po/sv.po2422
-rw-r--r--src/LYrcFile.c6
-rw-r--r--src/tidy_tls.c141
7 files changed, 3810 insertions, 3981 deletions
diff --git a/CHANGES b/CHANGES
index 63322fea..9d7200b3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,16 @@
--- $LynxId: CHANGES,v 1.798 2015/05/09 16:14:59 tom Exp $
+-- $LynxId: CHANGES,v 1.801 2015/06/02 00:32:43 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
 
-2015-05-09 (2.8.9dev.7)
+2015-05-27 (2.8.9dev.7)
+* update sv.po from
+    http://translationproject.org/latest/lynx
+* use gnutls_set_default_priority() to simplify algorithm priorities in the
+  gnutls configuration as well as track occassional changes in that library
+  (patch by Andreas Metzler).
+* correct logic in LYsetRcValue() from 2.8.8dev.13, which would free the wrong
+  pointer if the input had leading blanks (patch by Ruda Moura).
 * fix CF_CHECK_SIZEOF autoconf macro to work when its working variables have
   been preset to an empty value (report by Andrew Arensburger) -TD
 
@@ -20,7 +27,7 @@ Changes since Lynx 2.8 release
 * modify configure script to accept a release-number for the ncurses/ncursesw
   values of the "--with-screen" option, e.g., "--with-screen=ncursesw6" -TD
 * cosmetic fixes for autoconf macros to avoid vi-workaround -TD
-* da.po, et.po, fr.po, nl.po, vi.po from
+* update da.po, et.po, fr.po, nl.po, vi.po from
     http://translationproject.org/latest/lynx
 * regenerated lynx.pot, sent to translation project -TD
 * update config.guess (2015-03-04), config.sub (2015-03-08)
diff --git a/config.hin b/config.hin
index 25c38b6a..85e4d016 100644
--- a/config.hin
+++ b/config.hin
@@ -1,5 +1,5 @@
 /*
- * $LynxId: config.hin,v 1.137 2014/11/30 23:05:04 tom Exp $
+ * $LynxId: config.hin,v 1.138 2015/05/28 00:46:18 tom Exp $
  * vile:cmode
  *
  * The configure script translates "config.hin" into "lynx_cfg.h"
@@ -80,7 +80,6 @@
 #undef HAVE_GETTEXT		/* defined if you want to use non-GNU gettext */
 #undef HAVE_GETTIMEOFDAY
 #undef HAVE_GETUID
-#undef HAVE_GNUTLS_PRIORITY_SET_DIRECT
 #undef HAVE_GNUTLS_RND
 #undef HAVE_H_ERRNO
 #undef HAVE_ICONV		/* AM_ICONV */
diff --git a/configure b/configure
index f8bdf4a4..64966d1a 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in 2.8.9dev.6.
+# From configure.in 2.8.9dev.7.
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20141204.
 #
@@ -1274,7 +1274,7 @@ rm conftest.sed
 
 PACKAGE=lynx
 # $Format: "VERSION=$ProjectVersion$"$
-VERSION=2.8.9dev.6
+VERSION=2.8.9dev.7
 
 echo "$as_me:1279: checking for DESTDIR" >&5
 echo $ECHO_N "checking for DESTDIR... $ECHO_C" >&6
@@ -15665,75 +15665,6 @@ fi
 
 	fi
 
-for ac_func in gnutls_priority_set_direct
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:15671: 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 15677 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-char (*f) ();
-
-int
-main ()
-{
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15708: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:15711: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15714: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:15717: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-cat conftest.$ac_ext >&5
-eval "$as_ac_var=no"
-fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:15727: 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
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-EOF
-
-fi
-done
-
     else
 
 	cf_cv_have_gnutls=no
@@ -15773,7 +15704,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 15776 "configure"
+#line 15707 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -15785,16 +15716,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15788: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15719: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15791: \$? = $ac_status" >&5
+  echo "$as_me:15722: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15794: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15725: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15797: \$? = $ac_status" >&5
+  echo "$as_me:15728: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -15811,7 +15742,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}:15814: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:15745: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -15852,7 +15783,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 15855 "configure"
+#line 15786 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -15864,16 +15795,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15867: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15798: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15870: \$? = $ac_status" >&5
+  echo "$as_me:15801: \$? = $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:15804: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15876: \$? = $ac_status" >&5
+  echo "$as_me:15807: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -15890,7 +15821,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}:15893: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:15824: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -15906,7 +15837,7 @@ echo "${as_me:-configure}:15893: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:15909: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:15840: 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
@@ -15931,7 +15862,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}:15934: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:15865: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -15960,7 +15891,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}:15963: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:15894: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -15969,7 +15900,7 @@ echo "${as_me:-configure}:15963: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:15972: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:15903: 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
@@ -15987,12 +15918,12 @@ done
 		(yes) # if no explicit directory given, try pkg-config
 			test -n "$verbose" && echo "	checking pkg-config for $cf_pkg_gnutls" 1>&6
 
-echo "${as_me:-configure}:15990: testing checking pkg-config for $cf_pkg_gnutls ..." 1>&5
+echo "${as_me:-configure}:15921: 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}:15995: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:15926: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_cv_have_gnutls=yes
 				cf_cv_pkg_config_ssl=yes
@@ -16104,7 +16035,7 @@ fi
 					esac
 					test -n "$verbose" && echo "	adding $cf_libs_ssl to LIBS" 1>&6
 
-echo "${as_me:-configure}:16107: testing adding $cf_libs_ssl to LIBS ..." 1>&5
+echo "${as_me:-configure}:16038: testing adding $cf_libs_ssl to LIBS ..." 1>&5
 
 cf_add_libs="$cf_libs_ssl"
 # Filter out duplicates - this happens with badly-designed ".pc" files...
@@ -16126,7 +16057,7 @@ LIBS="$cf_add_libs"
 			else
 				test -n "$verbose" && echo "	... did not find $cf_pkg_gnutls in pkg-config" 1>&6
 
-echo "${as_me:-configure}:16129: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:16060: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_pkg_gnutls=none
 			fi
@@ -16146,12 +16077,12 @@ EOF
 cf_cv_header_path_gnutls=
 cf_cv_library_path_gnutls=
 
-echo "${as_me:-configure}:16149: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:16080: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 16154 "configure"
+#line 16085 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16180,16 +16111,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16183: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16114: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16186: \$? = $ac_status" >&5
+  echo "$as_me:16117: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16189: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16120: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16192: \$? = $ac_status" >&5
+  echo "$as_me:16123: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -16203,7 +16134,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lgnutls -lgnutls-openssl $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 16206 "configure"
+#line 16137 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16232,16 +16163,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16235: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16166: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16238: \$? = $ac_status" >&5
+  echo "$as_me:16169: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16241: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16172: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16244: \$? = $ac_status" >&5
+  echo "$as_me:16175: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -16258,9 +16189,9 @@ cat conftest.$ac_ext >&5
 
 	test -n "$verbose" && echo "	find linkage for gnutls library" 1>&6
 
-echo "${as_me:-configure}:16261: testing find linkage for gnutls library ..." 1>&5
+echo "${as_me:-configure}:16192: testing find linkage for gnutls library ..." 1>&5
 
-echo "${as_me:-configure}:16263: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:16194: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -16351,11 +16282,11 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d $cf_cv_header_path_gnutls ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_gnutls" 1>&6
 
-echo "${as_me:-configure}:16354: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:16285: 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 16358 "configure"
+#line 16289 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16384,21 +16315,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16387: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16318: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16390: \$? = $ac_status" >&5
+  echo "$as_me:16321: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16393: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16324: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16396: \$? = $ac_status" >&5
+  echo "$as_me:16327: \$? = $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}:16401: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:16332: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
 
 				cf_cv_find_linkage_gnutls=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -16416,7 +16347,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	if test "$cf_cv_find_linkage_gnutls" = maybe ; then
 
-echo "${as_me:-configure}:16419: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:16350: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -16491,13 +16422,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}:16494: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:16425: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
 
 					CPPFLAGS="$cf_test_CPPFLAGS"
 					LIBS="-lgnutls -lgnutls-openssl $cf_save_LIBS"
 					LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_gnutls"
 					cat >conftest.$ac_ext <<_ACEOF
-#line 16500 "configure"
+#line 16431 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16526,21 +16457,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16529: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16460: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16532: \$? = $ac_status" >&5
+  echo "$as_me:16463: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16535: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16466: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16538: \$? = $ac_status" >&5
+  echo "$as_me:16469: \$? = $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}:16543: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:16474: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
 
 					cf_cv_find_linkage_gnutls=yes
 					cf_cv_library_file_gnutls="-lgnutls"
@@ -16617,7 +16548,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 16620 "configure"
+#line 16551 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -16629,16 +16560,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16632: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16563: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16635: \$? = $ac_status" >&5
+  echo "$as_me:16566: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16638: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16569: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16641: \$? = $ac_status" >&5
+  echo "$as_me:16572: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -16655,7 +16586,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}:16658: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:16589: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -16694,7 +16625,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}:16697: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:16628: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -16720,13 +16651,13 @@ do
 done
 LIBS="$cf_add_libs"
 
-		echo "$as_me:16723: checking for gnutls_rnd" >&5
+		echo "$as_me:16654: checking for gnutls_rnd" >&5
 echo $ECHO_N "checking for gnutls_rnd... $ECHO_C" >&6
 if test "${ac_cv_func_gnutls_rnd+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 16729 "configure"
+#line 16660 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gnutls_rnd (); below.  */
@@ -16757,16 +16688,16 @@ f = gnutls_rnd; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16760: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16691: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16763: \$? = $ac_status" >&5
+  echo "$as_me:16694: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16766: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16697: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16769: \$? = $ac_status" >&5
+  echo "$as_me:16700: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_gnutls_rnd=yes
 else
@@ -16776,7 +16707,7 @@ ac_cv_func_gnutls_rnd=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:16779: result: $ac_cv_func_gnutls_rnd" >&5
+echo "$as_me:16710: result: $ac_cv_func_gnutls_rnd" >&5
 echo "${ECHO_T}$ac_cv_func_gnutls_rnd" >&6
 if test $ac_cv_func_gnutls_rnd = yes; then
   cat >>confdefs.h <<\EOF
@@ -16804,7 +16735,7 @@ LIBS="$cf_add_libs"
 fi
 
 		if test "$cf_pkg_gnutls" = none ; then
-				echo "$as_me:16807: checking for SSL_connect in -lgnutls-openssl" >&5
+				echo "$as_me:16738: 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
@@ -16812,7 +16743,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnutls-openssl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 16815 "configure"
+#line 16746 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16831,16 +16762,16 @@ SSL_connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16834: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16765: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16837: \$? = $ac_status" >&5
+  echo "$as_me:16768: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16840: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16771: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16843: \$? = $ac_status" >&5
+  echo "$as_me:16774: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gnutls_openssl_SSL_connect=yes
 else
@@ -16851,7 +16782,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16854: result: $ac_cv_lib_gnutls_openssl_SSL_connect" >&5
+echo "$as_me:16785: 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
 
@@ -16872,7 +16803,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-  echo "$as_me:16875: checking for SSL_connect in -lgnutls-extra" >&5
+  echo "$as_me:16806: 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
@@ -16880,7 +16811,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnutls-extra  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 16883 "configure"
+#line 16814 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16899,16 +16830,16 @@ SSL_connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16902: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16833: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16905: \$? = $ac_status" >&5
+  echo "$as_me:16836: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16908: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16839: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16911: \$? = $ac_status" >&5
+  echo "$as_me:16842: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gnutls_extra_SSL_connect=yes
 else
@@ -16919,7 +16850,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16922: result: $ac_cv_lib_gnutls_extra_SSL_connect" >&5
+echo "$as_me:16853: 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
 
@@ -16940,7 +16871,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-  { { echo "$as_me:16943: error: cannot find gnutls openssl functions" >&5
+  { { echo "$as_me:16874: error: cannot find gnutls openssl functions" >&5
 echo "$as_me: error: cannot find gnutls openssl functions" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -16949,10 +16880,10 @@ fi
 
 			fi
 
-echo "$as_me:16952: checking for X509 support" >&5
+echo "$as_me:16883: checking for X509 support" >&5
 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 16955 "configure"
+#line 16886 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16981,16 +16912,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:16984: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16915: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16987: \$? = $ac_status" >&5
+  echo "$as_me:16918: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16990: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16921: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16993: \$? = $ac_status" >&5
+  echo "$as_me:16924: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_x509_support=yes
 else
@@ -16999,7 +16930,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:17002: result: $cf_x509_support" >&5
+echo "$as_me:16933: result: $cf_x509_support" >&5
 echo "${ECHO_T}$cf_x509_support" >&6
 
 if test "$cf_x509_support" = yes ; then
@@ -17031,7 +16962,7 @@ case "$cf_cv_use_libnss_compat" in
 	;;
 (yes)
 
-echo "$as_me:17034: checking for SSL_get_version in -lnss_compat_ossl" >&5
+echo "$as_me:16965: 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
@@ -17039,7 +16970,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnss_compat_ossl -lnss_compat_ossl $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 17042 "configure"
+#line 16973 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17058,16 +16989,16 @@ SSL_get_version ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17061: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16992: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17064: \$? = $ac_status" >&5
+  echo "$as_me:16995: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17067: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16998: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17070: \$? = $ac_status" >&5
+  echo "$as_me:17001: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nss_compat_ossl_SSL_get_version=yes
 else
@@ -17078,7 +17009,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17081: result: $ac_cv_lib_nss_compat_ossl_SSL_get_version" >&5
+echo "$as_me:17012: 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
@@ -17093,11 +17024,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}:17096: testing assume it is in $cf_ssl_root ..." 1>&5
+echo "${as_me:-configure}:17027: 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:17100: error: cannot find NSS compilant libraries" >&5
+			{ { echo "$as_me:17031: error: cannot find NSS compilant libraries" >&5
 echo "$as_me: error: cannot find NSS compilant libraries" >&2;}
    { (exit 1); exit 1; }; }
 		fi
@@ -17112,13 +17043,13 @@ fi
 		elif test -d $cf_cv_use_libnss_compat/../include ; then
 			cf_ssl_root=$cf_cv_use_libnss_compat/..
 		else
-			{ { echo "$as_me:17115: error: cannot find NSS compilant library under $cf_cv_use_libnss_compat" >&5
+			{ { echo "$as_me:17046: 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:17121: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&5
+		{ echo "$as_me:17052: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&5
 echo "$as_me: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&2;}
 	fi
 	;;
@@ -17227,10 +17158,10 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 if test "$cf_ssl_subincs" = yes ; then
-echo "$as_me:17230: checking for NSS compilant include directory" >&5
+echo "$as_me:17161: 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 17233 "configure"
+#line 17164 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17244,16 +17175,16 @@ SSL_shutdown((SSL *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17247: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17178: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17250: \$? = $ac_status" >&5
+  echo "$as_me:17181: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17253: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17184: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17256: \$? = $ac_status" >&5
+  echo "$as_me:17187: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_ssl_incl=yes
 else
@@ -17262,7 +17193,7 @@ cat conftest.$ac_ext >&5
 cf_ssl_incl=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:17265: result: $cf_ssl_incl" >&5
+echo "$as_me:17196: result: $cf_ssl_incl" >&5
 echo "${ECHO_T}$cf_ssl_incl" >&6
 test "$cf_ssl_incl" = yes &&
 cat >>confdefs.h <<\EOF
@@ -17271,10 +17202,10 @@ EOF
 
 fi
 
-echo "$as_me:17274: checking if we can link to NSS compilant library" >&5
+echo "$as_me:17205: 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 17277 "configure"
+#line 17208 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17293,16 +17224,16 @@ SSL_shutdown((SSL *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17296: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17227: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17299: \$? = $ac_status" >&5
+  echo "$as_me:17230: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17302: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17233: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17305: \$? = $ac_status" >&5
+  echo "$as_me:17236: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_ssl_library=yes
 else
@@ -17311,7 +17242,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:17314: result: $cf_ssl_library" >&5
+echo "$as_me:17245: result: $cf_ssl_library" >&5
 echo "${ECHO_T}$cf_ssl_library" >&6
 if test "$cf_ssl_library" = yes ; then
 
@@ -17324,7 +17255,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-	{ { echo "$as_me:17327: error: Cannot link with NSS compilant libraries" >&5
+	{ { echo "$as_me:17258: error: Cannot link with NSS compilant libraries" >&5
 echo "$as_me: error: Cannot link with NSS compilant libraries" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -17332,7 +17263,7 @@ fi
 fi
 
 ### check for ipv6 support
-echo "$as_me:17335: checking whether to enable ipv6" >&5
+echo "$as_me:17266: 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.
@@ -17349,11 +17280,11 @@ EOF
 else
   enableval=no
 fi;
-echo "$as_me:17352: result: $enableval" >&5
+echo "$as_me:17283: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 if test "$enableval" = "yes"; then
 
-echo "$as_me:17356: checking ipv6 stack type" >&5
+echo "$as_me:17287: 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
@@ -17374,7 +17305,7 @@ do
 		;;
 	(inria)
 				cat >conftest.$ac_ext <<_ACEOF
-#line 17377 "configure"
+#line 17308 "configure"
 #include "confdefs.h"
 
 #include <netinet/in.h>
@@ -17391,7 +17322,7 @@ rm -rf conftest*
 		;;
 	(kame)
 				cat >conftest.$ac_ext <<_ACEOF
-#line 17394 "configure"
+#line 17325 "configure"
 #include "confdefs.h"
 
 #include <netinet/in.h>
@@ -17408,7 +17339,7 @@ rm -rf conftest*
 		;;
 	(linux-glibc)
 				cat >conftest.$ac_ext <<_ACEOF
-#line 17411 "configure"
+#line 17342 "configure"
 #include "confdefs.h"
 
 #include <features.h>
@@ -17434,7 +17365,7 @@ rm -rf conftest*
 		;;
 	(toshiba)
 		cat >conftest.$ac_ext <<_ACEOF
-#line 17437 "configure"
+#line 17368 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -17451,7 +17382,7 @@ rm -rf conftest*
 		;;
 	(v6d)
 		cat >conftest.$ac_ext <<_ACEOF
-#line 17454 "configure"
+#line 17385 "configure"
 #include "confdefs.h"
 
 #include </usr/local/v6/include/sys/v6config.h>
@@ -17468,7 +17399,7 @@ rm -rf conftest*
 		;;
 	(zeta)
 		cat >conftest.$ac_ext <<_ACEOF
-#line 17471 "configure"
+#line 17402 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -17490,13 +17421,13 @@ rm -rf conftest*
 done
 
 fi
-echo "$as_me:17493: result: $cf_cv_ipv6type" >&5
+echo "$as_me:17424: result: $cf_cv_ipv6type" >&5
 echo "${ECHO_T}$cf_cv_ipv6type" >&6
 
 cf_ipv6lib=none
 cf_ipv6dir=none
 
-echo "$as_me:17499: checking for IPv6 library if required" >&5
+echo "$as_me:17430: checking for IPv6 library if required" >&5
 echo $ECHO_N "checking for IPv6 library if required... $ECHO_C" >&6
 case $cf_cv_ipv6type in
 (solaris)
@@ -17526,13 +17457,13 @@ case $cf_cv_ipv6type in
 	cf_ipv6dir=v6
 	;;
 esac
-echo "$as_me:17529: result: $cf_ipv6lib" >&5
+echo "$as_me:17460: result: $cf_ipv6lib" >&5
 echo "${ECHO_T}$cf_ipv6lib" >&6
 
 if test "$cf_ipv6lib" != "none"; then
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 17535 "configure"
+#line 17466 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -17548,16 +17479,16 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17551: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17482: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17554: \$? = $ac_status" >&5
+  echo "$as_me:17485: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17557: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17488: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17560: \$? = $ac_status" >&5
+  echo "$as_me:17491: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -17675,7 +17606,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 17678 "configure"
+#line 17609 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -17687,16 +17618,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17690: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17621: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17693: \$? = $ac_status" >&5
+  echo "$as_me:17624: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17696: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17627: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17699: \$? = $ac_status" >&5
+  echo "$as_me:17630: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -17713,7 +17644,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}:17716: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:17647: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -17739,13 +17670,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:17742: checking for getaddrinfo" >&5
+	echo "$as_me:17673: 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 17748 "configure"
+#line 17679 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char getaddrinfo (); below.  */
@@ -17776,16 +17707,16 @@ f = getaddrinfo; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17779: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17710: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17782: \$? = $ac_status" >&5
+  echo "$as_me:17713: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17785: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17716: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17788: \$? = $ac_status" >&5
+  echo "$as_me:17719: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_getaddrinfo=yes
 else
@@ -17795,18 +17726,18 @@ ac_cv_func_getaddrinfo=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:17798: result: $ac_cv_func_getaddrinfo" >&5
+echo "$as_me:17729: 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:17805: checking for getaddrinfo in -l$cf_ipv6lib" >&5
+		echo "$as_me:17736: 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 17809 "configure"
+#line 17740 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -17822,25 +17753,25 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17825: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17756: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17828: \$? = $ac_status" >&5
+  echo "$as_me:17759: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17831: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17762: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17834: \$? = $ac_status" >&5
+  echo "$as_me:17765: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:17836: result: yes" >&5
+  echo "$as_me:17767: 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:17843: result: no" >&5
+echo "$as_me:17774: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -17908,11 +17839,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:17911: checking for -l$cf_ipv6lib in $cf_libdir" >&5
+				echo "$as_me:17842: 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 17915 "configure"
+#line 17846 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -17928,25 +17859,25 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17931: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17862: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17934: \$? = $ac_status" >&5
+  echo "$as_me:17865: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17937: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17868: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17940: \$? = $ac_status" >&5
+  echo "$as_me:17871: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:17942: result: yes" >&5
+  echo "$as_me:17873: 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:17949: result: no" >&5
+echo "$as_me:17880: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -17961,7 +17892,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_ipv6lib
 
 	if test $cf_found_library = no ; then
-		{ { echo "$as_me:17964: error: No $cf_ipv6lib library found, cannot continue.  You must fetch lib$cf_ipv6lib.a
+		{ { echo "$as_me:17895: 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;}
@@ -17969,7 +17900,7 @@ from an appropriate IPv6 kit and compile beforehand." >&2;}
 	fi
 fi
 
-echo "$as_me:17972: checking working getaddrinfo" >&5
+echo "$as_me:17903: 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
@@ -17979,7 +17910,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_getaddrinfo=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 17982 "configure"
+#line 17913 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -18059,15 +17990,15 @@ int main()
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:18062: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17993: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18065: \$? = $ac_status" >&5
+  echo "$as_me:17996: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:18067: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17998: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18070: \$? = $ac_status" >&5
+  echo "$as_me:18001: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_getaddrinfo=yes
 else
@@ -18080,7 +18011,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:18083: result: $cf_cv_getaddrinfo" >&5
+echo "$as_me:18014: result: $cf_cv_getaddrinfo" >&5
 echo "${ECHO_T}$cf_cv_getaddrinfo" >&6
 if test "$cf_cv_getaddrinfo" = yes ; then
 
@@ -18096,12 +18027,12 @@ fi
 
 if test "$cf_cv_getaddrinfo" != "yes"; then
 	if test "$cf_cv_ipv6type" != "linux"; then
-		{ echo "$as_me:18099: WARNING: You must get working getaddrinfo() function,
+		{ echo "$as_me:18030: 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:18104: WARNING: The getaddrinfo() implementation on your system seems be buggy.
+		{ echo "$as_me:18035: 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.
@@ -18112,7 +18043,7 @@ fi
 
 fi
 
-echo "$as_me:18115: checking for screen type" >&5
+echo "$as_me:18046: 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
@@ -18126,7 +18057,7 @@ case $withval in
 (curses|ncurses*|pdcurses|slang)
 	cf_cv_screen=$withval
 	;;
-(*)	{ { echo "$as_me:18129: error: Unexpected value $withval" >&5
+(*)	{ { echo "$as_me:18060: error: Unexpected value $withval" >&5
 echo "$as_me: error: Unexpected value $withval" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -18135,13 +18066,13 @@ else
   cf_cv_screen=curses
 fi;
 fi
-echo "$as_me:18138: result: $cf_cv_screen" >&5
+echo "$as_me:18069: result: $cf_cv_screen" >&5
 echo "${ECHO_T}$cf_cv_screen" >&6
 
 case $cf_cv_screen in
 (curses|ncurses*)
 
-echo "$as_me:18144: checking for specific curses-directory" >&5
+echo "$as_me:18075: checking for specific curses-directory" >&5
 echo $ECHO_N "checking for specific curses-directory... $ECHO_C" >&6
 
 # Check whether --with-curses-dir or --without-curses-dir was given.
@@ -18151,7 +18082,7 @@ if test "${with_curses_dir+set}" = set; then
 else
   cf_cv_curses_dir=no
 fi;
-echo "$as_me:18154: result: $cf_cv_curses_dir" >&5
+echo "$as_me:18085: result: $cf_cv_curses_dir" >&5
 echo "${ECHO_T}$cf_cv_curses_dir" >&6
 
 if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
@@ -18182,7 +18113,7 @@ case ".$withval" in
 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:18185: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:18116: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -18215,7 +18146,7 @@ if test -n "$cf_cv_curses_dir/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 18218 "configure"
+#line 18149 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -18227,16 +18158,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18230: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18161: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18233: \$? = $ac_status" >&5
+  echo "$as_me:18164: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18236: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18167: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18239: \$? = $ac_status" >&5
+  echo "$as_me:18170: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -18253,7 +18184,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}:18256: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:18187: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -18287,7 +18218,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}:18290: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:18221: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -18306,7 +18237,7 @@ dft_color_style=yes
 case $cf_cv_screen in
 (curses)
 
-echo "$as_me:18309: checking for extra include directories" >&5
+echo "$as_me:18240: 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
@@ -18332,11 +18263,11 @@ case $host_os in
 esac
 
 fi
-echo "$as_me:18335: result: $cf_cv_curses_incdir" >&5
+echo "$as_me:18266: result: $cf_cv_curses_incdir" >&5
 echo "${ECHO_T}$cf_cv_curses_incdir" >&6
 test "$cf_cv_curses_incdir" != no && CPPFLAGS="$CPPFLAGS $cf_cv_curses_incdir"
 
-echo "$as_me:18339: checking if we have identified curses headers" >&5
+echo "$as_me:18270: 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
@@ -18348,7 +18279,7 @@ for cf_header in \
 	curses.h  ncurses/ncurses.h ncurses/curses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 18351 "configure"
+#line 18282 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -18360,16 +18291,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18363: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18294: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18366: \$? = $ac_status" >&5
+  echo "$as_me:18297: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18369: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18300: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18372: \$? = $ac_status" >&5
+  echo "$as_me:18303: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -18380,11 +18311,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:18383: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:18314: 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:18387: error: No curses header-files found" >&5
+	{ { echo "$as_me:18318: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -18394,23 +18325,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:18397: checking for $ac_header" >&5
+echo "$as_me:18328: 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 18403 "configure"
+#line 18334 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18407: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:18338: \"$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:18413: \$? = $ac_status" >&5
+  echo "$as_me:18344: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18429,7 +18360,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:18432: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:18363: 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
@@ -18439,7 +18370,7 @@ EOF
 fi
 done
 
-echo "$as_me:18442: checking for terminfo header" >&5
+echo "$as_me:18373: 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
@@ -18457,7 +18388,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 18460 "configure"
+#line 18391 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -18472,16 +18403,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18475: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18406: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18478: \$? = $ac_status" >&5
+  echo "$as_me:18409: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18481: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18412: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18484: \$? = $ac_status" >&5
+  echo "$as_me:18415: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -18497,7 +18428,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:18500: result: $cf_cv_term_header" >&5
+echo "$as_me:18431: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -18529,7 +18460,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:18532: checking for ncurses version" >&5
+echo "$as_me:18463: 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
@@ -18555,10 +18486,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:18558: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:18489: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:18561: \$? = $ac_status" >&5
+  echo "$as_me:18492: \$? = $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%".*%%'`
@@ -18568,7 +18499,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 18571 "configure"
+#line 18502 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -18593,15 +18524,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:18596: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18527: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18599: \$? = $ac_status" >&5
+  echo "$as_me:18530: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:18601: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18532: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18604: \$? = $ac_status" >&5
+  echo "$as_me:18535: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -18615,17 +18546,17 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:18618: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:18549: 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:18625: checking if we have identified curses libraries" >&5
+echo "$as_me:18556: 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 18628 "configure"
+#line 18559 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -18637,16 +18568,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18640: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18571: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18643: \$? = $ac_status" >&5
+  echo "$as_me:18574: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18646: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18577: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18649: \$? = $ac_status" >&5
+  echo "$as_me:18580: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -18655,13 +18586,13 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:18658: result: $cf_result" >&5
+echo "$as_me:18589: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 if test "$cf_result" = no ; then
 case $host_os in
 (freebsd*)
-    echo "$as_me:18664: checking for tgoto in -lmytinfo" >&5
+    echo "$as_me:18595: 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
@@ -18669,7 +18600,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 18672 "configure"
+#line 18603 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18688,16 +18619,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18691: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18622: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18694: \$? = $ac_status" >&5
+  echo "$as_me:18625: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18697: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18628: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18700: \$? = $ac_status" >&5
+  echo "$as_me:18631: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -18708,7 +18639,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18711: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:18642: 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
 
@@ -18738,7 +18669,7 @@ fi
 	# term.h) for cur_colr
 	if test "x$cf_cv_screen" = "xcurses_colr"
 	then
-		echo "$as_me:18741: checking for initscr in -lcur_colr" >&5
+		echo "$as_me:18672: 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
@@ -18746,7 +18677,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcur_colr  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 18749 "configure"
+#line 18680 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18765,16 +18696,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18768: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18699: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18771: \$? = $ac_status" >&5
+  echo "$as_me:18702: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18774: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18705: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18777: \$? = $ac_status" >&5
+  echo "$as_me:18708: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_cur_colr_initscr=yes
 else
@@ -18785,7 +18716,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18788: result: $ac_cv_lib_cur_colr_initscr" >&5
+echo "$as_me:18719: 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
 
@@ -18809,7 +18740,7 @@ LIBS="$cf_add_libs"
 
 else
 
-		echo "$as_me:18812: checking for initscr in -lHcurses" >&5
+		echo "$as_me:18743: 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
@@ -18817,7 +18748,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lHcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 18820 "configure"
+#line 18751 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18836,16 +18767,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18839: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18770: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18842: \$? = $ac_status" >&5
+  echo "$as_me:18773: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18845: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18776: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18848: \$? = $ac_status" >&5
+  echo "$as_me:18779: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Hcurses_initscr=yes
 else
@@ -18856,7 +18787,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18859: result: $ac_cv_lib_Hcurses_initscr" >&5
+echo "$as_me:18790: 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
 
@@ -18912,7 +18843,7 @@ if test -n "/lib64" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:18915: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:18846: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -18941,7 +18872,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}:18944: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:18875: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -18972,7 +18903,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}:18975: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:18906: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -19007,7 +18938,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}:19010: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:18941: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -19051,13 +18982,13 @@ if test ".$ac_cv_func_initscr" != .yes ; then
 	# because it may be needed to link the test-case for initscr.
 	if test "x$cf_term_lib" = x
 	then
-		echo "$as_me:19054: checking for tgoto" >&5
+		echo "$as_me:18985: 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 19060 "configure"
+#line 18991 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char tgoto (); below.  */
@@ -19088,16 +19019,16 @@ f = tgoto; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19091: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19022: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19094: \$? = $ac_status" >&5
+  echo "$as_me:19025: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19097: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19028: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19100: \$? = $ac_status" >&5
+  echo "$as_me:19031: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_tgoto=yes
 else
@@ -19107,7 +19038,7 @@ ac_cv_func_tgoto=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:19110: result: $ac_cv_func_tgoto" >&5
+echo "$as_me:19041: 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
@@ -19116,7 +19047,7 @@ else
 			for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown
 			do
 				as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh`
-echo "$as_me:19119: checking for tgoto in -l$cf_term_lib" >&5
+echo "$as_me:19050: 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
@@ -19124,7 +19055,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_term_lib  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 19127 "configure"
+#line 19058 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19143,16 +19074,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19146: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19077: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19149: \$? = $ac_status" >&5
+  echo "$as_me:19080: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19152: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19083: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19155: \$? = $ac_status" >&5
+  echo "$as_me:19086: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -19163,7 +19094,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19166: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:19097: 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
@@ -19182,7 +19113,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:19185: checking for initscr in -l$cf_curs_lib" >&5
+echo "$as_me:19116: 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
@@ -19190,7 +19121,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_curs_lib  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 19193 "configure"
+#line 19124 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19209,16 +19140,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19212: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19143: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19215: \$? = $ac_status" >&5
+  echo "$as_me:19146: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19218: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19149: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19221: \$? = $ac_status" >&5
+  echo "$as_me:19152: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -19229,7 +19160,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19232: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:19163: 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
@@ -19237,16 +19168,16 @@ fi
 
 		done
 	fi
-	test $cf_curs_lib = unknown && { { echo "$as_me:19240: error: no curses library found" >&5
+	test $cf_curs_lib = unknown && { { echo "$as_me:19171: 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:19246: checking if we can link with $cf_curs_lib library" >&5
+		echo "$as_me:19177: 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 19249 "configure"
+#line 19180 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -19258,16 +19189,16 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19261: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19192: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19264: \$? = $ac_status" >&5
+  echo "$as_me:19195: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19267: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19198: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19270: \$? = $ac_status" >&5
+  echo "$as_me:19201: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -19276,18 +19207,18 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-		echo "$as_me:19279: result: $cf_result" >&5
+		echo "$as_me:19210: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
-		test $cf_result = no && { { echo "$as_me:19281: error: Cannot link curses library" >&5
+		test $cf_result = no && { { echo "$as_me:19212: 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:19287: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+		echo "$as_me:19218: 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 19290 "configure"
+#line 19221 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -19299,16 +19230,16 @@ initscr(); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19302: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19233: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19305: \$? = $ac_status" >&5
+  echo "$as_me:19236: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19308: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19239: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19311: \$? = $ac_status" >&5
+  echo "$as_me:19242: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=no
 else
@@ -19317,7 +19248,7 @@ cat conftest.$ac_ext >&5
 
 			LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
 			cat >conftest.$ac_ext <<_ACEOF
-#line 19320 "configure"
+#line 19251 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -19329,16 +19260,16 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19332: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19263: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19335: \$? = $ac_status" >&5
+  echo "$as_me:19266: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19338: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19269: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19341: \$? = $ac_status" >&5
+  echo "$as_me:19272: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -19350,13 +19281,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:19353: result: $cf_result" >&5
+		echo "$as_me:19284: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	fi
 fi
 fi
 
-echo "$as_me:19359: checking for curses performance tradeoff" >&5
+echo "$as_me:19290: 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
@@ -19364,7 +19295,7 @@ else
 
     cf_cv_curs_performance=no
     cat >conftest.$ac_ext <<_ACEOF
-#line 19367 "configure"
+#line 19298 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19383,20 +19314,20 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19386: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19317: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19389: \$? = $ac_status" >&5
+  echo "$as_me:19320: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19392: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19323: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19395: \$? = $ac_status" >&5
+  echo "$as_me:19326: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 19399 "configure"
+#line 19330 "configure"
 #include "confdefs.h"
 
 #define CURS_PERFORMANCE
@@ -19416,16 +19347,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19419: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19350: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19422: \$? = $ac_status" >&5
+  echo "$as_me:19353: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19425: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19356: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19428: \$? = $ac_status" >&5
+  echo "$as_me:19359: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_curs_performance=yes
 else
@@ -19440,21 +19371,21 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:19443: result: $cf_cv_curs_performance" >&5
+echo "$as_me:19374: 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:19450: checking for curses touchline function" >&5
+echo "$as_me:19381: 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 19457 "configure"
+#line 19388 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19467,23 +19398,23 @@ touchline(stdscr, 1,2,3);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19470: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19401: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19473: \$? = $ac_status" >&5
+  echo "$as_me:19404: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19476: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19407: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19479: \$? = $ac_status" >&5
+  echo "$as_me:19410: \$? = $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 19486 "configure"
+#line 19417 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19496,16 +19427,16 @@ touchline(stdscr, 1,2);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19499: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19430: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19502: \$? = $ac_status" >&5
+  echo "$as_me:19433: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19505: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19436: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19508: \$? = $ac_status" >&5
+  echo "$as_me:19439: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_curs_touchline=sysv
 else
@@ -19517,7 +19448,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:19520: result: $cf_cv_curs_touchline" >&5
+echo "$as_me:19451: result: $cf_cv_curs_touchline" >&5
 echo "${ECHO_T}$cf_cv_curs_touchline" >&6
 case "$cf_cv_curs_touchline" in
 (bsd)
@@ -19539,7 +19470,7 @@ esac
 	;;
 (ncursesw*)
 
-echo "$as_me:19542: checking for multibyte character support" >&5
+echo "$as_me:19473: 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
@@ -19547,7 +19478,7 @@ else
 
 	cf_save_LIBS="$LIBS"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 19550 "configure"
+#line 19481 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -19560,16 +19491,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19563: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19494: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19566: \$? = $ac_status" >&5
+  echo "$as_me:19497: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19569: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19500: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19572: \$? = $ac_status" >&5
+  echo "$as_me:19503: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_utf8_lib=yes
 else
@@ -19581,12 +19512,12 @@ cat conftest.$ac_ext >&5
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
-echo "${as_me:-configure}:19584: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:19515: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 19589 "configure"
+#line 19520 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -19599,16 +19530,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19602: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19533: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19605: \$? = $ac_status" >&5
+  echo "$as_me:19536: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19608: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19539: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19611: \$? = $ac_status" >&5
+  echo "$as_me:19542: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -19622,7 +19553,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lutf8  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 19625 "configure"
+#line 19556 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -19635,16 +19566,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19638: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19569: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19641: \$? = $ac_status" >&5
+  echo "$as_me:19572: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19644: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19575: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19647: \$? = $ac_status" >&5
+  echo "$as_me:19578: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -19661,9 +19592,9 @@ cat conftest.$ac_ext >&5
 
 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
 
-echo "${as_me:-configure}:19664: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:19595: testing find linkage for utf8 library ..." 1>&5
 
-echo "${as_me:-configure}:19666: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:19597: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -19754,11 +19685,11 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d $cf_cv_header_path_utf8 ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
 
-echo "${as_me:-configure}:19757: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:19688: 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 19761 "configure"
+#line 19692 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -19771,21 +19702,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19774: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19705: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19777: \$? = $ac_status" >&5
+  echo "$as_me:19708: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19780: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19711: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19783: \$? = $ac_status" >&5
+  echo "$as_me:19714: \$? = $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}:19788: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:19719: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
 
 				cf_cv_find_linkage_utf8=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -19803,7 +19734,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
-echo "${as_me:-configure}:19806: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:19737: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -19878,13 +19809,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}:19881: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:19812: 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 19887 "configure"
+#line 19818 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -19897,21 +19828,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19900: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19831: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19903: \$? = $ac_status" >&5
+  echo "$as_me:19834: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19906: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19837: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19909: \$? = $ac_status" >&5
+  echo "$as_me:19840: \$? = $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}:19914: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:19845: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
 
 					cf_cv_find_linkage_utf8=yes
 					cf_cv_library_file_utf8="-lutf8"
@@ -19953,7 +19884,7 @@ fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:19956: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:19887: 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
@@ -19988,7 +19919,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 19991 "configure"
+#line 19922 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -20000,16 +19931,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20003: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19934: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20006: \$? = $ac_status" >&5
+  echo "$as_me:19937: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20009: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19940: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20012: \$? = $ac_status" >&5
+  echo "$as_me:19943: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -20026,7 +19957,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}:20029: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:19960: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -20060,7 +19991,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}:20063: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:19994: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -20090,13 +20021,13 @@ cf_ncuconfig_root=$cf_cv_screen
 cf_have_ncuconfig=no
 
 if test "x$PKG_CONFIG" != xnone; then
-	echo "$as_me:20093: checking pkg-config for $cf_ncuconfig_root" >&5
+	echo "$as_me:20024: checking pkg-config for $cf_ncuconfig_root" >&5
 echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
 	if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then
-		echo "$as_me:20096: result: yes" >&5
+		echo "$as_me:20027: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:20099: checking if the $cf_ncuconfig_root package files work" >&5
+		echo "$as_me:20030: checking if the $cf_ncuconfig_root package files work" >&5
 echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
 		cf_have_ncuconfig=unknown
 
@@ -20122,7 +20053,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 20125 "configure"
+#line 20056 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -20134,39 +20065,39 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20137: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20068: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20140: \$? = $ac_status" >&5
+  echo "$as_me:20071: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20143: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20074: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20146: \$? = $ac_status" >&5
+  echo "$as_me:20077: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:20149: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:20080: 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 20154 "configure"
+#line 20085 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 				int main(void)
 				{ char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:20161: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20092: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20164: \$? = $ac_status" >&5
+  echo "$as_me:20095: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:20166: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20097: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20169: \$? = $ac_status" >&5
+  echo "$as_me:20100: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -20184,7 +20115,7 @@ cf_have_ncuconfig=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
-		echo "$as_me:20187: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:20118: result: $cf_have_ncuconfig" >&5
 echo "${ECHO_T}$cf_have_ncuconfig" >&6
 		if test "$cf_have_ncuconfig" != "yes"
 		then
@@ -20201,7 +20132,7 @@ EOF
 		fi
 
 	else
-		echo "$as_me:20204: result: no" >&5
+		echo "$as_me:20135: result: no" >&5
 echo "${ECHO_T}no" >&6
 		NCURSES_CONFIG_PKG=none
 	fi
@@ -20217,7 +20148,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:20220: checking for $ac_word" >&5
+echo "$as_me:20151: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20232,7 +20163,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:20235: found $ac_dir/$ac_word" >&5
+echo "$as_me:20166: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -20240,10 +20171,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:20243: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:20174: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:20246: result: no" >&5
+  echo "$as_me:20177: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -20256,7 +20187,7 @@ if test -z "$NCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:20259: checking for $ac_word" >&5
+echo "$as_me:20190: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20271,7 +20202,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
-echo "$as_me:20274: found $ac_dir/$ac_word" >&5
+echo "$as_me:20205: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -20279,10 +20210,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
-  echo "$as_me:20282: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:20213: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:20285: result: no" >&5
+  echo "$as_me:20216: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -20315,7 +20246,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:20318: checking if we have identified curses headers" >&5
+echo "$as_me:20249: 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
@@ -20327,7 +20258,7 @@ for cf_header in \
 	curses.h $cf_cv_screen/curses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 20330 "configure"
+#line 20261 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -20339,16 +20270,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20342: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20273: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20345: \$? = $ac_status" >&5
+  echo "$as_me:20276: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20348: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20279: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20351: \$? = $ac_status" >&5
+  echo "$as_me:20282: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -20359,11 +20290,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:20362: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:20293: 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:20366: error: No curses header-files found" >&5
+	{ { echo "$as_me:20297: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -20373,23 +20304,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:20376: checking for $ac_header" >&5
+echo "$as_me:20307: 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 20382 "configure"
+#line 20313 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20386: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:20317: \"$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:20392: \$? = $ac_status" >&5
+  echo "$as_me:20323: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20408,7 +20339,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:20411: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:20342: 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
@@ -20461,7 +20392,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 20464 "configure"
+#line 20395 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -20473,16 +20404,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20476: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20407: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20479: \$? = $ac_status" >&5
+  echo "$as_me:20410: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20482: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20413: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20485: \$? = $ac_status" >&5
+  echo "$as_me:20416: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -20499,7 +20430,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}:20502: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:20433: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -20516,7 +20447,7 @@ fi
 
 }
 
-echo "$as_me:20519: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:20450: 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
@@ -20528,7 +20459,7 @@ else
 	do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 20531 "configure"
+#line 20462 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -20552,16 +20483,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20555: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20486: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20558: \$? = $ac_status" >&5
+  echo "$as_me:20489: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20561: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20492: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20564: \$? = $ac_status" >&5
+  echo "$as_me:20495: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -20576,14 +20507,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 	done
 
 fi
-echo "$as_me:20579: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:20510: 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:20586: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:20517: 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
@@ -20701,7 +20632,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 20704 "configure"
+#line 20635 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -20713,16 +20644,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20716: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20647: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20719: \$? = $ac_status" >&5
+  echo "$as_me:20650: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20722: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20653: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20725: \$? = $ac_status" >&5
+  echo "$as_me:20656: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -20739,7 +20670,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}:20742: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:20673: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -20760,7 +20691,7 @@ fi
 		do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 20763 "configure"
+#line 20694 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -20784,16 +20715,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20787: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20718: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20790: \$? = $ac_status" >&5
+  echo "$as_me:20721: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20793: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20724: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20796: \$? = $ac_status" >&5
+  echo "$as_me:20727: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -20814,12 +20745,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:20817: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:20748: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:20822: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:20753: 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%/[^/]*$%%'`
@@ -20852,7 +20783,7 @@ if test -n "$cf_1st_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 20855 "configure"
+#line 20786 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -20864,16 +20795,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20867: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20798: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20870: \$? = $ac_status" >&5
+  echo "$as_me:20801: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20873: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20804: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20876: \$? = $ac_status" >&5
+  echo "$as_me:20807: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -20890,7 +20821,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}:20893: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:20824: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -20936,7 +20867,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:20939: checking for terminfo header" >&5
+echo "$as_me:20870: 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
@@ -20954,7 +20885,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 20957 "configure"
+#line 20888 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20969,16 +20900,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20972: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20903: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20975: \$? = $ac_status" >&5
+  echo "$as_me:20906: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20978: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20909: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20981: \$? = $ac_status" >&5
+  echo "$as_me:20912: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -20994,7 +20925,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:20997: result: $cf_cv_term_header" >&5
+echo "$as_me:20928: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -21032,7 +20963,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:21035: checking for ncurses version" >&5
+echo "$as_me:20966: 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
@@ -21058,10 +20989,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:21061: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:20992: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:21064: \$? = $ac_status" >&5
+  echo "$as_me:20995: \$? = $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%".*%%'`
@@ -21071,7 +21002,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 21074 "configure"
+#line 21005 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -21096,15 +21027,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:21099: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21030: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21102: \$? = $ac_status" >&5
+  echo "$as_me:21033: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:21104: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21035: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21107: \$? = $ac_status" >&5
+  echo "$as_me:21038: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -21118,7 +21049,7 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:21121: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:21052: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -21131,7 +21062,7 @@ cf_nculib_root=$cf_cv_screen
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:21134: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:21065: 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
@@ -21139,7 +21070,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 21142 "configure"
+#line 21073 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21158,16 +21089,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21161: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21092: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21164: \$? = $ac_status" >&5
+  echo "$as_me:21095: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21167: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21098: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21170: \$? = $ac_status" >&5
+  echo "$as_me:21101: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -21178,10 +21109,10 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21181: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:21112: 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:21184: checking for initscr in -lgpm" >&5
+  echo "$as_me:21115: 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
@@ -21189,7 +21120,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 21192 "configure"
+#line 21123 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21208,16 +21139,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21211: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21142: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21214: \$? = $ac_status" >&5
+  echo "$as_me:21145: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21217: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21148: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21220: \$? = $ac_status" >&5
+  echo "$as_me:21151: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -21228,7 +21159,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21231: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:21162: 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"
@@ -21243,7 +21174,7 @@ case $host_os in
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it's static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:21246: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:21177: 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
@@ -21251,7 +21182,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 21254 "configure"
+#line 21185 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21270,16 +21201,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21273: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21204: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21276: \$? = $ac_status" >&5
+  echo "$as_me:21207: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21279: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21210: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21282: \$? = $ac_status" >&5
+  echo "$as_me:21213: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -21290,7 +21221,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21293: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:21224: 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"
@@ -21339,13 +21270,13 @@ else
 
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
-	echo "$as_me:21342: checking for initscr" >&5
+	echo "$as_me:21273: 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 21348 "configure"
+#line 21279 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */
@@ -21376,16 +21307,16 @@ f = initscr; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21379: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21310: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21382: \$? = $ac_status" >&5
+  echo "$as_me:21313: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21385: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21316: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21388: \$? = $ac_status" >&5
+  echo "$as_me:21319: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -21395,18 +21326,18 @@ ac_cv_func_initscr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:21398: result: $ac_cv_func_initscr" >&5
+echo "$as_me:21329: 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:21405: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:21336: 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 21409 "configure"
+#line 21340 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -21418,25 +21349,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21421: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21352: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21424: \$? = $ac_status" >&5
+  echo "$as_me:21355: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21427: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21358: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21430: \$? = $ac_status" >&5
+  echo "$as_me:21361: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:21432: result: yes" >&5
+  echo "$as_me:21363: 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:21439: result: no" >&5
+echo "$as_me:21370: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -21504,11 +21435,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:21507: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:21438: 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 21511 "configure"
+#line 21442 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -21520,25 +21451,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21523: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21454: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21526: \$? = $ac_status" >&5
+  echo "$as_me:21457: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21529: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21460: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21532: \$? = $ac_status" >&5
+  echo "$as_me:21463: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:21534: result: yes" >&5
+  echo "$as_me:21465: 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:21541: result: no" >&5
+echo "$as_me:21472: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -21553,7 +21484,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:21556: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:21487: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -21561,7 +21492,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:21564: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:21495: 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
@@ -21571,7 +21502,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >conftest.$ac_ext <<_ACEOF
-#line 21574 "configure"
+#line 21505 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -21583,23 +21514,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21586: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21517: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21589: \$? = $ac_status" >&5
+  echo "$as_me:21520: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21592: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21523: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21595: \$? = $ac_status" >&5
+  echo "$as_me:21526: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:21597: result: yes" >&5
+  echo "$as_me:21528: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:21602: result: no" >&5
+echo "$as_me:21533: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -21625,13 +21556,13 @@ cf_ncuconfig_root=$cf_cv_screen
 cf_have_ncuconfig=no
 
 if test "x$PKG_CONFIG" != xnone; then
-	echo "$as_me:21628: checking pkg-config for $cf_ncuconfig_root" >&5
+	echo "$as_me:21559: checking pkg-config for $cf_ncuconfig_root" >&5
 echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
 	if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then
-		echo "$as_me:21631: result: yes" >&5
+		echo "$as_me:21562: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:21634: checking if the $cf_ncuconfig_root package files work" >&5
+		echo "$as_me:21565: checking if the $cf_ncuconfig_root package files work" >&5
 echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
 		cf_have_ncuconfig=unknown
 
@@ -21657,7 +21588,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 21660 "configure"
+#line 21591 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -21669,39 +21600,39 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21672: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21603: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21675: \$? = $ac_status" >&5
+  echo "$as_me:21606: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21678: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21609: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21681: \$? = $ac_status" >&5
+  echo "$as_me:21612: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:21684: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:21615: 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 21689 "configure"
+#line 21620 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 				int main(void)
 				{ char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:21696: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21627: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21699: \$? = $ac_status" >&5
+  echo "$as_me:21630: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:21701: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21632: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21704: \$? = $ac_status" >&5
+  echo "$as_me:21635: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -21719,7 +21650,7 @@ cf_have_ncuconfig=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
-		echo "$as_me:21722: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:21653: result: $cf_have_ncuconfig" >&5
 echo "${ECHO_T}$cf_have_ncuconfig" >&6
 		if test "$cf_have_ncuconfig" != "yes"
 		then
@@ -21736,7 +21667,7 @@ EOF
 		fi
 
 	else
-		echo "$as_me:21739: result: no" >&5
+		echo "$as_me:21670: result: no" >&5
 echo "${ECHO_T}no" >&6
 		NCURSES_CONFIG_PKG=none
 	fi
@@ -21752,7 +21683,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:21755: checking for $ac_word" >&5
+echo "$as_me:21686: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21767,7 +21698,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:21770: found $ac_dir/$ac_word" >&5
+echo "$as_me:21701: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -21775,10 +21706,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:21778: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:21709: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:21781: result: no" >&5
+  echo "$as_me:21712: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -21791,7 +21722,7 @@ if test -z "$NCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:21794: checking for $ac_word" >&5
+echo "$as_me:21725: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21806,7 +21737,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
-echo "$as_me:21809: found $ac_dir/$ac_word" >&5
+echo "$as_me:21740: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -21814,10 +21745,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
-  echo "$as_me:21817: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:21748: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:21820: result: no" >&5
+  echo "$as_me:21751: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -21850,7 +21781,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:21853: checking if we have identified curses headers" >&5
+echo "$as_me:21784: 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
@@ -21862,7 +21793,7 @@ for cf_header in \
 	curses.h $cf_cv_screen/curses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 21865 "configure"
+#line 21796 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -21874,16 +21805,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21877: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21808: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21880: \$? = $ac_status" >&5
+  echo "$as_me:21811: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21883: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21814: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21886: \$? = $ac_status" >&5
+  echo "$as_me:21817: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -21894,11 +21825,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:21897: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:21828: 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:21901: error: No curses header-files found" >&5
+	{ { echo "$as_me:21832: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -21908,23 +21839,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:21911: checking for $ac_header" >&5
+echo "$as_me:21842: 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 21917 "configure"
+#line 21848 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:21921: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:21852: \"$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:21927: \$? = $ac_status" >&5
+  echo "$as_me:21858: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -21943,7 +21874,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:21946: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:21877: 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
@@ -21996,7 +21927,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 21999 "configure"
+#line 21930 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -22008,16 +21939,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22011: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21942: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22014: \$? = $ac_status" >&5
+  echo "$as_me:21945: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22017: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21948: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22020: \$? = $ac_status" >&5
+  echo "$as_me:21951: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -22034,7 +21965,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}:22037: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:21968: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -22051,7 +21982,7 @@ fi
 
 }
 
-echo "$as_me:22054: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:21985: 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
@@ -22063,7 +21994,7 @@ else
 	do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 22066 "configure"
+#line 21997 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -22087,16 +22018,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22090: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22021: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22093: \$? = $ac_status" >&5
+  echo "$as_me:22024: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22096: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22027: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22099: \$? = $ac_status" >&5
+  echo "$as_me:22030: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -22111,14 +22042,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 	done
 
 fi
-echo "$as_me:22114: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:22045: 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:22121: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:22052: 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
@@ -22236,7 +22167,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 22239 "configure"
+#line 22170 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -22248,16 +22179,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22251: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22182: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22254: \$? = $ac_status" >&5
+  echo "$as_me:22185: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22257: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22188: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22260: \$? = $ac_status" >&5
+  echo "$as_me:22191: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -22274,7 +22205,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}:22277: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:22208: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -22295,7 +22226,7 @@ fi
 		do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 22298 "configure"
+#line 22229 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -22319,16 +22250,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22322: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22253: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22325: \$? = $ac_status" >&5
+  echo "$as_me:22256: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22328: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22259: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22331: \$? = $ac_status" >&5
+  echo "$as_me:22262: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -22349,12 +22280,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:22352: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:22283: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:22357: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:22288: 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%/[^/]*$%%'`
@@ -22387,7 +22318,7 @@ if test -n "$cf_1st_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 22390 "configure"
+#line 22321 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -22399,16 +22330,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22402: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22333: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22405: \$? = $ac_status" >&5
+  echo "$as_me:22336: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22408: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22339: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22411: \$? = $ac_status" >&5
+  echo "$as_me:22342: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -22425,7 +22356,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}:22428: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:22359: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -22471,7 +22402,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:22474: checking for terminfo header" >&5
+echo "$as_me:22405: 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
@@ -22489,7 +22420,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 22492 "configure"
+#line 22423 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -22504,16 +22435,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22507: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22438: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22510: \$? = $ac_status" >&5
+  echo "$as_me:22441: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22513: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22444: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22516: \$? = $ac_status" >&5
+  echo "$as_me:22447: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -22529,7 +22460,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:22532: result: $cf_cv_term_header" >&5
+echo "$as_me:22463: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -22567,7 +22498,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:22570: checking for ncurses version" >&5
+echo "$as_me:22501: 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
@@ -22593,10 +22524,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:22596: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:22527: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:22599: \$? = $ac_status" >&5
+  echo "$as_me:22530: \$? = $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%".*%%'`
@@ -22606,7 +22537,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 22609 "configure"
+#line 22540 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -22631,15 +22562,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:22634: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22565: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22637: \$? = $ac_status" >&5
+  echo "$as_me:22568: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:22639: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22570: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22642: \$? = $ac_status" >&5
+  echo "$as_me:22573: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -22653,7 +22584,7 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:22656: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:22587: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -22666,7 +22597,7 @@ cf_nculib_root=$cf_cv_screen
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:22669: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:22600: 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
@@ -22674,7 +22605,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 22677 "configure"
+#line 22608 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22693,16 +22624,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22696: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22627: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22699: \$? = $ac_status" >&5
+  echo "$as_me:22630: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22702: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22633: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22705: \$? = $ac_status" >&5
+  echo "$as_me:22636: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -22713,10 +22644,10 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22716: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:22647: 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:22719: checking for initscr in -lgpm" >&5
+  echo "$as_me:22650: 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
@@ -22724,7 +22655,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 22727 "configure"
+#line 22658 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22743,16 +22674,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22746: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22677: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22749: \$? = $ac_status" >&5
+  echo "$as_me:22680: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22752: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22683: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22755: \$? = $ac_status" >&5
+  echo "$as_me:22686: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -22763,7 +22694,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22766: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:22697: 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"
@@ -22778,7 +22709,7 @@ case $host_os in
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it's static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:22781: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:22712: 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
@@ -22786,7 +22717,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 22789 "configure"
+#line 22720 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22805,16 +22736,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22808: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22739: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22811: \$? = $ac_status" >&5
+  echo "$as_me:22742: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22814: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22745: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22817: \$? = $ac_status" >&5
+  echo "$as_me:22748: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -22825,7 +22756,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22828: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:22759: 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"
@@ -22874,13 +22805,13 @@ else
 
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
-	echo "$as_me:22877: checking for initscr" >&5
+	echo "$as_me:22808: 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 22883 "configure"
+#line 22814 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */
@@ -22911,16 +22842,16 @@ f = initscr; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22914: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22845: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22917: \$? = $ac_status" >&5
+  echo "$as_me:22848: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22920: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22851: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22923: \$? = $ac_status" >&5
+  echo "$as_me:22854: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -22930,18 +22861,18 @@ ac_cv_func_initscr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:22933: result: $ac_cv_func_initscr" >&5
+echo "$as_me:22864: 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:22940: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:22871: 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 22944 "configure"
+#line 22875 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -22953,25 +22884,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22956: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22887: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22959: \$? = $ac_status" >&5
+  echo "$as_me:22890: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22962: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22893: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22965: \$? = $ac_status" >&5
+  echo "$as_me:22896: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:22967: result: yes" >&5
+  echo "$as_me:22898: 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:22974: result: no" >&5
+echo "$as_me:22905: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -23039,11 +22970,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:23042: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:22973: 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 23046 "configure"
+#line 22977 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -23055,25 +22986,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23058: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22989: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23061: \$? = $ac_status" >&5
+  echo "$as_me:22992: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23064: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22995: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23067: \$? = $ac_status" >&5
+  echo "$as_me:22998: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:23069: result: yes" >&5
+  echo "$as_me:23000: 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:23076: result: no" >&5
+echo "$as_me:23007: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -23088,7 +23019,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:23091: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:23022: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -23096,7 +23027,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:23099: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:23030: 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
@@ -23106,7 +23037,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >conftest.$ac_ext <<_ACEOF
-#line 23109 "configure"
+#line 23040 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -23118,23 +23049,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23121: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23052: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23124: \$? = $ac_status" >&5
+  echo "$as_me:23055: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23127: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23058: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23130: \$? = $ac_status" >&5
+  echo "$as_me:23061: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:23132: result: yes" >&5
+  echo "$as_me:23063: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:23137: result: no" >&5
+echo "$as_me:23068: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -23166,7 +23097,7 @@ fi
 	;;
 (slang)
 
-echo "$as_me:23169: checking for slang header file" >&5
+echo "$as_me:23100: 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
@@ -23174,7 +23105,7 @@ else
 
 	cf_cv_slang_header=no
 	cat >conftest.$ac_ext <<_ACEOF
-#line 23177 "configure"
+#line 23108 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -23186,16 +23117,16 @@ printf("%s\n", SLANG_VERSION)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23189: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23120: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23192: \$? = $ac_status" >&5
+  echo "$as_me:23123: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23195: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23126: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23198: \$? = $ac_status" >&5
+  echo "$as_me:23129: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_header=predefined
 else
@@ -23300,7 +23231,7 @@ cf_search="$cf_search $cf_header_path_list"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:23303: result: $cf_cv_slang_header" >&5
+echo "$as_me:23234: result: $cf_cv_slang_header" >&5
 echo "${ECHO_T}$cf_cv_slang_header" >&6
 
 if test "x$cf_cv_slang_header" != xno
@@ -23341,7 +23272,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 23344 "configure"
+#line 23275 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -23353,16 +23284,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23356: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23287: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23359: \$? = $ac_status" >&5
+  echo "$as_me:23290: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23362: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23293: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23365: \$? = $ac_status" >&5
+  echo "$as_me:23296: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -23379,7 +23310,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}:23382: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:23313: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -23409,7 +23340,7 @@ else
 
 cf_cv_termlib=none
 cat >conftest.$ac_ext <<_ACEOF
-#line 23412 "configure"
+#line 23343 "configure"
 #include "confdefs.h"
 
 int
@@ -23421,19 +23352,19 @@ char *x=(char*)tgoto("",0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23424: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23355: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23427: \$? = $ac_status" >&5
+  echo "$as_me:23358: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23430: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23361: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23433: \$? = $ac_status" >&5
+  echo "$as_me:23364: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 23436 "configure"
+#line 23367 "configure"
 #include "confdefs.h"
 
 int
@@ -23445,16 +23376,16 @@ int x=tigetstr("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23448: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23379: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23451: \$? = $ac_status" >&5
+  echo "$as_me:23382: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23454: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23385: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23457: \$? = $ac_status" >&5
+  echo "$as_me:23388: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termlib=terminfo
 else
@@ -23465,7 +23396,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}:23468: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
+echo "${as_me:-configure}:23399: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
 
 else
   echo "$as_me: failed program was:" >&5
@@ -23480,10 +23411,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:23483: checking for $cf_func in -l$cf_lib" >&5
+			echo "$as_me:23414: 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 23486 "configure"
+#line 23417 "configure"
 #include "confdefs.h"
 
 int
@@ -23495,16 +23426,16 @@ int x=$cf_func("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23498: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23429: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23501: \$? = $ac_status" >&5
+  echo "$as_me:23432: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23504: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23435: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23507: \$? = $ac_status" >&5
+  echo "$as_me:23438: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -23513,7 +23444,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-			echo "$as_me:23516: result: $cf_result" >&5
+			echo "$as_me:23447: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				if test "$cf_func" = tigetstr ; then
@@ -23530,7 +23461,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:23533: checking for initscr in -lcurses" >&5
+	echo "$as_me:23464: 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
@@ -23538,7 +23469,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 23541 "configure"
+#line 23472 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23557,16 +23488,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23560: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23491: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23563: \$? = $ac_status" >&5
+  echo "$as_me:23494: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23566: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23497: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23569: \$? = $ac_status" >&5
+  echo "$as_me:23500: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_curses_initscr=yes
 else
@@ -23577,7 +23508,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23580: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:23511: 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
 
@@ -23599,7 +23530,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-	echo "$as_me:23602: checking for tgoto in -ltermcap" >&5
+	echo "$as_me:23533: 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
@@ -23607,7 +23538,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 23610 "configure"
+#line 23541 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23626,16 +23557,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23629: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23560: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23632: \$? = $ac_status" >&5
+  echo "$as_me:23563: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23635: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23566: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23638: \$? = $ac_status" >&5
+  echo "$as_me:23569: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_termcap_tgoto=yes
 else
@@ -23646,7 +23577,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23649: result: $ac_cv_lib_termcap_tgoto" >&5
+echo "$as_me:23580: 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
 
@@ -23673,20 +23604,20 @@ fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 if test "$cf_cv_termlib" = none; then
-	{ echo "$as_me:23676: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
+	{ echo "$as_me:23607: 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:23683: checking for acos" >&5
+echo "$as_me:23614: 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 23689 "configure"
+#line 23620 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char acos (); below.  */
@@ -23717,16 +23648,16 @@ f = acos; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23720: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23651: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23723: \$? = $ac_status" >&5
+  echo "$as_me:23654: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23726: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23657: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23729: \$? = $ac_status" >&5
+  echo "$as_me:23660: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_acos=yes
 else
@@ -23736,13 +23667,13 @@ ac_cv_func_acos=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:23739: result: $ac_cv_func_acos" >&5
+echo "$as_me:23670: 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:23745: checking for acos in -lm" >&5
+echo "$as_me:23676: 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
@@ -23750,7 +23681,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm $LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 23753 "configure"
+#line 23684 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23769,16 +23700,16 @@ acos ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23772: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23703: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23775: \$? = $ac_status" >&5
+  echo "$as_me:23706: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23778: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23709: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23781: \$? = $ac_status" >&5
+  echo "$as_me:23712: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_m_acos=yes
 else
@@ -23789,7 +23720,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23792: result: $ac_cv_lib_m_acos" >&5
+echo "$as_me:23723: 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
 
@@ -23815,13 +23746,13 @@ case $host_os in
 
 	eval 'cf_cv_have_lib_'video'=no'
 	cf_libdir=""
-	echo "$as_me:23818: checking for v_init" >&5
+	echo "$as_me:23749: 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 23824 "configure"
+#line 23755 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char v_init (); below.  */
@@ -23852,16 +23783,16 @@ f = v_init; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23855: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23786: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23858: \$? = $ac_status" >&5
+  echo "$as_me:23789: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23861: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23792: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23864: \$? = $ac_status" >&5
+  echo "$as_me:23795: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_v_init=yes
 else
@@ -23871,18 +23802,18 @@ ac_cv_func_v_init=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:23874: result: $ac_cv_func_v_init" >&5
+echo "$as_me:23805: 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:23881: checking for v_init in -lvideo" >&5
+		echo "$as_me:23812: 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 23885 "configure"
+#line 23816 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -23894,25 +23825,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23897: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23828: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23900: \$? = $ac_status" >&5
+  echo "$as_me:23831: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23903: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23834: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23906: \$? = $ac_status" >&5
+  echo "$as_me:23837: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:23908: result: yes" >&5
+  echo "$as_me:23839: 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:23915: result: no" >&5
+echo "$as_me:23846: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -23980,11 +23911,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:23983: checking for -lvideo in $cf_libdir" >&5
+				echo "$as_me:23914: 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 23987 "configure"
+#line 23918 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -23996,25 +23927,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23999: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23930: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24002: \$? = $ac_status" >&5
+  echo "$as_me:23933: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24005: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23936: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24008: \$? = $ac_status" >&5
+  echo "$as_me:23939: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:24010: result: yes" >&5
+  echo "$as_me:23941: 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:24017: result: no" >&5
+echo "$as_me:23948: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -24029,7 +23960,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'video
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:24032: error: Cannot link video library" >&5
+	{ { echo "$as_me:23963: error: Cannot link video library" >&5
 echo "$as_me: error: Cannot link video library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -24039,13 +23970,13 @@ esac
 
 	eval 'cf_cv_have_lib_'slang'=no'
 	cf_libdir=""
-	echo "$as_me:24042: checking for SLtt_get_screen_size" >&5
+	echo "$as_me:23973: 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 24048 "configure"
+#line 23979 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char SLtt_get_screen_size (); below.  */
@@ -24076,16 +24007,16 @@ f = SLtt_get_screen_size; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24079: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24010: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24082: \$? = $ac_status" >&5
+  echo "$as_me:24013: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24085: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24016: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24088: \$? = $ac_status" >&5
+  echo "$as_me:24019: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_SLtt_get_screen_size=yes
 else
@@ -24095,18 +24026,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:24098: result: $ac_cv_func_SLtt_get_screen_size" >&5
+echo "$as_me:24029: 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:24105: checking for SLtt_get_screen_size in -lslang" >&5
+		echo "$as_me:24036: 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 24109 "configure"
+#line 24040 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -24118,25 +24049,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24121: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24052: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24124: \$? = $ac_status" >&5
+  echo "$as_me:24055: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24127: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24058: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24130: \$? = $ac_status" >&5
+  echo "$as_me:24061: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:24132: result: yes" >&5
+  echo "$as_me:24063: 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:24139: result: no" >&5
+echo "$as_me:24070: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -24204,11 +24135,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:24207: checking for -lslang in $cf_libdir" >&5
+				echo "$as_me:24138: 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 24211 "configure"
+#line 24142 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -24220,25 +24151,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24223: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24154: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24226: \$? = $ac_status" >&5
+  echo "$as_me:24157: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24229: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24160: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24232: \$? = $ac_status" >&5
+  echo "$as_me:24163: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:24234: result: yes" >&5
+  echo "$as_me:24165: 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:24241: result: no" >&5
+echo "$as_me:24172: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -24253,13 +24184,13 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'slang
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:24256: error: Cannot link slang library" >&5
+	{ { echo "$as_me:24187: 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:24262: checking if we can link slang without termcap" >&5
+echo "$as_me:24193: 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%^.%%'`
@@ -24268,7 +24199,7 @@ else
 fi
 LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s%$cf_exclude%%" -e 's%^.%%'`
 cat >conftest.$ac_ext <<_ACEOF
-#line 24271 "configure"
+#line 24202 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -24280,16 +24211,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24283: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24214: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24286: \$? = $ac_status" >&5
+  echo "$as_me:24217: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24289: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24220: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24292: \$? = $ac_status" >&5
+  echo "$as_me:24223: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -24298,13 +24229,13 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:24301: result: $cf_result" >&5
+echo "$as_me:24232: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 test $cf_result = no && LIBS="$cf_slang_LIBS3"
 
 else
 
-echo "$as_me:24307: checking for slang2 header file" >&5
+echo "$as_me:24238: checking for slang2 header file" >&5
 echo $ECHO_N "checking for slang2 header file... $ECHO_C" >&6
 if test "${cf_cv_slang2_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -24312,7 +24243,7 @@ else
 
 	cf_cv_slang2_header=no
 	cat >conftest.$ac_ext <<_ACEOF
-#line 24315 "configure"
+#line 24246 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -24324,16 +24255,16 @@ printf("%s\n", SLANG_VERSION)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24327: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24258: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24330: \$? = $ac_status" >&5
+  echo "$as_me:24261: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24333: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24264: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24336: \$? = $ac_status" >&5
+  echo "$as_me:24267: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang2_header=predefined
 else
@@ -24438,7 +24369,7 @@ cf_search="$cf_search $cf_header_path_list"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:24441: result: $cf_cv_slang2_header" >&5
+echo "$as_me:24372: result: $cf_cv_slang2_header" >&5
 echo "${ECHO_T}$cf_cv_slang2_header" >&6
 
 if test "x$cf_cv_slang2_header" != xno
@@ -24479,7 +24410,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 24482 "configure"
+#line 24413 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24491,16 +24422,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24494: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24425: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24497: \$? = $ac_status" >&5
+  echo "$as_me:24428: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24500: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24431: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24503: \$? = $ac_status" >&5
+  echo "$as_me:24434: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -24517,7 +24448,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}:24520: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24451: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24547,7 +24478,7 @@ else
 
 cf_cv_termlib=none
 cat >conftest.$ac_ext <<_ACEOF
-#line 24550 "configure"
+#line 24481 "configure"
 #include "confdefs.h"
 
 int
@@ -24559,19 +24490,19 @@ char *x=(char*)tgoto("",0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24562: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24493: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24565: \$? = $ac_status" >&5
+  echo "$as_me:24496: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24568: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24499: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24571: \$? = $ac_status" >&5
+  echo "$as_me:24502: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 24574 "configure"
+#line 24505 "configure"
 #include "confdefs.h"
 
 int
@@ -24583,16 +24514,16 @@ int x=tigetstr("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24586: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24517: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24589: \$? = $ac_status" >&5
+  echo "$as_me:24520: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24592: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24523: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24595: \$? = $ac_status" >&5
+  echo "$as_me:24526: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termlib=terminfo
 else
@@ -24603,7 +24534,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}:24606: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
+echo "${as_me:-configure}:24537: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
 
 else
   echo "$as_me: failed program was:" >&5
@@ -24618,10 +24549,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:24621: checking for $cf_func in -l$cf_lib" >&5
+			echo "$as_me:24552: 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 24624 "configure"
+#line 24555 "configure"
 #include "confdefs.h"
 
 int
@@ -24633,16 +24564,16 @@ int x=$cf_func("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24636: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24567: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24639: \$? = $ac_status" >&5
+  echo "$as_me:24570: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24642: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24573: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24645: \$? = $ac_status" >&5
+  echo "$as_me:24576: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -24651,7 +24582,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-			echo "$as_me:24654: result: $cf_result" >&5
+			echo "$as_me:24585: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				if test "$cf_func" = tigetstr ; then
@@ -24668,7 +24599,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:24671: checking for initscr in -lcurses" >&5
+	echo "$as_me:24602: 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
@@ -24676,7 +24607,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 24679 "configure"
+#line 24610 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24695,16 +24626,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24698: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24629: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24701: \$? = $ac_status" >&5
+  echo "$as_me:24632: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24704: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24635: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24707: \$? = $ac_status" >&5
+  echo "$as_me:24638: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_curses_initscr=yes
 else
@@ -24715,7 +24646,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24718: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:24649: 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
 
@@ -24737,7 +24668,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-	echo "$as_me:24740: checking for tgoto in -ltermcap" >&5
+	echo "$as_me:24671: 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
@@ -24745,7 +24676,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 24748 "configure"
+#line 24679 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24764,16 +24695,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24767: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24698: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24770: \$? = $ac_status" >&5
+  echo "$as_me:24701: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24773: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24704: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24776: \$? = $ac_status" >&5
+  echo "$as_me:24707: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_termcap_tgoto=yes
 else
@@ -24784,7 +24715,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24787: result: $ac_cv_lib_termcap_tgoto" >&5
+echo "$as_me:24718: 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
 
@@ -24811,20 +24742,20 @@ fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 if test "$cf_cv_termlib" = none; then
-	{ echo "$as_me:24814: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
+	{ echo "$as_me:24745: 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:24821: checking for acos" >&5
+echo "$as_me:24752: 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 24827 "configure"
+#line 24758 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char acos (); below.  */
@@ -24855,16 +24786,16 @@ f = acos; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24858: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24789: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24861: \$? = $ac_status" >&5
+  echo "$as_me:24792: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24864: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24795: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24867: \$? = $ac_status" >&5
+  echo "$as_me:24798: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_acos=yes
 else
@@ -24874,13 +24805,13 @@ ac_cv_func_acos=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:24877: result: $ac_cv_func_acos" >&5
+echo "$as_me:24808: 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:24883: checking for acos in -lm" >&5
+echo "$as_me:24814: 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
@@ -24888,7 +24819,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm $LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 24891 "configure"
+#line 24822 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24907,16 +24838,16 @@ acos ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24910: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24841: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24913: \$? = $ac_status" >&5
+  echo "$as_me:24844: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24916: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24847: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24919: \$? = $ac_status" >&5
+  echo "$as_me:24850: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_m_acos=yes
 else
@@ -24927,7 +24858,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24930: result: $ac_cv_lib_m_acos" >&5
+echo "$as_me:24861: 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
 
@@ -24953,13 +24884,13 @@ case $host_os in
 
 	eval 'cf_cv_have_lib_'video'=no'
 	cf_libdir=""
-	echo "$as_me:24956: checking for v_init" >&5
+	echo "$as_me:24887: 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 24962 "configure"
+#line 24893 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char v_init (); below.  */
@@ -24990,16 +24921,16 @@ f = v_init; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24993: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24924: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24996: \$? = $ac_status" >&5
+  echo "$as_me:24927: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24999: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24930: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25002: \$? = $ac_status" >&5
+  echo "$as_me:24933: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_v_init=yes
 else
@@ -25009,18 +24940,18 @@ ac_cv_func_v_init=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:25012: result: $ac_cv_func_v_init" >&5
+echo "$as_me:24943: 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:25019: checking for v_init in -lvideo" >&5
+		echo "$as_me:24950: 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 25023 "configure"
+#line 24954 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -25032,25 +24963,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25035: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24966: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25038: \$? = $ac_status" >&5
+  echo "$as_me:24969: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25041: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24972: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25044: \$? = $ac_status" >&5
+  echo "$as_me:24975: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:25046: result: yes" >&5
+  echo "$as_me:24977: 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:25053: result: no" >&5
+echo "$as_me:24984: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -25118,11 +25049,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:25121: checking for -lvideo in $cf_libdir" >&5
+				echo "$as_me:25052: 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 25125 "configure"
+#line 25056 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -25134,25 +25065,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25137: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25068: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25140: \$? = $ac_status" >&5
+  echo "$as_me:25071: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25143: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25074: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25146: \$? = $ac_status" >&5
+  echo "$as_me:25077: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:25148: result: yes" >&5
+  echo "$as_me:25079: 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:25155: result: no" >&5
+echo "$as_me:25086: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -25167,7 +25098,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'video
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:25170: error: Cannot link video library" >&5
+	{ { echo "$as_me:25101: error: Cannot link video library" >&5
 echo "$as_me: error: Cannot link video library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -25177,13 +25108,13 @@ esac
 
 	eval 'cf_cv_have_lib_'slang2'=no'
 	cf_libdir=""
-	echo "$as_me:25180: checking for SLtt_get_screen_size" >&5
+	echo "$as_me:25111: 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 25186 "configure"
+#line 25117 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char SLtt_get_screen_size (); below.  */
@@ -25214,16 +25145,16 @@ f = SLtt_get_screen_size; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25217: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25148: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25220: \$? = $ac_status" >&5
+  echo "$as_me:25151: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25223: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25154: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25226: \$? = $ac_status" >&5
+  echo "$as_me:25157: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_SLtt_get_screen_size=yes
 else
@@ -25233,18 +25164,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:25236: result: $ac_cv_func_SLtt_get_screen_size" >&5
+echo "$as_me:25167: result: $ac_cv_func_SLtt_get_screen_size" >&5
 echo "${ECHO_T}$ac_cv_func_SLtt_get_screen_size" >&6
 if test $ac_cv_func_SLtt_get_screen_size = yes; then
   eval 'cf_cv_have_lib_'slang2'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:25243: checking for SLtt_get_screen_size in -lslang2" >&5
+		echo "$as_me:25174: checking for SLtt_get_screen_size in -lslang2" >&5
 echo $ECHO_N "checking for SLtt_get_screen_size in -lslang2... $ECHO_C" >&6
 		LIBS="-lslang2 $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 25247 "configure"
+#line 25178 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -25256,25 +25187,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25259: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25190: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25262: \$? = $ac_status" >&5
+  echo "$as_me:25193: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25265: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25196: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25268: \$? = $ac_status" >&5
+  echo "$as_me:25199: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:25270: result: yes" >&5
+  echo "$as_me:25201: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'slang2'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:25277: result: no" >&5
+echo "$as_me:25208: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -25342,11 +25273,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:25345: checking for -lslang2 in $cf_libdir" >&5
+				echo "$as_me:25276: checking for -lslang2 in $cf_libdir" >&5
 echo $ECHO_N "checking for -lslang2 in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -lslang2 $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 25349 "configure"
+#line 25280 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -25358,25 +25289,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25361: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25292: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25364: \$? = $ac_status" >&5
+  echo "$as_me:25295: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25367: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25298: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25370: \$? = $ac_status" >&5
+  echo "$as_me:25301: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:25372: result: yes" >&5
+  echo "$as_me:25303: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'slang2'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:25379: result: no" >&5
+echo "$as_me:25310: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -25391,13 +25322,13 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'slang2
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:25394: error: Cannot link slang2 library" >&5
+	{ { echo "$as_me:25325: error: Cannot link slang2 library" >&5
 echo "$as_me: error: Cannot link slang2 library" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 cf_slang_LIBS3="$LIBS"
-echo "$as_me:25400: checking if we can link slang2 without termcap" >&5
+echo "$as_me:25331: checking if we can link slang2 without termcap" >&5
 echo $ECHO_N "checking if we can link slang2 without termcap... $ECHO_C" >&6
 if test -n "`echo $cf_slang_LIBS1 | sed -e 's/ //g'`" ; then
 	cf_exclude=`echo ".$cf_slang_LIBS2" | sed -e "s%$cf_slang_LIBS1%%" -e 's%^.%%'`
@@ -25406,7 +25337,7 @@ else
 fi
 LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s%$cf_exclude%%" -e 's%^.%%'`
 cat >conftest.$ac_ext <<_ACEOF
-#line 25409 "configure"
+#line 25340 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -25418,16 +25349,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25421: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25352: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25424: \$? = $ac_status" >&5
+  echo "$as_me:25355: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25427: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25358: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25430: \$? = $ac_status" >&5
+  echo "$as_me:25361: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -25436,12 +25367,12 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:25439: result: $cf_result" >&5
+echo "$as_me:25370: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 test $cf_result = no && LIBS="$cf_slang_LIBS3"
 
 	else
-		{ { echo "$as_me:25444: error: cannot find slang headers" >&5
+		{ { echo "$as_me:25375: error: cannot find slang headers" >&5
 echo "$as_me: error: cannot find slang headers" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -25449,14 +25380,14 @@ fi
 
 # There's an unofficial set of patches for slang that gives it some limited
 # UTF8 capability.  Unfortunately it won't compile unless one defines UTF8.
-echo "$as_me:25452: checking if we must define UTF8" >&5
+echo "$as_me:25383: 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 25459 "configure"
+#line 25390 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -25468,16 +25399,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25471: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25402: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25474: \$? = $ac_status" >&5
+  echo "$as_me:25405: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25477: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25408: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25480: \$? = $ac_status" >&5
+  echo "$as_me:25411: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_utf8=no
 else
@@ -25485,7 +25416,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 25488 "configure"
+#line 25419 "configure"
 #include "confdefs.h"
 
 #define UTF8
@@ -25499,16 +25430,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25502: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25433: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25505: \$? = $ac_status" >&5
+  echo "$as_me:25436: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25508: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25439: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25511: \$? = $ac_status" >&5
+  echo "$as_me:25442: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_utf8=yes
 else
@@ -25521,7 +25452,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:25524: result: $cf_cv_slang_utf8" >&5
+echo "$as_me:25455: result: $cf_cv_slang_utf8" >&5
 echo "${ECHO_T}$cf_cv_slang_utf8" >&6
 
 if test "$cf_cv_slang_utf8" = yes ; then
@@ -25532,14 +25463,14 @@ EOF
 
 fi
 
-echo "$as_me:25535: checking if we must tell slang this is UNIX" >&5
+echo "$as_me:25466: 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 25542 "configure"
+#line 25473 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -25558,16 +25489,16 @@ SLang_TT_Baud_Rate = 1
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25561: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25492: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25564: \$? = $ac_status" >&5
+  echo "$as_me:25495: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25567: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25498: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25570: \$? = $ac_status" >&5
+  echo "$as_me:25501: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_unix=yes
 else
@@ -25578,20 +25509,20 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:25581: result: $cf_cv_slang_unix" >&5
+echo "$as_me:25512: result: $cf_cv_slang_unix" >&5
 echo "${ECHO_T}$cf_cv_slang_unix" >&6
 test $cf_cv_slang_unix = yes &&
 cat >>confdefs.h <<\EOF
 #define REAL_UNIX_SYSTEM 1
 EOF
 
-	echo "$as_me:25588: checking for SLsmg_Color_Type" >&5
+	echo "$as_me:25519: checking for SLsmg_Color_Type" >&5
 echo $ECHO_N "checking for SLsmg_Color_Type... $ECHO_C" >&6
 if test "${ac_cv_type_SLsmg_Color_Type+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 25594 "configure"
+#line 25525 "configure"
 #include "confdefs.h"
 #include <slang.h>
 
@@ -25607,16 +25538,16 @@ if (sizeof (SLsmg_Color_Type))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25610: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25541: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25613: \$? = $ac_status" >&5
+  echo "$as_me:25544: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25616: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25547: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25619: \$? = $ac_status" >&5
+  echo "$as_me:25550: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_SLsmg_Color_Type=yes
 else
@@ -25626,7 +25557,7 @@ ac_cv_type_SLsmg_Color_Type=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:25629: result: $ac_cv_type_SLsmg_Color_Type" >&5
+echo "$as_me:25560: result: $ac_cv_type_SLsmg_Color_Type" >&5
 echo "${ECHO_T}$ac_cv_type_SLsmg_Color_Type" >&6
 if test $ac_cv_type_SLsmg_Color_Type = yes; then
   ac_cv_type_SLsmg_Color_Type=yes
@@ -25642,13 +25573,13 @@ EOF
 
 fi
 
-	echo "$as_me:25645: checking for SLtt_Char_Type" >&5
+	echo "$as_me:25576: checking for SLtt_Char_Type" >&5
 echo $ECHO_N "checking for SLtt_Char_Type... $ECHO_C" >&6
 if test "${ac_cv_type_SLtt_Char_Type+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 25651 "configure"
+#line 25582 "configure"
 #include "confdefs.h"
 #include <slang.h>
 
@@ -25664,16 +25595,16 @@ if (sizeof (SLtt_Char_Type))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25667: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25598: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25670: \$? = $ac_status" >&5
+  echo "$as_me:25601: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25673: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25604: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25676: \$? = $ac_status" >&5
+  echo "$as_me:25607: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_SLtt_Char_Type=yes
 else
@@ -25683,7 +25614,7 @@ ac_cv_type_SLtt_Char_Type=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:25686: result: $ac_cv_type_SLtt_Char_Type" >&5
+echo "$as_me:25617: result: $ac_cv_type_SLtt_Char_Type" >&5
 echo "${ECHO_T}$ac_cv_type_SLtt_Char_Type" >&6
 if test $ac_cv_type_SLtt_Char_Type = yes; then
   ac_cv_type_SLtt_Char_Type=yes
@@ -25703,14 +25634,14 @@ fi
 	;;
 esac
 
-echo "$as_me:25706: checking for chtype typedef" >&5
+echo "$as_me:25637: checking for chtype typedef" >&5
 echo $ECHO_N "checking for chtype typedef... $ECHO_C" >&6
 if test "${cf_cv_chtype_decl+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 25713 "configure"
+#line 25644 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -25722,16 +25653,16 @@ chtype foo
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25725: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25656: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25728: \$? = $ac_status" >&5
+  echo "$as_me:25659: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25731: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25662: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25734: \$? = $ac_status" >&5
+  echo "$as_me:25665: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_chtype_decl=yes
 else
@@ -25741,7 +25672,7 @@ cf_cv_chtype_decl=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:25744: result: $cf_cv_chtype_decl" >&5
+echo "$as_me:25675: result: $cf_cv_chtype_decl" >&5
 echo "${ECHO_T}$cf_cv_chtype_decl" >&6
 if test $cf_cv_chtype_decl = yes ; then
 
@@ -25749,14 +25680,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_TYPE_CHTYPE 1
 EOF
 
-	echo "$as_me:25752: checking if chtype is scalar or struct" >&5
+	echo "$as_me:25683: checking if chtype is scalar or struct" >&5
 echo $ECHO_N "checking if chtype is scalar or struct... $ECHO_C" >&6
 if test "${cf_cv_chtype_type+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 25759 "configure"
+#line 25690 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -25768,16 +25699,16 @@ chtype foo; long x = foo
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25771: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25702: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25774: \$? = $ac_status" >&5
+  echo "$as_me:25705: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25777: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25708: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25780: \$? = $ac_status" >&5
+  echo "$as_me:25711: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_chtype_type=scalar
 else
@@ -25787,7 +25718,7 @@ cf_cv_chtype_type=struct
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:25790: result: $cf_cv_chtype_type" >&5
+echo "$as_me:25721: result: $cf_cv_chtype_type" >&5
 echo "${ECHO_T}$cf_cv_chtype_type" >&6
 	if test $cf_cv_chtype_type = scalar ; then
 
@@ -25798,7 +25729,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:25801: checking if you want the wide-curses features" >&5
+echo "$as_me:25732: 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.
@@ -25815,10 +25746,10 @@ else
   use_wide_curses=$cf_wide_curses
 
 fi;
-echo "$as_me:25818: result: $use_wide_curses" >&5
+echo "$as_me:25749: result: $use_wide_curses" >&5
 echo "${ECHO_T}$use_wide_curses" >&6
 
-echo "$as_me:25821: checking if color-style code should be used" >&5
+echo "$as_me:25752: 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.
@@ -25838,7 +25769,7 @@ fi;
 
 case $use_color_style in
 (no)
-	echo "$as_me:25841: result: no" >&5
+	echo "$as_me:25772: result: no" >&5
 echo "${ECHO_T}no" >&6
 	INSTALL_LSS=
 	;;
@@ -25848,10 +25779,10 @@ cat >>confdefs.h <<\EOF
 #define USE_COLOR_STYLE 1
 EOF
 
-	echo "$as_me:25851: result: yes" >&5
+	echo "$as_me:25782: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-	echo "$as_me:25854: checking for location of style-sheet file" >&5
+	echo "$as_me:25785: 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.
@@ -25887,7 +25818,7 @@ case ".$withval" in
 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:25890: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:25821: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -25896,7 +25827,7 @@ esac
 fi
 eval LYNX_LSS_FILE="$withval"
 
-	echo "$as_me:25899: result: $LYNX_LSS_FILE" >&5
+	echo "$as_me:25830: result: $LYNX_LSS_FILE" >&5
 echo "${ECHO_T}$LYNX_LSS_FILE" >&6
 
 	test "$LYNX_LSS_FILE" = no && LYNX_LSS_FILE=
@@ -25909,7 +25840,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:25912: checking for the default configuration-file" >&5
+echo "$as_me:25843: 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.
@@ -25945,7 +25876,7 @@ case ".$withval" in
 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:25948: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:25879: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -25954,7 +25885,7 @@ esac
 fi
 eval LYNX_CFG_FILE="$withval"
 
-echo "$as_me:25957: result: $LYNX_CFG_FILE" >&5
+echo "$as_me:25888: result: $LYNX_CFG_FILE" >&5
 echo "${ECHO_T}$LYNX_CFG_FILE" >&6
 
 test "$LYNX_CFG_FILE" = no && LYNX_CFG_FILE=
@@ -25963,7 +25894,7 @@ cat >>confdefs.h <<EOF
 #define LYNX_CFG_FILE "$LYNX_CFG_FILE"
 EOF
 
-echo "$as_me:25966: checking for the default configuration-path" >&5
+echo "$as_me:25897: checking for the default configuration-path" >&5
 echo $ECHO_N "checking for the default configuration-path... $ECHO_C" >&6
 
 # Check whether --with-cfg-path or --without-cfg-path was given.
@@ -25999,7 +25930,7 @@ case ".$withval" in
 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:26002: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:25933: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -26008,7 +25939,7 @@ esac
 fi
 eval LYNX_CFG_PATH="$withval"
 
-echo "$as_me:26011: result: $LYNX_CFG_PATH" >&5
+echo "$as_me:25942: result: $LYNX_CFG_PATH" >&5
 echo "${ECHO_T}$LYNX_CFG_PATH" >&6
 
 test -z "$LYNX_CFG_PATH" && `echo "$LYNX_CFG_FILE" | sed -e 's%/[^/]*$%%'`
@@ -26018,7 +25949,7 @@ cat >>confdefs.h <<EOF
 #define LYNX_CFG_PATH "$LYNX_CFG_PATH"
 EOF
 
-echo "$as_me:26021: checking if htmlized lynx.cfg should be built" >&5
+echo "$as_me:25952: 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.
@@ -26035,7 +25966,7 @@ else
   use_htmlized_cfg=no
 
 fi;
-echo "$as_me:26038: result: $use_htmlized_cfg" >&5
+echo "$as_me:25969: result: $use_htmlized_cfg" >&5
 echo "${ECHO_T}$use_htmlized_cfg" >&6
 
 LYNXCFG_MAKE=''
@@ -26043,7 +25974,7 @@ if test $use_htmlized_cfg = no ; then
 	LYNXCFG_MAKE='#'
 fi
 
-echo "$as_me:26046: checking if local doc directory should be linked to help page" >&5
+echo "$as_me:25977: 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.
@@ -26060,7 +25991,7 @@ else
   use_local_docs=no
 
 fi;
-echo "$as_me:26063: result: $use_local_docs" >&5
+echo "$as_me:25994: result: $use_local_docs" >&5
 echo "${ECHO_T}$use_local_docs" >&6
 
 LYNXDOC_MAKE=''
@@ -26068,7 +25999,7 @@ if test $use_local_docs = no ; then
 	LYNXDOC_MAKE='#'
 fi
 
-echo "$as_me:26071: checking for MIME library directory" >&5
+echo "$as_me:26002: 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.
@@ -26104,7 +26035,7 @@ case ".$withval" in
 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:26107: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:26038: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -26113,7 +26044,7 @@ esac
 fi
 eval MIME_LIBDIR="$withval"
 
-echo "$as_me:26116: result: $MIME_LIBDIR" >&5
+echo "$as_me:26047: result: $MIME_LIBDIR" >&5
 echo "${ECHO_T}$MIME_LIBDIR" >&6
 MIME_LIBDIR=`echo "$MIME_LIBDIR" | sed -e 's,/$,,' -e 's,$,/,'`
 
@@ -26121,7 +26052,7 @@ cat >>confdefs.h <<EOF
 #define MIME_LIBDIR "$MIME_LIBDIR"
 EOF
 
-echo "$as_me:26124: checking if locale-charset selection logic should be used" >&5
+echo "$as_me:26055: 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.
@@ -26138,7 +26069,7 @@ else
   use_locale_charset=yes
 
 fi;
-echo "$as_me:26141: result: $use_locale_charset" >&5
+echo "$as_me:26072: result: $use_locale_charset" >&5
 echo "${ECHO_T}$use_locale_charset" >&6
 test $use_locale_charset != no &&
 cat >>confdefs.h <<\EOF
@@ -26147,7 +26078,7 @@ EOF
 
 CHARSET_DEFS=
 
-echo "$as_me:26150: checking if you want only a few charsets" >&5
+echo "$as_me:26081: 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.
@@ -26159,7 +26090,7 @@ else
 fi;
 
 if test -n "$cf_charsets" ; then
-	echo "$as_me:26162: result: yes" >&5
+	echo "$as_me:26093: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 cat >>confdefs.h <<\EOF
@@ -26173,7 +26104,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}:26176: testing using minimal list of charsets: $cf_min_charsets ..." 1>&5
+echo "${as_me:-configure}:26107: 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'`
@@ -26200,28 +26131,28 @@ echo "${as_me:-configure}:26176: testing using minimal list of charsets: $cf_min
 		then
 			test -n "$verbose" && echo "	found $cf_charset" 1>&6
 
-echo "${as_me:-configure}:26203: testing found $cf_charset ..." 1>&5
+echo "${as_me:-configure}:26134: 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}:26209: testing not found $cf_charset ..." 1>&5
+echo "${as_me:-configure}:26140: testing not found $cf_charset ..." 1>&5
 
 		fi
 	done
 else
-	echo "$as_me:26214: result: no" >&5
+	echo "$as_me:26145: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:26218: checking for ANSI C header files" >&5
+echo "$as_me:26149: 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 26224 "configure"
+#line 26155 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -26229,13 +26160,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:26232: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:26163: \"$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:26238: \$? = $ac_status" >&5
+  echo "$as_me:26169: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -26257,7 +26188,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 26260 "configure"
+#line 26191 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -26275,7 +26206,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 26278 "configure"
+#line 26209 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -26296,7 +26227,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 26299 "configure"
+#line 26230 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -26322,15 +26253,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:26325: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26256: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26328: \$? = $ac_status" >&5
+  echo "$as_me:26259: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:26330: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26261: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26333: \$? = $ac_status" >&5
+  echo "$as_me:26264: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -26343,7 +26274,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:26346: result: $ac_cv_header_stdc" >&5
+echo "$as_me:26277: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -26353,13 +26284,13 @@ EOF
 
 fi
 
-echo "$as_me:26356: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:26287: 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 26362 "configure"
+#line 26293 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -26375,16 +26306,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26378: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26309: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26381: \$? = $ac_status" >&5
+  echo "$as_me:26312: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26384: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26315: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26387: \$? = $ac_status" >&5
+  echo "$as_me:26318: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_header_time=yes
 else
@@ -26394,7 +26325,7 @@ ac_cv_header_time=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:26397: result: $ac_cv_header_time" >&5
+echo "$as_me:26328: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -26407,13 +26338,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:26410: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:26341: 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 26416 "configure"
+#line 26347 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -26428,16 +26359,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26431: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26362: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26434: \$? = $ac_status" >&5
+  echo "$as_me:26365: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26437: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26368: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26440: \$? = $ac_status" >&5
+  echo "$as_me:26371: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -26447,7 +26378,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:26450: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:26381: 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
@@ -26460,7 +26391,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:26463: checking for opendir in -ldir" >&5
+  echo "$as_me:26394: 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
@@ -26468,7 +26399,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 26471 "configure"
+#line 26402 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -26487,16 +26418,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26490: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26421: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26493: \$? = $ac_status" >&5
+  echo "$as_me:26424: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26496: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26427: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26499: \$? = $ac_status" >&5
+  echo "$as_me:26430: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -26507,14 +26438,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:26510: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:26441: 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:26517: checking for opendir in -lx" >&5
+  echo "$as_me:26448: 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
@@ -26522,7 +26453,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 26525 "configure"
+#line 26456 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -26541,16 +26472,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26544: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26475: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26547: \$? = $ac_status" >&5
+  echo "$as_me:26478: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26550: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26481: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26553: \$? = $ac_status" >&5
+  echo "$as_me:26484: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -26561,7 +26492,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:26564: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:26495: 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"
@@ -26589,23 +26520,23 @@ for ac_header in \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:26592: checking for $ac_header" >&5
+echo "$as_me:26523: 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 26598 "configure"
+#line 26529 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:26602: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:26533: \"$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:26608: \$? = $ac_status" >&5
+  echo "$as_me:26539: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -26624,7 +26555,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:26627: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:26558: 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
@@ -26634,14 +26565,14 @@ EOF
 fi
 done
 
-echo "$as_me:26637: checking termio.h and termios.h" >&5
+echo "$as_me:26568: 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 26644 "configure"
+#line 26575 "configure"
 #include "confdefs.h"
 
 #if HAVE_TERMIO_H
@@ -26659,16 +26590,16 @@ putchar (0x0a)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26662: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26593: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26665: \$? = $ac_status" >&5
+  echo "$as_me:26596: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26668: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26599: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26671: \$? = $ac_status" >&5
+  echo "$as_me:26602: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termio_and_termios=yes
 else
@@ -26679,21 +26610,21 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:26682: result: $cf_cv_termio_and_termios" >&5
+echo "$as_me:26613: 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:26689: checking for sigaction and structs" >&5
+echo "$as_me:26620: 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 26696 "configure"
+#line 26627 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -26713,16 +26644,16 @@ struct sigaction act;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26716: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26647: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26719: \$? = $ac_status" >&5
+  echo "$as_me:26650: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26722: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26653: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26725: \$? = $ac_status" >&5
+  echo "$as_me:26656: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_func_sigaction=yes
 else
@@ -26733,7 +26664,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:26736: result: $cf_cv_func_sigaction" >&5
+echo "$as_me:26667: result: $cf_cv_func_sigaction" >&5
 echo "${ECHO_T}$cf_cv_func_sigaction" >&6
 test "$cf_cv_func_sigaction" = yes &&
 cat >>confdefs.h <<\EOF
@@ -26743,23 +26674,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:26746: checking for $ac_header" >&5
+echo "$as_me:26677: 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 26752 "configure"
+#line 26683 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:26756: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:26687: \"$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:26762: \$? = $ac_status" >&5
+  echo "$as_me:26693: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -26778,7 +26709,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:26781: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:26712: 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
@@ -26799,23 +26730,23 @@ else
 for ac_header in wait.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:26802: checking for $ac_header" >&5
+echo "$as_me:26733: 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 26808 "configure"
+#line 26739 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:26812: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:26743: \"$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:26818: \$? = $ac_status" >&5
+  echo "$as_me:26749: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -26834,7 +26765,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:26837: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:26768: 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
@@ -26847,23 +26778,23 @@ done
 for ac_header in waitstatus.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:26850: checking for $ac_header" >&5
+echo "$as_me:26781: 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 26856 "configure"
+#line 26787 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:26860: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:26791: \"$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:26866: \$? = $ac_status" >&5
+  echo "$as_me:26797: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -26882,7 +26813,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:26885: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:26816: 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
@@ -26904,14 +26835,14 @@ cf_wait_headers="$cf_wait_headers
 fi
 fi
 
-echo "$as_me:26907: checking for union wait" >&5
+echo "$as_me:26838: 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 26914 "configure"
+#line 26845 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -26927,16 +26858,16 @@ int x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26930: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26861: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26933: \$? = $ac_status" >&5
+  echo "$as_me:26864: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26936: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26867: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26939: \$? = $ac_status" >&5
+  echo "$as_me:26870: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_unionwait=no
 	 echo compiles ok w/o union wait 1>&5
@@ -26946,7 +26877,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 26949 "configure"
+#line 26880 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -26966,16 +26897,16 @@ union wait x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26969: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26900: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26972: \$? = $ac_status" >&5
+  echo "$as_me:26903: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26975: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26906: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26978: \$? = $ac_status" >&5
+  echo "$as_me:26909: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_unionwait=yes
 	 echo compiles ok with union wait and possibly macros too 1>&5
@@ -26990,7 +26921,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:26993: result: $cf_cv_type_unionwait" >&5
+echo "$as_me:26924: result: $cf_cv_type_unionwait" >&5
 echo "${ECHO_T}$cf_cv_type_unionwait" >&6
 test $cf_cv_type_unionwait = yes &&
 cat >>confdefs.h <<\EOF
@@ -26999,14 +26930,14 @@ EOF
 
 if test $cf_cv_type_unionwait = yes; then
 
-	echo "$as_me:27002: checking if union wait can be used as wait-arg" >&5
+	echo "$as_me:26933: 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 27009 "configure"
+#line 26940 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -27018,16 +26949,16 @@ union wait x; wait(&x)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27021: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26952: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27024: \$? = $ac_status" >&5
+  echo "$as_me:26955: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27027: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26958: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27030: \$? = $ac_status" >&5
+  echo "$as_me:26961: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_arg_union_wait=yes
 else
@@ -27039,21 +26970,21 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-	echo "$as_me:27042: result: $cf_cv_arg_union_wait" >&5
+	echo "$as_me:26973: 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:27049: checking if union wait can be used as waitpid-arg" >&5
+	echo "$as_me:26980: 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 27056 "configure"
+#line 26987 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -27065,16 +26996,16 @@ union wait x; waitpid(0, &x, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27068: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26999: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27071: \$? = $ac_status" >&5
+  echo "$as_me:27002: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27074: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27005: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27077: \$? = $ac_status" >&5
+  echo "$as_me:27008: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_arg_union_waitpid=yes
 else
@@ -27086,7 +27017,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-	echo "$as_me:27089: result: $cf_cv_arg_union_waitpid" >&5
+	echo "$as_me:27020: 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
@@ -27095,13 +27026,13 @@ EOF
 
 fi
 
-echo "$as_me:27098: checking for uid_t in sys/types.h" >&5
+echo "$as_me:27029: 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 27104 "configure"
+#line 27035 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -27115,7 +27046,7 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:27118: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:27049: 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
 
@@ -27129,7 +27060,7 @@ EOF
 
 fi
 
-echo "$as_me:27132: checking type of array argument to getgroups" >&5
+echo "$as_me:27063: 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
@@ -27138,7 +27069,7 @@ else
   ac_cv_type_getgroups=cross
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 27141 "configure"
+#line 27072 "configure"
 #include "confdefs.h"
 /* Thanks to Mike Rendell for this test.  */
 #include <sys/types.h>
@@ -27164,15 +27095,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:27167: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27098: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27170: \$? = $ac_status" >&5
+  echo "$as_me:27101: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:27172: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27103: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27175: \$? = $ac_status" >&5
+  echo "$as_me:27106: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_getgroups=gid_t
 else
@@ -27185,7 +27116,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 27188 "configure"
+#line 27119 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 
@@ -27200,20 +27131,20 @@ rm -rf conftest*
 
 fi
 fi
-echo "$as_me:27203: result: $ac_cv_type_getgroups" >&5
+echo "$as_me:27134: 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:27210: checking for off_t" >&5
+echo "$as_me:27141: 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 27216 "configure"
+#line 27147 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27228,16 +27159,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27231: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27162: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27234: \$? = $ac_status" >&5
+  echo "$as_me:27165: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27237: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27168: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27240: \$? = $ac_status" >&5
+  echo "$as_me:27171: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -27247,7 +27178,7 @@ ac_cv_type_off_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27250: result: $ac_cv_type_off_t" >&5
+echo "$as_me:27181: 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
   :
@@ -27259,13 +27190,13 @@ EOF
 
 fi
 
-echo "$as_me:27262: checking for pid_t" >&5
+echo "$as_me:27193: 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 27268 "configure"
+#line 27199 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27280,16 +27211,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27283: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27214: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27286: \$? = $ac_status" >&5
+  echo "$as_me:27217: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27289: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27220: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27292: \$? = $ac_status" >&5
+  echo "$as_me:27223: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -27299,7 +27230,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27302: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:27233: 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
   :
@@ -27311,13 +27242,13 @@ EOF
 
 fi
 
-echo "$as_me:27314: checking for uid_t in sys/types.h" >&5
+echo "$as_me:27245: 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 27320 "configure"
+#line 27251 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -27331,7 +27262,7 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:27334: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:27265: 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
 
@@ -27345,13 +27276,13 @@ EOF
 
 fi
 
-echo "$as_me:27348: checking for mode_t" >&5
+echo "$as_me:27279: 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 27354 "configure"
+#line 27285 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27366,16 +27297,16 @@ if (sizeof (mode_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27369: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27300: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27372: \$? = $ac_status" >&5
+  echo "$as_me:27303: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27375: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27306: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27378: \$? = $ac_status" >&5
+  echo "$as_me:27309: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_mode_t=yes
 else
@@ -27385,7 +27316,7 @@ ac_cv_type_mode_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27388: result: $ac_cv_type_mode_t" >&5
+echo "$as_me:27319: 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
   :
@@ -27397,13 +27328,13 @@ EOF
 
 fi
 
-	echo "$as_me:27400: checking for ssize_t" >&5
+	echo "$as_me:27331: checking for ssize_t" >&5
 echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6
 if test "${ac_cv_type_ssize_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 27406 "configure"
+#line 27337 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27418,16 +27349,16 @@ if (sizeof (ssize_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27421: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27352: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27424: \$? = $ac_status" >&5
+  echo "$as_me:27355: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27427: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27358: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27430: \$? = $ac_status" >&5
+  echo "$as_me:27361: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_ssize_t=yes
 else
@@ -27437,7 +27368,7 @@ ac_cv_type_ssize_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27440: result: $ac_cv_type_ssize_t" >&5
+echo "$as_me:27371: result: $ac_cv_type_ssize_t" >&5
 echo "${ECHO_T}$ac_cv_type_ssize_t" >&6
 if test $ac_cv_type_ssize_t = yes; then
   ac_cv_type_ssize_t=yes
@@ -27453,13 +27384,13 @@ EOF
 
 fi
 
-	echo "$as_me:27456: checking for socklen_t" >&5
+	echo "$as_me:27387: 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 27462 "configure"
+#line 27393 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -27477,16 +27408,16 @@ if (sizeof (socklen_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27480: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27411: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27483: \$? = $ac_status" >&5
+  echo "$as_me:27414: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27486: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27417: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27489: \$? = $ac_status" >&5
+  echo "$as_me:27420: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_socklen_t=yes
 else
@@ -27496,7 +27427,7 @@ ac_cv_type_socklen_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27499: result: $ac_cv_type_socklen_t" >&5
+echo "$as_me:27430: 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
@@ -27512,7 +27443,7 @@ EOF
 
 fi
 
-echo "$as_me:27515: checking for long long type" >&5
+echo "$as_me:27446: checking for long long type" >&5
 echo $ECHO_N "checking for long long type... $ECHO_C" >&6
 if test "${cf_cv_type_long_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27543,7 +27474,7 @@ _CFEOF
 	rm -f conftest*
 
 fi
-echo "$as_me:27546: result: $cf_cv_type_long_long" >&5
+echo "$as_me:27477: result: $cf_cv_type_long_long" >&5
 echo "${ECHO_T}$cf_cv_type_long_long" >&6
 
 if test "$cf_cv_type_long_long" = yes ; then
@@ -27554,14 +27485,14 @@ EOF
 
 fi
 
-echo "$as_me:27557: checking for tm.tm_gmtoff" >&5
+echo "$as_me:27488: 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 27564 "configure"
+#line 27495 "configure"
 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME
@@ -27586,16 +27517,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27589: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27520: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27592: \$? = $ac_status" >&5
+  echo "$as_me:27523: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27595: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27526: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27598: \$? = $ac_status" >&5
+  echo "$as_me:27529: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_tm_gmtoff=yes
 else
@@ -27606,20 +27537,20 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:27609: result: $cf_cv_tm_gmtoff" >&5
+echo "$as_me:27540: 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:27616: checking for int" >&5
+echo "$as_me:27547: checking for int" >&5
 echo $ECHO_N "checking for int... $ECHO_C" >&6
 if test "${ac_cv_type_int+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 27622 "configure"
+#line 27553 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27634,16 +27565,16 @@ if (sizeof (int))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27637: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27568: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27640: \$? = $ac_status" >&5
+  echo "$as_me:27571: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27643: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27574: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27646: \$? = $ac_status" >&5
+  echo "$as_me:27577: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_int=yes
 else
@@ -27653,10 +27584,10 @@ ac_cv_type_int=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27656: result: $ac_cv_type_int" >&5
+echo "$as_me:27587: result: $ac_cv_type_int" >&5
 echo "${ECHO_T}$ac_cv_type_int" >&6
 
-echo "$as_me:27659: checking size of int" >&5
+echo "$as_me:27590: checking size of int" >&5
 echo $ECHO_N "checking size of int... $ECHO_C" >&6
 if test "${ac_cv_sizeof_int+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27665,7 +27596,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 27668 "configure"
+#line 27599 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27677,21 +27608,21 @@ int _array_ [1 - 2 * !((sizeof (int)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27680: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27611: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27683: \$? = $ac_status" >&5
+  echo "$as_me:27614: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27686: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27617: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27689: \$? = $ac_status" >&5
+  echo "$as_me:27620: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 27694 "configure"
+#line 27625 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27703,16 +27634,16 @@ int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27706: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27637: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27709: \$? = $ac_status" >&5
+  echo "$as_me:27640: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27712: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27643: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27715: \$? = $ac_status" >&5
+  echo "$as_me:27646: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -27728,7 +27659,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 27731 "configure"
+#line 27662 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27740,16 +27671,16 @@ int _array_ [1 - 2 * !((sizeof (int)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27743: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27674: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27746: \$? = $ac_status" >&5
+  echo "$as_me:27677: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27749: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27680: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27752: \$? = $ac_status" >&5
+  echo "$as_me:27683: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -27765,7 +27696,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 27768 "configure"
+#line 27699 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27777,16 +27708,16 @@ int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27780: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27711: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27783: \$? = $ac_status" >&5
+  echo "$as_me:27714: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27786: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27717: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27789: \$? = $ac_status" >&5
+  echo "$as_me:27720: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -27799,12 +27730,12 @@ done
 ac_cv_sizeof_int=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:27802: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:27733: 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 27807 "configure"
+#line 27738 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27820,15 +27751,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:27823: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27754: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27826: \$? = $ac_status" >&5
+  echo "$as_me:27757: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:27828: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27759: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27831: \$? = $ac_status" >&5
+  echo "$as_me:27762: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_int=`cat conftest.val`
 else
@@ -27844,7 +27775,7 @@ else
   ac_cv_sizeof_int=0
 fi
 fi
-echo "$as_me:27847: result: $ac_cv_sizeof_int" >&5
+echo "$as_me:27778: result: $ac_cv_sizeof_int" >&5
 echo "${ECHO_T}$ac_cv_sizeof_int" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_INT $ac_cv_sizeof_int
@@ -27852,23 +27783,23 @@ EOF
 
 if test "${ac_cv_type_int+set}" = set; then
 	if test "${ac_cv_sizeof_int+set}" != set; then
-		{ echo "$as_me:27855: WARNING: using 4 for sizeof int" >&5
+		{ echo "$as_me:27786: WARNING: using 4 for sizeof int" >&5
 echo "$as_me: WARNING: using 4 for sizeof int" >&2;}
 		ac_cv_sizeof_int=4
 	elif test "x${ac_cv_sizeof_int}" = x0; then
-		{ echo "$as_me:27859: WARNING: sizeof int not found, using 4" >&5
+		{ echo "$as_me:27790: WARNING: sizeof int not found, using 4" >&5
 echo "$as_me: WARNING: sizeof int not found, using 4" >&2;}
 		ac_cv_sizeof_int=4
 	fi
 fi
 
-echo "$as_me:27865: checking for long" >&5
+echo "$as_me:27796: 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 27871 "configure"
+#line 27802 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27883,16 +27814,16 @@ if (sizeof (long))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27886: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27817: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27889: \$? = $ac_status" >&5
+  echo "$as_me:27820: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27892: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27823: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27895: \$? = $ac_status" >&5
+  echo "$as_me:27826: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_long=yes
 else
@@ -27902,10 +27833,10 @@ ac_cv_type_long=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27905: result: $ac_cv_type_long" >&5
+echo "$as_me:27836: result: $ac_cv_type_long" >&5
 echo "${ECHO_T}$ac_cv_type_long" >&6
 
-echo "$as_me:27908: checking size of long" >&5
+echo "$as_me:27839: 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
@@ -27914,7 +27845,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 27917 "configure"
+#line 27848 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27926,21 +27857,21 @@ int _array_ [1 - 2 * !((sizeof (long)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27929: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27860: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27932: \$? = $ac_status" >&5
+  echo "$as_me:27863: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27935: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27866: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27938: \$? = $ac_status" >&5
+  echo "$as_me:27869: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 27943 "configure"
+#line 27874 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27952,16 +27883,16 @@ int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27955: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27886: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27958: \$? = $ac_status" >&5
+  echo "$as_me:27889: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27961: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27892: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27964: \$? = $ac_status" >&5
+  echo "$as_me:27895: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -27977,7 +27908,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 27980 "configure"
+#line 27911 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27989,16 +27920,16 @@ int _array_ [1 - 2 * !((sizeof (long)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27992: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27923: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27995: \$? = $ac_status" >&5
+  echo "$as_me:27926: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27998: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27929: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28001: \$? = $ac_status" >&5
+  echo "$as_me:27932: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -28014,7 +27945,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 28017 "configure"
+#line 27948 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28026,16 +27957,16 @@ int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28029: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27960: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28032: \$? = $ac_status" >&5
+  echo "$as_me:27963: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28035: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27966: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28038: \$? = $ac_status" >&5
+  echo "$as_me:27969: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -28048,12 +27979,12 @@ done
 ac_cv_sizeof_long=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:28051: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:27982: 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 28056 "configure"
+#line 27987 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28069,15 +28000,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:28072: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28003: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28075: \$? = $ac_status" >&5
+  echo "$as_me:28006: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:28077: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28008: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28080: \$? = $ac_status" >&5
+  echo "$as_me:28011: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_long=`cat conftest.val`
 else
@@ -28093,7 +28024,7 @@ else
   ac_cv_sizeof_long=0
 fi
 fi
-echo "$as_me:28096: result: $ac_cv_sizeof_long" >&5
+echo "$as_me:28027: 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
@@ -28101,23 +28032,23 @@ EOF
 
 if test "${ac_cv_type_long+set}" = set; then
 	if test "${ac_cv_sizeof_long+set}" != set; then
-		{ echo "$as_me:28104: WARNING: using 4 for sizeof long" >&5
+		{ echo "$as_me:28035: WARNING: using 4 for sizeof long" >&5
 echo "$as_me: WARNING: using 4 for sizeof long" >&2;}
 		ac_cv_sizeof_long=4
 	elif test "x${ac_cv_sizeof_long}" = x0; then
-		{ echo "$as_me:28108: WARNING: sizeof long not found, using 4" >&5
+		{ echo "$as_me:28039: WARNING: sizeof long not found, using 4" >&5
 echo "$as_me: WARNING: sizeof long not found, using 4" >&2;}
 		ac_cv_sizeof_long=4
 	fi
 fi
 
-echo "$as_me:28114: checking for off_t" >&5
+echo "$as_me:28045: 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 28120 "configure"
+#line 28051 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28132,16 +28063,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28135: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28066: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28138: \$? = $ac_status" >&5
+  echo "$as_me:28069: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28141: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28072: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28144: \$? = $ac_status" >&5
+  echo "$as_me:28075: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -28151,10 +28082,10 @@ ac_cv_type_off_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:28154: result: $ac_cv_type_off_t" >&5
+echo "$as_me:28085: result: $ac_cv_type_off_t" >&5
 echo "${ECHO_T}$ac_cv_type_off_t" >&6
 
-echo "$as_me:28157: checking size of off_t" >&5
+echo "$as_me:28088: 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
@@ -28163,7 +28094,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 28166 "configure"
+#line 28097 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28175,21 +28106,21 @@ int _array_ [1 - 2 * !((sizeof (off_t)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28178: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28109: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28181: \$? = $ac_status" >&5
+  echo "$as_me:28112: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28184: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28115: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28187: \$? = $ac_status" >&5
+  echo "$as_me:28118: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 28192 "configure"
+#line 28123 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28201,16 +28132,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28204: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28135: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28207: \$? = $ac_status" >&5
+  echo "$as_me:28138: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28210: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28141: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28213: \$? = $ac_status" >&5
+  echo "$as_me:28144: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -28226,7 +28157,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 28229 "configure"
+#line 28160 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28238,16 +28169,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28241: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28172: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28244: \$? = $ac_status" >&5
+  echo "$as_me:28175: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28247: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28178: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28250: \$? = $ac_status" >&5
+  echo "$as_me:28181: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -28263,7 +28194,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 28266 "configure"
+#line 28197 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28275,16 +28206,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28278: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28209: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28281: \$? = $ac_status" >&5
+  echo "$as_me:28212: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28284: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28215: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28287: \$? = $ac_status" >&5
+  echo "$as_me:28218: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -28297,12 +28228,12 @@ done
 ac_cv_sizeof_off_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:28300: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:28231: 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 28305 "configure"
+#line 28236 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28318,15 +28249,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:28321: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28252: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28324: \$? = $ac_status" >&5
+  echo "$as_me:28255: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:28326: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28257: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28329: \$? = $ac_status" >&5
+  echo "$as_me:28260: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_off_t=`cat conftest.val`
 else
@@ -28342,7 +28273,7 @@ else
   ac_cv_sizeof_off_t=0
 fi
 fi
-echo "$as_me:28345: result: $ac_cv_sizeof_off_t" >&5
+echo "$as_me:28276: 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
@@ -28350,23 +28281,23 @@ EOF
 
 if test "${ac_cv_type_off_t+set}" = set; then
 	if test "${ac_cv_sizeof_off_t+set}" != set; then
-		{ echo "$as_me:28353: WARNING: using 4 for sizeof off_t" >&5
+		{ echo "$as_me:28284: WARNING: using 4 for sizeof off_t" >&5
 echo "$as_me: WARNING: using 4 for sizeof off_t" >&2;}
 		ac_cv_sizeof_off_t=4
 	elif test "x${ac_cv_sizeof_off_t}" = x0; then
-		{ echo "$as_me:28357: WARNING: sizeof off_t not found, using 4" >&5
+		{ echo "$as_me:28288: WARNING: sizeof off_t not found, using 4" >&5
 echo "$as_me: WARNING: sizeof off_t not found, using 4" >&2;}
 		ac_cv_sizeof_off_t=4
 	fi
 fi
 
-echo "$as_me:28363: checking for time_t" >&5
+echo "$as_me:28294: 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 28369 "configure"
+#line 28300 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28381,16 +28312,16 @@ if (sizeof (time_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28384: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28315: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28387: \$? = $ac_status" >&5
+  echo "$as_me:28318: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28390: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28321: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28393: \$? = $ac_status" >&5
+  echo "$as_me:28324: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_time_t=yes
 else
@@ -28400,10 +28331,10 @@ ac_cv_type_time_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:28403: result: $ac_cv_type_time_t" >&5
+echo "$as_me:28334: result: $ac_cv_type_time_t" >&5
 echo "${ECHO_T}$ac_cv_type_time_t" >&6
 
-echo "$as_me:28406: checking size of time_t" >&5
+echo "$as_me:28337: 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
@@ -28412,7 +28343,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 28415 "configure"
+#line 28346 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28424,21 +28355,21 @@ int _array_ [1 - 2 * !((sizeof (time_t)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28427: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28358: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28430: \$? = $ac_status" >&5
+  echo "$as_me:28361: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28433: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28364: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28436: \$? = $ac_status" >&5
+  echo "$as_me:28367: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 28441 "configure"
+#line 28372 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28450,16 +28381,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28453: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28384: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28456: \$? = $ac_status" >&5
+  echo "$as_me:28387: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28459: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28390: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28462: \$? = $ac_status" >&5
+  echo "$as_me:28393: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -28475,7 +28406,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 28478 "configure"
+#line 28409 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28487,16 +28418,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28490: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28421: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28493: \$? = $ac_status" >&5
+  echo "$as_me:28424: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28496: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28427: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28499: \$? = $ac_status" >&5
+  echo "$as_me:28430: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -28512,7 +28443,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 28515 "configure"
+#line 28446 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28524,16 +28455,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28527: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28458: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28530: \$? = $ac_status" >&5
+  echo "$as_me:28461: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28533: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28464: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28536: \$? = $ac_status" >&5
+  echo "$as_me:28467: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -28546,12 +28477,12 @@ done
 ac_cv_sizeof_time_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:28549: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:28480: 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 28554 "configure"
+#line 28485 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28567,15 +28498,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:28570: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28501: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28573: \$? = $ac_status" >&5
+  echo "$as_me:28504: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:28575: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28506: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28578: \$? = $ac_status" >&5
+  echo "$as_me:28509: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_time_t=`cat conftest.val`
 else
@@ -28591,7 +28522,7 @@ else
   ac_cv_sizeof_time_t=0
 fi
 fi
-echo "$as_me:28594: result: $ac_cv_sizeof_time_t" >&5
+echo "$as_me:28525: 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
@@ -28599,23 +28530,23 @@ EOF
 
 if test "${ac_cv_type_time_t+set}" = set; then
 	if test "${ac_cv_sizeof_time_t+set}" != set; then
-		{ echo "$as_me:28602: WARNING: using 4 for sizeof time_t" >&5
+		{ echo "$as_me:28533: WARNING: using 4 for sizeof time_t" >&5
 echo "$as_me: WARNING: using 4 for sizeof time_t" >&2;}
 		ac_cv_sizeof_time_t=4
 	elif test "x${ac_cv_sizeof_time_t}" = x0; then
-		{ echo "$as_me:28606: WARNING: sizeof time_t not found, using 4" >&5
+		{ echo "$as_me:28537: WARNING: sizeof time_t not found, using 4" >&5
 echo "$as_me: WARNING: sizeof time_t not found, using 4" >&2;}
 		ac_cv_sizeof_time_t=4
 	fi
 fi
 
-echo "$as_me:28612: checking for intptr_t" >&5
+echo "$as_me:28543: checking for intptr_t" >&5
 echo $ECHO_N "checking for intptr_t... $ECHO_C" >&6
 if test "${ac_cv_type_intptr_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 28618 "configure"
+#line 28549 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28630,16 +28561,16 @@ if (sizeof (intptr_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28633: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28564: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28636: \$? = $ac_status" >&5
+  echo "$as_me:28567: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28639: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28570: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28642: \$? = $ac_status" >&5
+  echo "$as_me:28573: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_intptr_t=yes
 else
@@ -28649,7 +28580,7 @@ ac_cv_type_intptr_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:28652: result: $ac_cv_type_intptr_t" >&5
+echo "$as_me:28583: result: $ac_cv_type_intptr_t" >&5
 echo "${ECHO_T}$ac_cv_type_intptr_t" >&6
 if test $ac_cv_type_intptr_t = yes; then
   :
@@ -28663,13 +28594,13 @@ fi
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo "$as_me:28666: checking for working alloca.h" >&5
+echo "$as_me:28597: 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 28672 "configure"
+#line 28603 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int
@@ -28681,16 +28612,16 @@ char *p = (char *) alloca (2 * sizeof (int));
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28684: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28615: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28687: \$? = $ac_status" >&5
+  echo "$as_me:28618: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28690: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28621: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28693: \$? = $ac_status" >&5
+  echo "$as_me:28624: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_working_alloca_h=yes
 else
@@ -28700,7 +28631,7 @@ ac_cv_working_alloca_h=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:28703: result: $ac_cv_working_alloca_h" >&5
+echo "$as_me:28634: 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
 
@@ -28710,13 +28641,13 @@ EOF
 
 fi
 
-echo "$as_me:28713: checking for alloca" >&5
+echo "$as_me:28644: 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 28719 "configure"
+#line 28650 "configure"
 #include "confdefs.h"
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -28748,16 +28679,16 @@ char *p = (char *) alloca (1);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28751: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28682: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28754: \$? = $ac_status" >&5
+  echo "$as_me:28685: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28757: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28688: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28760: \$? = $ac_status" >&5
+  echo "$as_me:28691: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_alloca_works=yes
 else
@@ -28767,7 +28698,7 @@ ac_cv_func_alloca_works=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:28770: result: $ac_cv_func_alloca_works" >&5
+echo "$as_me:28701: 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
@@ -28788,13 +28719,13 @@ cat >>confdefs.h <<\EOF
 #define C_ALLOCA 1
 EOF
 
-echo "$as_me:28791: checking whether \`alloca.c' needs Cray hooks" >&5
+echo "$as_me:28722: 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 28797 "configure"
+#line 28728 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -28812,18 +28743,18 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:28815: result: $ac_cv_os_cray" >&5
+echo "$as_me:28746: 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:28820: checking for $ac_func" >&5
+echo "$as_me:28751: 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 28826 "configure"
+#line 28757 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -28854,16 +28785,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28857: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28788: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28860: \$? = $ac_status" >&5
+  echo "$as_me:28791: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28863: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28794: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28866: \$? = $ac_status" >&5
+  echo "$as_me:28797: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -28873,7 +28804,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:28876: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:28807: 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
 
@@ -28887,7 +28818,7 @@ fi
   done
 fi
 
-echo "$as_me:28890: checking stack direction for C alloca" >&5
+echo "$as_me:28821: 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
@@ -28896,7 +28827,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 28899 "configure"
+#line 28830 "configure"
 #include "confdefs.h"
 int
 find_stack_direction ()
@@ -28919,15 +28850,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:28922: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28853: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28925: \$? = $ac_status" >&5
+  echo "$as_me:28856: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:28927: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28858: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28930: \$? = $ac_status" >&5
+  echo "$as_me:28861: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_stack_direction=1
 else
@@ -28939,7 +28870,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:28942: result: $ac_cv_c_stack_direction" >&5
+echo "$as_me:28873: result: $ac_cv_c_stack_direction" >&5
 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
 cat >>confdefs.h <<EOF
@@ -28951,23 +28882,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:28954: checking for $ac_header" >&5
+echo "$as_me:28885: 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 28960 "configure"
+#line 28891 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:28964: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:28895: \"$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:28970: \$? = $ac_status" >&5
+  echo "$as_me:28901: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -28986,7 +28917,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:28989: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:28920: 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
@@ -28999,13 +28930,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:29002: checking for $ac_func" >&5
+echo "$as_me:28933: 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 29008 "configure"
+#line 28939 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -29036,16 +28967,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29039: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28970: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29042: \$? = $ac_status" >&5
+  echo "$as_me:28973: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29045: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28976: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29048: \$? = $ac_status" >&5
+  echo "$as_me:28979: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -29055,7 +28986,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:29058: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:28989: 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
@@ -29067,7 +28998,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:29070: checking for working fork" >&5
+  echo "$as_me:29001: 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
@@ -29090,15 +29021,15 @@ else
       }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:29093: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29024: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29096: \$? = $ac_status" >&5
+  echo "$as_me:29027: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:29098: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29029: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29101: \$? = $ac_status" >&5
+  echo "$as_me:29032: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -29110,7 +29041,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:29113: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:29044: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -29124,12 +29055,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:29127: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:29058: 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:29132: checking for working vfork" >&5
+  echo "$as_me:29063: 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
@@ -29138,7 +29069,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 29141 "configure"
+#line 29072 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -29235,15 +29166,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:29238: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29169: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29241: \$? = $ac_status" >&5
+  echo "$as_me:29172: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:29243: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29174: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29246: \$? = $ac_status" >&5
+  echo "$as_me:29177: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -29255,13 +29186,13 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:29258: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:29189: 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:29264: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:29195: 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
 
@@ -29286,14 +29217,14 @@ EOF
 
 fi
 
-echo "$as_me:29289: checking if we should use fcntl or ioctl" >&5
+echo "$as_me:29220: 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 29296 "configure"
+#line 29227 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -29310,16 +29241,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29313: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29244: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29316: \$? = $ac_status" >&5
+  echo "$as_me:29247: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29319: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29250: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29322: \$? = $ac_status" >&5
+  echo "$as_me:29253: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fionbio=ioctl
 else
@@ -29327,7 +29258,7 @@ else
 cat conftest.$ac_ext >&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 29330 "configure"
+#line 29261 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -29349,16 +29280,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29352: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29283: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29355: \$? = $ac_status" >&5
+  echo "$as_me:29286: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29358: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29289: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29361: \$? = $ac_status" >&5
+  echo "$as_me:29292: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fionbio=fcntl
 else
@@ -29371,21 +29302,21 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:29374: result: $cf_cv_fionbio" >&5
+echo "$as_me:29305: 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:29381: checking for broken/missing definition of remove" >&5
+echo "$as_me:29312: 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 29388 "configure"
+#line 29319 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -29397,23 +29328,23 @@ remove("dummy")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29400: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29331: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29403: \$? = $ac_status" >&5
+  echo "$as_me:29334: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29406: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29337: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29409: \$? = $ac_status" >&5
+  echo "$as_me:29340: \$? = $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 29416 "configure"
+#line 29347 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 		int __unlink(name) { return unlink(name); }
@@ -29426,16 +29357,16 @@ remove("dummy")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29429: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29360: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29432: \$? = $ac_status" >&5
+  echo "$as_me:29363: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29435: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29366: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29438: \$? = $ac_status" >&5
+  echo "$as_me:29369: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_baddef_remove=yes
 else
@@ -29450,21 +29381,21 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:29453: result: $cf_cv_baddef_remove" >&5
+echo "$as_me:29384: 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:29460: checking for lstat" >&5
+echo "$as_me:29391: 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 29467 "configure"
+#line 29398 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -29478,16 +29409,16 @@ lstat(".", (struct stat *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29481: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29412: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29484: \$? = $ac_status" >&5
+  echo "$as_me:29415: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29487: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29418: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29490: \$? = $ac_status" >&5
+  echo "$as_me:29421: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_lstat=yes
 else
@@ -29499,7 +29430,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:29502: result: $ac_cv_func_lstat " >&5
+echo "$as_me:29433: result: $ac_cv_func_lstat " >&5
 echo "${ECHO_T}$ac_cv_func_lstat " >&6
 if test $ac_cv_func_lstat = yes; then
 
@@ -29534,13 +29465,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:29537: checking for $ac_func" >&5
+echo "$as_me:29468: 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 29543 "configure"
+#line 29474 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -29571,16 +29502,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29574: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29505: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29577: \$? = $ac_status" >&5
+  echo "$as_me:29508: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29580: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29511: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29583: \$? = $ac_status" >&5
+  echo "$as_me:29514: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -29590,7 +29521,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:29593: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:29524: 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
@@ -29606,13 +29537,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:29609: checking for $ac_func" >&5
+echo "$as_me:29540: 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 29615 "configure"
+#line 29546 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -29643,16 +29574,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29646: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29577: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29649: \$? = $ac_status" >&5
+  echo "$as_me:29580: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29652: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29583: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29655: \$? = $ac_status" >&5
+  echo "$as_me:29586: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -29662,7 +29593,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:29665: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:29596: 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
@@ -29674,7 +29605,7 @@ else
 fi
 done
 
-echo "$as_me:29677: checking for random-integer functions" >&5
+echo "$as_me:29608: 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
@@ -29694,7 +29625,7 @@ do
 	esac
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 29697 "configure"
+#line 29628 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -29713,16 +29644,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:29716: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29647: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29719: \$? = $ac_status" >&5
+  echo "$as_me:29650: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29722: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29653: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29725: \$? = $ac_status" >&5
+  echo "$as_me:29656: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_srand_func=$cf_func
  break
@@ -29734,10 +29665,10 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:29737: result: $cf_cv_srand_func" >&5
+echo "$as_me:29668: 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:29740: checking for range of random-integers" >&5
+	echo "$as_me:29671: 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
@@ -29758,7 +29689,7 @@ else
 			;;
 		esac
 		cat >conftest.$ac_ext <<_ACEOF
-#line 29761 "configure"
+#line 29692 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -29777,16 +29708,16 @@ long x = $cf_cv_rand_max
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29780: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29711: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29783: \$? = $ac_status" >&5
+  echo "$as_me:29714: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29786: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29717: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29789: \$? = $ac_status" >&5
+  echo "$as_me:29720: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -29797,15 +29728,15 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:29800: result: $cf_cv_rand_max" >&5
+echo "$as_me:29731: result: $cf_cv_rand_max" >&5
 echo "${ECHO_T}$cf_cv_rand_max" >&6
 
 	case $cf_cv_srand_func in
 	(*/arc4random)
-		echo "$as_me:29805: checking if <bsd/stdlib.h> should be included" >&5
+		echo "$as_me:29736: checking if <bsd/stdlib.h> should be included" >&5
 echo $ECHO_N "checking if <bsd/stdlib.h> should be included... $ECHO_C" >&6
 		cat >conftest.$ac_ext <<_ACEOF
-#line 29808 "configure"
+#line 29739 "configure"
 #include "confdefs.h"
 #include <bsd/stdlib.h>
 int
@@ -29818,23 +29749,23 @@ void *arc4random(int);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29821: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29752: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29824: \$? = $ac_status" >&5
+  echo "$as_me:29755: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29827: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29758: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29830: \$? = $ac_status" >&5
+  echo "$as_me:29761: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_bsd_stdlib_h=no
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 29837 "configure"
+#line 29768 "configure"
 #include "confdefs.h"
 #include <bsd/stdlib.h>
 int
@@ -29846,16 +29777,16 @@ unsigned x = arc4random()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29849: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29780: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29852: \$? = $ac_status" >&5
+  echo "$as_me:29783: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29855: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29786: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29858: \$? = $ac_status" >&5
+  echo "$as_me:29789: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_bsd_stdlib_h=yes
 else
@@ -29866,7 +29797,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-	    echo "$as_me:29869: result: $cf_bsd_stdlib_h" >&5
+	    echo "$as_me:29800: result: $cf_bsd_stdlib_h" >&5
 echo "${ECHO_T}$cf_bsd_stdlib_h" >&6
 		if test "$cf_bsd_stdlib_h" = yes
 		then
@@ -29876,10 +29807,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 		else
-			echo "$as_me:29879: checking if <bsd/random.h> should be included" >&5
+			echo "$as_me:29810: checking if <bsd/random.h> should be included" >&5
 echo $ECHO_N "checking if <bsd/random.h> should be included... $ECHO_C" >&6
 			cat >conftest.$ac_ext <<_ACEOF
-#line 29882 "configure"
+#line 29813 "configure"
 #include "confdefs.h"
 #include <bsd/random.h>
 int
@@ -29892,23 +29823,23 @@ void *arc4random(int);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29895: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29826: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29898: \$? = $ac_status" >&5
+  echo "$as_me:29829: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29901: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29832: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29904: \$? = $ac_status" >&5
+  echo "$as_me:29835: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_bsd_random_h=no
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 29911 "configure"
+#line 29842 "configure"
 #include "confdefs.h"
 #include <bsd/random.h>
 int
@@ -29920,16 +29851,16 @@ unsigned x = arc4random()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29923: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29854: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29926: \$? = $ac_status" >&5
+  echo "$as_me:29857: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29929: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29860: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29932: \$? = $ac_status" >&5
+  echo "$as_me:29863: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_bsd_random_h=yes
 else
@@ -29940,7 +29871,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-			echo "$as_me:29943: result: $cf_bsd_random_h" >&5
+			echo "$as_me:29874: result: $cf_bsd_random_h" >&5
 echo "${ECHO_T}$cf_bsd_random_h" >&6
 			if test "$cf_bsd_random_h" = yes
 			then
@@ -29950,7 +29881,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 			else
-				{ echo "$as_me:29953: WARNING: no header file found for arc4random" >&5
+				{ echo "$as_me:29884: WARNING: no header file found for arc4random" >&5
 echo "$as_me: WARNING: no header file found for arc4random" >&2;}
 			fi
 		fi
@@ -29985,13 +29916,13 @@ fi
 for ac_func in sleep
 do
 
-echo "$as_me:29988: checking for $ac_func declaration" >&5
+echo "$as_me:29919: 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 29994 "configure"
+#line 29925 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -30012,20 +29943,20 @@ extern	int	$ac_func();
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30015: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29946: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30018: \$? = $ac_status" >&5
+  echo "$as_me:29949: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30021: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29952: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30024: \$? = $ac_status" >&5
+  echo "$as_me:29955: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 30028 "configure"
+#line 29959 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -30046,16 +29977,16 @@ int	(*p)() = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30049: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29980: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30052: \$? = $ac_status" >&5
+  echo "$as_me:29983: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30055: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29986: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30058: \$? = $ac_status" >&5
+  echo "$as_me:29989: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -30076,11 +30007,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:30079: result: yes" >&5
+  echo "$as_me:30010: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:30083: result: no" >&5
+  echo "$as_me:30014: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -30095,13 +30026,13 @@ done
 for ac_func in strstr
 do
 
-echo "$as_me:30098: checking for $ac_func declaration" >&5
+echo "$as_me:30029: 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 30104 "configure"
+#line 30035 "configure"
 #include "confdefs.h"
 #include <string.h>
 int
@@ -30115,20 +30046,20 @@ extern	int	$ac_func();
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30118: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30049: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30121: \$? = $ac_status" >&5
+  echo "$as_me:30052: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30124: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30055: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30127: \$? = $ac_status" >&5
+  echo "$as_me:30058: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 30131 "configure"
+#line 30062 "configure"
 #include "confdefs.h"
 #include <string.h>
 int
@@ -30142,16 +30073,16 @@ int	(*p)() = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30145: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30076: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30148: \$? = $ac_status" >&5
+  echo "$as_me:30079: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30151: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30082: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30154: \$? = $ac_status" >&5
+  echo "$as_me:30085: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -30172,11 +30103,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:30175: result: yes" >&5
+  echo "$as_me:30106: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:30179: result: no" >&5
+  echo "$as_me:30110: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -30191,13 +30122,13 @@ done
 for ac_func in getgrgid getgrnam
 do
 
-echo "$as_me:30194: checking for $ac_func declaration" >&5
+echo "$as_me:30125: 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 30200 "configure"
+#line 30131 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -30213,20 +30144,20 @@ extern	int	$ac_func();
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30216: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30147: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30219: \$? = $ac_status" >&5
+  echo "$as_me:30150: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30222: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30153: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30225: \$? = $ac_status" >&5
+  echo "$as_me:30156: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 30229 "configure"
+#line 30160 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -30242,16 +30173,16 @@ int	(*p)() = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30245: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30176: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30248: \$? = $ac_status" >&5
+  echo "$as_me:30179: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30251: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30182: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30254: \$? = $ac_status" >&5
+  echo "$as_me:30185: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -30272,11 +30203,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:30275: result: yes" >&5
+  echo "$as_me:30206: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:30279: result: no" >&5
+  echo "$as_me:30210: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -30288,14 +30219,14 @@ EOF
 fi
 done
 
-echo "$as_me:30291: checking if TRUE/FALSE are defined" >&5
+echo "$as_me:30222: 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 30298 "configure"
+#line 30229 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -30309,16 +30240,16 @@ int x = TRUE, y = FALSE
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30312: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30243: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30315: \$? = $ac_status" >&5
+  echo "$as_me:30246: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30318: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30249: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30321: \$? = $ac_status" >&5
+  echo "$as_me:30252: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_bool_defs=yes
 else
@@ -30329,7 +30260,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:30332: result: $cf_cv_bool_defs" >&5
+echo "$as_me:30263: result: $cf_cv_bool_defs" >&5
 echo "${ECHO_T}$cf_cv_bool_defs" >&6
 if test "$cf_cv_bool_defs" = no ; then
 
@@ -30343,14 +30274,14 @@ EOF
 
 fi
 
-echo "$as_me:30346: checking if external errno is declared" >&5
+echo "$as_me:30277: 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 30353 "configure"
+#line 30284 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -30368,16 +30299,16 @@ int x = (int) errno
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30371: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30302: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30374: \$? = $ac_status" >&5
+  echo "$as_me:30305: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30377: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30308: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30380: \$? = $ac_status" >&5
+  echo "$as_me:30311: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -30388,7 +30319,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:30391: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:30322: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -30403,14 +30334,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:30406: checking if external errno exists" >&5
+echo "$as_me:30337: 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 30413 "configure"
+#line 30344 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -30425,16 +30356,16 @@ errno = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30428: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30359: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30431: \$? = $ac_status" >&5
+  echo "$as_me:30362: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30434: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30365: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30437: \$? = $ac_status" >&5
+  echo "$as_me:30368: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_errno=yes
 else
@@ -30445,7 +30376,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:30448: result: $cf_cv_have_errno" >&5
+echo "$as_me:30379: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -30458,7 +30389,7 @@ EOF
 
 fi
 
-echo "$as_me:30461: checking if we can set errno" >&5
+echo "$as_me:30392: 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
@@ -30466,7 +30397,7 @@ else
 
 if test "$cross_compiling" = yes; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 30469 "configure"
+#line 30400 "configure"
 #include "confdefs.h"
 #include <errno.h>
 int
@@ -30478,16 +30409,16 @@ errno = 255
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30481: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30412: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30484: \$? = $ac_status" >&5
+  echo "$as_me:30415: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30487: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30418: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30490: \$? = $ac_status" >&5
+  echo "$as_me:30421: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_set_errno=maybe
 else
@@ -30498,7 +30429,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 30501 "configure"
+#line 30432 "configure"
 #include "confdefs.h"
 
 #include <errno.h>
@@ -30509,15 +30440,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:30512: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30443: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30515: \$? = $ac_status" >&5
+  echo "$as_me:30446: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:30517: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30448: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30520: \$? = $ac_status" >&5
+  echo "$as_me:30451: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_set_errno=yes
 else
@@ -30530,21 +30461,21 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:30533: result: $cf_cv_set_errno" >&5
+echo "$as_me:30464: 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:30540: checking for setlocale()" >&5
+echo "$as_me:30471: 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 30547 "configure"
+#line 30478 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int
@@ -30556,16 +30487,16 @@ setlocale(LC_ALL, "")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30559: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30490: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30562: \$? = $ac_status" >&5
+  echo "$as_me:30493: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30565: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30496: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30568: \$? = $ac_status" >&5
+  echo "$as_me:30499: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_locale=yes
 else
@@ -30577,7 +30508,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:30580: result: $cf_cv_locale" >&5
+echo "$as_me:30511: result: $cf_cv_locale" >&5
 echo "${ECHO_T}$cf_cv_locale" >&6
 test $cf_cv_locale = yes && {
 cat >>confdefs.h <<\EOF
@@ -30585,14 +30516,14 @@ cat >>confdefs.h <<\EOF
 EOF
  }
 
-echo "$as_me:30588: checking if NGROUPS is defined" >&5
+echo "$as_me:30519: 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 30595 "configure"
+#line 30526 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -30611,23 +30542,23 @@ int x = NGROUPS
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30614: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30545: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30617: \$? = $ac_status" >&5
+  echo "$as_me:30548: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30620: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30551: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30623: \$? = $ac_status" >&5
+  echo "$as_me:30554: \$? = $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 30630 "configure"
+#line 30561 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -30646,16 +30577,16 @@ int x = NGROUPS_MAX
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30649: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30580: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30652: \$? = $ac_status" >&5
+  echo "$as_me:30583: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30655: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30586: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30658: \$? = $ac_status" >&5
+  echo "$as_me:30589: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ngroups=NGROUPS_MAX
 else
@@ -30667,7 +30598,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:30670: result: $cf_cv_ngroups" >&5
+echo "$as_me:30601: result: $cf_cv_ngroups" >&5
 echo "${ECHO_T}$cf_cv_ngroups" >&6
 
 fi
@@ -30685,14 +30616,14 @@ EOF
 
 fi
 
-echo "$as_me:30688: checking if external sys_nerr is declared" >&5
+echo "$as_me:30619: 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 30695 "configure"
+#line 30626 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -30710,16 +30641,16 @@ int x = (int) sys_nerr
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30713: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30644: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30716: \$? = $ac_status" >&5
+  echo "$as_me:30647: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30719: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30650: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30722: \$? = $ac_status" >&5
+  echo "$as_me:30653: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_sys_nerr=yes
 else
@@ -30730,7 +30661,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:30733: result: $cf_cv_dcl_sys_nerr" >&5
+echo "$as_me:30664: 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
@@ -30745,14 +30676,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:30748: checking if external sys_nerr exists" >&5
+echo "$as_me:30679: 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 30755 "configure"
+#line 30686 "configure"
 #include "confdefs.h"
 
 #undef sys_nerr
@@ -30767,16 +30698,16 @@ sys_nerr = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30770: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30701: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30773: \$? = $ac_status" >&5
+  echo "$as_me:30704: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30776: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30707: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30779: \$? = $ac_status" >&5
+  echo "$as_me:30710: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_sys_nerr=yes
 else
@@ -30787,7 +30718,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:30790: result: $cf_cv_have_sys_nerr" >&5
+echo "$as_me:30721: 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
@@ -30800,14 +30731,14 @@ EOF
 
 fi
 
-echo "$as_me:30803: checking if external sys_errlist is declared" >&5
+echo "$as_me:30734: 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 30810 "configure"
+#line 30741 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -30825,16 +30756,16 @@ int x = (int) sys_errlist
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30828: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30759: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30831: \$? = $ac_status" >&5
+  echo "$as_me:30762: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30834: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30765: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30837: \$? = $ac_status" >&5
+  echo "$as_me:30768: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_sys_errlist=yes
 else
@@ -30845,7 +30776,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:30848: result: $cf_cv_dcl_sys_errlist" >&5
+echo "$as_me:30779: 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
@@ -30860,14 +30791,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:30863: checking if external sys_errlist exists" >&5
+echo "$as_me:30794: 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 30870 "configure"
+#line 30801 "configure"
 #include "confdefs.h"
 
 #undef sys_errlist
@@ -30882,16 +30813,16 @@ sys_errlist = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30885: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30816: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30888: \$? = $ac_status" >&5
+  echo "$as_me:30819: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30891: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30822: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30894: \$? = $ac_status" >&5
+  echo "$as_me:30825: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_sys_errlist=yes
 else
@@ -30902,7 +30833,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:30905: result: $cf_cv_have_sys_errlist" >&5
+echo "$as_me:30836: 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
@@ -30918,23 +30849,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:30921: checking for $ac_header" >&5
+echo "$as_me:30852: 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 30927 "configure"
+#line 30858 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:30931: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:30862: \"$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:30937: \$? = $ac_status" >&5
+  echo "$as_me:30868: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -30953,7 +30884,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:30956: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:30887: 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
@@ -30963,14 +30894,14 @@ EOF
 fi
 done
 
-echo "$as_me:30966: checking for lastlog path" >&5
+echo "$as_me:30897: 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 30973 "configure"
+#line 30904 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -30990,16 +30921,16 @@ char *path = _PATH_LASTLOG
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30993: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30924: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30996: \$? = $ac_status" >&5
+  echo "$as_me:30927: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30999: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30930: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31002: \$? = $ac_status" >&5
+  echo "$as_me:30933: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_path_lastlog="_PATH_LASTLOG"
 else
@@ -31014,14 +30945,14 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:31017: result: $cf_cv_path_lastlog" >&5
+echo "$as_me:30948: 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:31024: checking for utmp implementation" >&5
+echo "$as_me:30955: 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
@@ -31038,7 +30969,7 @@ cf_utmp_includes="
 #endif
 "
 	cat >conftest.$ac_ext <<_ACEOF
-#line 31041 "configure"
+#line 30972 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -31052,16 +30983,16 @@ struct $cf_header x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31055: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30986: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31058: \$? = $ac_status" >&5
+  echo "$as_me:30989: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31061: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30992: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31064: \$? = $ac_status" >&5
+  echo "$as_me:30995: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -31070,7 +31001,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 31073 "configure"
+#line 31004 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -31084,16 +31015,16 @@ struct $cf_header x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31087: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31018: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31090: \$? = $ac_status" >&5
+  echo "$as_me:31021: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31093: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31024: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31096: \$? = $ac_status" >&5
+  echo "$as_me:31027: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -31108,7 +31039,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:31111: result: $cf_cv_have_utmp" >&5
+echo "$as_me:31042: result: $cf_cv_have_utmp" >&5
 echo "${ECHO_T}$cf_cv_have_utmp" >&6
 
 if test $cf_cv_have_utmp != no ; then
@@ -31123,14 +31054,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:31126: checking if ${cf_cv_have_utmp}.ut_host is declared" >&5
+echo "$as_me:31057: 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 31133 "configure"
+#line 31064 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -31144,16 +31075,16 @@ struct $cf_cv_have_utmp x; char *y = &x.ut_host[0]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31147: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31078: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31150: \$? = $ac_status" >&5
+  echo "$as_me:31081: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31153: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31084: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31156: \$? = $ac_status" >&5
+  echo "$as_me:31087: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_host=yes
 else
@@ -31165,7 +31096,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:31168: result: $cf_cv_have_utmp_ut_host" >&5
+echo "$as_me:31099: 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
@@ -31175,14 +31106,14 @@ EOF
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:31178: checking if ${cf_cv_have_utmp}.ut_syslen is declared" >&5
+echo "$as_me:31109: 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 31185 "configure"
+#line 31116 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -31196,16 +31127,16 @@ struct $cf_cv_have_utmp x; int y = x.ut_syslen
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31199: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31130: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31202: \$? = $ac_status" >&5
+  echo "$as_me:31133: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31205: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31136: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31208: \$? = $ac_status" >&5
+  echo "$as_me:31139: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_syslen=yes
 else
@@ -31217,7 +31148,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:31220: result: $cf_cv_have_utmp_ut_syslen" >&5
+echo "$as_me:31151: 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
@@ -31227,7 +31158,7 @@ EOF
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:31230: checking if ${cf_cv_have_utmp}.ut_name is declared" >&5
+echo "$as_me:31161: 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
@@ -31244,7 +31175,7 @@ cf_utmp_includes="
 "
 for cf_header in ut_name ut_user ; do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 31247 "configure"
+#line 31178 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -31258,16 +31189,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31261: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31192: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31264: \$? = $ac_status" >&5
+  echo "$as_me:31195: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31267: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31198: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31270: \$? = $ac_status" >&5
+  echo "$as_me:31201: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_name=$cf_header
 	 break
@@ -31279,12 +31210,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:31282: result: $cf_cv_have_utmp_ut_name" >&5
+echo "$as_me:31213: result: $cf_cv_have_utmp_ut_name" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_name" >&6
 
 case $cf_cv_have_utmp_ut_name in
 (no)
-	{ { echo "$as_me:31287: error: Cannot find declaration for ut.ut_name" >&5
+	{ { echo "$as_me:31218: 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; }; }
 	;;
@@ -31299,7 +31230,7 @@ esac
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:31302: checking for exit-status in $cf_cv_have_utmp" >&5
+echo "$as_me:31233: 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
@@ -31312,7 +31243,7 @@ for cf_result in \
 	ut_exit.ut_exit
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 31315 "configure"
+#line 31246 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -31326,16 +31257,16 @@ struct $cf_cv_have_utmp x; long y = x.$cf_result = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31329: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31260: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31332: \$? = $ac_status" >&5
+  echo "$as_me:31263: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31335: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31266: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31338: \$? = $ac_status" >&5
+  echo "$as_me:31269: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_xstatus=$cf_result
 	 break
@@ -31348,7 +31279,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:31351: result: $cf_cv_have_utmp_ut_xstatus" >&5
+echo "$as_me:31282: 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
 
@@ -31364,14 +31295,14 @@ fi
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:31367: checking if ${cf_cv_have_utmp}.ut_xtime is declared" >&5
+echo "$as_me:31298: 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 31374 "configure"
+#line 31305 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -31385,23 +31316,23 @@ struct $cf_cv_have_utmp x; long y = x.ut_xtime = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31388: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31319: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31391: \$? = $ac_status" >&5
+  echo "$as_me:31322: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31394: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31325: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31397: \$? = $ac_status" >&5
+  echo "$as_me:31328: \$? = $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 31404 "configure"
+#line 31335 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -31415,16 +31346,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:31418: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31349: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31421: \$? = $ac_status" >&5
+  echo "$as_me:31352: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31424: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31355: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31427: \$? = $ac_status" >&5
+  echo "$as_me:31358: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_xtime=define
 else
@@ -31438,7 +31369,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:31441: result: $cf_cv_have_utmp_ut_xtime" >&5
+echo "$as_me:31372: 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
 
@@ -31457,14 +31388,14 @@ fi
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:31460: checking if ${cf_cv_have_utmp}.ut_session is declared" >&5
+echo "$as_me:31391: 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 31467 "configure"
+#line 31398 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -31478,16 +31409,16 @@ struct $cf_cv_have_utmp x; long y = x.ut_session
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31481: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31412: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31484: \$? = $ac_status" >&5
+  echo "$as_me:31415: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31487: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31418: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31490: \$? = $ac_status" >&5
+  echo "$as_me:31421: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_session=yes
 else
@@ -31498,7 +31429,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:31501: result: $cf_cv_have_utmp_ut_session" >&5
+echo "$as_me:31432: 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
 
@@ -31509,7 +31440,7 @@ EOF
 fi
 fi
 
-echo "$as_me:31512: checking if $cf_cv_have_utmp is SYSV flavor" >&5
+echo "$as_me:31443: 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
@@ -31517,7 +31448,7 @@ else
 
 test "$cf_cv_have_utmp" = "utmp" && cf_prefix="ut" || cf_prefix="utx"
 cat >conftest.$ac_ext <<_ACEOF
-#line 31520 "configure"
+#line 31451 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -31536,16 +31467,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31539: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31470: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31542: \$? = $ac_status" >&5
+  echo "$as_me:31473: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31545: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31476: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31548: \$? = $ac_status" >&5
+  echo "$as_me:31479: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_sysv_utmp=yes
 else
@@ -31556,7 +31487,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:31559: result: $cf_cv_sysv_utmp" >&5
+echo "$as_me:31490: result: $cf_cv_sysv_utmp" >&5
 echo "${ECHO_T}$cf_cv_sysv_utmp" >&6
 test $cf_cv_sysv_utmp = yes &&
 cat >>confdefs.h <<\EOF
@@ -31565,14 +31496,14 @@ EOF
 
 fi
 
-echo "$as_me:31568: checking if external h_errno exists" >&5
+echo "$as_me:31499: 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 31575 "configure"
+#line 31506 "configure"
 #include "confdefs.h"
 
 #undef h_errno
@@ -31587,16 +31518,16 @@ h_errno = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31590: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31521: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31593: \$? = $ac_status" >&5
+  echo "$as_me:31524: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31596: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31527: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31599: \$? = $ac_status" >&5
+  echo "$as_me:31530: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_h_errno=yes
 else
@@ -31607,7 +31538,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:31610: result: $cf_cv_have_h_errno" >&5
+echo "$as_me:31541: 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
@@ -31620,7 +31551,7 @@ EOF
 
 fi
 
-echo "$as_me:31623: checking if bibp: URLs should be supported" >&5
+echo "$as_me:31554: 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.
@@ -31637,14 +31568,14 @@ else
   use_bibp_urls=yes
 
 fi;
-echo "$as_me:31640: result: $use_bibp_urls" >&5
+echo "$as_me:31571: 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:31647: checking if configuration info should be browsable" >&5
+echo "$as_me:31578: 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.
@@ -31661,14 +31592,14 @@ else
   use_config_info=yes
 
 fi;
-echo "$as_me:31664: result: $use_config_info" >&5
+echo "$as_me:31595: 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:31671: checking if new-style forms-based options screen should be used" >&5
+echo "$as_me:31602: 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.
@@ -31685,14 +31616,14 @@ else
   use_forms_options=yes
 
 fi;
-echo "$as_me:31688: result: $use_forms_options" >&5
+echo "$as_me:31619: 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:31695: checking if old-style options menu should be used" >&5
+echo "$as_me:31626: 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.
@@ -31709,14 +31640,14 @@ else
   use_menu_options=yes
 
 fi;
-echo "$as_me:31712: result: $use_menu_options" >&5
+echo "$as_me:31643: 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:31719: checking if sessions code should be used" >&5
+echo "$as_me:31650: 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.
@@ -31733,7 +31664,7 @@ else
   use_sessions=yes
 
 fi;
-echo "$as_me:31736: result: $use_sessions" >&5
+echo "$as_me:31667: result: $use_sessions" >&5
 echo "${ECHO_T}$use_sessions" >&6
 if test $use_sessions != no ; then
 
@@ -31744,7 +31675,7 @@ EOF
 	EXTRA_OBJS="$EXTRA_OBJS LYSession\$o"
 fi
 
-echo "$as_me:31747: checking if session-caching code should be used" >&5
+echo "$as_me:31678: 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.
@@ -31761,7 +31692,7 @@ else
   use_session_cache=yes
 
 fi;
-echo "$as_me:31764: result: $use_session_cache" >&5
+echo "$as_me:31695: result: $use_session_cache" >&5
 echo "${ECHO_T}$use_session_cache" >&6
 if test $use_session_cache != no ; then
 
@@ -31771,7 +31702,7 @@ EOF
 
 fi
 
-echo "$as_me:31774: checking if address-list page should be used" >&5
+echo "$as_me:31705: checking if address-list page should be used" >&5
 echo $ECHO_N "checking if address-list page should be used... $ECHO_C" >&6
 
 # Check whether --enable-addrlist-page or --disable-addrlist-page was given.
@@ -31788,14 +31719,14 @@ else
   use_addrlist_page=yes
 
 fi;
-echo "$as_me:31791: result: $use_addrlist_page" >&5
+echo "$as_me:31722: result: $use_addrlist_page" >&5
 echo "${ECHO_T}$use_addrlist_page" >&6
 test $use_addrlist_page != no &&
 cat >>confdefs.h <<\EOF
 #define USE_ADDRLIST_PAGE 1
 EOF
 
-echo "$as_me:31798: checking if experimental CJK logic should be used" >&5
+echo "$as_me:31729: 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.
@@ -31812,14 +31743,14 @@ else
   use_cjk=no
 
 fi;
-echo "$as_me:31815: result: $use_cjk" >&5
+echo "$as_me:31746: 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:31822: checking if experimental Japanese UTF-8 logic should be used" >&5
+echo "$as_me:31753: 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.
@@ -31836,7 +31767,7 @@ else
   use_ja_utf8=no
 
 fi;
-echo "$as_me:31839: result: $use_ja_utf8" >&5
+echo "$as_me:31770: result: $use_ja_utf8" >&5
 echo "${ECHO_T}$use_ja_utf8" >&6
 if test $use_ja_utf8 != no ; then
 
@@ -31882,7 +31813,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 31885 "configure"
+#line 31816 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -31894,16 +31825,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31897: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31828: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31900: \$? = $ac_status" >&5
+  echo "$as_me:31831: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31903: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31834: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31906: \$? = $ac_status" >&5
+  echo "$as_me:31837: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -31920,7 +31851,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}:31923: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:31854: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -31961,7 +31892,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 31964 "configure"
+#line 31895 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -31973,16 +31904,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31976: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31907: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31979: \$? = $ac_status" >&5
+  echo "$as_me:31910: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31982: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31913: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31985: \$? = $ac_status" >&5
+  echo "$as_me:31916: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -31999,7 +31930,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}:32002: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:31933: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -32015,7 +31946,7 @@ echo "${as_me:-configure}:32002: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:32018: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:31949: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -32040,7 +31971,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}:32043: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:31974: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -32069,7 +32000,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}:32072: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:32003: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -32078,7 +32009,7 @@ echo "${as_me:-configure}:32072: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:32081: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:32012: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -32089,7 +32020,7 @@ done
 
 fi;
 
-  echo "$as_me:32092: checking for iconv" >&5
+  echo "$as_me:32023: 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
@@ -32100,12 +32031,12 @@ else
 cf_cv_header_path_iconv=
 cf_cv_library_path_iconv=
 
-echo "${as_me:-configure}:32103: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:32034: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 32108 "configure"
+#line 32039 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -32124,16 +32055,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32127: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32058: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32130: \$? = $ac_status" >&5
+  echo "$as_me:32061: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32133: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32064: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32136: \$? = $ac_status" >&5
+  echo "$as_me:32067: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -32147,7 +32078,7 @@ cat conftest.$ac_ext >&5
 LIBS="-liconv  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 32150 "configure"
+#line 32081 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -32166,16 +32097,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32169: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32100: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32172: \$? = $ac_status" >&5
+  echo "$as_me:32103: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32175: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32106: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32178: \$? = $ac_status" >&5
+  echo "$as_me:32109: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -32192,9 +32123,9 @@ cat conftest.$ac_ext >&5
 
 	test -n "$verbose" && echo "	find linkage for iconv library" 1>&6
 
-echo "${as_me:-configure}:32195: testing find linkage for iconv library ..." 1>&5
+echo "${as_me:-configure}:32126: testing find linkage for iconv library ..." 1>&5
 
-echo "${as_me:-configure}:32197: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:32128: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -32285,11 +32216,11 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d $cf_cv_header_path_iconv ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_iconv" 1>&6
 
-echo "${as_me:-configure}:32288: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:32219: 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 32292 "configure"
+#line 32223 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -32308,21 +32239,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32311: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32242: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32314: \$? = $ac_status" >&5
+  echo "$as_me:32245: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32317: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32248: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32320: \$? = $ac_status" >&5
+  echo "$as_me:32251: \$? = $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}:32325: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:32256: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
 
 				cf_cv_find_linkage_iconv=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -32340,7 +32271,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	if test "$cf_cv_find_linkage_iconv" = maybe ; then
 
-echo "${as_me:-configure}:32343: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:32274: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -32415,13 +32346,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}:32418: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:32349: 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 32424 "configure"
+#line 32355 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -32440,21 +32371,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32443: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32374: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32446: \$? = $ac_status" >&5
+  echo "$as_me:32377: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32449: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32380: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32452: \$? = $ac_status" >&5
+  echo "$as_me:32383: \$? = $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}:32457: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:32388: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
 
 					cf_cv_find_linkage_iconv=yes
 					cf_cv_library_file_iconv="-liconv"
@@ -32494,7 +32425,7 @@ am_cv_func_iconv="no, consider installing GNU libiconv"
 fi
 
 fi
-echo "$as_me:32497: result: $am_cv_func_iconv" >&5
+echo "$as_me:32428: result: $am_cv_func_iconv" >&5
 echo "${ECHO_T}$am_cv_func_iconv" >&6
 
   if test "$am_cv_func_iconv" = yes; then
@@ -32503,14 +32434,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_ICONV 1
 EOF
 
-    echo "$as_me:32506: checking if the declaration of iconv() needs const." >&5
+    echo "$as_me:32437: 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 32513 "configure"
+#line 32444 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -32535,16 +32466,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32538: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32469: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32541: \$? = $ac_status" >&5
+  echo "$as_me:32472: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32544: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32475: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32547: \$? = $ac_status" >&5
+  echo "$as_me:32478: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_proto_iconv_const=no
 else
@@ -32554,7 +32485,7 @@ am_cv_proto_iconv_const=yes
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:32557: result: $am_cv_proto_iconv_const" >&5
+echo "$as_me:32488: 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
@@ -32596,7 +32527,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 32599 "configure"
+#line 32530 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -32608,16 +32539,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32611: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32542: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32614: \$? = $ac_status" >&5
+  echo "$as_me:32545: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32617: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32548: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32620: \$? = $ac_status" >&5
+  echo "$as_me:32551: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -32634,7 +32565,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}:32637: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:32568: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -32671,7 +32602,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}:32674: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:32605: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -32695,7 +32626,7 @@ case $cf_cv_screen in
 esac
 
 if test "$use_dft_colors" != no ; then
-echo "$as_me:32698: checking if you want to use default-colors" >&5
+echo "$as_me:32629: 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.
@@ -32712,7 +32643,7 @@ else
   use_dft_colors=no
 
 fi;
-echo "$as_me:32715: result: $use_dft_colors" >&5
+echo "$as_me:32646: result: $use_dft_colors" >&5
 echo "${ECHO_T}$use_dft_colors" >&6
 test $use_dft_colors = "yes" &&
 cat >>confdefs.h <<\EOF
@@ -32721,7 +32652,7 @@ EOF
 
 fi
 
-echo "$as_me:32724: checking if experimental keyboard-layout logic should be used" >&5
+echo "$as_me:32655: 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.
@@ -32738,14 +32669,14 @@ else
   use_kbd_layout=no
 
 fi;
-echo "$as_me:32741: result: $use_kbd_layout" >&5
+echo "$as_me:32672: 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:32748: checking if experimental nested-table logic should be used" >&5
+echo "$as_me:32679: 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.
@@ -32762,14 +32693,14 @@ else
   use_nested_tables=no
 
 fi;
-echo "$as_me:32765: result: $use_nested_tables" >&5
+echo "$as_me:32696: 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:32772: checking if alternative line-edit bindings should be used" >&5
+echo "$as_me:32703: 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.
@@ -32786,14 +32717,14 @@ else
   use_alt_bindings=yes
 
 fi;
-echo "$as_me:32789: result: $use_alt_bindings" >&5
+echo "$as_me:32720: result: $use_alt_bindings" >&5
 echo "${ECHO_T}$use_alt_bindings" >&6
 test $use_alt_bindings != no &&
 cat >>confdefs.h <<\EOF
 #define USE_ALT_BINDINGS 1
 EOF
 
-echo "$as_me:32796: checking if ascii case-conversion should be used" >&5
+echo "$as_me:32727: checking if ascii case-conversion should be used" >&5
 echo $ECHO_N "checking if ascii case-conversion should be used... $ECHO_C" >&6
 
 # Check whether --enable-ascii-ctypes or --disable-ascii-ctypes was given.
@@ -32810,14 +32741,14 @@ else
   use_ascii_ctypes=yes
 
 fi;
-echo "$as_me:32813: result: $use_ascii_ctypes" >&5
+echo "$as_me:32744: result: $use_ascii_ctypes" >&5
 echo "${ECHO_T}$use_ascii_ctypes" >&6
 test $use_ascii_ctypes != no &&
 cat >>confdefs.h <<\EOF
 #define USE_ASCII_CTYPES 1
 EOF
 
-echo "$as_me:32820: checking if you want to use extended HTML DTD logic" >&5
+echo "$as_me:32751: 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.
@@ -32834,14 +32765,14 @@ else
   use_ext_htmldtd=yes
 
 fi;
-echo "$as_me:32837: result: $use_ext_htmldtd" >&5
+echo "$as_me:32768: 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:32844: checking if file-upload logic should be used" >&5
+echo "$as_me:32775: 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.
@@ -32858,14 +32789,14 @@ else
   use_file_upload=yes
 
 fi;
-echo "$as_me:32861: result: $use_file_upload" >&5
+echo "$as_me:32792: 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:32868: checking if IDNA support should be used" >&5
+echo "$as_me:32799: checking if IDNA support should be used" >&5
 echo $ECHO_N "checking if IDNA support should be used... $ECHO_C" >&6
 
 # Check whether --enable-idna or --disable-idna was given.
@@ -32882,7 +32813,7 @@ else
   use_idna=yes
 
 fi;
-echo "$as_me:32885: result: $use_idna" >&5
+echo "$as_me:32816: result: $use_idna" >&5
 echo "${ECHO_T}$use_idna" >&6
 
 if test "$use_idna" = yes ; then
@@ -32921,7 +32852,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 32924 "configure"
+#line 32855 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -32933,16 +32864,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32936: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32867: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32939: \$? = $ac_status" >&5
+  echo "$as_me:32870: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32942: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32873: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32945: \$? = $ac_status" >&5
+  echo "$as_me:32876: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -32959,7 +32890,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}:32962: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:32893: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -33000,7 +32931,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 33003 "configure"
+#line 32934 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -33012,16 +32943,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33015: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32946: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33018: \$? = $ac_status" >&5
+  echo "$as_me:32949: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33021: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32952: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33024: \$? = $ac_status" >&5
+  echo "$as_me:32955: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -33038,7 +32969,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}:33041: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:32972: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -33054,7 +32985,7 @@ echo "${as_me:-configure}:33041: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:33057: error: cannot find  under $use_idna" >&5
+{ { echo "$as_me:32988: error: cannot find  under $use_idna" >&5
 echo "$as_me: error: cannot find  under $use_idna" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -33079,7 +33010,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}:33082: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:33013: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -33108,7 +33039,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}:33111: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:33042: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -33117,7 +33048,7 @@ echo "${as_me:-configure}:33111: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:33120: error: cannot find  under $use_idna" >&5
+{ { echo "$as_me:33051: error: cannot find  under $use_idna" >&5
 echo "$as_me: error: cannot find  under $use_idna" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -33131,12 +33062,12 @@ done
 cf_cv_header_path_idn=
 cf_cv_library_path_idn=
 
-echo "${as_me:-configure}:33134: testing Starting FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:33065: testing Starting FIND_LINKAGE(idn,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 33139 "configure"
+#line 33070 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -33154,16 +33085,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33157: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33088: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33160: \$? = $ac_status" >&5
+  echo "$as_me:33091: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33163: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33094: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33166: \$? = $ac_status" >&5
+  echo "$as_me:33097: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_idn=yes
@@ -33177,7 +33108,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lidn $LIBICONV $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 33180 "configure"
+#line 33111 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -33195,16 +33126,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33198: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33129: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33201: \$? = $ac_status" >&5
+  echo "$as_me:33132: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33204: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33135: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33207: \$? = $ac_status" >&5
+  echo "$as_me:33138: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_idn=yes
@@ -33221,9 +33152,9 @@ cat conftest.$ac_ext >&5
 
 	test -n "$verbose" && echo "	find linkage for idn library" 1>&6
 
-echo "${as_me:-configure}:33224: testing find linkage for idn library ..." 1>&5
+echo "${as_me:-configure}:33155: testing find linkage for idn library ..." 1>&5
 
-echo "${as_me:-configure}:33226: testing Searching for headers in FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:33157: testing Searching for headers in FIND_LINKAGE(idn,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -33314,11 +33245,11 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d $cf_cv_header_path_idn ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_idn" 1>&6
 
-echo "${as_me:-configure}:33317: testing ... testing $cf_cv_header_path_idn ..." 1>&5
+echo "${as_me:-configure}:33248: testing ... testing $cf_cv_header_path_idn ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_idn"
 			cat >conftest.$ac_ext <<_ACEOF
-#line 33321 "configure"
+#line 33252 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -33336,21 +33267,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33339: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33270: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33342: \$? = $ac_status" >&5
+  echo "$as_me:33273: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33345: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33276: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33348: \$? = $ac_status" >&5
+  echo "$as_me:33279: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 				test -n "$verbose" && echo "	... found idn headers in $cf_cv_header_path_idn" 1>&6
 
-echo "${as_me:-configure}:33353: testing ... found idn headers in $cf_cv_header_path_idn ..." 1>&5
+echo "${as_me:-configure}:33284: testing ... found idn headers in $cf_cv_header_path_idn ..." 1>&5
 
 				cf_cv_find_linkage_idn=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -33368,7 +33299,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	if test "$cf_cv_find_linkage_idn" = maybe ; then
 
-echo "${as_me:-configure}:33371: testing Searching for idn library in FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:33302: testing Searching for idn library in FIND_LINKAGE(idn,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -33443,13 +33374,13 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d $cf_cv_library_path_idn ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_idn" 1>&6
 
-echo "${as_me:-configure}:33446: testing ... testing $cf_cv_library_path_idn ..." 1>&5
+echo "${as_me:-configure}:33377: testing ... testing $cf_cv_library_path_idn ..." 1>&5
 
 					CPPFLAGS="$cf_test_CPPFLAGS"
 					LIBS="-lidn $LIBICONV $cf_save_LIBS"
 					LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_idn"
 					cat >conftest.$ac_ext <<_ACEOF
-#line 33452 "configure"
+#line 33383 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -33467,21 +33398,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33470: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33401: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33473: \$? = $ac_status" >&5
+  echo "$as_me:33404: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33476: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33407: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33479: \$? = $ac_status" >&5
+  echo "$as_me:33410: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 					test -n "$verbose" && echo "	... found idn library in $cf_cv_library_path_idn" 1>&6
 
-echo "${as_me:-configure}:33484: testing ... found idn library in $cf_cv_library_path_idn ..." 1>&5
+echo "${as_me:-configure}:33415: testing ... found idn library in $cf_cv_library_path_idn ..." 1>&5
 
 					cf_cv_find_linkage_idn=yes
 					cf_cv_library_file_idn="-lidn"
@@ -33540,7 +33471,7 @@ if test -n "$cf_cv_header_path_idn" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 33543 "configure"
+#line 33474 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -33552,16 +33483,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33555: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33486: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33558: \$? = $ac_status" >&5
+  echo "$as_me:33489: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33561: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33492: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33564: \$? = $ac_status" >&5
+  echo "$as_me:33495: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -33578,7 +33509,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}:33581: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:33512: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -33612,7 +33543,7 @@ if test -n "$cf_cv_library_path_idn" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:33615: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:33546: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -33637,7 +33568,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:33640: WARNING: Cannot find idn library" >&5
+{ echo "$as_me:33571: WARNING: Cannot find idn library" >&5
 echo "$as_me: WARNING: Cannot find idn library" >&2;}
 fi
 
@@ -33651,7 +33582,7 @@ fi
 
 fi
 
-echo "$as_me:33654: checking if element-justification logic should be used" >&5
+echo "$as_me:33585: 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.
@@ -33668,14 +33599,14 @@ else
   use_justify_elts=yes
 
 fi;
-echo "$as_me:33671: result: $use_justify_elts" >&5
+echo "$as_me:33602: result: $use_justify_elts" >&5
 echo "${ECHO_T}$use_justify_elts" >&6
 test $use_justify_elts != no &&
 cat >>confdefs.h <<\EOF
 #define USE_JUSTIFY_ELTS 1
 EOF
 
-echo "$as_me:33678: checking if partial-display should be used" >&5
+echo "$as_me:33609: 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.
@@ -33692,14 +33623,14 @@ else
   use_partial_display=yes
 
 fi;
-echo "$as_me:33695: result: $use_partial_display" >&5
+echo "$as_me:33626: 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:33702: checking if persistent-cookie logic should be used" >&5
+echo "$as_me:33633: 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.
@@ -33716,14 +33647,14 @@ else
   use_filed_cookies=yes
 
 fi;
-echo "$as_me:33719: result: $use_filed_cookies" >&5
+echo "$as_me:33650: 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:33726: checking if html source should be colorized" >&5
+echo "$as_me:33657: 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.
@@ -33740,14 +33671,14 @@ else
   use_prettysrc=yes
 
 fi;
-echo "$as_me:33743: result: $use_prettysrc" >&5
+echo "$as_me:33674: 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:33750: checking if progress-bar code should be used" >&5
+echo "$as_me:33681: 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.
@@ -33764,14 +33695,14 @@ else
   use_progressbar=yes
 
 fi;
-echo "$as_me:33767: result: $use_progressbar" >&5
+echo "$as_me:33698: 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:33774: checking if read-progress message should show ETA" >&5
+echo "$as_me:33705: 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.
@@ -33788,14 +33719,14 @@ else
   use_read_eta=yes
 
 fi;
-echo "$as_me:33791: result: $use_read_eta" >&5
+echo "$as_me:33722: 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:33798: checking if source caching should be used" >&5
+echo "$as_me:33729: 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.
@@ -33812,14 +33743,14 @@ else
   use_source_cache=yes
 
 fi;
-echo "$as_me:33815: result: $use_source_cache" >&5
+echo "$as_me:33746: 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:33822: checking if scrollbar code should be used" >&5
+echo "$as_me:33753: 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.
@@ -33836,10 +33767,10 @@ else
   use_scrollbar=yes
 
 fi;
-echo "$as_me:33839: result: $use_scrollbar" >&5
+echo "$as_me:33770: result: $use_scrollbar" >&5
 echo "${ECHO_T}$use_scrollbar" >&6
 
-echo "$as_me:33842: checking if charset-selection logic should be used" >&5
+echo "$as_me:33773: checking if charset-selection logic should be used" >&5
 echo $ECHO_N "checking if charset-selection logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-charset-choice or --disable-charset-choice was given.
@@ -33856,14 +33787,14 @@ else
   use_charset_choice=no
 
 fi;
-echo "$as_me:33859: result: $use_charset_choice" >&5
+echo "$as_me:33790: result: $use_charset_choice" >&5
 echo "${ECHO_T}$use_charset_choice" >&6
 test $use_charset_choice != no &&
 cat >>confdefs.h <<\EOF
 #define USE_CHARSET_CHOICE 1
 EOF
 
-echo "$as_me:33866: checking if you want to use external commands" >&5
+echo "$as_me:33797: 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.
@@ -33880,7 +33811,7 @@ else
   use_externs=no
 
 fi;
-echo "$as_me:33883: result: $use_externs" >&5
+echo "$as_me:33814: result: $use_externs" >&5
 echo "${ECHO_T}$use_externs" >&6
 if test $use_externs != "no" ; then
 
@@ -33891,7 +33822,7 @@ EOF
 	EXTRA_OBJS="$EXTRA_OBJS LYExtern\$o"
 fi
 
-echo "$as_me:33894: checking if you want to use setfont support" >&5
+echo "$as_me:33825: 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.
@@ -33908,7 +33839,7 @@ else
   use_setfont=no
 
 fi;
-echo "$as_me:33911: result: $use_setfont" >&5
+echo "$as_me:33842: result: $use_setfont" >&5
 echo "${ECHO_T}$use_setfont" >&6
 if test $use_setfont = yes ; then
 	case $host_os in
@@ -33919,7 +33850,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:33922: checking for $ac_word" >&5
+echo "$as_me:33853: 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
@@ -33936,7 +33867,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:33939: found $ac_dir/$ac_word" >&5
+   echo "$as_me:33870: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -33947,10 +33878,10 @@ fi
 SETFONT=$ac_cv_path_SETFONT
 
 if test -n "$SETFONT"; then
-  echo "$as_me:33950: result: $SETFONT" >&5
+  echo "$as_me:33881: result: $SETFONT" >&5
 echo "${ECHO_T}$SETFONT" >&6
 else
-  echo "$as_me:33953: result: no" >&5
+  echo "$as_me:33884: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -34009,7 +33940,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:34012: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:33943: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define SETFONT_PATH "$cf_path_prog"
@@ -34027,19 +33958,19 @@ fi
 		SETFONT=built-in
 		test -n "$verbose" && echo "	Assume $host_os has font-switching" 1>&6
 
-echo "${as_me:-configure}:34030: testing Assume $host_os has font-switching ..." 1>&5
+echo "${as_me:-configure}:33961: 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}:34037: testing Assume $host_os has no font-switching ..." 1>&5
+echo "${as_me:-configure}:33968: testing Assume $host_os has no font-switching ..." 1>&5
 
 		;;
 	esac
 	if test -z "$SETFONT" ; then
-		{ echo "$as_me:34042: WARNING: Cannot find a font-setting program" >&5
+		{ echo "$as_me:33973: WARNING: Cannot find a font-setting program" >&5
 echo "$as_me: WARNING: Cannot find a font-setting program" >&2;}
 	elif test "$SETFONT" != unknown ; then
 
@@ -34050,7 +33981,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:34053: checking if you want cgi-link support" >&5
+echo "$as_me:33984: 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.
@@ -34067,10 +33998,10 @@ EOF
 else
   enableval=no
 fi;
-echo "$as_me:34070: result: $enableval" >&5
+echo "$as_me:34001: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:34073: checking if you want change-exec support" >&5
+echo "$as_me:34004: 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.
@@ -34087,14 +34018,14 @@ else
   use_change_exec=no
 
 fi;
-echo "$as_me:34090: result: $use_change_exec" >&5
+echo "$as_me:34021: 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:34097: checking if you want exec-links support" >&5
+echo "$as_me:34028: 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.
@@ -34111,14 +34042,14 @@ else
   use_exec_links=$enableval
 
 fi;
-echo "$as_me:34114: result: $use_exec_links" >&5
+echo "$as_me:34045: 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:34121: checking if you want exec-scripts support" >&5
+echo "$as_me:34052: 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.
@@ -34135,14 +34066,14 @@ else
   use_exec_scripts=$enableval
 
 fi;
-echo "$as_me:34138: result: $use_exec_scripts" >&5
+echo "$as_me:34069: 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:34145: checking if you want internal-links feature" >&5
+echo "$as_me:34076: 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.
@@ -34159,14 +34090,14 @@ else
   use_internal_links=no
 
 fi;
-echo "$as_me:34162: result: $use_internal_links" >&5
+echo "$as_me:34093: result: $use_internal_links" >&5
 echo "${ECHO_T}$use_internal_links" >&6
 test $use_internal_links = yes &&
 cat >>confdefs.h <<\EOF
 #define TRACK_INTERNAL_LINKS 1
 EOF
 
-echo "$as_me:34169: checking if you want to fork NSL requests" >&5
+echo "$as_me:34100: 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.
@@ -34183,7 +34114,7 @@ else
   use_nsl_fork=no
 
 fi;
-echo "$as_me:34186: result: $use_nsl_fork" >&5
+echo "$as_me:34117: result: $use_nsl_fork" >&5
 echo "${ECHO_T}$use_nsl_fork" >&6
 if test $use_nsl_fork = yes ; then
 	case $host_os in
@@ -34204,7 +34135,7 @@ EOF
 	esac
 fi
 
-echo "$as_me:34207: checking if you want to log URL requests via syslog" >&5
+echo "$as_me:34138: 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.
@@ -34221,14 +34152,14 @@ else
   use_syslog=no
 
 fi;
-echo "$as_me:34224: result: $use_syslog" >&5
+echo "$as_me:34155: 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:34231: checking if you want to underline links" >&5
+echo "$as_me:34162: 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.
@@ -34245,7 +34176,7 @@ else
   use_underline=no
 
 fi;
-echo "$as_me:34248: result: $use_underline" >&5
+echo "$as_me:34179: result: $use_underline" >&5
 echo "${ECHO_T}$use_underline" >&6
 test $use_underline = yes &&
 cat >>confdefs.h <<\EOF
@@ -34257,7 +34188,7 @@ cat >>confdefs.h <<\EOF
 #define UNDERLINE_LINKS 0
 EOF
 
-echo "$as_me:34260: checking if help files should be gzip'ed" >&5
+echo "$as_me:34191: 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.
@@ -34274,10 +34205,10 @@ else
   use_gzip_help=no
 
 fi;
-echo "$as_me:34277: result: $use_gzip_help" >&5
+echo "$as_me:34208: result: $use_gzip_help" >&5
 echo "${ECHO_T}$use_gzip_help" >&6
 
-echo "$as_me:34280: checking if you want to use libbz2 for decompression of some bzip2 files" >&5
+echo "$as_me:34211: 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.
@@ -34287,7 +34218,7 @@ if test "${with_bzlib+set}" = set; then
 else
   use_bzlib=no
 fi;
-echo "$as_me:34290: result: $use_bzlib" >&5
+echo "$as_me:34221: result: $use_bzlib" >&5
 echo "${ECHO_T}$use_bzlib" >&6
 
 if test ".$use_bzlib" != ".no" ; then
@@ -34326,7 +34257,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 34329 "configure"
+#line 34260 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -34338,16 +34269,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34341: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34272: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34344: \$? = $ac_status" >&5
+  echo "$as_me:34275: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:34347: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34278: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34350: \$? = $ac_status" >&5
+  echo "$as_me:34281: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -34364,7 +34295,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}:34367: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:34298: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -34405,7 +34336,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 34408 "configure"
+#line 34339 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -34417,16 +34348,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34420: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34351: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34423: \$? = $ac_status" >&5
+  echo "$as_me:34354: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:34426: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34357: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34429: \$? = $ac_status" >&5
+  echo "$as_me:34360: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -34443,7 +34374,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}:34446: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:34377: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -34459,7 +34390,7 @@ echo "${as_me:-configure}:34446: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:34462: error: cannot find  under $use_bzlib" >&5
+{ { echo "$as_me:34393: error: cannot find  under $use_bzlib" >&5
 echo "$as_me: error: cannot find  under $use_bzlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -34484,7 +34415,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}:34487: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:34418: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -34513,7 +34444,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}:34516: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:34447: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -34522,7 +34453,7 @@ echo "${as_me:-configure}:34516: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:34525: error: cannot find  under $use_bzlib" >&5
+{ { echo "$as_me:34456: error: cannot find  under $use_bzlib" >&5
 echo "$as_me: error: cannot find  under $use_bzlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -34536,12 +34467,12 @@ done
 cf_cv_header_path_bz2=
 cf_cv_library_path_bz2=
 
-echo "${as_me:-configure}:34539: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:34470: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 34544 "configure"
+#line 34475 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -34558,16 +34489,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34561: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34492: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34564: \$? = $ac_status" >&5
+  echo "$as_me:34495: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:34567: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34498: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34570: \$? = $ac_status" >&5
+  echo "$as_me:34501: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_bz2=yes
@@ -34581,7 +34512,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lbz2  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 34584 "configure"
+#line 34515 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -34598,16 +34529,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34601: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34532: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34604: \$? = $ac_status" >&5
+  echo "$as_me:34535: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:34607: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34538: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34610: \$? = $ac_status" >&5
+  echo "$as_me:34541: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_bz2=yes
@@ -34624,9 +34555,9 @@ cat conftest.$ac_ext >&5
 
 	test -n "$verbose" && echo "	find linkage for bz2 library" 1>&6
 
-echo "${as_me:-configure}:34627: testing find linkage for bz2 library ..." 1>&5
+echo "${as_me:-configure}:34558: testing find linkage for bz2 library ..." 1>&5
 
-echo "${as_me:-configure}:34629: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:34560: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -34717,11 +34648,11 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d $cf_cv_header_path_bz2 ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_bz2" 1>&6
 
-echo "${as_me:-configure}:34720: testing ... testing $cf_cv_header_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:34651: 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 34724 "configure"
+#line 34655 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -34738,21 +34669,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34741: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34672: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34744: \$? = $ac_status" >&5
+  echo "$as_me:34675: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:34747: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34678: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34750: \$? = $ac_status" >&5
+  echo "$as_me:34681: \$? = $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}:34755: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:34686: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5
 
 				cf_cv_find_linkage_bz2=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -34770,7 +34701,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	if test "$cf_cv_find_linkage_bz2" = maybe ; then
 
-echo "${as_me:-configure}:34773: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:34704: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -34778,7 +34709,7 @@ echo "${as_me:-configure}:34773: testing Searching for bz2 library in FIND_LINKA
 		CPPFLAGS="$cf_test_CPPFLAGS"
 		LIBS="-lbz2  $cf_save_LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 34781 "configure"
+#line 34712 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -34795,21 +34726,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34798: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34729: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34801: \$? = $ac_status" >&5
+  echo "$as_me:34732: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:34804: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34735: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34807: \$? = $ac_status" >&5
+  echo "$as_me:34738: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 			test -n "$verbose" && echo "	... found bz2 library in system" 1>&6
 
-echo "${as_me:-configure}:34812: testing ... found bz2 library in system ..." 1>&5
+echo "${as_me:-configure}:34743: testing ... found bz2 library in system ..." 1>&5
 
 			cf_cv_find_linkage_bz2=yes
 else
@@ -34890,13 +34821,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}:34893: testing ... testing $cf_cv_library_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:34824: 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 34899 "configure"
+#line 34830 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -34913,21 +34844,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34916: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34847: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34919: \$? = $ac_status" >&5
+  echo "$as_me:34850: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:34922: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34853: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34925: \$? = $ac_status" >&5
+  echo "$as_me:34856: \$? = $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}:34930: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:34861: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5
 
 					cf_cv_find_linkage_bz2=yes
 					cf_cv_library_file_bz2="-lbz2"
@@ -34986,7 +34917,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 34989 "configure"
+#line 34920 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -34998,16 +34929,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:35001: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34932: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35004: \$? = $ac_status" >&5
+  echo "$as_me:34935: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:35007: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34938: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35010: \$? = $ac_status" >&5
+  echo "$as_me:34941: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -35024,7 +34955,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}:35027: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:34958: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -35058,7 +34989,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}:35061: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:34992: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -35083,7 +35014,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:35086: WARNING: Cannot find bz2 library" >&5
+{ echo "$as_me:35017: WARNING: Cannot find bz2 library" >&5
 echo "$as_me: WARNING: Cannot find bz2 library" >&2;}
 fi
 
@@ -35094,7 +35025,7 @@ EOF
 
 fi
 
-echo "$as_me:35097: checking if you want to use zlib for decompression of some gzip files" >&5
+echo "$as_me:35028: 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.
@@ -35104,7 +35035,7 @@ if test "${with_zlib+set}" = set; then
 else
   use_zlib=no
 fi;
-echo "$as_me:35107: result: $use_zlib" >&5
+echo "$as_me:35038: result: $use_zlib" >&5
 echo "${ECHO_T}$use_zlib" >&6
 
 if test ".$use_zlib" != ".no" ; then
@@ -35143,7 +35074,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 35146 "configure"
+#line 35077 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -35155,16 +35086,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:35158: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35089: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35161: \$? = $ac_status" >&5
+  echo "$as_me:35092: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:35164: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35095: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35167: \$? = $ac_status" >&5
+  echo "$as_me:35098: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -35181,7 +35112,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}:35184: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:35115: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -35222,7 +35153,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 35225 "configure"
+#line 35156 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -35234,16 +35165,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:35237: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35168: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35240: \$? = $ac_status" >&5
+  echo "$as_me:35171: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:35243: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35174: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35246: \$? = $ac_status" >&5
+  echo "$as_me:35177: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -35260,7 +35191,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}:35263: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:35194: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -35276,7 +35207,7 @@ echo "${as_me:-configure}:35263: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:35279: error: cannot find  under $use_zlib" >&5
+{ { echo "$as_me:35210: error: cannot find  under $use_zlib" >&5
 echo "$as_me: error: cannot find  under $use_zlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -35301,7 +35232,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}:35304: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:35235: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -35330,7 +35261,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}:35333: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:35264: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -35339,7 +35270,7 @@ echo "${as_me:-configure}:35333: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:35342: error: cannot find  under $use_zlib" >&5
+{ { echo "$as_me:35273: error: cannot find  under $use_zlib" >&5
 echo "$as_me: error: cannot find  under $use_zlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -35353,12 +35284,12 @@ done
 cf_cv_header_path_z=
 cf_cv_library_path_z=
 
-echo "${as_me:-configure}:35356: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:35287: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 35361 "configure"
+#line 35292 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -35374,16 +35305,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35377: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35308: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35380: \$? = $ac_status" >&5
+  echo "$as_me:35311: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35383: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35314: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35386: \$? = $ac_status" >&5
+  echo "$as_me:35317: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_z=yes
@@ -35397,7 +35328,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lz  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 35400 "configure"
+#line 35331 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -35413,16 +35344,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35416: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35347: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35419: \$? = $ac_status" >&5
+  echo "$as_me:35350: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35422: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35353: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35425: \$? = $ac_status" >&5
+  echo "$as_me:35356: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_z=yes
@@ -35439,9 +35370,9 @@ cat conftest.$ac_ext >&5
 
 	test -n "$verbose" && echo "	find linkage for z library" 1>&6
 
-echo "${as_me:-configure}:35442: testing find linkage for z library ..." 1>&5
+echo "${as_me:-configure}:35373: testing find linkage for z library ..." 1>&5
 
-echo "${as_me:-configure}:35444: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:35375: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -35532,11 +35463,11 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d $cf_cv_header_path_z ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_z" 1>&6
 
-echo "${as_me:-configure}:35535: testing ... testing $cf_cv_header_path_z ..." 1>&5
+echo "${as_me:-configure}:35466: 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 35539 "configure"
+#line 35470 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -35552,21 +35483,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:35555: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35486: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35558: \$? = $ac_status" >&5
+  echo "$as_me:35489: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:35561: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35492: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35564: \$? = $ac_status" >&5
+  echo "$as_me:35495: \$? = $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}:35569: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5
+echo "${as_me:-configure}:35500: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5
 
 				cf_cv_find_linkage_z=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -35584,7 +35515,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	if test "$cf_cv_find_linkage_z" = maybe ; then
 
-echo "${as_me:-configure}:35587: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:35518: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -35592,7 +35523,7 @@ echo "${as_me:-configure}:35587: testing Searching for z library in FIND_LINKAGE
 		CPPFLAGS="$cf_test_CPPFLAGS"
 		LIBS="-lz  $cf_save_LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 35595 "configure"
+#line 35526 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -35608,21 +35539,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35611: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35542: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35614: \$? = $ac_status" >&5
+  echo "$as_me:35545: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35617: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35548: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35620: \$? = $ac_status" >&5
+  echo "$as_me:35551: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 			test -n "$verbose" && echo "	... found z library in system" 1>&6
 
-echo "${as_me:-configure}:35625: testing ... found z library in system ..." 1>&5
+echo "${as_me:-configure}:35556: testing ... found z library in system ..." 1>&5
 
 			cf_cv_find_linkage_z=yes
 else
@@ -35703,13 +35634,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}:35706: testing ... testing $cf_cv_library_path_z ..." 1>&5
+echo "${as_me:-configure}:35637: 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 35712 "configure"
+#line 35643 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -35725,21 +35656,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35728: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35659: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35731: \$? = $ac_status" >&5
+  echo "$as_me:35662: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35734: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35665: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35737: \$? = $ac_status" >&5
+  echo "$as_me:35668: \$? = $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}:35742: testing ... found z library in $cf_cv_library_path_z ..." 1>&5
+echo "${as_me:-configure}:35673: testing ... found z library in $cf_cv_library_path_z ..." 1>&5
 
 					cf_cv_find_linkage_z=yes
 					cf_cv_library_file_z="-lz"
@@ -35798,7 +35729,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 35801 "configure"
+#line 35732 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -35810,16 +35741,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:35813: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35744: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35816: \$? = $ac_status" >&5
+  echo "$as_me:35747: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:35819: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35750: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35822: \$? = $ac_status" >&5
+  echo "$as_me:35753: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -35836,7 +35767,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}:35839: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:35770: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -35870,7 +35801,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}:35873: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:35804: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -35895,7 +35826,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:35898: WARNING: Cannot find z library" >&5
+{ echo "$as_me:35829: WARNING: Cannot find z library" >&5
 echo "$as_me: WARNING: Cannot find z library" >&2;}
 fi
 
@@ -35904,13 +35835,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:35907: checking for $ac_func" >&5
+echo "$as_me:35838: 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 35913 "configure"
+#line 35844 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -35941,16 +35872,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35944: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35875: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35947: \$? = $ac_status" >&5
+  echo "$as_me:35878: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35950: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35881: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35953: \$? = $ac_status" >&5
+  echo "$as_me:35884: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -35960,7 +35891,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:35963: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:35894: 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
@@ -35977,7 +35908,7 @@ EOF
 
 fi
 
-echo "$as_me:35980: checking if you want to exclude FINGER code" >&5
+echo "$as_me:35911: 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.
@@ -35994,14 +35925,14 @@ else
   use_finger=no
 
 fi;
-echo "$as_me:35997: result: $use_finger" >&5
+echo "$as_me:35928: 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:36004: checking if you want to exclude GOPHER code" >&5
+echo "$as_me:35935: 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.
@@ -36018,14 +35949,14 @@ else
   use_gopher=no
 
 fi;
-echo "$as_me:36021: result: $use_gopher" >&5
+echo "$as_me:35952: 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:36028: checking if you want to exclude NEWS code" >&5
+echo "$as_me:35959: 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.
@@ -36042,14 +35973,14 @@ else
   use_news=no
 
 fi;
-echo "$as_me:36045: result: $use_news" >&5
+echo "$as_me:35976: 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:36052: checking if you want to exclude FTP code" >&5
+echo "$as_me:35983: 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.
@@ -36066,14 +35997,14 @@ else
   use_ftp=no
 
 fi;
-echo "$as_me:36069: result: $use_ftp" >&5
+echo "$as_me:36000: result: $use_ftp" >&5
 echo "${ECHO_T}$use_ftp" >&6
 test $use_ftp != "no" &&
 cat >>confdefs.h <<\EOF
 #define DISABLE_FTP 1
 EOF
 
-echo "$as_me:36076: checking if you want to include WAIS code" >&5
+echo "$as_me:36007: checking if you want to include WAIS code" >&5
 echo $ECHO_N "checking if you want to include WAIS code... $ECHO_C" >&6
 
 # Check whether --enable-wais or --disable-wais was given.
@@ -36090,13 +36021,13 @@ else
   use_wais=no
 
 fi;
-echo "$as_me:36093: result: $use_wais" >&5
+echo "$as_me:36024: result: $use_wais" >&5
 echo "${ECHO_T}$use_wais" >&6
 
 MAKE_WAIS="#"
 if test $use_wais != "no"
 then
-	echo "$as_me:36099: checking for fs_free in -lwais" >&5
+	echo "$as_me:36030: checking for fs_free in -lwais" >&5
 echo $ECHO_N "checking for fs_free in -lwais... $ECHO_C" >&6
 if test "${ac_cv_lib_wais_fs_free+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -36104,7 +36035,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lwais  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 36107 "configure"
+#line 36038 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -36123,16 +36054,16 @@ fs_free ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36126: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36057: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36129: \$? = $ac_status" >&5
+  echo "$as_me:36060: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36132: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36063: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36135: \$? = $ac_status" >&5
+  echo "$as_me:36066: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_wais_fs_free=yes
 else
@@ -36143,18 +36074,18 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:36146: result: $ac_cv_lib_wais_fs_free" >&5
+echo "$as_me:36077: result: $ac_cv_lib_wais_fs_free" >&5
 echo "${ECHO_T}$ac_cv_lib_wais_fs_free" >&6
 if test $ac_cv_lib_wais_fs_free = yes; then
 
-echo "$as_me:36150: checking if -lm needed for math functions" >&5
+echo "$as_me:36081: checking if -lm needed for math functions" >&5
 echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6
 if test "${cf_cv_need_libm+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 36157 "configure"
+#line 36088 "configure"
 #include "confdefs.h"
 
 	#include <stdio.h>
@@ -36169,16 +36100,16 @@ double x = rand(); printf("result = %g\n", sin(x))
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36172: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36103: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36175: \$? = $ac_status" >&5
+  echo "$as_me:36106: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36178: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36109: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36181: \$? = $ac_status" >&5
+  echo "$as_me:36112: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_libm=no
 else
@@ -36188,7 +36119,7 @@ cf_cv_need_libm=yes
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:36191: result: $cf_cv_need_libm" >&5
+echo "$as_me:36122: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
 if test "$cf_cv_need_libm" = yes
 then
@@ -36230,23 +36161,23 @@ LIBS="$cf_add_libs"
 for ac_header in wais.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:36233: checking for $ac_header" >&5
+echo "$as_me:36164: 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 36239 "configure"
+#line 36170 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:36243: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:36174: \"$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:36249: \$? = $ac_status" >&5
+  echo "$as_me:36180: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -36265,7 +36196,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:36268: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:36199: 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
@@ -36278,7 +36209,7 @@ done
 		MAKE_WAIS=
 
 else
-  { echo "$as_me:36281: WARNING: could not find WAIS library" >&5
+  { echo "$as_me:36212: WARNING: could not find WAIS library" >&5
 echo "$as_me: WARNING: could not find WAIS library" >&2;}
 fi
 
@@ -36286,7 +36217,7 @@ fi
 
 # All DirEd functions that were enabled on compilation can be disabled
 # or modified at run time via DIRED_MENU symbols in lynx.cfg.
-echo "$as_me:36289: checking if directory-editor code should be used" >&5
+echo "$as_me:36220: 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.
@@ -36303,7 +36234,7 @@ else
   use_dired=yes
 
 fi;
-echo "$as_me:36306: result: $use_dired" >&5
+echo "$as_me:36237: result: $use_dired" >&5
 echo "${ECHO_T}$use_dired" >&6
 
 if test ".$use_dired" != ".no" ; then
@@ -36313,7 +36244,7 @@ cat >>confdefs.h <<\EOF
 #define DIRED_SUPPORT 1
 EOF
 
-	echo "$as_me:36316: checking if you wish to allow extracting from archives via DirEd" >&5
+	echo "$as_me:36247: 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.
@@ -36330,10 +36261,10 @@ EOF
 else
   enableval=yes
 fi;
-	echo "$as_me:36333: result: $enableval" >&5
+	echo "$as_me:36264: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:36336: checking if DirEd mode should override keys" >&5
+	echo "$as_me:36267: 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.
@@ -36357,10 +36288,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:36360: result: $enableval" >&5
+	echo "$as_me:36291: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:36363: checking if you wish to allow permissions commands via DirEd" >&5
+	echo "$as_me:36294: 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.
@@ -36384,10 +36315,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:36387: result: $enableval" >&5
+	echo "$as_me:36318: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:36390: checking if you wish to allow executable-permission commands via DirEd" >&5
+	echo "$as_me:36321: 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.
@@ -36404,10 +36335,10 @@ EOF
 else
   enableval=yes
 fi;
-	echo "$as_me:36407: result: $enableval" >&5
+	echo "$as_me:36338: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:36410: checking if you wish to allow \"tar\" commands from DirEd" >&5
+	echo "$as_me:36341: 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.
@@ -36431,10 +36362,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:36434: result: $enableval" >&5
+	echo "$as_me:36365: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:36437: checking if you wish to allow \"uudecode\" commands from DirEd" >&5
+	echo "$as_me:36368: 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.
@@ -36458,10 +36389,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:36461: result: $enableval" >&5
+	echo "$as_me:36392: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:36464: checking if you wish to allow \"zip\" and \"unzip\" commands from DirEd" >&5
+	echo "$as_me:36395: 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.
@@ -36485,10 +36416,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:36488: result: $enableval" >&5
+	echo "$as_me:36419: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:36491: checking if you wish to allow \"gzip\" and \"gunzip\" commands from DirEd" >&5
+	echo "$as_me:36422: 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.
@@ -36512,11 +36443,11 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:36515: result: $enableval" >&5
+	echo "$as_me:36446: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 fi
 
-echo "$as_me:36519: checking if you want long-directory listings" >&5
+echo "$as_me:36450: 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.
@@ -36540,10 +36471,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-echo "$as_me:36543: result: $enableval" >&5
+echo "$as_me:36474: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:36546: checking if parent-directory references are permitted" >&5
+echo "$as_me:36477: 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.
@@ -36560,7 +36491,7 @@ EOF
 else
   enableval=yes
 fi;
-echo "$as_me:36563: result: $enableval" >&5
+echo "$as_me:36494: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 test -z "$TELNET" && TELNET=telnet
@@ -36568,7 +36499,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:36571: checking for $ac_word" >&5
+echo "$as_me:36502: 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
@@ -36585,7 +36516,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:36588: found $ac_dir/$ac_word" >&5
+   echo "$as_me:36519: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -36596,10 +36527,10 @@ fi
 TELNET=$ac_cv_path_TELNET
 
 if test -n "$TELNET"; then
-  echo "$as_me:36599: result: $TELNET" >&5
+  echo "$as_me:36530: result: $TELNET" >&5
 echo "${ECHO_T}$TELNET" >&6
 else
-  echo "$as_me:36602: result: no" >&5
+  echo "$as_me:36533: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -36658,7 +36589,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:36661: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:36592: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TELNET_PATH "$cf_path_prog"
@@ -36676,7 +36607,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:36679: checking for $ac_word" >&5
+echo "$as_me:36610: 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
@@ -36693,7 +36624,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:36696: found $ac_dir/$ac_word" >&5
+   echo "$as_me:36627: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -36704,10 +36635,10 @@ fi
 TN3270=$ac_cv_path_TN3270
 
 if test -n "$TN3270"; then
-  echo "$as_me:36707: result: $TN3270" >&5
+  echo "$as_me:36638: result: $TN3270" >&5
 echo "${ECHO_T}$TN3270" >&6
 else
-  echo "$as_me:36710: result: no" >&5
+  echo "$as_me:36641: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -36766,7 +36697,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:36769: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:36700: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TN3270_PATH "$cf_path_prog"
@@ -36784,7 +36715,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:36787: checking for $ac_word" >&5
+echo "$as_me:36718: 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
@@ -36801,7 +36732,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:36804: found $ac_dir/$ac_word" >&5
+   echo "$as_me:36735: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -36812,10 +36743,10 @@ fi
 RLOGIN=$ac_cv_path_RLOGIN
 
 if test -n "$RLOGIN"; then
-  echo "$as_me:36815: result: $RLOGIN" >&5
+  echo "$as_me:36746: result: $RLOGIN" >&5
 echo "${ECHO_T}$RLOGIN" >&6
 else
-  echo "$as_me:36818: result: no" >&5
+  echo "$as_me:36749: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -36874,7 +36805,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:36877: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:36808: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define RLOGIN_PATH "$cf_path_prog"
@@ -36892,7 +36823,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:36895: checking for $ac_word" >&5
+echo "$as_me:36826: 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
@@ -36909,7 +36840,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:36912: found $ac_dir/$ac_word" >&5
+   echo "$as_me:36843: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -36920,10 +36851,10 @@ fi
 MV=$ac_cv_path_MV
 
 if test -n "$MV"; then
-  echo "$as_me:36923: result: $MV" >&5
+  echo "$as_me:36854: result: $MV" >&5
 echo "${ECHO_T}$MV" >&6
 else
-  echo "$as_me:36926: result: no" >&5
+  echo "$as_me:36857: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -36982,7 +36913,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:36985: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:36916: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define MV_PATH "$cf_path_prog"
@@ -37000,7 +36931,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:37003: checking for $ac_word" >&5
+echo "$as_me:36934: 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
@@ -37017,7 +36948,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:37020: found $ac_dir/$ac_word" >&5
+   echo "$as_me:36951: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37028,10 +36959,10 @@ fi
 GZIP=$ac_cv_path_GZIP
 
 if test -n "$GZIP"; then
-  echo "$as_me:37031: result: $GZIP" >&5
+  echo "$as_me:36962: result: $GZIP" >&5
 echo "${ECHO_T}$GZIP" >&6
 else
-  echo "$as_me:37034: result: no" >&5
+  echo "$as_me:36965: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37090,7 +37021,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37093: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37024: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define GZIP_PATH "$cf_path_prog"
@@ -37108,7 +37039,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:37111: checking for $ac_word" >&5
+echo "$as_me:37042: 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
@@ -37125,7 +37056,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:37128: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37059: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37136,10 +37067,10 @@ fi
 UNCOMPRESS=$ac_cv_path_UNCOMPRESS
 
 if test -n "$UNCOMPRESS"; then
-  echo "$as_me:37139: result: $UNCOMPRESS" >&5
+  echo "$as_me:37070: result: $UNCOMPRESS" >&5
 echo "${ECHO_T}$UNCOMPRESS" >&6
 else
-  echo "$as_me:37142: result: no" >&5
+  echo "$as_me:37073: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37198,7 +37129,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37201: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37132: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define UNCOMPRESS_PATH "$cf_path_prog"
@@ -37216,7 +37147,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:37219: checking for $ac_word" >&5
+echo "$as_me:37150: 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
@@ -37233,7 +37164,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:37236: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37167: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37244,10 +37175,10 @@ fi
 UNZIP=$ac_cv_path_UNZIP
 
 if test -n "$UNZIP"; then
-  echo "$as_me:37247: result: $UNZIP" >&5
+  echo "$as_me:37178: result: $UNZIP" >&5
 echo "${ECHO_T}$UNZIP" >&6
 else
-  echo "$as_me:37250: result: no" >&5
+  echo "$as_me:37181: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37306,7 +37237,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37309: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37240: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define UNZIP_PATH "$cf_path_prog"
@@ -37324,7 +37255,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:37327: checking for $ac_word" >&5
+echo "$as_me:37258: 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
@@ -37341,7 +37272,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:37344: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37275: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37352,10 +37283,10 @@ fi
 BZIP2=$ac_cv_path_BZIP2
 
 if test -n "$BZIP2"; then
-  echo "$as_me:37355: result: $BZIP2" >&5
+  echo "$as_me:37286: result: $BZIP2" >&5
 echo "${ECHO_T}$BZIP2" >&6
 else
-  echo "$as_me:37358: result: no" >&5
+  echo "$as_me:37289: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37414,7 +37345,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37417: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37348: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define BZIP2_PATH "$cf_path_prog"
@@ -37432,7 +37363,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:37435: checking for $ac_word" >&5
+echo "$as_me:37366: 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
@@ -37449,7 +37380,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:37452: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37383: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37460,10 +37391,10 @@ fi
 TAR=$ac_cv_path_TAR
 
 if test -n "$TAR"; then
-  echo "$as_me:37463: result: $TAR" >&5
+  echo "$as_me:37394: result: $TAR" >&5
 echo "${ECHO_T}$TAR" >&6
 else
-  echo "$as_me:37466: result: no" >&5
+  echo "$as_me:37397: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37522,7 +37453,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37525: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37456: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TAR_PATH "$cf_path_prog"
@@ -37580,7 +37511,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:37583: checking for $ac_word" >&5
+echo "$as_me:37514: 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
@@ -37597,7 +37528,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:37600: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37531: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37608,10 +37539,10 @@ fi
 COMPRESS=$ac_cv_path_COMPRESS
 
 if test -n "$COMPRESS"; then
-  echo "$as_me:37611: result: $COMPRESS" >&5
+  echo "$as_me:37542: result: $COMPRESS" >&5
 echo "${ECHO_T}$COMPRESS" >&6
 else
-  echo "$as_me:37614: result: no" >&5
+  echo "$as_me:37545: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37670,7 +37601,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37673: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37604: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define COMPRESS_PATH "$cf_path_prog"
@@ -37688,7 +37619,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:37691: checking for $ac_word" >&5
+echo "$as_me:37622: 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
@@ -37705,7 +37636,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:37708: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37639: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37716,10 +37647,10 @@ fi
 RM=$ac_cv_path_RM
 
 if test -n "$RM"; then
-  echo "$as_me:37719: result: $RM" >&5
+  echo "$as_me:37650: result: $RM" >&5
 echo "${ECHO_T}$RM" >&6
 else
-  echo "$as_me:37722: result: no" >&5
+  echo "$as_me:37653: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37778,7 +37709,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37781: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37712: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define RM_PATH "$cf_path_prog"
@@ -37796,7 +37727,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:37799: checking for $ac_word" >&5
+echo "$as_me:37730: 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
@@ -37813,7 +37744,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:37816: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37747: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37824,10 +37755,10 @@ fi
 UUDECODE=$ac_cv_path_UUDECODE
 
 if test -n "$UUDECODE"; then
-  echo "$as_me:37827: result: $UUDECODE" >&5
+  echo "$as_me:37758: result: $UUDECODE" >&5
 echo "${ECHO_T}$UUDECODE" >&6
 else
-  echo "$as_me:37830: result: no" >&5
+  echo "$as_me:37761: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37886,7 +37817,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37889: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37820: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define UUDECODE_PATH "$cf_path_prog"
@@ -37904,7 +37835,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:37907: checking for $ac_word" >&5
+echo "$as_me:37838: 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
@@ -37921,7 +37852,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:37924: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37855: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37932,10 +37863,10 @@ fi
 ZCAT=$ac_cv_path_ZCAT
 
 if test -n "$ZCAT"; then
-  echo "$as_me:37935: result: $ZCAT" >&5
+  echo "$as_me:37866: result: $ZCAT" >&5
 echo "${ECHO_T}$ZCAT" >&6
 else
-  echo "$as_me:37938: result: no" >&5
+  echo "$as_me:37869: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37994,7 +37925,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37997: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37928: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define ZCAT_PATH "$cf_path_prog"
@@ -38012,7 +37943,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:38015: checking for $ac_word" >&5
+echo "$as_me:37946: 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
@@ -38029,7 +37960,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:38032: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37963: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -38040,10 +37971,10 @@ fi
 ZIP=$ac_cv_path_ZIP
 
 if test -n "$ZIP"; then
-  echo "$as_me:38043: result: $ZIP" >&5
+  echo "$as_me:37974: result: $ZIP" >&5
 echo "${ECHO_T}$ZIP" >&6
 else
-  echo "$as_me:38046: result: no" >&5
+  echo "$as_me:37977: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -38102,7 +38033,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:38105: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:38036: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define ZIP_PATH "$cf_path_prog"
@@ -38130,7 +38061,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:38133: checking for $ac_word" >&5
+echo "$as_me:38064: 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
@@ -38147,7 +38078,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:38150: found $ac_dir/$ac_word" >&5
+   echo "$as_me:38081: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -38158,10 +38089,10 @@ fi
 INSTALL=$ac_cv_path_INSTALL
 
 if test -n "$INSTALL"; then
-  echo "$as_me:38161: result: $INSTALL" >&5
+  echo "$as_me:38092: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 else
-  echo "$as_me:38164: result: no" >&5
+  echo "$as_me:38095: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -38220,7 +38151,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:38223: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:38154: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define INSTALL_PATH "$cf_path_prog"
@@ -38250,7 +38181,7 @@ if test $cf_cv_screen = pdcurses ; then
 	case $host_os in
 	(mingw*)
 
-echo "$as_me:38253: checking for initscr in -lpdcurses" >&5
+echo "$as_me:38184: checking for initscr in -lpdcurses" >&5
 echo $ECHO_N "checking for initscr in -lpdcurses... $ECHO_C" >&6
 if test "${ac_cv_lib_pdcurses_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -38258,7 +38189,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpdcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 38261 "configure"
+#line 38192 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -38277,16 +38208,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38280: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38211: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38283: \$? = $ac_status" >&5
+  echo "$as_me:38214: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38286: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38217: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38289: \$? = $ac_status" >&5
+  echo "$as_me:38220: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_pdcurses_initscr=yes
 else
@@ -38297,7 +38228,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:38300: result: $ac_cv_lib_pdcurses_initscr" >&5
+echo "$as_me:38231: result: $ac_cv_lib_pdcurses_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_pdcurses_initscr" >&6
 if test $ac_cv_lib_pdcurses_initscr = yes; then
 
@@ -38319,13 +38250,13 @@ LIBS="$cf_add_libs"
 
 	cf_cv_term_header=no
 	cf_cv_unctrl_header=no
-	echo "$as_me:38322: checking for winwstr" >&5
+	echo "$as_me:38253: checking for winwstr" >&5
 echo $ECHO_N "checking for winwstr... $ECHO_C" >&6
 if test "${ac_cv_func_winwstr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 38328 "configure"
+#line 38259 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char winwstr (); below.  */
@@ -38356,16 +38287,16 @@ f = winwstr; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38359: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38290: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38362: \$? = $ac_status" >&5
+  echo "$as_me:38293: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38365: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38296: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38368: \$? = $ac_status" >&5
+  echo "$as_me:38299: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_winwstr=yes
 else
@@ -38375,7 +38306,7 @@ ac_cv_func_winwstr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:38378: result: $ac_cv_func_winwstr" >&5
+echo "$as_me:38309: result: $ac_cv_func_winwstr" >&5
 echo "${ECHO_T}$ac_cv_func_winwstr" >&6
 if test $ac_cv_func_winwstr = yes; then
   cat >>confdefs.h <<\EOF
@@ -38384,13 +38315,13 @@ EOF
 
 fi
 
-	echo "$as_me:38387: checking for pdcurses_dll_iname" >&5
+	echo "$as_me:38318: checking for pdcurses_dll_iname" >&5
 echo $ECHO_N "checking for pdcurses_dll_iname... $ECHO_C" >&6
 if test "${ac_cv_func_pdcurses_dll_iname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 38393 "configure"
+#line 38324 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char pdcurses_dll_iname (); below.  */
@@ -38421,16 +38352,16 @@ f = pdcurses_dll_iname; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38424: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38355: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38427: \$? = $ac_status" >&5
+  echo "$as_me:38358: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38430: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38361: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38433: \$? = $ac_status" >&5
+  echo "$as_me:38364: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_pdcurses_dll_iname=yes
 else
@@ -38440,7 +38371,7 @@ ac_cv_func_pdcurses_dll_iname=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:38443: result: $ac_cv_func_pdcurses_dll_iname" >&5
+echo "$as_me:38374: result: $ac_cv_func_pdcurses_dll_iname" >&5
 echo "${ECHO_T}$ac_cv_func_pdcurses_dll_iname" >&6
 if test $ac_cv_func_pdcurses_dll_iname = yes; then
   cat >>confdefs.h <<\EOF
@@ -38453,7 +38384,7 @@ fi
 
 		;;
 	(*)
-		echo "$as_me:38456: checking for X" >&5
+		echo "$as_me:38387: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -38550,17 +38481,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 38553 "configure"
+#line 38484 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:38557: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:38488: \"$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:38563: \$? = $ac_status" >&5
+  echo "$as_me:38494: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -38593,7 +38524,7 @@ if test "$ac_x_libraries" = no; then
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >conftest.$ac_ext <<_ACEOF
-#line 38596 "configure"
+#line 38527 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -38605,16 +38536,16 @@ XtMalloc (0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38608: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38539: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38611: \$? = $ac_status" >&5
+  echo "$as_me:38542: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38614: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38545: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38617: \$? = $ac_status" >&5
+  echo "$as_me:38548: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -38652,7 +38583,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:38655: result: $have_x" >&5
+  echo "$as_me:38586: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -38662,7 +38593,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:38665: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:38596: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -38686,11 +38617,11 @@ else
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:38689: checking whether -R must be followed by a space" >&5
+      echo "$as_me:38620: 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 38693 "configure"
+#line 38624 "configure"
 #include "confdefs.h"
 
 int
@@ -38702,16 +38633,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38705: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38636: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38708: \$? = $ac_status" >&5
+  echo "$as_me:38639: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38711: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38642: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38714: \$? = $ac_status" >&5
+  echo "$as_me:38645: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_nospace=yes
 else
@@ -38721,13 +38652,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:38724: result: no" >&5
+	echo "$as_me:38655: 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 38730 "configure"
+#line 38661 "configure"
 #include "confdefs.h"
 
 int
@@ -38739,16 +38670,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38742: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38673: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38745: \$? = $ac_status" >&5
+  echo "$as_me:38676: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38748: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38679: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38751: \$? = $ac_status" >&5
+  echo "$as_me:38682: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_space=yes
 else
@@ -38758,11 +38689,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:38761: result: yes" >&5
+	  echo "$as_me:38692: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:38765: result: neither works" >&5
+	  echo "$as_me:38696: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -38782,7 +38713,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 38785 "configure"
+#line 38716 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -38801,22 +38732,22 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38804: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38735: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38807: \$? = $ac_status" >&5
+  echo "$as_me:38738: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38810: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38741: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38813: \$? = $ac_status" >&5
+  echo "$as_me:38744: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:38819: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:38750: 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
@@ -38824,7 +38755,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 38827 "configure"
+#line 38758 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -38843,16 +38774,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38846: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38777: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38849: \$? = $ac_status" >&5
+  echo "$as_me:38780: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38852: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38783: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38855: \$? = $ac_status" >&5
+  echo "$as_me:38786: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -38863,14 +38794,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:38866: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:38797: 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:38873: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:38804: 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
@@ -38878,7 +38809,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 38881 "configure"
+#line 38812 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -38897,16 +38828,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38900: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38831: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38903: \$? = $ac_status" >&5
+  echo "$as_me:38834: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38906: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38837: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38909: \$? = $ac_status" >&5
+  echo "$as_me:38840: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -38917,7 +38848,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:38920: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:38851: 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"
@@ -38936,13 +38867,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:38939: checking for gethostbyname" >&5
+    echo "$as_me:38870: 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 38945 "configure"
+#line 38876 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname (); below.  */
@@ -38973,16 +38904,16 @@ f = gethostbyname; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38976: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38907: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38979: \$? = $ac_status" >&5
+  echo "$as_me:38910: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38982: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38913: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38985: \$? = $ac_status" >&5
+  echo "$as_me:38916: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -38992,11 +38923,11 @@ ac_cv_func_gethostbyname=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:38995: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:38926: 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:38999: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:38930: 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
@@ -39004,7 +38935,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 39007 "configure"
+#line 38938 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -39023,16 +38954,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39026: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38957: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39029: \$? = $ac_status" >&5
+  echo "$as_me:38960: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39032: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38963: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39035: \$? = $ac_status" >&5
+  echo "$as_me:38966: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -39043,14 +38974,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:39046: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:38977: 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:39053: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:38984: 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
@@ -39058,7 +38989,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 39061 "configure"
+#line 38992 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -39077,16 +39008,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39080: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39011: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39083: \$? = $ac_status" >&5
+  echo "$as_me:39014: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39086: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39017: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39089: \$? = $ac_status" >&5
+  echo "$as_me:39020: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -39097,7 +39028,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:39100: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:39031: 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"
@@ -39113,13 +39044,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:39116: checking for connect" >&5
+    echo "$as_me:39047: 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 39122 "configure"
+#line 39053 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect (); below.  */
@@ -39150,16 +39081,16 @@ f = connect; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39153: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39084: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39156: \$? = $ac_status" >&5
+  echo "$as_me:39087: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39159: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39090: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39162: \$? = $ac_status" >&5
+  echo "$as_me:39093: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_connect=yes
 else
@@ -39169,11 +39100,11 @@ ac_cv_func_connect=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:39172: result: $ac_cv_func_connect" >&5
+echo "$as_me:39103: 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:39176: checking for connect in -lsocket" >&5
+      echo "$as_me:39107: 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
@@ -39181,7 +39112,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 39184 "configure"
+#line 39115 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -39200,16 +39131,16 @@ connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39203: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39134: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39206: \$? = $ac_status" >&5
+  echo "$as_me:39137: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39209: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39140: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39212: \$? = $ac_status" >&5
+  echo "$as_me:39143: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -39220,7 +39151,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:39223: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:39154: 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"
@@ -39229,13 +39160,13 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:39232: checking for remove" >&5
+    echo "$as_me:39163: 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 39238 "configure"
+#line 39169 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove (); below.  */
@@ -39266,16 +39197,16 @@ f = remove; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39269: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39200: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39272: \$? = $ac_status" >&5
+  echo "$as_me:39203: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39275: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39206: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39278: \$? = $ac_status" >&5
+  echo "$as_me:39209: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_remove=yes
 else
@@ -39285,11 +39216,11 @@ ac_cv_func_remove=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:39288: result: $ac_cv_func_remove" >&5
+echo "$as_me:39219: 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:39292: checking for remove in -lposix" >&5
+      echo "$as_me:39223: 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
@@ -39297,7 +39228,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 39300 "configure"
+#line 39231 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -39316,16 +39247,16 @@ remove ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39319: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39250: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39322: \$? = $ac_status" >&5
+  echo "$as_me:39253: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39325: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39256: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39328: \$? = $ac_status" >&5
+  echo "$as_me:39259: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -39336,7 +39267,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:39339: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:39270: 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"
@@ -39345,13 +39276,13 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:39348: checking for shmat" >&5
+    echo "$as_me:39279: 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 39354 "configure"
+#line 39285 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat (); below.  */
@@ -39382,16 +39313,16 @@ f = shmat; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39385: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39316: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39388: \$? = $ac_status" >&5
+  echo "$as_me:39319: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39391: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39322: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39394: \$? = $ac_status" >&5
+  echo "$as_me:39325: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -39401,11 +39332,11 @@ ac_cv_func_shmat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:39404: result: $ac_cv_func_shmat" >&5
+echo "$as_me:39335: 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:39408: checking for shmat in -lipc" >&5
+      echo "$as_me:39339: 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
@@ -39413,7 +39344,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 39416 "configure"
+#line 39347 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -39432,16 +39363,16 @@ shmat ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39435: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39366: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39438: \$? = $ac_status" >&5
+  echo "$as_me:39369: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39441: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39372: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39444: \$? = $ac_status" >&5
+  echo "$as_me:39375: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -39452,7 +39383,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:39455: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:39386: 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"
@@ -39470,7 +39401,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:39473: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:39404: 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
@@ -39478,7 +39409,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 39481 "configure"
+#line 39412 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -39497,16 +39428,16 @@ IceConnectionNumber ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39500: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39431: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39503: \$? = $ac_status" >&5
+  echo "$as_me:39434: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39506: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39437: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39509: \$? = $ac_status" >&5
+  echo "$as_me:39440: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -39517,7 +39448,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:39520: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:39451: 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"
@@ -39529,7 +39460,7 @@ fi
 
 cf_x_athena=${cf_x_athena:-Xaw}
 
-echo "$as_me:39532: checking if you want to link with Xaw 3d library" >&5
+echo "$as_me:39463: 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=
 
@@ -39540,14 +39471,14 @@ if test "${with_Xaw3d+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3d
-	echo "$as_me:39543: result: yes" >&5
+	echo "$as_me:39474: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:39546: result: no" >&5
+	echo "$as_me:39477: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:39550: checking if you want to link with Xaw 3d xft library" >&5
+echo "$as_me:39481: checking if you want to link with Xaw 3d xft library" >&5
 echo $ECHO_N "checking if you want to link with Xaw 3d xft library... $ECHO_C" >&6
 withval=
 
@@ -39558,14 +39489,14 @@ if test "${with_Xaw3dxft+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3dxft
-	echo "$as_me:39561: result: yes" >&5
+	echo "$as_me:39492: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:39564: result: no" >&5
+	echo "$as_me:39495: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:39568: checking if you want to link with neXT Athena library" >&5
+echo "$as_me:39499: 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=
 
@@ -39576,14 +39507,14 @@ if test "${with_neXtaw+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=neXtaw
-	echo "$as_me:39579: result: yes" >&5
+	echo "$as_me:39510: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:39582: result: no" >&5
+	echo "$as_me:39513: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:39586: checking if you want to link with Athena-Plus library" >&5
+echo "$as_me:39517: 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=
 
@@ -39594,10 +39525,10 @@ if test "${with_XawPlus+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=XawPlus
-	echo "$as_me:39597: result: yes" >&5
+	echo "$as_me:39528: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:39600: result: no" >&5
+	echo "$as_me:39531: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -39617,17 +39548,17 @@ if test "$PKG_CONFIG" != none ; then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists $cf_athena_pkg; then
 	test -n "$verbose" && echo "	found package $cf_athena_pkg" 1>&6
 
-echo "${as_me:-configure}:39620: testing found package $cf_athena_pkg ..." 1>&5
+echo "${as_me:-configure}:39551: testing found package $cf_athena_pkg ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags $cf_athena_pkg 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   $cf_athena_pkg 2>/dev/null`"
 	test -n "$verbose" && echo "	package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:39626: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:39557: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package $cf_athena_pkg LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:39630: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:39561: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -39738,20 +39669,20 @@ EOF
 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
 
-echo "${as_me:-configure}:39741: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:39672: testing ..trimmed $LIBS ..." 1>&5
 
 			;;
 		esac
 	done
 
-echo "$as_me:39747: checking for usable $cf_x_athena/Xmu package" >&5
+echo "$as_me:39678: checking for usable $cf_x_athena/Xmu package" >&5
 echo $ECHO_N "checking for usable $cf_x_athena/Xmu package... $ECHO_C" >&6
 if test "${cf_cv_xaw_compat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 39754 "configure"
+#line 39685 "configure"
 #include "confdefs.h"
 
 #include <X11/Xmu/CharSet.h>
@@ -39767,16 +39698,16 @@ int check = XmuCompareISOLatin1("big", "small")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39770: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39701: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39773: \$? = $ac_status" >&5
+  echo "$as_me:39704: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39776: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39707: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39779: \$? = $ac_status" >&5
+  echo "$as_me:39710: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xaw_compat=yes
 else
@@ -39786,7 +39717,7 @@ cf_cv_xaw_compat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:39789: result: $cf_cv_xaw_compat" >&5
+echo "$as_me:39720: result: $cf_cv_xaw_compat" >&5
 echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 
 			if test "$cf_cv_xaw_compat" = no
@@ -39798,7 +39729,7 @@ echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 				(*)
 					test -n "$verbose" && echo "	work around broken package" 1>&6
 
-echo "${as_me:-configure}:39801: testing work around broken package ..." 1>&5
+echo "${as_me:-configure}:39732: testing work around broken package ..." 1>&5
 
 					cf_save_xmu="$LIBS"
 					cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^  *//' -e 's/ .*//'`
@@ -39806,17 +39737,17 @@ echo "${as_me:-configure}:39801: testing work around broken package ..." 1>&5
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xmu; then
 	test -n "$verbose" && echo "	found package xmu" 1>&6
 
-echo "${as_me:-configure}:39809: testing found package xmu ..." 1>&5
+echo "${as_me:-configure}:39740: testing found package xmu ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags xmu 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   xmu 2>/dev/null`"
 	test -n "$verbose" && echo "	package xmu CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:39815: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:39746: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package xmu LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:39819: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:39750: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -39916,12 +39847,12 @@ LIBS="$cf_add_libs"
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:39919: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:39850: testing ...before $LIBS ..." 1>&5
 
 LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%$cf_first_lib %$cf_first_lib $cf_pkgconfig_libs %" -e 's%  % %g'`
 test -n "$verbose" && echo "	...after  $LIBS" 1>&6
 
-echo "${as_me:-configure}:39924: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:39855: testing ...after  $LIBS ..." 1>&5
 
 else
 	cf_pkgconfig_incs=
@@ -39929,12 +39860,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:39932: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:39863: testing ...before $LIBS ..." 1>&5
 
 LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%$cf_first_lib %$cf_first_lib -lXmu %" -e 's%  % %g'`
 test -n "$verbose" && echo "	...after  $LIBS" 1>&6
 
-echo "${as_me:-configure}:39937: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:39868: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -39945,7 +39876,7 @@ fi
 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
 
-echo "${as_me:-configure}:39948: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:39879: testing ..trimmed $LIBS ..." 1>&5
 
 			;;
 		esac
@@ -39970,17 +39901,17 @@ if test -z "$cf_x_athena_lib" ; then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists Xext; then
 	test -n "$verbose" && echo "	found package Xext" 1>&6
 
-echo "${as_me:-configure}:39973: testing found package Xext ..." 1>&5
+echo "${as_me:-configure}:39904: testing found package Xext ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags Xext 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   Xext 2>/dev/null`"
 	test -n "$verbose" && echo "	package Xext CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:39979: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:39910: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package Xext LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:39983: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:39914: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -40081,7 +40012,7 @@ else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
 
-	echo "$as_me:40084: checking for XextCreateExtension in -lXext" >&5
+	echo "$as_me:40015: 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
@@ -40089,7 +40020,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 40092 "configure"
+#line 40023 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -40108,16 +40039,16 @@ XextCreateExtension ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40111: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40042: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40114: \$? = $ac_status" >&5
+  echo "$as_me:40045: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40117: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40048: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40120: \$? = $ac_status" >&5
+  echo "$as_me:40051: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
@@ -40128,7 +40059,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:40131: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:40062: 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
 
@@ -40164,17 +40095,17 @@ then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then
 	test -n "$verbose" && echo "	found package x11" 1>&6
 
-echo "${as_me:-configure}:40167: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:40098: testing found package x11 ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags x11 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   x11 2>/dev/null`"
 	test -n "$verbose" && echo "	package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:40173: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:40104: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package x11 LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:40177: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:40108: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -40274,24 +40205,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:40277: WARNING: unable to find X11 library" >&5
+	{ echo "$as_me:40208: WARNING: unable to find X11 library" >&5
 echo "$as_me: WARNING: unable to find X11 library" >&2;}
 fi
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then
 	test -n "$verbose" && echo "	found package ice" 1>&6
 
-echo "${as_me:-configure}:40284: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:40215: testing found package ice ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags ice 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   ice 2>/dev/null`"
 	test -n "$verbose" && echo "	package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:40290: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:40221: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package ice LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:40294: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:40225: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -40391,24 +40322,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:40394: WARNING: unable to find ICE library" >&5
+	{ echo "$as_me:40325: WARNING: unable to find ICE library" >&5
 echo "$as_me: WARNING: unable to find ICE library" >&2;}
 fi
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then
 	test -n "$verbose" && echo "	found package sm" 1>&6
 
-echo "${as_me:-configure}:40401: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:40332: testing found package sm ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags sm 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   sm 2>/dev/null`"
 	test -n "$verbose" && echo "	package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:40407: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:40338: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package sm LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:40411: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:40342: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -40508,24 +40439,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:40511: WARNING: unable to find SM library" >&5
+	{ echo "$as_me:40442: WARNING: unable to find SM library" >&5
 echo "$as_me: WARNING: unable to find SM library" >&2;}
 fi
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then
 	test -n "$verbose" && echo "	found package xt" 1>&6
 
-echo "${as_me:-configure}:40518: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:40449: testing found package xt ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags xt 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   xt 2>/dev/null`"
 	test -n "$verbose" && echo "	package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:40524: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:40455: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package xt LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:40528: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:40459: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -40625,7 +40556,7 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:40628: WARNING: unable to find Xt library" >&5
+	{ echo "$as_me:40559: WARNING: unable to find Xt library" >&5
 echo "$as_me: WARNING: unable to find Xt library" >&2;}
 fi
 
@@ -40636,17 +40567,17 @@ cf_have_X_LIBS=no
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then
 	test -n "$verbose" && echo "	found package xt" 1>&6
 
-echo "${as_me:-configure}:40639: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:40570: testing found package xt ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags xt 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   xt 2>/dev/null`"
 	test -n "$verbose" && echo "	package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:40645: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:40576: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package xt LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:40649: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:40580: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -40747,14 +40678,14 @@ LIBS="$cf_add_libs"
 		;;
 	(*)
 # we have an "xt" package, but it may omit Xt's dependency on X11
-echo "$as_me:40750: checking for usable X dependency" >&5
+echo "$as_me:40681: checking for usable X dependency" >&5
 echo $ECHO_N "checking for usable X dependency... $ECHO_C" >&6
 if test "${cf_cv_xt_x11_compat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 40757 "configure"
+#line 40688 "configure"
 #include "confdefs.h"
 
 #include <X11/Xlib.h>
@@ -40773,16 +40704,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40776: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40707: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40779: \$? = $ac_status" >&5
+  echo "$as_me:40710: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40782: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40713: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40785: \$? = $ac_status" >&5
+  echo "$as_me:40716: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xt_x11_compat=yes
 else
@@ -40792,30 +40723,30 @@ cf_cv_xt_x11_compat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:40795: result: $cf_cv_xt_x11_compat" >&5
+echo "$as_me:40726: result: $cf_cv_xt_x11_compat" >&5
 echo "${ECHO_T}$cf_cv_xt_x11_compat" >&6
 		if test "$cf_cv_xt_x11_compat" = no
 		then
 			test -n "$verbose" && echo "	work around broken X11 dependency" 1>&6
 
-echo "${as_me:-configure}:40801: testing work around broken X11 dependency ..." 1>&5
+echo "${as_me:-configure}:40732: testing work around broken X11 dependency ..." 1>&5
 
 			# 2010/11/19 - good enough until a working Xt on Xcb is delivered.
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then
 	test -n "$verbose" && echo "	found package x11" 1>&6
 
-echo "${as_me:-configure}:40808: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:40739: testing found package x11 ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags x11 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   x11 2>/dev/null`"
 	test -n "$verbose" && echo "	package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:40814: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:40745: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package x11 LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:40818: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:40749: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -40918,12 +40849,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:40921: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:40852: testing ...before $LIBS ..." 1>&5
 
 LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%-lXt %-lXt -lX11 %" -e 's%  % %g'`
 test -n "$verbose" && echo "	...after  $LIBS" 1>&6
 
-echo "${as_me:-configure}:40926: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:40857: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -40931,14 +40862,14 @@ fi
 		;;
 	esac
 
-echo "$as_me:40934: checking for usable X Toolkit package" >&5
+echo "$as_me:40865: checking for usable X Toolkit package" >&5
 echo $ECHO_N "checking for usable X Toolkit package... $ECHO_C" >&6
 if test "${cf_cv_xt_ice_compat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 40941 "configure"
+#line 40872 "configure"
 #include "confdefs.h"
 
 #include <X11/Shell.h>
@@ -40953,16 +40884,16 @@ int num = IceConnectionNumber(0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40956: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40887: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40959: \$? = $ac_status" >&5
+  echo "$as_me:40890: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40962: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40893: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40965: \$? = $ac_status" >&5
+  echo "$as_me:40896: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xt_ice_compat=yes
 else
@@ -40972,7 +40903,7 @@ cf_cv_xt_ice_compat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:40975: result: $cf_cv_xt_ice_compat" >&5
+echo "$as_me:40906: result: $cf_cv_xt_ice_compat" >&5
 echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
 
 	if test "$cf_cv_xt_ice_compat" = no
@@ -40986,22 +40917,22 @@ echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
 			(*)
 				test -n "$verbose" && echo "	work around broken ICE dependency" 1>&6
 
-echo "${as_me:-configure}:40989: testing work around broken ICE dependency ..." 1>&5
+echo "${as_me:-configure}:40920: testing work around broken ICE dependency ..." 1>&5
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then
 	test -n "$verbose" && echo "	found package ice" 1>&6
 
-echo "${as_me:-configure}:40994: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:40925: testing found package ice ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags ice 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   ice 2>/dev/null`"
 	test -n "$verbose" && echo "	package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:41000: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:40931: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package ice LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:41004: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:40935: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -41100,17 +41031,17 @@ LIBS="$cf_add_libs"
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then
 	test -n "$verbose" && echo "	found package sm" 1>&6
 
-echo "${as_me:-configure}:41103: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:41034: testing found package sm ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags sm 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   sm 2>/dev/null`"
 	test -n "$verbose" && echo "	package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:41109: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:41040: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package sm LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:41113: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:41044: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -41219,12 +41150,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:41222: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:41153: testing ...before $LIBS ..." 1>&5
 
 LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%-lXt %-lXt $X_PRE_LIBS %" -e 's%  % %g'`
 test -n "$verbose" && echo "	...after  $LIBS" 1>&6
 
-echo "${as_me:-configure}:41227: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:41158: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -41244,7 +41175,7 @@ else
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:41247: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:41178: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -41315,7 +41246,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}:41318: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:41249: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	CFLAGS="$CFLAGS $cf_new_cflags"
 fi
@@ -41323,7 +41254,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}:41326: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:41257: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
 fi
@@ -41331,14 +41262,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}:41334: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:41265: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
 
 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
 fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 41341 "configure"
+#line 41272 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -41350,16 +41281,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:41353: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41284: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41356: \$? = $ac_status" >&5
+  echo "$as_me:41287: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:41359: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41290: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41362: \$? = $ac_status" >&5
+  echo "$as_me:41293: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -41367,12 +41298,12 @@ else
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:41370: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:41301: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
 
 	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:41375: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:41306: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_flags"
@@ -41380,13 +41311,13 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-	echo "$as_me:41383: checking for XOpenDisplay" >&5
+	echo "$as_me:41314: 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 41389 "configure"
+#line 41320 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char XOpenDisplay (); below.  */
@@ -41417,16 +41348,16 @@ f = XOpenDisplay; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:41420: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41351: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41423: \$? = $ac_status" >&5
+  echo "$as_me:41354: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:41426: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41357: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41429: \$? = $ac_status" >&5
+  echo "$as_me:41360: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_XOpenDisplay=yes
 else
@@ -41436,13 +41367,13 @@ ac_cv_func_XOpenDisplay=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:41439: result: $ac_cv_func_XOpenDisplay" >&5
+echo "$as_me:41370: 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:41445: checking for XOpenDisplay in -lX11" >&5
+	echo "$as_me:41376: 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
@@ -41450,7 +41381,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 41453 "configure"
+#line 41384 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -41469,16 +41400,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:41472: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41403: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41475: \$? = $ac_status" >&5
+  echo "$as_me:41406: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:41478: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41409: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41481: \$? = $ac_status" >&5
+  echo "$as_me:41412: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -41489,7 +41420,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:41492: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:41423: 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
 
@@ -41513,13 +41444,13 @@ fi
 
 fi
 
-	echo "$as_me:41516: checking for XtAppInitialize" >&5
+	echo "$as_me:41447: 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 41522 "configure"
+#line 41453 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char XtAppInitialize (); below.  */
@@ -41550,16 +41481,16 @@ f = XtAppInitialize; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:41553: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41484: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41556: \$? = $ac_status" >&5
+  echo "$as_me:41487: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:41559: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41490: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41562: \$? = $ac_status" >&5
+  echo "$as_me:41493: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_XtAppInitialize=yes
 else
@@ -41569,13 +41500,13 @@ ac_cv_func_XtAppInitialize=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:41572: result: $ac_cv_func_XtAppInitialize" >&5
+echo "$as_me:41503: 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:41578: checking for XtAppInitialize in -lXt" >&5
+	echo "$as_me:41509: 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
@@ -41583,7 +41514,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 41586 "configure"
+#line 41517 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -41602,16 +41533,16 @@ XtAppInitialize ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:41605: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41536: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41608: \$? = $ac_status" >&5
+  echo "$as_me:41539: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:41611: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41542: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41614: \$? = $ac_status" >&5
+  echo "$as_me:41545: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xt_XtAppInitialize=yes
 else
@@ -41622,7 +41553,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:41625: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "$as_me:41556: 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
 
@@ -41639,7 +41570,7 @@ fi
 fi
 
 if test $cf_have_X_LIBS = no ; then
-	{ echo "$as_me:41642: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+	{ echo "$as_me:41573: 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
@@ -41661,14 +41592,14 @@ do
 		cf_test=X11/$cf_x_athena_root/SimpleMenu.h
 		if test $cf_path != default ; then
 			CPPFLAGS="$cf_save -I$cf_path/include"
-			echo "$as_me:41664: checking for $cf_test in $cf_path" >&5
+			echo "$as_me:41595: 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:41667: checking for $cf_test" >&5
+			echo "$as_me:41598: checking for $cf_test" >&5
 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
 		fi
 		cat >conftest.$ac_ext <<_ACEOF
-#line 41671 "configure"
+#line 41602 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -41682,16 +41613,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:41685: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:41616: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:41688: \$? = $ac_status" >&5
+  echo "$as_me:41619: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:41691: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41622: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41694: \$? = $ac_status" >&5
+  echo "$as_me:41625: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -41700,7 +41631,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-		echo "$as_me:41703: result: $cf_result" >&5
+		echo "$as_me:41634: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 		if test "$cf_result" = yes ; then
 			cf_x_athena_inc=$cf_path
@@ -41712,7 +41643,7 @@ echo "${ECHO_T}$cf_result" >&6
 done
 
 if test -z "$cf_x_athena_inc" ; then
-	{ echo "$as_me:41715: WARNING: Unable to successfully find Athena header files with test program" >&5
+	{ echo "$as_me:41646: WARNING: Unable to successfully find Athena header files with test program" >&5
 echo "$as_me: WARNING: Unable to successfully find Athena header files with test program" >&2;}
 elif test "$cf_x_athena_inc" != default ; then
 	CPPFLAGS="$CPPFLAGS -I$cf_x_athena_inc"
@@ -41758,7 +41689,7 @@ do
 done
 LIBS="$cf_add_libs"
 
-				echo "$as_me:41761: checking for $cf_libs in $cf_path" >&5
+				echo "$as_me:41692: checking for $cf_libs in $cf_path" >&5
 echo $ECHO_N "checking for $cf_libs in $cf_path... $ECHO_C" >&6
 			else
 
@@ -41778,11 +41709,11 @@ do
 done
 LIBS="$cf_add_libs"
 
-				echo "$as_me:41781: checking for $cf_test in $cf_libs" >&5
+				echo "$as_me:41712: checking for $cf_test in $cf_libs" >&5
 echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6
 			fi
 			cat >conftest.$ac_ext <<_ACEOF
-#line 41785 "configure"
+#line 41716 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -41798,16 +41729,16 @@ $cf_test((XtAppContext) 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:41801: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41732: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41804: \$? = $ac_status" >&5
+  echo "$as_me:41735: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:41807: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41738: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41810: \$? = $ac_status" >&5
+  echo "$as_me:41741: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -41816,7 +41747,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-			echo "$as_me:41819: result: $cf_result" >&5
+			echo "$as_me:41750: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				cf_x_athena_lib="$cf_libs"
@@ -41830,7 +41761,7 @@ echo "${ECHO_T}$cf_result" >&6
 done
 
 if test -z "$cf_x_athena_lib" ; then
-	{ { echo "$as_me:41833: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+	{ { echo "$as_me:41764: 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
@@ -41848,7 +41779,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:41851: checking for $ac_word" >&5
+echo "$as_me:41782: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_XCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -41863,7 +41794,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_XCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:41866: found $ac_dir/$ac_word" >&5
+echo "$as_me:41797: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -41871,10 +41802,10 @@ fi
 fi
 XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG
 if test -n "$XCURSES_CONFIG"; then
-  echo "$as_me:41874: result: $XCURSES_CONFIG" >&5
+  echo "$as_me:41805: result: $XCURSES_CONFIG" >&5
 echo "${ECHO_T}$XCURSES_CONFIG" >&6
 else
-  echo "$as_me:41877: result: no" >&5
+  echo "$as_me:41808: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -41887,7 +41818,7 @@ if test -z "$XCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:41890: checking for $ac_word" >&5
+echo "$as_me:41821: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_XCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -41902,7 +41833,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_XCURSES_CONFIG="$ac_prog"
-echo "$as_me:41905: found $ac_dir/$ac_word" >&5
+echo "$as_me:41836: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -41910,10 +41841,10 @@ fi
 fi
 ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG
 if test -n "$ac_ct_XCURSES_CONFIG"; then
-  echo "$as_me:41913: result: $ac_ct_XCURSES_CONFIG" >&5
+  echo "$as_me:41844: result: $ac_ct_XCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6
 else
-  echo "$as_me:41916: result: no" >&5
+  echo "$as_me:41847: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -41952,7 +41883,7 @@ LDFLAGS="$LDFLAGS $X_LIBS"
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:41955: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:41886: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -42023,7 +41954,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}:42026: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:41957: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	CFLAGS="$CFLAGS $cf_new_cflags"
 fi
@@ -42031,7 +41962,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}:42034: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:41965: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
 fi
@@ -42039,14 +41970,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}:42042: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:41973: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
 
 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
 fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 42049 "configure"
+#line 41980 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -42058,16 +41989,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42061: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41992: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42064: \$? = $ac_status" >&5
+  echo "$as_me:41995: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42067: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41998: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42070: \$? = $ac_status" >&5
+  echo "$as_me:42001: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -42075,12 +42006,12 @@ else
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:42078: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:42009: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
 
 	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:42083: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:42014: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_flags"
@@ -42088,7 +42019,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:42091: checking for XOpenDisplay in -lX11" >&5
+echo "$as_me:42022: 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
@@ -42096,7 +42027,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 42099 "configure"
+#line 42030 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -42115,16 +42046,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42118: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42049: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42121: \$? = $ac_status" >&5
+  echo "$as_me:42052: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42124: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42055: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42127: \$? = $ac_status" >&5
+  echo "$as_me:42058: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -42135,7 +42066,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:42138: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:42069: 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
 
@@ -42157,7 +42088,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-echo "$as_me:42160: checking for XCurses library" >&5
+echo "$as_me:42091: 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
@@ -42180,7 +42111,7 @@ done
 LIBS="$cf_add_libs"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 42183 "configure"
+#line 42114 "configure"
 #include "confdefs.h"
 
 #include <xcurses.h>
@@ -42195,16 +42126,16 @@ XCursesExit();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42198: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42129: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42201: \$? = $ac_status" >&5
+  echo "$as_me:42132: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42204: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42135: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42207: \$? = $ac_status" >&5
+  echo "$as_me:42138: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_lib_XCurses=yes
 else
@@ -42215,7 +42146,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:42218: result: $cf_cv_lib_XCurses" >&5
+echo "$as_me:42149: result: $cf_cv_lib_XCurses" >&5
 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
 
 fi
@@ -42230,23 +42161,23 @@ cat >>confdefs.h <<\EOF
 #define XCURSES 1
 EOF
 
-	echo "$as_me:42233: checking for xcurses.h" >&5
+	echo "$as_me:42164: checking for xcurses.h" >&5
 echo $ECHO_N "checking for xcurses.h... $ECHO_C" >&6
 if test "${ac_cv_header_xcurses_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 42239 "configure"
+#line 42170 "configure"
 #include "confdefs.h"
 #include <xcurses.h>
 _ACEOF
-if { (eval echo "$as_me:42243: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:42174: \"$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:42249: \$? = $ac_status" >&5
+  echo "$as_me:42180: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -42265,7 +42196,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:42268: result: $ac_cv_header_xcurses_h" >&5
+echo "$as_me:42199: result: $ac_cv_header_xcurses_h" >&5
 echo "${ECHO_T}$ac_cv_header_xcurses_h" >&6
 if test $ac_cv_header_xcurses_h = yes; then
 
@@ -42276,7 +42207,7 @@ EOF
 fi
 
 else
-	{ { echo "$as_me:42279: error: Cannot link with XCurses" >&5
+	{ { echo "$as_me:42210: error: Cannot link with XCurses" >&5
 echo "$as_me: error: Cannot link with XCurses" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -42285,7 +42216,7 @@ fi
 	esac
 else
 
-echo "$as_me:42288: checking if we can include termio.h with curses" >&5
+echo "$as_me:42219: 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
@@ -42295,7 +42226,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 42298 "configure"
+#line 42229 "configure"
 #include "confdefs.h"
 
 #include <LYCurses.h>
@@ -42309,16 +42240,16 @@ putchar(0x0a)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:42312: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42243: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:42315: \$? = $ac_status" >&5
+  echo "$as_me:42246: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:42318: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42249: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42321: \$? = $ac_status" >&5
+  echo "$as_me:42252: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termio_and_curses=yes
 else
@@ -42331,7 +42262,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
     rm -f lynx_cfg.h
 
 fi
-echo "$as_me:42334: result: $cf_cv_termio_and_curses" >&5
+echo "$as_me:42265: result: $cf_cv_termio_and_curses" >&5
 echo "${ECHO_T}$cf_cv_termio_and_curses" >&6
 
 test $cf_cv_termio_and_curses = yes &&
@@ -42348,23 +42279,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:42351: checking for $ac_header" >&5
+echo "$as_me:42282: 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 42357 "configure"
+#line 42288 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:42361: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:42292: \"$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:42367: \$? = $ac_status" >&5
+  echo "$as_me:42298: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -42383,7 +42314,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:42386: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:42317: 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
@@ -42395,7 +42326,7 @@ done
 
 	fi
 
-echo "$as_me:42398: checking if curses supports alternate-character set" >&5
+echo "$as_me:42329: 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
@@ -42404,7 +42335,7 @@ else
 for mapname in acs_map _acs_map
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 42407 "configure"
+#line 42338 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -42418,16 +42349,16 @@ chtype x = $mapname['l']; $mapname['m'] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42421: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42352: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42424: \$? = $ac_status" >&5
+  echo "$as_me:42355: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42427: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42358: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42430: \$? = $ac_status" >&5
+  echo "$as_me:42361: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_alt_char_set=$mapname
 	 break
@@ -42441,21 +42372,21 @@ done
 
 fi
 
-echo "$as_me:42444: result: $cf_cv_alt_char_set" >&5
+echo "$as_me:42375: 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:42451: checking if curses supports fancy attributes" >&5
+echo "$as_me:42382: 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 42458 "configure"
+#line 42389 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -42473,16 +42404,16 @@ attrset(A_UNDERLINE|A_BOLD|A_REVERSE);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42476: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42407: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42479: \$? = $ac_status" >&5
+  echo "$as_me:42410: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42482: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42413: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42485: \$? = $ac_status" >&5
+  echo "$as_me:42416: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fancy_curses=yes
 else
@@ -42494,14 +42425,14 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:42497: result: $cf_cv_fancy_curses" >&5
+echo "$as_me:42428: 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:42504: checking for function curses_version" >&5
+echo "$as_me:42435: 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
@@ -42511,7 +42442,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_curses_version=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 42514 "configure"
+#line 42445 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -42524,15 +42455,15 @@ int main()
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:42527: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42458: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42530: \$? = $ac_status" >&5
+  echo "$as_me:42461: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:42532: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42463: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42535: \$? = $ac_status" >&5
+  echo "$as_me:42466: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_func_curses_version=yes
 
@@ -42547,7 +42478,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core
 fi
-echo "$as_me:42550: result: $cf_cv_func_curses_version" >&5
+echo "$as_me:42481: 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
@@ -42555,14 +42486,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test "$cf_cv_ncurses_version" != no ; then
-echo "$as_me:42558: checking for obsolete/broken version of ncurses" >&5
+echo "$as_me:42489: 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 42565 "configure"
+#line 42496 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -42581,16 +42512,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:42584: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42515: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:42587: \$? = $ac_status" >&5
+  echo "$as_me:42518: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:42590: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42521: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42593: \$? = $ac_status" >&5
+  echo "$as_me:42524: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_broken=no
 else
@@ -42602,10 +42533,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:42605: result: $cf_cv_ncurses_broken" >&5
+echo "$as_me:42536: 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:42608: WARNING: hmm... you should get an up-to-date version of ncurses" >&5
+	{ echo "$as_me:42539: 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
@@ -42615,14 +42546,14 @@ EOF
 fi
 fi
 
-echo "$as_me:42618: checking if curses supports color attributes" >&5
+echo "$as_me:42549: 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 42625 "configure"
+#line 42556 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -42642,16 +42573,16 @@ chtype x = COLOR_BLUE;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42645: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42576: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42648: \$? = $ac_status" >&5
+  echo "$as_me:42579: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42651: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42582: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42654: \$? = $ac_status" >&5
+  echo "$as_me:42585: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_color_curses=yes
 else
@@ -42663,7 +42594,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:42666: result: $cf_cv_color_curses" >&5
+echo "$as_me:42597: result: $cf_cv_color_curses" >&5
 echo "${ECHO_T}$cf_cv_color_curses" >&6
 if test $cf_cv_color_curses = yes ; then
 
@@ -42685,23 +42616,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:42688: checking for $ac_header" >&5
+echo "$as_me:42619: 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 42694 "configure"
+#line 42625 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:42698: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:42629: \"$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:42704: \$? = $ac_status" >&5
+  echo "$as_me:42635: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -42720,7 +42651,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:42723: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:42654: 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
@@ -42735,23 +42666,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:42738: checking for $ac_header" >&5
+echo "$as_me:42669: 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 42744 "configure"
+#line 42675 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:42748: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:42679: \"$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:42754: \$? = $ac_status" >&5
+  echo "$as_me:42685: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -42770,7 +42701,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:42773: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:42704: 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
@@ -42788,10 +42719,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	(*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:42791: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:42722: 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 42794 "configure"
+#line 42725 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -42803,16 +42734,16 @@ struct termios foo; int x = foo.c_iflag
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:42806: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42737: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:42809: \$? = $ac_status" >&5
+  echo "$as_me:42740: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:42812: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42743: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42815: \$? = $ac_status" >&5
+  echo "$as_me:42746: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   termios_bad=no
 else
@@ -42820,7 +42751,7 @@ else
 cat conftest.$ac_ext >&5
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 42823 "configure"
+#line 42754 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -42834,16 +42765,16 @@ struct termios foo; int x = foo.c_iflag
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:42837: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42768: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:42840: \$? = $ac_status" >&5
+  echo "$as_me:42771: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:42843: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42774: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42846: \$? = $ac_status" >&5
+  echo "$as_me:42777: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   termios_bad=unknown
 else
@@ -42859,12 +42790,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-	echo "$as_me:42862: result: $termios_bad" >&5
+	echo "$as_me:42793: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:42867: checking declaration of size-change" >&5
+echo "$as_me:42798: 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
@@ -42879,7 +42810,7 @@ do
 	CPPFLAGS="$cf_save_CPPFLAGS"
 	test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 42882 "configure"
+#line 42813 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -42923,16 +42854,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:42926: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42857: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:42929: \$? = $ac_status" >&5
+  echo "$as_me:42860: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:42932: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42863: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42935: \$? = $ac_status" >&5
+  echo "$as_me:42866: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_sizechange=yes
 else
@@ -42951,7 +42882,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:42954: result: $cf_cv_sizechange" >&5
+echo "$as_me:42885: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 
@@ -42969,14 +42900,14 @@ EOF
 	esac
 fi
 
-echo "$as_me:42972: checking if ttytype is declared in curses library" >&5
+echo "$as_me:42903: 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 42979 "configure"
+#line 42910 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -42988,16 +42919,16 @@ char *x = &ttytype[1]; *x = 1
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42991: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42922: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42994: \$? = $ac_status" >&5
+  echo "$as_me:42925: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42997: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42928: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43000: \$? = $ac_status" >&5
+  echo "$as_me:42931: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_ttytype=yes
 else
@@ -43009,7 +42940,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:43012: result: $cf_cv_have_ttytype" >&5
+echo "$as_me:42943: result: $cf_cv_have_ttytype" >&5
 echo "${ECHO_T}$cf_cv_have_ttytype" >&6
 test $cf_cv_have_ttytype = yes &&
 cat >>confdefs.h <<\EOF
@@ -43018,14 +42949,14 @@ EOF
 
 	if test "$use_wide_curses" = yes ; then
 
-echo "$as_me:43021: checking if curses supports wide characters" >&5
+echo "$as_me:42952: 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 43028 "configure"
+#line 42959 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -43044,16 +42975,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:43047: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42978: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43050: \$? = $ac_status" >&5
+  echo "$as_me:42981: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:43053: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42984: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43056: \$? = $ac_status" >&5
+  echo "$as_me:42987: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_widec_curses=yes
 else
@@ -43064,7 +42995,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:43067: result: $cf_cv_widec_curses" >&5
+echo "$as_me:42998: result: $cf_cv_widec_curses" >&5
 echo "${ECHO_T}$cf_cv_widec_curses" >&6
 
 if test "$cf_cv_widec_curses" = yes ; then
@@ -43074,14 +43005,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	# This is needed on Tru64 5.0 to declare mbstate_t
-	echo "$as_me:43077: checking if we must include wchar.h to declare mbstate_t" >&5
+	echo "$as_me:43008: 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 43084 "configure"
+#line 43015 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -43095,23 +43026,23 @@ mbstate_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:43098: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:43029: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:43101: \$? = $ac_status" >&5
+  echo "$as_me:43032: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:43104: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43035: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43107: \$? = $ac_status" >&5
+  echo "$as_me:43038: \$? = $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 43114 "configure"
+#line 43045 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -43126,16 +43057,16 @@ mbstate_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:43129: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:43060: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:43132: \$? = $ac_status" >&5
+  echo "$as_me:43063: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:43135: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43066: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43138: \$? = $ac_status" >&5
+  echo "$as_me:43069: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_widec_mbstate=yes
 else
@@ -43147,7 +43078,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:43150: result: $cf_cv_widec_mbstate" >&5
+echo "$as_me:43081: result: $cf_cv_widec_mbstate" >&5
 echo "${ECHO_T}$cf_cv_widec_mbstate" >&6
 
 if test "$cf_cv_widec_mbstate" = yes ; then
@@ -43170,14 +43101,14 @@ fi
 
 	fi
 
-echo "$as_me:43173: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+echo "$as_me:43104: 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 43180 "configure"
+#line 43111 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -43199,23 +43130,23 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:43202: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43133: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43205: \$? = $ac_status" >&5
+  echo "$as_me:43136: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:43208: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43139: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43211: \$? = $ac_status" >&5
+  echo "$as_me:43142: \$? = $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 43218 "configure"
+#line 43149 "configure"
 #include "confdefs.h"
 
 #define _XOPEN_SOURCE_EXTENDED
@@ -43237,16 +43168,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:43240: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43171: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43243: \$? = $ac_status" >&5
+  echo "$as_me:43174: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:43246: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43177: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43249: \$? = $ac_status" >&5
+  echo "$as_me:43180: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_xopen_extension=yes
 else
@@ -43258,11 +43189,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:43261: result: $cf_cv_need_xopen_extension" >&5
+echo "$as_me:43192: 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:43265: checking for term.h" >&5
+echo "$as_me:43196: 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
@@ -43283,7 +43214,7 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 43286 "configure"
+#line 43217 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -43297,16 +43228,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:43300: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:43231: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:43303: \$? = $ac_status" >&5
+  echo "$as_me:43234: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:43306: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43237: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43309: \$? = $ac_status" >&5
+  echo "$as_me:43240: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_term_header=$cf_header
 	 break
@@ -43325,7 +43256,7 @@ case $cf_cv_term_header in
 	for cf_header in ncurses/term.h ncursesw/term.h
 	do
 		cat >conftest.$ac_ext <<_ACEOF
-#line 43328 "configure"
+#line 43259 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -43343,16 +43274,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:43346: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:43277: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:43349: \$? = $ac_status" >&5
+  echo "$as_me:43280: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:43352: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43283: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43355: \$? = $ac_status" >&5
+  echo "$as_me:43286: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_term_header=$cf_header
 			 break
@@ -43367,7 +43298,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 esac
 
 fi
-echo "$as_me:43370: result: $cf_cv_term_header" >&5
+echo "$as_me:43301: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 case $cf_cv_term_header in
@@ -43394,7 +43325,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:43397: checking for unctrl.h" >&5
+echo "$as_me:43328: checking for unctrl.h" >&5
 echo $ECHO_N "checking for unctrl.h... $ECHO_C" >&6
 if test "${cf_cv_unctrl_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -43415,7 +43346,7 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 43418 "configure"
+#line 43349 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -43429,16 +43360,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:43432: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:43363: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:43435: \$? = $ac_status" >&5
+  echo "$as_me:43366: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:43438: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43369: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43441: \$? = $ac_status" >&5
+  echo "$as_me:43372: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_unctrl_header=$cf_header
 	 break
@@ -43451,12 +43382,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:43454: result: $cf_cv_unctrl_header" >&5
+echo "$as_me:43385: result: $cf_cv_unctrl_header" >&5
 echo "${ECHO_T}$cf_cv_unctrl_header" >&6
 
 case $cf_cv_unctrl_header in
 (no)
-	{ echo "$as_me:43459: WARNING: unctrl.h header not found" >&5
+	{ echo "$as_me:43390: WARNING: unctrl.h header not found" >&5
 echo "$as_me: WARNING: unctrl.h header not found" >&2;}
 	;;
 esac
@@ -43512,10 +43443,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:43515: checking for ${cf_func}" >&5
+	echo "$as_me:43446: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me:-configure}:43518: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:43449: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -43524,7 +43455,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >conftest.$ac_ext <<_ACEOF
-#line 43527 "configure"
+#line 43458 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -43557,16 +43488,16 @@ if (foo + 1234 > 5678)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:43560: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43491: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43563: \$? = $ac_status" >&5
+  echo "$as_me:43494: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:43566: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43497: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43569: \$? = $ac_status" >&5
+  echo "$as_me:43500: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -43582,7 +43513,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:43585: result: $cf_result" >&5
+	echo "$as_me:43516: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test $cf_result != no; then
 		cat >>confdefs.h <<EOF
@@ -43598,13 +43529,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:43601: checking for $ac_func" >&5
+echo "$as_me:43532: 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 43607 "configure"
+#line 43538 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -43635,16 +43566,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:43638: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43569: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43641: \$? = $ac_status" >&5
+  echo "$as_me:43572: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:43644: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43575: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43647: \$? = $ac_status" >&5
+  echo "$as_me:43578: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -43654,7 +43585,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:43657: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:43588: 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
@@ -43668,12 +43599,12 @@ fi
 
 if test $use_color_style != no ; then
 	if test .$cf_cv_color_curses != .yes ; then
-		{ { echo "$as_me:43671: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:43602: 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:43676: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:43607: error: Configuration does not support color-styles" >&5
 echo "$as_me: error: Configuration does not support color-styles" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -43681,7 +43612,7 @@ fi
 
 if test $use_scrollbar != no ; then
 	if test .$cf_cv_fancy_curses != .yes ; then
-		{ echo "$as_me:43684: WARNING: Configuration does not support ACS_xxx definitions" >&5
+		{ echo "$as_me:43615: WARNING: Configuration does not support ACS_xxx definitions" >&5
 echo "$as_me: WARNING: Configuration does not support ACS_xxx definitions" >&2;}
 	else
 
@@ -43695,7 +43626,7 @@ fi
 # use rpath for libraries in unusual places
 
 LD_RPATH_OPT=
-echo "$as_me:43698: checking for an rpath option" >&5
+echo "$as_me:43629: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 case $cf_cv_system_name in
 (irix*)
@@ -43726,12 +43657,12 @@ case $cf_cv_system_name in
 (*)
 	;;
 esac
-echo "$as_me:43729: result: $LD_RPATH_OPT" >&5
+echo "$as_me:43660: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 case "x$LD_RPATH_OPT" in
 (x-R*)
-	echo "$as_me:43734: checking if we need a space after rpath option" >&5
+	echo "$as_me:43665: checking if we need a space after rpath option" >&5
 echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
 	cf_save_LIBS="$LIBS"
 
@@ -43752,7 +43683,7 @@ done
 LIBS="$cf_add_libs"
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 43755 "configure"
+#line 43686 "configure"
 #include "confdefs.h"
 
 int
@@ -43764,16 +43695,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:43767: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43698: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43770: \$? = $ac_status" >&5
+  echo "$as_me:43701: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:43773: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43704: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43776: \$? = $ac_status" >&5
+  echo "$as_me:43707: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_rpath_space=no
 else
@@ -43783,13 +43714,13 @@ cf_rpath_space=yes
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	LIBS="$cf_save_LIBS"
-	echo "$as_me:43786: result: $cf_rpath_space" >&5
+	echo "$as_me:43717: result: $cf_rpath_space" >&5
 echo "${ECHO_T}$cf_rpath_space" >&6
 	test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
 	;;
 esac
 
-echo "$as_me:43792: checking if rpath-hack should be disabled" >&5
+echo "$as_me:43723: checking if rpath-hack should be disabled" >&5
 echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6
 
 # Check whether --enable-rpath-hack or --disable-rpath-hack was given.
@@ -43806,21 +43737,21 @@ else
   cf_disable_rpath_hack=no
 
 fi;
-echo "$as_me:43809: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:43740: result: $cf_disable_rpath_hack" >&5
 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 if test "$cf_disable_rpath_hack" = no ; then
 
-echo "$as_me:43813: checking for updated LDFLAGS" >&5
+echo "$as_me:43744: checking for updated LDFLAGS" >&5
 echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
 if test -n "$LD_RPATH_OPT" ; then
-	echo "$as_me:43816: result: maybe" >&5
+	echo "$as_me:43747: result: maybe" >&5
 echo "${ECHO_T}maybe" >&6
 
 	for ac_prog in ldd
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:43823: checking for $ac_word" >&5
+echo "$as_me:43754: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -43835,7 +43766,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_cf_ldd_prog="$ac_prog"
-echo "$as_me:43838: found $ac_dir/$ac_word" >&5
+echo "$as_me:43769: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -43843,10 +43774,10 @@ fi
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:43846: result: $cf_ldd_prog" >&5
+  echo "$as_me:43777: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:43849: result: no" >&5
+  echo "$as_me:43780: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -43860,7 +43791,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
 		cf_rpath_oops=
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 43863 "configure"
+#line 43794 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -43872,16 +43803,16 @@ printf("Hello");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:43875: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43806: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43878: \$? = $ac_status" >&5
+  echo "$as_me:43809: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:43881: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43812: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43884: \$? = $ac_status" >&5
+  echo "$as_me:43815: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
 		 cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
@@ -43909,7 +43840,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 					then
 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
 
-echo "${as_me:-configure}:43912: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:43843: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
 
 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
 						break
@@ -43921,11 +43852,11 @@ echo "${as_me:-configure}:43912: testing ...adding -L$cf_rpath_dir/lib to LDFLAG
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:43924: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:43855: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:43928: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:43859: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -43962,7 +43893,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:43965: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:43896: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -43975,11 +43906,11 @@ LDFLAGS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:43978: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:43909: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:43982: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:43913: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -44016,7 +43947,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:44019: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:43950: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -44029,14 +43960,14 @@ LIBS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:44032: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:43963: testing ...checked LIBS $LIBS ..." 1>&5
 
 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:44036: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:43967: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 else
-	echo "$as_me:44039: result: no" >&5
+	echo "$as_me:43970: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44137,7 +44068,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:44140: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:44071: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -44313,7 +44244,7 @@ cat >>$CONFIG_STATUS <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:44316: error: ambiguous option: $1
+    { { echo "$as_me:44247: 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;}
@@ -44332,7 +44263,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:44335: error: unrecognized option: $1
+  -*) { { echo "$as_me:44266: 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;}
@@ -44385,7 +44316,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:44388: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:44319: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -44719,7 +44650,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:44722: creating $ac_file" >&5
+    { echo "$as_me:44653: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -44737,7 +44668,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:44740: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:44671: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -44750,7 +44681,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:44753: error: cannot find input file: $f" >&5
+           { { echo "$as_me:44684: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -44766,7 +44697,7 @@ cat >>$CONFIG_STATUS <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' $ac_item`
         if test -z "$ac_used"; then
-          { echo "$as_me:44769: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:44700: WARNING: datarootdir was used implicitly but not set:
 $ac_seen" >&5
 echo "$as_me: WARNING: datarootdir was used implicitly but not set:
 $ac_seen" >&2;}
@@ -44775,7 +44706,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' $ac_item`
       if test -n "$ac_seen"; then
-        { echo "$as_me:44778: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:44709: WARNING: datarootdir was used explicitly but not set:
 $ac_seen" >&5
 echo "$as_me: WARNING: datarootdir was used explicitly but not set:
 $ac_seen" >&2;}
@@ -44812,7 +44743,7 @@ s,@INSTALL@,$ac_INSTALL,;t t
             ac_init=`egrep '[ 	]*'$ac_name'[ 	]*=' $ac_file`
             if test -z "$ac_init"; then
               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
-              { echo "$as_me:44815: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:44746: WARNING: Variable $ac_name is used but was not set:
 $ac_seen" >&5
 echo "$as_me: WARNING: Variable $ac_name is used but was not set:
 $ac_seen" >&2;}
@@ -44823,7 +44754,7 @@ $ac_seen" >&2;}
     egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
     if test -s $tmp/out; then
       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
-      { echo "$as_me:44826: WARNING: Some variables may not be substituted:
+      { echo "$as_me:44757: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -44872,7 +44803,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:44875: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:44806: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -44883,7 +44814,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:44886: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:44817: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -44896,7 +44827,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:44899: error: cannot find input file: $f" >&5
+           { { echo "$as_me:44830: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -45014,7 +44945,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:45017: $ac_file is unchanged" >&5
+      { echo "$as_me:44948: $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 fbd5c4f6..81073efa 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $LynxId: configure.in,v 1.277 2015/05/09 15:06:14 tom Exp $
+dnl $LynxId: configure.in,v 1.278 2015/05/28 00:47:06 tom Exp $
 dnl
 dnl Process this file with autoconf to produce a configure script.
 dnl
@@ -487,7 +487,6 @@ if test "x$cf_cv_use_libssl"  != xno ; then
 elif test "x$cf_cv_use_libgnutls" != xno ; then
     if test "x$cf_cv_gnutls_compat" = xno ; then
         CF_GNUTLS($cf_cv_use_libgnutls,tidy_tls\$o)
-		AC_CHECK_FUNCS(gnutls_priority_set_direct)
     else
         CF_GNUTLS($cf_cv_use_libgnutls)
     fi
diff --git a/po/sv.po b/po/sv.po
index 8e684b5d..0848e414 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,20 +1,22 @@
 # Swedish translation for Lynx
-# Copyright © 2000, 2001, 2002, 2003, 2004, 2008 Free Software Foundation, Inc.
+# Copyright © 2000, 2001, 2002, 2003, 2004, 2008, 2015 Free Software Foundation, Inc.
 # This file is distributed under the same license as the lynx package.
-# Peter Krefting <peter@softwolves.pp.se>, 2000-2012.
+# Peter Krefting <peter@softwolves.pp.se>, 2000-2015, 2015.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: lynx 2.8.8-dev9\n"
+"Project-Id-Version: lynx 2.8.9-dev5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-12 19:13-0500\n"
-"PO-Revision-Date: 2012-03-21 22:35+0100\n"
+"POT-Creation-Date: 2015-04-14 20:53-0400\n"
+"PO-Revision-Date: 2015-05-31 17:55+0100\n"
 "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Gtranslator 2.91.6\n"
 
 #. ******************************************************************
 #. * The following definitions are for status line prompts, messages, or
@@ -30,2020 +32,2020 @@ msgstr ""
 #. * translations.  When no translation is available, the English default is
 #. * used.
 #.
-#: LYMessages.c:27
+#: LYMessages.c:28
 #, c-format
 msgid "Alert!: %s"
 msgstr "Varning!: %s"
 
-#: LYMessages.c:28
+#: LYMessages.c:29
 msgid "Welcome"
 msgstr "Välkommen"
 
-#: LYMessages.c:29
+#: LYMessages.c:30
 msgid "Are you sure you want to quit?"
 msgstr "Är du säker att du vill avsluta?"
 
-#: LYMessages.c:31
+#: LYMessages.c:32
 msgid "Really exit from Lynx?"
 msgstr "Verkligen avsluta Lynx?"
 
-#: LYMessages.c:33
+#: LYMessages.c:34
 msgid "Connection interrupted."
 msgstr "Anslutningen avbröts."
 
-#: LYMessages.c:34
+#: LYMessages.c:35
 msgid "Data transfer interrupted."
 msgstr "Dataöverföringen avbröts."
 
-#: LYMessages.c:35
+#: LYMessages.c:36
 msgid "Cancelled!!!"
 msgstr "Avbruten!!!"
 
-#: LYMessages.c:36
+#: LYMessages.c:37
 msgid "Cancelling!"
 msgstr "Avbryter!"
 
-#: LYMessages.c:37
+#: LYMessages.c:38
 msgid "Excellent!!!"
 msgstr "Underbart!!!"
 
-#: LYMessages.c:38
+#: LYMessages.c:39
 msgid "OK"
 msgstr "OK"
 
-#: LYMessages.c:39
+#: LYMessages.c:40
 msgid "Done!"
 msgstr "Klar!"
 
-#: LYMessages.c:40
+#: LYMessages.c:41
 msgid "Bad request!"
 msgstr "Felaktig förfrågan!"
 
-#: LYMessages.c:41
+#: LYMessages.c:42
 msgid "previous"
 msgstr "föregående"
 
-#: LYMessages.c:42
+#: LYMessages.c:43
 msgid "next screen"
 msgstr "nästa skärm"
 
-#: LYMessages.c:43
+#: LYMessages.c:44
 msgid "HELP!"
 msgstr "HJÄLP!"
 
-#: LYMessages.c:44
+#: LYMessages.c:45
 msgid ", help on "
 msgstr ", hjälp om "
 
 #. #define HELP
-#: LYMessages.c:46
+#: LYMessages.c:47
 msgid "Commands: Use arrow keys to move, '?' for help, 'q' to quit, '<-' to go back."
 msgstr "Kommandon: Piltangenter flyttar, \"?\" ger hjälp, \"q\" avslutar, \"<-\" återgår."
 
 #. #define MOREHELP
-#: LYMessages.c:48
+#: LYMessages.c:49
 msgid "-- press space for more, use arrow keys to move, '?' for help, 'q' to quit."
 msgstr "-- tryck blanksteg för mer, piltangenter flyttar, \"?\" ger hjälp, \"q\" avslutar."
 
-#: LYMessages.c:49
+#: LYMessages.c:50
 msgid "-- press space for next page --"
 msgstr "-- tryck blanksteg för nästa sida --"
 
-#: LYMessages.c:50
+#: LYMessages.c:51
 msgid "URL too long"
 msgstr "Adressen för lång"
 
 #. Inactive input fields, messages used with -tna option - kw
 #. #define FORM_LINK_TEXT_MESSAGE_INA
-#: LYMessages.c:56
+#: LYMessages.c:57
 msgid "(Text entry field) Inactive.  Press <return> to activate."
 msgstr "(Textinmatningsfält) Inaktivt. Tryck <Enter> för att aktivera."
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE_INA
-#: LYMessages.c:58
+#: LYMessages.c:59
 msgid "(Textarea) Inactive.  Press <return> to activate."
 msgstr "(Textfält) Inaktivt. Tryck <Enter> för att aktivera."
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE_INA_E
-#: LYMessages.c:60
+#: LYMessages.c:61
 #, c-format
 msgid "(Textarea) Inactive.  Press <return> to activate (%s for editor)."
 msgstr "(Textfält) Inaktivt. Tryck <Enter> för att aktivera (%s för redigeringsprogram)."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_INA
-#: LYMessages.c:62
+#: LYMessages.c:63
 msgid "(Form field) Inactive.  Use <return> to edit."
 msgstr "(Formulärfält) Inaktivt. Tryck <Enter> för att redigera."
 
 #. #define FORM_TEXT_SUBMIT_MESSAGE_INA_X
-#: LYMessages.c:64
+#: LYMessages.c:65
 #, c-format
 msgid "(Form field) Inactive.  Use <return> to edit (%s to submit with no cache)."
 msgstr "(Formulärfält) Inaktivt. Tryck <Enter> för att redigera (%s skickar utan cache)."
 
 #. #define FORM_TEXT_RESUBMIT_MESSAGE_INA
-#: LYMessages.c:66
+#: LYMessages.c:67
 msgid "(Form field) Inactive. Press <return> to edit, press <return> twice to submit."
 msgstr "(Formulärfält) Inaktivt. Redigera med <Enter>, två gånger för att skicka."
 
 #. #define FORM_TEXT_SUBMIT_MAILTO_MSG_INA
-#: LYMessages.c:68
+#: LYMessages.c:69
 msgid "(mailto form field) Inactive.  Press <return> to change."
 msgstr "(e-postformulärfält) Inaktivt. Tryck <Enter> för att ändra."
 
 #. #define FORM_LINK_PASSWORD_MESSAGE_INA
-#: LYMessages.c:70
+#: LYMessages.c:71
 msgid "(Password entry field) Inactive.  Press <return> to activate."
 msgstr "(Lösenordsinmatningsfält) Inaktivt. Tryck <Enter> för att aktivera."
 
 #. #define FORM_LINK_FILE_UNM_MSG
-#: LYMessages.c:73
+#: LYMessages.c:74
 msgid "UNMODIFIABLE file entry field.  Use UP or DOWN arrows or tab to move off."
 msgstr "SKRIVSKYDDAT filinmatningsfält. Använd UPP-/NED-pil eller tabb för att lämna."
 
 #. #define FORM_LINK_FILE_MESSAGE
-#: LYMessages.c:75
+#: LYMessages.c:76
 msgid "(File entry field) Enter filename.  Use UP or DOWN arrows or tab to move off."
 msgstr "(Filinmatningsfält) Ange filnamn. Använd UPP-/NED-pil eller tabb för att lämna."
 
 #. #define FORM_LINK_TEXT_MESSAGE
-#: LYMessages.c:77
+#: LYMessages.c:78
 msgid "(Text entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
 msgstr "(Textinmatningsfält) Ange text. Använd UPP-/NED-pil eller tabb för att lämna."
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE
-#: LYMessages.c:79
+#: LYMessages.c:80
 msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off."
 msgstr "(Textfält) Ange text. Använd UPP-/NED-pil eller tabb för att lämna."
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE_E
-#: LYMessages.c:81
+#: LYMessages.c:82
 #, c-format
 msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off (%s for editor)."
 msgstr "(Textfält) Ange text. UPP-/NED-pil eller tabb lämnar (%s redigerar med program)."
 
 #. #define FORM_LINK_TEXT_UNM_MSG
-#: LYMessages.c:83
+#: LYMessages.c:84
 msgid "UNMODIFIABLE form text field.  Use UP or DOWN arrows or tab to move off."
 msgstr "SKRIVSKYDDAT formulärtextfält. Använd UPP-/NED-pil eller tabb för att lämna."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE
-#: LYMessages.c:85
+#: LYMessages.c:86
 msgid "(Form field) Enter text.  Use <return> to submit."
 msgstr "(Formulärfält) Ange text. Tryck <Enter> för att skicka."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_X
-#: LYMessages.c:87
+#: LYMessages.c:88
 #, c-format
 msgid "(Form field) Enter text.  Use <return> to submit (%s for no cache)."
 msgstr "(Formulärfält) Ange text. Tryck <Enter> för att skicka (%s förbigår cache)."
 
 #. #define FORM_LINK_TEXT_RESUBMIT_MESSAGE
-#: LYMessages.c:89
+#: LYMessages.c:90
 msgid "(Form field) Enter text.  Use <return> to submit, arrows or tab to move off."
 msgstr "(Formulärfält) Ange text. <Enter> skickar, pilar eller tabb lämnar."
 
 #. #define FORM_LINK_TEXT_SUBMIT_UNM_MSG
-#: LYMessages.c:91
+#: LYMessages.c:92
 msgid "UNMODIFIABLE form field.  Use UP or DOWN arrows or tab to move off."
 msgstr "SKRIVSKYDDAT formulärfält. Använd UPP-/NED-pil eller tabb för att lämna."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MAILTO_MSG
-#: LYMessages.c:93
+#: LYMessages.c:94
 msgid "(mailto form field) Enter text.  Use <return> to submit, arrows to move off."
 msgstr "(e-postformulärfält) Ange text. <Enter> skickar, pilar lämnar."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MAILTO_DIS_MSG
-#: LYMessages.c:95
+#: LYMessages.c:96
 msgid "(mailto form field) Mail is disallowed so you cannot submit."
 msgstr "(e-postformulärfält) E-post tillåts ej, så du kan inte skicka."
 
 #. #define FORM_LINK_PASSWORD_MESSAGE
-#: LYMessages.c:97
+#: LYMessages.c:98
 msgid "(Password entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
 msgstr "(Lösenordsfält) Ange text. Använd UPP-/NED-pil eller tabb för att lämna."
 
 #. #define FORM_LINK_PASSWORD_UNM_MSG
-#: LYMessages.c:99
+#: LYMessages.c:100
 msgid "UNMODIFIABLE form password.  Use UP or DOWN arrows or tab to move off."
 msgstr "SKRIVSKYDDAT formulärlösenord. Använd UPP-/NED-pil eller tabb för att lämna."
 
 #. #define FORM_LINK_CHECKBOX_MESSAGE
-#: LYMessages.c:101
+#: LYMessages.c:102
 msgid "(Checkbox Field)   Use right-arrow or <return> to toggle."
 msgstr "(Kryssruta)   Använd högerpil eller <Enter> för att ställa om."
 
 #. #define FORM_LINK_CHECKBOX_UNM_MSG
-#: LYMessages.c:103
+#: LYMessages.c:104
 msgid "UNMODIFIABLE form checkbox.  Use UP or DOWN arrows or tab to move off."
 msgstr "SKRIVSKYDDAD kryssruta. Använd UPP-/NED-pil eller tabb för att lämna."
 
 #. #define FORM_LINK_RADIO_MESSAGE
-#: LYMessages.c:105
+#: LYMessages.c:106
 msgid "(Radio Button)   Use right-arrow or <return> to toggle."
 msgstr "(Radioknapp)   Använd högerpil eller <Enter> för att ställa om."
 
 #. #define FORM_LINK_RADIO_UNM_MSG
-#: LYMessages.c:107
+#: LYMessages.c:108
 msgid "UNMODIFIABLE form radio button.  Use UP or DOWN arrows or tab to move off."
 msgstr "SKRIVSKYDDAD radioknapp. Använd UPP-/NED-pil eller tabb för att lämna."
 
 #. #define FORM_LINK_SUBMIT_PREFIX
-#: LYMessages.c:109
+#: LYMessages.c:110
 msgid "Submit ('x' for no cache) to "
 msgstr "Skicka (\"x\" förbigår cache) till "
 
 #. #define FORM_LINK_RESUBMIT_PREFIX
-#: LYMessages.c:111
+#: LYMessages.c:112
 msgid "Submit to "
 msgstr "Skicka till "
 
 #. #define FORM_LINK_SUBMIT_MESSAGE
-#: LYMessages.c:113
+#: LYMessages.c:114
 msgid "(Form submit button) Use right-arrow or <return> to submit ('x' for no cache)."
 msgstr "(Sändknapp) Använd högerpil eller <Enter> för att skicka (\"x\" förbigår cache)."
 
 #. #define FORM_LINK_RESUBMIT_MESSAGE
-#: LYMessages.c:115
+#: LYMessages.c:116
 msgid "(Form submit button) Use right-arrow or <return> to submit."
 msgstr "(Sändknapp) Använd högerpil eller <Enter> för att skicka."
 
 #. #define FORM_LINK_SUBMIT_DIS_MSG
-#: LYMessages.c:117
+#: LYMessages.c:118
 msgid "DISABLED form submit button.  Use UP or DOWN arrows or tab to move off."
 msgstr "INAKTIV sändknapp. Använd UPP-/NED-pil eller tabb för att lämna."
 
 #. #define FORM_LINK_SUBMIT_MAILTO_PREFIX
-#: LYMessages.c:119
+#: LYMessages.c:120
 msgid "Submit mailto form to "
 msgstr "Skicka e-postformulär till "
 
 #. #define FORM_LINK_SUBMIT_MAILTO_MSG
-#: LYMessages.c:121
+#: LYMessages.c:122
 msgid "(mailto form submit button) Use right-arrow or <return> to submit."
 msgstr "(sändknapp i e-postformulär) Använd högerpil eller <Enter> för att skicka."
 
 #. #define FORM_LINK_SUBMIT_MAILTO_DIS_MSG
-#: LYMessages.c:123
+#: LYMessages.c:124
 msgid "(mailto form submit button) Mail is disallowed so you cannot submit."
 msgstr "(sändknapp i e-postformulär) E-post tillåts ej, så du kan inte skicka."
 
 #. #define FORM_LINK_RESET_MESSAGE
-#: LYMessages.c:125
+#: LYMessages.c:126
 msgid "(Form reset button)   Use right-arrow or <return> to reset form to defaults."
 msgstr "(Nollställningsknapp) Använd högerpil eller <Enter> för att återställa förval."
 
 #. #define FORM_LINK_RESET_DIS_MSG
-#: LYMessages.c:127
+#: LYMessages.c:128
 msgid "DISABLED form reset button.  Use UP or DOWN arrows or tab to move off."
 msgstr "INAKTIV nollställningsknapp. Använd UPP-/NED-pil eller tabb för att lämna."
 
 #. #define FORM_LINK_BUTTON_MESSAGE
-#: LYMessages.c:129
+#: LYMessages.c:130
 msgid "(Script button)   Use UP or DOWN arrows or tab to move off."
 msgstr "(Skriptknapp)   Använd UPP-/NED-pil eller tabb för att lämna."
 
 #. #define FORM_LINK_BUTTON_DIS_MSG
-#: LYMessages.c:131
+#: LYMessages.c:132
 msgid "DISABLED Script button.  Use UP or DOWN arrows or tab to move off."
 msgstr "INAKTIV skriptknapp. Använd UPP-/NED-pil eller tabb för att lämna."
 
 #. #define FORM_LINK_OPTION_LIST_MESSAGE
-#: LYMessages.c:133
+#: LYMessages.c:134
 msgid "(Option list) Hit return and use arrow keys and return to select option."
 msgstr "(Alternativlista) Tryck Enter och använd pilar och Enter för att välja."
 
 #. #define CHOICE_LIST_MESSAGE
-#: LYMessages.c:135
+#: LYMessages.c:136
 msgid "(Choice list) Hit return and use arrow keys and return to select option."
 msgstr "(Vallista) Tryck Enter och använd piltangenter och Enter för att välja."
 
 #. #define FORM_LINK_OPTION_LIST_UNM_MSG
-#: LYMessages.c:137
+#: LYMessages.c:138
 msgid "UNMODIFIABLE option list.  Use return or arrow keys to review or leave."
 msgstr "SKRIVSKYDDAD alternativlista. Använd Enter och pilar för att visa eller lämna."
 
 #. #define CHOICE_LIST_UNM_MSG
-#: LYMessages.c:139
+#: LYMessages.c:140
 msgid "UNMODIFIABLE choice list.  Use return or arrow keys to review or leave."
 msgstr "SKRIVSKYDDAD vallista. Använd Enter och piltangenter för att visa eller lämna."
 
-#: LYMessages.c:140
+#: LYMessages.c:141
 msgid "Submitting form..."
 msgstr "Skickar formulär..."
 
-#: LYMessages.c:141
+#: LYMessages.c:142
 msgid "Resetting form..."
 msgstr "Nollställer formulär..."
 
 #. #define RELOADING_FORM
-#: LYMessages.c:143
+#: LYMessages.c:144
 msgid "Reloading document.  Any form entries will be lost!"
 msgstr "Hämtar om dokument. Eventuellt formulärinnehåll förkastas!"
 
 #. #define LINK_NOT_IN_FORM
-#: LYMessages.c:145
+#: LYMessages.c:146
 msgid "The current link is not in a FORM"
 msgstr "Aktuell länk är inte i ett FORMULÄR"
 
-#: LYMessages.c:146
+#: LYMessages.c:147
 #, c-format
 msgid "Warning: Cannot transcode form data to charset %s!"
 msgstr "Varning: Kan inte koda formulärdata i teckenuppsättningen %s!"
 
 #. #define NORMAL_LINK_MESSAGE
-#: LYMessages.c:149
+#: LYMessages.c:150
 msgid "(NORMAL LINK)   Use right-arrow or <return> to activate."
 msgstr "(VANLIG LÄNK)   Använd högerpil eller <Enter> för att aktivera."
 
-#: LYMessages.c:150
+#: LYMessages.c:151
 msgid "The resource requested is not available at this time."
 msgstr "Resursen du begärt är inte tillgänglig just nu."
 
-#: LYMessages.c:151
+#: LYMessages.c:152
 msgid "Enter Lynx keystroke command: "
 msgstr "Ange Lynxtangentkommando: "
 
-#: LYMessages.c:152
+#: LYMessages.c:153
 msgid "Looking up "
 msgstr "Slår upp "
 
-#: LYMessages.c:153
+#: LYMessages.c:154
 #, c-format
 msgid "Getting %s"
 msgstr "Hämtar %s"
 
-#: LYMessages.c:154
+#: LYMessages.c:155
 #, c-format
 msgid "Skipping %s"
 msgstr "Hoppas över %s"
 
-#: LYMessages.c:155
+#: LYMessages.c:156
 #, c-format
 msgid "Using %s"
 msgstr "Använder %s"
 
-#: LYMessages.c:156
+#: LYMessages.c:157
 #, c-format
 msgid "Illegal URL: %s"
 msgstr "Felaktig adress: %s"
 
-#: LYMessages.c:157
+#: LYMessages.c:158
 #, c-format
 msgid "Badly formed address %s"
 msgstr "Trasig adress %s"
 
-#: LYMessages.c:158
+#: LYMessages.c:159
 #, c-format
 msgid "URL: %s"
 msgstr "Adress: %s"
 
-#: LYMessages.c:159
+#: LYMessages.c:160
 msgid "Unable to access WWW file!!!"
 msgstr "Kan inte komma åt webbfil!!!"
 
-#: LYMessages.c:160
+#: LYMessages.c:161
 #, c-format
 msgid "This is a searchable index.  Use %s to search."
 msgstr "Detta är ett sökbart index. Använd %s för att söka."
 
 #. #define WWW_INDEX_MORE_MESSAGE
-#: LYMessages.c:162
+#: LYMessages.c:163
 #, c-format
 msgid "--More--  This is a searchable index.  Use %s to search."
 msgstr "--Mer--  Detta är ett sökbart index. Använd %s för att söka."
 
-#: LYMessages.c:163
+#: LYMessages.c:164
 msgid "You have entered an invalid link number."
 msgstr "Du har angett ett felaktigt länknummer."
 
 #. #define SOURCE_HELP
-#: LYMessages.c:165
+#: LYMessages.c:166
 msgid "Currently viewing document source.  Press '\\' to return to rendered version."
 msgstr "Visar dokumentkällkod. Tryck \"\\\" för att återgå till tolkad version."
 
 #. #define NOVICE_LINE_ONE
-#: LYMessages.c:167
+#: LYMessages.c:168
 msgid "  Arrow keys: Up and Down to move.  Right to follow a link; Left to go back.  \n"
 msgstr "  Piltangenter: Upp och ned flyttar. Höger följer länk; vänster återgår.  \n"
 
 #. #define NOVICE_LINE_TWO
-#: LYMessages.c:169
+#: LYMessages.c:170
 msgid " H)elp O)ptions P)rint G)o M)ain screen Q)uit /=search [delete]=history list \n"
 msgstr " H=Hjälp O=Val P=Utskrift G=Gå M=Huvudskärm Q=Avsluta /=sök Del=Historik \n"
 
 #. #define NOVICE_LINE_TWO_A
-#: LYMessages.c:171
+#: LYMessages.c:172
 msgid "  O)ther cmds  H)elp  K)eymap  G)oto  P)rint  M)ain screen  o)ptions  Q)uit  \n"
 msgstr "  O=Fler H=Hjälp K=Tangenter G=Gå P=Utskrift M=Huvudskärm O=Val Q=Avsluta \n"
 
 #. #define NOVICE_LINE_TWO_B
-#: LYMessages.c:173
+#: LYMessages.c:174
 msgid "  O)ther cmds  B)ack  E)dit  D)ownload ^R)eload ^W)ipe screen  search doc: / \n"
 msgstr "  O=Fler B=Bakåt E=Redigera D=Hämta ^R=Hämta om ^W=Rita om  sök dokument: / \n"
 
 #. #define NOVICE_LINE_TWO_C
-#: LYMessages.c:175
+#: LYMessages.c:176
 msgid "O)ther cmds  C)omment  History: <backspace>  Bookmarks: V)iew, A)dd, R)emove \n"
 msgstr "O=Fler  C=Kommentera  Historik: backsteg  Bokmärken: V=Visa A=Nytt R=Ta bort \n"
 
 #. #define FORM_NOVICELINE_ONE
-#: LYMessages.c:177
+#: LYMessages.c:178
 msgid "            Enter text into the field by typing on the keyboard              "
 msgstr "           Ange text i fältet genom att skriva på tangentbordet              "
 
 #. #define FORM_NOVICELINE_TWO
-#: LYMessages.c:179
+#: LYMessages.c:180
 msgid "    Ctrl-U to delete all text in field, [Backspace] to delete a character    "
 msgstr "        Ctrl-U tömmer inmatningsfältet, [Backsteg] tar bort en bokstav       "
 
 #. #define FORM_NOVICELINE_TWO_DELBL
-#: LYMessages.c:181
+#: LYMessages.c:182
 msgid "      Ctrl-U to delete text in field, [Backspace] to delete a character    "
 msgstr "        Ctrl-U tömmer inmatningsfältet, [Backsteg] tar bort en bokstav     "
 
 #. #define FORM_NOVICELINE_TWO_VAR
-#: LYMessages.c:183
+#: LYMessages.c:184
 #, c-format
 msgid "    %s to delete all text in field, [Backspace] to delete a character    "
 msgstr "       %s tömmer inmatningsfältet, [Backsteg] tar bort en bokstav        "
 
 #. #define FORM_NOVICELINE_TWO_DELBL_VAR
-#: LYMessages.c:185
+#: LYMessages.c:186
 #, c-format
 msgid "      %s to delete text in field, [Backspace] to delete a character    "
 msgstr "       %s tömmer inmatningsfältet, [Backsteg] tar bort en bokstav      "
 
 #. mailto
-#: LYMessages.c:188
+#: LYMessages.c:189
 msgid "Malformed mailto form submission!  Cancelled!"
 msgstr "Trasig \"mailto\" i formulär! Avbryter!"
 
-#: LYMessages.c:189
+#: LYMessages.c:190
 msgid "Warning!  Control codes in mail address replaced by ?"
 msgstr "Varning!  Kontrollkoder i e-postadress ersatta med frågetecken"
 
-#: LYMessages.c:190
+#: LYMessages.c:191
 msgid "Mail disallowed!  Cannot submit."
 msgstr "E-post tillåts ej! Kan inte skicka."
 
-#: LYMessages.c:191
+#: LYMessages.c:192
 msgid "Mailto form submission failed!"
 msgstr "Misslyckades att skicka e-postformulär!"
 
-#: LYMessages.c:192
+#: LYMessages.c:193
 msgid "Mailto form submission Cancelled!!!"
 msgstr "Insändning av e-postformulär avbruten!!!"
 
-#: LYMessages.c:193
+#: LYMessages.c:194
 msgid "Sending form content..."
 msgstr "Skickar formulärdata..."
 
-#: LYMessages.c:194
+#: LYMessages.c:195
 msgid "No email address is present in mailto URL!"
 msgstr "Ingen e-postadress i \"mailto\"-fältet!"
 
 #. #define MAILTO_URL_TEMPOPEN_FAILED
-#: LYMessages.c:196
+#: LYMessages.c:197
 msgid "Unable to open temporary file for mailto URL!"
 msgstr "Kan inte öppna temporärfil för \"mailto\"-adress!"
 
 #. #define INC_ORIG_MSG_PROMPT
-#: LYMessages.c:198
+#: LYMessages.c:199
 msgid "Do you wish to include the original message?"
 msgstr "Vill du inkludera originalmeddelandet?"
 
 #. #define INC_PREPARSED_MSG_PROMPT
-#: LYMessages.c:200
+#: LYMessages.c:201
 msgid "Do you wish to include the preparsed source?"
 msgstr "Vill du inkludera den färdigtolkade källkoden?"
 
 #. #define SPAWNING_EDITOR_FOR_MAIL
-#: LYMessages.c:202
+#: LYMessages.c:203
 msgid "Spawning your selected editor to edit mail message"
 msgstr "Startar ditt valda textredigeringsprogram för att skriva brevet"
 
 #. #define ERROR_SPAWNING_EDITOR
-#: LYMessages.c:204
+#: LYMessages.c:205
 msgid "Error spawning editor, check your editor definition in the options menu"
 msgstr "Fel vid start av textredigeringsprogram, se inställningar i valmenyn"
 
-#: LYMessages.c:205
+#: LYMessages.c:206
 msgid "Send this comment?"
 msgstr "Skicka denna kommentar?"
 
-#: LYMessages.c:206
+#: LYMessages.c:207
 msgid "Send this message?"
 msgstr "Skicka detta meddelande?"
 
-#: LYMessages.c:207
+#: LYMessages.c:208
 msgid "Sending your message..."
 msgstr "Skickar ditt meddelande..."
 
-#: LYMessages.c:208
+#: LYMessages.c:209
 msgid "Sending your comment:"
 msgstr "Skickar din kommentar:"
 
 #. textarea
-#: LYMessages.c:211
+#: LYMessages.c:212
 msgid "Not in a TEXTAREA; cannot use external editor."
 msgstr "Inte i en TEXTAREA; kan inte använda externt redigeringsprogram."
 
-#: LYMessages.c:212
+#: LYMessages.c:213
 msgid "Not in a TEXTAREA; cannot use command."
 msgstr "Inte i en TEXTAREA; kan inte använda kommando."
 
-#: LYMessages.c:214
+#: LYMessages.c:215
 msgid "file: ACTIONs are disallowed!"
 msgstr "file:-formulärmål tillåts inte!"
 
 #. #define FILE_SERVED_LINKS_DISALLOWED
-#: LYMessages.c:216
+#: LYMessages.c:217
 msgid "file: URLs via served links are disallowed!"
 msgstr "file:-adresser i givna adresser tillåts ej!"
 
-#: LYMessages.c:217
+#: LYMessages.c:218
 msgid "Access to local files denied."
 msgstr "Åtkomst till lokala filer nekas."
 
-#: LYMessages.c:218
+#: LYMessages.c:219
 msgid "file: URLs via bookmarks are disallowed!"
 msgstr "file:-adresser i bokmärken tillåts ej!"
 
 #. #define SPECIAL_VIA_EXTERNAL_DISALLOWED
-#: LYMessages.c:220
+#: LYMessages.c:221
 msgid "This special URL is not allowed in external documents!"
 msgstr "Denna specialadress tillåts ej i externa dokument!"
 
-#: LYMessages.c:221
+#: LYMessages.c:222
 msgid "Press <return> to return to Lynx."
 msgstr "Tryck <Enter> för att återgå till Lynx."
 
 #. #define SPAWNING_MSG
-#: LYMessages.c:224
+#: LYMessages.c:225
 msgid "Spawning DCL subprocess.  Use 'logout' to return to Lynx.\n"
 msgstr "Startar DCL-underprocess. Använd \"logout\" för att återgå till Lynx.\n"
 
 #. #define SPAWNING_MSG
-#: LYMessages.c:228
+#: LYMessages.c:229
 msgid "Type EXIT to return to Lynx.\n"
 msgstr "Skriv EXIT för att återgå till Lynx.\n"
 
 #. #define SPAWNING_MSG
-#: LYMessages.c:231
+#: LYMessages.c:232
 msgid "Spawning your default shell.  Use 'exit' to return to Lynx.\n"
 msgstr "Startar ditt valda skal. Skriv \"exit\" för att återgå till Lynx.\n"
 
-#: LYMessages.c:234
+#: LYMessages.c:235
 msgid "Spawning is currently disabled."
 msgstr "Start av externa program tillåts ej just nu."
 
-#: LYMessages.c:235
+#: LYMessages.c:236
 msgid "The 'd'ownload command is currently disabled."
 msgstr "Hämtningskommandot (\"d\") tillåts ej just nu."
 
-#: LYMessages.c:236
+#: LYMessages.c:237
 msgid "You cannot download an input field."
 msgstr "Du kan inte hämta ett indatafält."
 
-#: LYMessages.c:237
+#: LYMessages.c:238
 msgid "Form has a mailto action!  Cannot download."
 msgstr "Detta är ett e-postformulär! Kan inte hämta."
 
-#: LYMessages.c:238
+#: LYMessages.c:239
 msgid "You cannot download a mailto: link."
 msgstr "Du kan inte hämta en mailto:-länk."
 
-#: LYMessages.c:239
+#: LYMessages.c:240
 msgid "You cannot download cookies."
 msgstr "Du kan inte hämta kakor."
 
-#: LYMessages.c:240
+#: LYMessages.c:241
 msgid "You cannot download a printing option."
 msgstr "Du kan inte hämta ett utskriftsval."
 
-#: LYMessages.c:241
+#: LYMessages.c:242
 msgid "You cannot download an upload option."
 msgstr "Du kan inte hämta ett sändningsalternativ."
 
-#: LYMessages.c:242
+#: LYMessages.c:243
 msgid "You cannot download an permit option."
 msgstr "Du kan inte hämta en inställning."
 
-#: LYMessages.c:243
+#: LYMessages.c:244
 msgid "This special URL cannot be downloaded!"
 msgstr "Denna specialadress kan inte hämtas!"
 
-#: LYMessages.c:244
+#: LYMessages.c:245
 msgid "Nothing to download."
 msgstr "Inget att hämta."
 
-#: LYMessages.c:245
+#: LYMessages.c:246
 msgid "Trace ON!"
 msgstr "Spårning AKTIV!"
 
-#: LYMessages.c:246
+#: LYMessages.c:247
 msgid "Trace OFF!"
 msgstr "Spårning INAKTIV!"
 
 #. #define CLICKABLE_IMAGES_ON
-#: LYMessages.c:248
+#: LYMessages.c:249
 msgid "Links will be included for all images!  Reloading..."
 msgstr "Länkar skapas för alla bilder! Hämtar om..."
 
 #. #define CLICKABLE_IMAGES_OFF
-#: LYMessages.c:250
+#: LYMessages.c:251
 msgid "Standard image handling restored!  Reloading..."
 msgstr "Normal bildhantering återställd! Hämtar om..."
 
 #. #define PSEUDO_INLINE_ALTS_ON
-#: LYMessages.c:252
+#: LYMessages.c:253
 msgid "Pseudo_ALTs will be inserted for inlines without ALT strings!  Reloading..."
 msgstr "\"Pseudo-ALT\" sätts in för bilder som saknar ALT-strängar! Hämtar om..."
 
 #. #define PSEUDO_INLINE_ALTS_OFF
-#: LYMessages.c:254
+#: LYMessages.c:255
 msgid "Inlines without an ALT string specified will be ignored!  Reloading..."
 msgstr "Bilder utan ALT-strängar ignoreras! Hämtar om..."
 
-#: LYMessages.c:255
+#: LYMessages.c:256
 msgid "Raw 8-bit or CJK mode toggled OFF!  Reloading..."
 msgstr "Rått 8-bitars- eller CJK-läge AV! Hämtar om..."
 
-#: LYMessages.c:256
+#: LYMessages.c:257
 msgid "Raw 8-bit or CJK mode toggled ON!  Reloading..."
 msgstr "Rått 8-bitars- eller CJK-läge PÅ! Hämtar om..."
 
 #. #define HEAD_D_L_OR_CANCEL
-#: LYMessages.c:258
+#: LYMessages.c:259
 msgid "Send HEAD request for D)ocument or L)ink, or C)ancel? (d,l,c): "
 msgstr "Sänd \"HEAD\" för D=dokument eller L=länk; C=Avbryt? (d,l,c): "
 
 #. #define HEAD_D_OR_CANCEL
-#: LYMessages.c:260
+#: LYMessages.c:261
 msgid "Send HEAD request for D)ocument, or C)ancel? (d,c): "
 msgstr "Sänd \"HEAD\" för D=dokument; C=Avbryt? (d,c): "
 
-#: LYMessages.c:261
+#: LYMessages.c:262
 msgid "Sorry, the document is not an http URL."
 msgstr "Tyvärr, dokumentet har inte en http-adress."
 
-#: LYMessages.c:262
+#: LYMessages.c:263
 msgid "Sorry, the link is not an http URL."
 msgstr "Tyvärr, länken har inte en http-adress."
 
-#: LYMessages.c:263
+#: LYMessages.c:264
 msgid "Sorry, the ACTION for this form is disabled."
 msgstr "Tyvärr, formulärmålet detta formulär är avstängt."
 
 #. #define FORM_ACTION_NOT_HTTP_URL
-#: LYMessages.c:265
+#: LYMessages.c:266
 msgid "Sorry, the ACTION for this form is not an http URL."
 msgstr "Tyvärr, formulärmålet för detta formulär är inte en http-adress."
 
-#: LYMessages.c:266
+#: LYMessages.c:267
 msgid "Not an http URL or form ACTION!"
 msgstr "Inte en http-adress eller formulärmål!"
 
-#: LYMessages.c:267
+#: LYMessages.c:268
 msgid "This special URL cannot be a form ACTION!"
 msgstr "Denna speciella adress kan inte vara formulärmål!"
 
-#: LYMessages.c:268
+#: LYMessages.c:269
 msgid "URL is not in starting realm!"
 msgstr "Adressen är inte i startmängden!"
 
-#: LYMessages.c:269
+#: LYMessages.c:270
 msgid "News posting is disabled!"
 msgstr "Postning av artiklar deaktiverad!"
 
-#: LYMessages.c:270
+#: LYMessages.c:271
 msgid "File management support is disabled!"
 msgstr "Filhanteringsstödet är deaktiverat!"
 
-#: LYMessages.c:271
+#: LYMessages.c:272
 msgid "No jump file is currently available."
 msgstr "Ingen hoppfil finns just nu att tillgå."
 
-#: LYMessages.c:272
+#: LYMessages.c:273
 msgid "Jump to (use '?' for list): "
 msgstr "Hoppa till (\"?\"=lista): "
 
-#: LYMessages.c:273
+#: LYMessages.c:274
 msgid "Jumping to a shortcut URL is disallowed!"
 msgstr "Hopp till genvägsadress ej tillåtet!"
 
-#: LYMessages.c:274
+#: LYMessages.c:275
 msgid "Random URL is disallowed!  Use a shortcut."
 msgstr "Slumpmässig adress ej tillåten! Använd en genväg."
 
-#: LYMessages.c:275
+#: LYMessages.c:276
 msgid "No random URLs have been used thus far."
 msgstr "Inga slumpmässiga adresser har ännu används."
 
-#: LYMessages.c:276
+#: LYMessages.c:277
 msgid "Bookmark features are currently disabled."
-msgstr "Bomärkesfunktionerna är just nu deaktiverade."
+msgstr "Bokmärkesfunktionerna är just nu deaktiverade."
 
-#: LYMessages.c:277
+#: LYMessages.c:278
 msgid "Execution via bookmarks is disabled."
 msgstr "Programkörning via bokmärken är deaktiverat."
 
 #. #define BOOKMARK_FILE_NOT_DEFINED
-#: LYMessages.c:279
+#: LYMessages.c:280
 #, c-format
 msgid "Bookmark file is not defined. Use %s to see options."
 msgstr "Bokmärkesfil ej definierad. Använd %s för att se alternativ."
 
 #. #define NO_TEMP_FOR_HOTLIST
-#: LYMessages.c:281
+#: LYMessages.c:282
 msgid "Unable to open tempfile for X Mosaic hotlist conversion."
 msgstr "Kan inte öppna temporärfil för konvertering av X Mosaics bokmärken."
 
-#: LYMessages.c:282
+#: LYMessages.c:283
 msgid "ERROR - unable to open bookmark file."
 msgstr "FEL - kan inte öppna bokmärkesfil."
 
 #. #define BOOKMARK_OPEN_FAILED_FOR_DEL
-#: LYMessages.c:284
+#: LYMessages.c:285
 msgid "Unable to open bookmark file for deletion of link."
 msgstr "Kan inte öppna bokmärkesfil för borttagning av länk."
 
 #. #define BOOKSCRA_OPEN_FAILED_FOR_DEL
-#: LYMessages.c:286
+#: LYMessages.c:287
 msgid "Unable to open scratch file for deletion of link."
 msgstr "Kan inte öppna skräpfil för borttagning av länk."
 
-#: LYMessages.c:288
+#: LYMessages.c:289
 msgid "Error renaming scratch file."
 msgstr "Fel vid namnändring av skräpfil."
 
-#: LYMessages.c:290
+#: LYMessages.c:291
 msgid "Error renaming temporary file."
 msgstr "Fel vid namnändring av temporärfil."
 
 #. #define BOOKTEMP_COPY_FAIL
-#: LYMessages.c:292
+#: LYMessages.c:293
 msgid "Unable to copy temporary file for deletion of link."
 msgstr "Kan inte kopiera temporärfil för borttagning av länk."
 
 #. #define BOOKTEMP_REOPEN_FAIL_FOR_DEL
-#: LYMessages.c:294
+#: LYMessages.c:295
 msgid "Unable to reopen temporary file for deletion of link."
 msgstr "Kan inte återöppna temporärfil för borttagning av länk."
 
 #. #define BOOKMARK_LINK_NOT_ONE_LINE
-#: LYMessages.c:297
+#: LYMessages.c:298
 msgid "Link is not by itself all on one line in bookmark file."
 msgstr "Länk är inte själv helt på en rad i bokmärkesfilen."
 
-#: LYMessages.c:298
+#: LYMessages.c:299
 msgid "Bookmark deletion failed."
 msgstr "Borttagning av bokmärke misslyckades."
 
 #. #define BOOKMARKS_NOT_TRAVERSED
-#: LYMessages.c:300
+#: LYMessages.c:301
 msgid "Bookmark files cannot be traversed (only http URLs)."
 msgstr "Bokmärkesfiler kan inte traverseras (endast http-adresser)."
 
 #. #define BOOKMARKS_NOT_OPEN
-#: LYMessages.c:302
+#: LYMessages.c:303
 msgid "Unable to open bookmark file, use 'a' to save a link first"
 msgstr "Kan inte öppna bokmärkesfil, använd 'a' för att spara en länk först"
 
-#: LYMessages.c:303
+#: LYMessages.c:304
 msgid "There are no links in this bookmark file!"
 msgstr "Det finns inga länkar i denna bokmärkesfil!"
 
 #. #define CACHE_D_OR_CANCEL
-#: LYMessages.c:305
+#: LYMessages.c:306
 msgid "D)elete cached document or C)ancel? (d,c): "
 msgstr "D=Ta bort cachat dokument; C=Avbryt? (d,c): "
 
 #. #define BOOK_D_L_OR_CANCEL
-#: LYMessages.c:307
+#: LYMessages.c:308
 msgid "Save D)ocument or L)ink to bookmark file or C)ancel? (d,l,c): "
 msgstr "Spara D)okument eller L)änk till bokmärkesfil? C=Avbryt (d,l,c): "
 
-#: LYMessages.c:308
+#: LYMessages.c:309
 msgid "Save D)ocument to bookmark file or C)ancel? (d,c): "
 msgstr "Spara D)okument till bokmärkesfil? C=Avbryt (d,c): "
 
-#: LYMessages.c:309
+#: LYMessages.c:310
 msgid "Save L)ink to bookmark file or C)ancel? (l,c): "
 msgstr "Spara L)änk till bokmärkesfil? C=Avbryt (l,c): "
 
 #. #define NOBOOK_POST_FORM
-#: LYMessages.c:311
+#: LYMessages.c:312
 msgid "Documents from forms with POST content cannot be saved as bookmarks."
 msgstr "Dokument från \"POST\"-formulär kan inte lagras som bokmärken."
 
-#: LYMessages.c:312
+#: LYMessages.c:313
 msgid "Cannot save form fields/links"
 msgstr "Kan inte spara formulärfält/länkar"
 
 #. #define NOBOOK_HSML
-#: LYMessages.c:314
+#: LYMessages.c:315
 msgid "History, showinfo, menu and list files cannot be saved as bookmarks."
 msgstr "Historik, \"showinfo\", menyer och listfiler kan inte lagras som bokmärken."
 
 #. #define CONFIRM_BOOKMARK_DELETE
-#: LYMessages.c:316
+#: LYMessages.c:317
 msgid "Do you really want to delete this link from your bookmark file?"
 msgstr "Vill du verkligen ta bort denna länk från din bokmärkesfil?"
 
-#: LYMessages.c:317
+#: LYMessages.c:318
 msgid "Malformed address."
 msgstr "Trasig adress."
 
 #. #define HISTORICAL_ON_MINIMAL_OFF
-#: LYMessages.c:319
+#: LYMessages.c:320
 msgid "Historical comment parsing ON (Minimal is overridden)!"
 msgstr "Historisk tolkning av kommentarer PÅ (minimal undertryckt)!"
 
 #. #define HISTORICAL_OFF_MINIMAL_ON
-#: LYMessages.c:321
+#: LYMessages.c:322
 msgid "Historical comment parsing OFF (Minimal is in effect)!"
-msgstr "Historisk tolkning av kommentarer AV (minmal aktiv)!"
+msgstr "Historisk tolkning av kommentarer AV (minimal aktiv)!"
 
 #. #define HISTORICAL_ON_VALID_OFF
-#: LYMessages.c:323
+#: LYMessages.c:324
 msgid "Historical comment parsing ON (Valid is overridden)!"
 msgstr "Historisk tolkning av kommentarer PÅ (korrekt undertryckt)!"
 
 #. #define HISTORICAL_OFF_VALID_ON
-#: LYMessages.c:325
+#: LYMessages.c:326
 msgid "Historical comment parsing OFF (Valid is in effect)!"
 msgstr "Historisk tolkning av kommentarer AV (korrekt aktiv)!"
 
 #. #define MINIMAL_ON_IN_EFFECT
-#: LYMessages.c:327
+#: LYMessages.c:328
 msgid "Minimal comment parsing ON (and in effect)!"
 msgstr "Minimal tolkning av kommentarer PÅ (och aktiv)!"
 
 #. #define MINIMAL_OFF_VALID_ON
-#: LYMessages.c:329
+#: LYMessages.c:330
 msgid "Minimal comment parsing OFF (Valid is in effect)!"
 msgstr "Minimal tolkning av kommentarer AV (korrekt aktiv)!"
 
 #. #define MINIMAL_ON_BUT_HISTORICAL
-#: LYMessages.c:331
+#: LYMessages.c:332
 msgid "Minimal comment parsing ON (but Historical is in effect)!"
 msgstr "Minimal tolkning av kommentarer PÅ (men historisk aktiv)!"
 
 #. #define MINIMAL_OFF_HISTORICAL_ON
-#: LYMessages.c:333
+#: LYMessages.c:334
 msgid "Minimal comment parsing OFF (Historical is in effect)!"
 msgstr "Minimal tolkning av kommentarer AV (historisk aktiv)!"
 
-#: LYMessages.c:334
+#: LYMessages.c:335
 msgid "Soft double-quote parsing ON!"
 msgstr "Mjuk citationsteckenstolkning PÅ!"
 
-#: LYMessages.c:335
+#: LYMessages.c:336
 msgid "Soft double-quote parsing OFF!"
 msgstr "Mjuk citationsteckenstolkning AV!"
 
-#: LYMessages.c:336
+#: LYMessages.c:337
 msgid "Now using TagSoup parsing of HTML."
 msgstr "Tolkar nu HTML enligt \"TagSoup\"-modellen."
 
-#: LYMessages.c:337
+#: LYMessages.c:338
 msgid "Now using SortaSGML parsing of HTML!"
 msgstr "Tolkar nu HTML enligt \"SortaSGML\"-modellen."
 
-#: LYMessages.c:338
+#: LYMessages.c:339
 msgid "You are already at the end of this document."
 msgstr "Du är redan i slutet av dokumentet."
 
-#: LYMessages.c:339
+#: LYMessages.c:340
 msgid "You are already at the beginning of this document."
 msgstr "Du är redan i början av dokumentet."
 
-#: LYMessages.c:340
+#: LYMessages.c:341
 #, c-format
 msgid "You are already at page %d of this document."
 msgstr "Du är redan på sida %d av dokumentet."
 
-#: LYMessages.c:341
+#: LYMessages.c:342
 #, c-format
 msgid "Link number %d already is current."
 msgstr "Länk nummer %d är redan nuvarande."
 
-#: LYMessages.c:342
+#: LYMessages.c:343
 msgid "You are already at the first document"
 msgstr "Du är redan i det första dokumentet."
 
-#: LYMessages.c:343
+#: LYMessages.c:344
 msgid "There are no links above this line of the document."
 msgstr "Det finns inga länkar över denna rad i dokumentet."
 
-#: LYMessages.c:344
+#: LYMessages.c:345
 msgid "There are no links below this line of the document."
 msgstr "Det finns inga länkar nedanför denna rad i dokumentet."
 
 #. #define MAXLEN_REACHED_DEL_OR_MOV
-#: LYMessages.c:346
+#: LYMessages.c:347
 msgid "Maximum length reached!  Delete text or move off field."
 msgstr "Maximal längd nådd! Ta bort text eller lämna fältet."
 
 #. #define NOT_ON_SUBMIT_OR_LINK
-#: LYMessages.c:348
+#: LYMessages.c:349
 msgid "You are not on a form submission button or normal link."
 msgstr "Du är inte på en formulärsändknapp eller normal länk."
 
 #. #define NEED_CHECKED_RADIO_BUTTON
-#: LYMessages.c:350
+#: LYMessages.c:351
 msgid "One radio button must be checked at all times!"
 msgstr "En radioknapp måste alltid vara markerad!"
 
-#: LYMessages.c:351
+#: LYMessages.c:352
 msgid "No submit button for this form, submit single text field?"
 msgstr "Ingen insändningsknapp i formuläret, skicka ensamt textfält?"
 
-#: LYMessages.c:352
+#: LYMessages.c:353
 msgid "Do you want to go back to the previous document?"
 msgstr "Vill du gå tillbaka till föregående dokument?"
 
-#: LYMessages.c:353
+#: LYMessages.c:354
 msgid "Use arrows or tab to move off of field."
 msgstr "Använd pilar eller tabb för att lämna."
 
 #. #define ENTER_TEXT_ARROWS_OR_TAB
-#: LYMessages.c:355
+#: LYMessages.c:356
 msgid "Enter text.  Use arrows or tab to move off of field."
 msgstr "Ange text. Använd pilar eller tabb för att lämna."
 
-#: LYMessages.c:356
+#: LYMessages.c:357
 msgid "** Bad HTML!!  No form action defined. **"
 msgstr "** Trasig HTML!! Inget formulärmål angivet. **"
 
-#: LYMessages.c:357
+#: LYMessages.c:358
 msgid "Bad HTML!!  Unable to create popup window!"
 msgstr "Trasig HTML!! Kan inte skapa popupfönster!"
 
-#: LYMessages.c:358
+#: LYMessages.c:359
 msgid "Unable to create popup window!"
 msgstr "Kan inte skapa popupfönster!"
 
-#: LYMessages.c:359
+#: LYMessages.c:360
 msgid "Goto a random URL is disallowed!"
 msgstr "Slumpmässig adress ej tillåten!"
 
-#: LYMessages.c:360
+#: LYMessages.c:361
 msgid "Goto a non-http URL is disallowed!"
 msgstr "Icke-http-adress ej tillåten!"
 
-#: LYMessages.c:361
+#: LYMessages.c:362
 #, c-format
 msgid "You are not allowed to goto \"%s\" URLs"
 msgstr "Du tillåts inte gå till \"%s\"-adresser"
 
-#: LYMessages.c:362
+#: LYMessages.c:363
 msgid "URL to open: "
 msgstr "Adress att öppna: "
 
-#: LYMessages.c:363
+#: LYMessages.c:364
 msgid "Edit the current Goto URL: "
 msgstr "Redigera aktuell gåadress: "
 
-#: LYMessages.c:364
+#: LYMessages.c:365
 msgid "Edit the previous Goto URL: "
 msgstr "Redigera föregående gåadress: "
 
-#: LYMessages.c:365
+#: LYMessages.c:366
 msgid "Edit a previous Goto URL: "
 msgstr "Redigera en tidigare gåadress: "
 
-#: LYMessages.c:366
+#: LYMessages.c:367
 msgid "Current document has POST data."
 msgstr "Aktuellt dokument har \"POST\"-data."
 
-#: LYMessages.c:367
+#: LYMessages.c:368
 msgid "Edit this document's URL: "
 msgstr "Redigera dokumentets adress: "
 
-#: LYMessages.c:368
+#: LYMessages.c:369
 msgid "Edit the current link's URL: "
-msgstr "Redigera aktull länkadress: "
+msgstr "Redigera aktuell länkadress: "
 
-#: LYMessages.c:369
+#: LYMessages.c:370
 msgid "Edit the form's submit-URL: "
 msgstr "Redigera formulärets mottagaradress: "
 
-#: LYMessages.c:370
+#: LYMessages.c:371
 msgid "You cannot edit File Management URLs"
 msgstr "Du kan inte redigera filhanteringsadresser"
 
-#: LYMessages.c:371
+#: LYMessages.c:372
 msgid "Enter a database query: "
 msgstr "Ange en databasfråga: "
 
-#: LYMessages.c:372
+#: LYMessages.c:373
 msgid "Enter a whereis query: "
 msgstr "Ange en \"whereis\"-fråga: "
 
-#: LYMessages.c:373
+#: LYMessages.c:374
 msgid "Edit the current query: "
 msgstr "Redigera aktuell fråga: "
 
-#: LYMessages.c:374
+#: LYMessages.c:375
 msgid "Edit the previous query: "
 msgstr "Redigera föregående fråga: "
 
-#: LYMessages.c:375
+#: LYMessages.c:376
 msgid "Edit a previous query: "
 msgstr "Redigera en tidigare fråga: "
 
 #. #define USE_C_R_TO_RESUB_CUR_QUERY
-#: LYMessages.c:377
+#: LYMessages.c:378
 msgid "Use Control-R to resubmit the current query."
 msgstr "Använd Control-R för att skicka frågan på nytt."
 
-#: LYMessages.c:378
+#: LYMessages.c:379
 msgid "Edit the current shortcut: "
 msgstr "Redigera aktuell genväg: "
 
-#: LYMessages.c:379
+#: LYMessages.c:380
 msgid "Edit the previous shortcut: "
 msgstr "Redigera föregående genväg: "
 
-#: LYMessages.c:380
+#: LYMessages.c:381
 msgid "Edit a previous shortcut: "
 msgstr "Redigera en tidigare genväg:"
 
-#: LYMessages.c:381
+#: LYMessages.c:382
 #, c-format
 msgid "Key '%c' is not mapped to a jump file!"
 msgstr "Tangenten \"%c\" är inte kopplad till en hoppfil!"
 
-#: LYMessages.c:382
+#: LYMessages.c:383
 msgid "Cannot locate jump file!"
 msgstr "Kan inte lokalisera hoppfil!"
 
-#: LYMessages.c:383
+#: LYMessages.c:384
 msgid "Cannot open jump file!"
 msgstr "Kan inte öppna hoppfil!"
 
-#: LYMessages.c:384
+#: LYMessages.c:385
 msgid "Error reading jump file!"
 msgstr "Fel vid läsning av hoppfil!"
 
-#: LYMessages.c:385
+#: LYMessages.c:386
 msgid "Out of memory reading jump file!"
 msgstr "Slut på minne vid läsning av hoppfil!"
 
-#: LYMessages.c:386
+#: LYMessages.c:387
 msgid "Out of memory reading jump table!"
 msgstr "Slut på minne vid läsning av hopptabell!"
 
-#: LYMessages.c:387
+#: LYMessages.c:388
 msgid "No index is currently available."
 msgstr "Inget index är tillgängligt."
 
 #. #define CONFIRM_MAIN_SCREEN
-#: LYMessages.c:389
+#: LYMessages.c:390
 msgid "Do you really want to go to the Main screen?"
 msgstr "Vill du verkligen gå till huvudskärmen?"
 
-#: LYMessages.c:390
+#: LYMessages.c:391
 msgid "You are already at main screen!"
 msgstr "Du är redan på huvudskärmen!"
 
 #. #define NOT_ISINDEX
-#: LYMessages.c:392
+#: LYMessages.c:393
 msgid "Not a searchable indexed document -- press '/' to search for a text string"
 msgstr "Inte ett sökbart index -- tryck \"/\" för att söka efter en textsträng"
 
 #. #define NO_OWNER
-#: LYMessages.c:394
+#: LYMessages.c:395
 msgid "No owner is defined for this file so you cannot send a comment"
 msgstr "Ingen ägare är angiven för denna fil, så du kan inte skicka en kommentar"
 
-#: LYMessages.c:395
+#: LYMessages.c:396
 #, c-format
 msgid "No owner is defined. Use %s?"
 msgstr "Ingen ägaren är angiven. Använda %s?"
 
-#: LYMessages.c:396
+#: LYMessages.c:397
 msgid "Do you wish to send a comment?"
 msgstr "Vill du skicka en kommentar?"
 
-#: LYMessages.c:397
+#: LYMessages.c:398
 msgid "Mail is disallowed so you cannot send a comment"
 msgstr "E-post tillåts ej, så du kan inte skicka en kommentar"
 
-#: LYMessages.c:398
+#: LYMessages.c:399
 msgid "The 'e'dit command is currently disabled."
 msgstr "Redigeringskommandot är just nu deaktiverat."
 
-#: LYMessages.c:399
+#: LYMessages.c:400
 msgid "External editing is currently disabled."
 msgstr "Extern redigering är just nu deaktiverad."
 
-#: LYMessages.c:400
+#: LYMessages.c:401
 msgid "System error - failure to get status."
 msgstr "Systemfel - kunde inte hämta status."
 
-#: LYMessages.c:401
+#: LYMessages.c:402
 msgid "No editor is defined!"
 msgstr "Inget textredigeringsprogram har angivits!"
 
-#: LYMessages.c:402
+#: LYMessages.c:403
 msgid "The 'p'rint command is currently disabled."
 msgstr "Utskriftskommandot är just nu deaktiverat."
 
-#: LYMessages.c:403
+#: LYMessages.c:404
 msgid "Document has no Toolbar links or Banner."
 msgstr "Dokumentet har varken verktygsradslänkar eller baner."
 
-#: LYMessages.c:404
+#: LYMessages.c:405
 msgid "Unable to open traversal file."
 msgstr "Kan inte öppna traverseringsfil."
 
-#: LYMessages.c:405
+#: LYMessages.c:406
 msgid "Unable to open traversal found file."
 msgstr "Kan inte öppna traverseringens resultatfil."
 
-#: LYMessages.c:406
+#: LYMessages.c:407
 msgid "Unable to open reject file."
 msgstr "Kan inte öppna avvisningsfilen."
 
-#: LYMessages.c:407
+#: LYMessages.c:408
 msgid "Unable to open traversal errors output file"
 msgstr "Kan inte öppna traverseringens felfil."
 
-#: LYMessages.c:408
+#: LYMessages.c:409
 msgid "TRAVERSAL WAS INTERRUPTED"
 msgstr "TRAVERSERINGEN AVBRÖTS"
 
-#: LYMessages.c:409
+#: LYMessages.c:410
 msgid "Follow link (or goto link or page) number: "
 msgstr "Följ länk (eller gå till länk eller sida) nummer: "
 
-#: LYMessages.c:410
+#: LYMessages.c:411
 msgid "Select option (or page) number: "
 msgstr "Välj val- (eller sid-)nummer: "
 
-#: LYMessages.c:411
+#: LYMessages.c:412
 #, c-format
 msgid "Option number %d already is current."
 msgstr "Alternativ %d är redan markerat."
 
 #. #define ALREADY_AT_OPTION_END
-#: LYMessages.c:413
+#: LYMessages.c:414
 msgid "You are already at the end of this option list."
 msgstr "Du är redan i slutet av alternativlistan."
 
 #. #define ALREADY_AT_OPTION_BEGIN
-#: LYMessages.c:415
+#: LYMessages.c:416
 msgid "You are already at the beginning of this option list."
 msgstr "Du är redan i början av alternativlistan."
 
 #. #define ALREADY_AT_OPTION_PAGE
-#: LYMessages.c:417
+#: LYMessages.c:418
 #, c-format
 msgid "You are already at page %d of this option list."
 msgstr "Du är redan på sida %d i alternativlistan."
 
-#: LYMessages.c:418
+#: LYMessages.c:419
 msgid "You have entered an invalid option number."
 msgstr "Du har angett ett felaktigt alternativnummer."
 
-#: LYMessages.c:419
+#: LYMessages.c:420
 msgid "** Bad HTML!!  Use -trace to diagnose. **"
 msgstr "** Trasig HTML!! Använd -trace för att diagnostisera. **"
 
-#: LYMessages.c:420
+#: LYMessages.c:421
 msgid "Give name of file to save in"
 msgstr "Ange filnamn att spara till"
 
-#: LYMessages.c:421
+#: LYMessages.c:422
 msgid "Can't save data to file -- please run WWW locally"
 msgstr "Kan inte spara data till fil -- kör lokal webbläsare"
 
-#: LYMessages.c:422
+#: LYMessages.c:423
 msgid "Can't open temporary file!"
 msgstr "Kan inte öppna temporärfil!"
 
-#: LYMessages.c:423
+#: LYMessages.c:424
 msgid "Can't open output file!  Cancelling!"
 msgstr "Kan inte öppna utdatafil! Avbryter!"
 
-#: LYMessages.c:424
+#: LYMessages.c:425
 msgid "Execution is disabled."
 msgstr "Programkörning deaktiverad."
 
 #. #define EXECUTION_DISABLED_FOR_FILE
-#: LYMessages.c:426
+#: LYMessages.c:427
 #, c-format
 msgid "Execution is not enabled for this file.  See the Options menu (use %s)."
 msgstr "Programkörning inte aktiverad för denna fil. Se alternativmeny (använd %s)."
 
 #. #define EXECUTION_NOT_COMPILED
-#: LYMessages.c:428
+#: LYMessages.c:429
 msgid "Execution capabilities are not compiled into this version."
 msgstr "Programkörningsmöjligheter inte inkompilerade i denna version."
 
-#: LYMessages.c:429
+#: LYMessages.c:430
 msgid "This file cannot be displayed on this terminal."
 msgstr "Denna fil kan inte visas på terminalen."
 
 #. #define CANNOT_DISPLAY_FILE_D_OR_C
-#: LYMessages.c:431
+#: LYMessages.c:432
 msgid "This file cannot be displayed on this terminal:  D)ownload, or C)ancel"
 msgstr "Denna fil kan inte visas på terminalen. D=Hämta, C=Avbryt"
 
-#: LYMessages.c:432
+#: LYMessages.c:433
 #, c-format
 msgid "%s  D)ownload, or C)ancel"
 msgstr "%s  D=Hämta, C=Avbryt"
 
-#: LYMessages.c:433
+#: LYMessages.c:434
 msgid "Cancelling file."
 msgstr "Avbryter fil."
 
-#: LYMessages.c:434
+#: LYMessages.c:435
 msgid "Retrieving file.  - PLEASE WAIT -"
 msgstr "Hämtar fil. - VÄNLIGEN VÄNTA -"
 
-#: LYMessages.c:435
+#: LYMessages.c:436
 msgid "Enter a filename: "
 msgstr "Ange ett filnamn: "
 
-#: LYMessages.c:436
+#: LYMessages.c:437
 msgid "Edit the previous filename: "
 msgstr "Redigera föregående filnamn: "
 
-#: LYMessages.c:437
+#: LYMessages.c:438
 msgid "Edit a previous filename: "
 msgstr "Redigera ett tidigare filnamn: "
 
-#: LYMessages.c:438
+#: LYMessages.c:439
 msgid "Enter a new filename: "
 msgstr "Ange ett nytt filnamn: "
 
-#: LYMessages.c:439
+#: LYMessages.c:440
 msgid "File name may not begin with a dot."
 msgstr "Filnamnet får inte börja med en punkt."
 
-#: LYMessages.c:441
+#: LYMessages.c:442
 msgid "File exists.  Create higher version?"
 msgstr "Filen existerar. Skapa en högre version?"
 
-#: LYMessages.c:443
+#: LYMessages.c:444
 msgid "File exists.  Overwrite?"
 msgstr "Filen existerar. Skriva över?"
 
-#: LYMessages.c:445
+#: LYMessages.c:446
 msgid "Cannot write to file."
 msgstr "Kan inte skriva till fil."
 
-#: LYMessages.c:446
+#: LYMessages.c:447
 msgid "ERROR! - download command is misconfigured."
 msgstr "FEL! - hämtkommandot är felkonfigurerat."
 
-#: LYMessages.c:447
+#: LYMessages.c:448
 msgid "Unable to download file."
 msgstr "Kan inte hämta fil."
 
-#: LYMessages.c:448
+#: LYMessages.c:449
 msgid "Reading directory..."
 msgstr "Läser katalog..."
 
-#: LYMessages.c:449
+#: LYMessages.c:450
 msgid "Building directory listing..."
 msgstr "Bygger kataloglista..."
 
-#: LYMessages.c:450
+#: LYMessages.c:451
 msgid "Saving..."
 msgstr "Sparar..."
 
-#: LYMessages.c:451
+#: LYMessages.c:452
 #, c-format
 msgid "Could not edit file '%s'."
 msgstr "Kan inte redigera filen \"%s\"."
 
-#: LYMessages.c:452
+#: LYMessages.c:453
 msgid "Unable to access document!"
 msgstr "Kan inte komma åt dokument!"
 
-#: LYMessages.c:453
+#: LYMessages.c:454
 msgid "Could not access file."
 msgstr "Kan inte komma åt fil."
 
-#: LYMessages.c:454
+#: LYMessages.c:455
 msgid "Could not access directory."
 msgstr "Kan inte komma åt katalog."
 
-#: LYMessages.c:455
+#: LYMessages.c:456
 msgid "Could not load data."
 msgstr "Kan inte läsa in data."
 
 #. #define CANNOT_EDIT_REMOTE_FILES
-#: LYMessages.c:457
+#: LYMessages.c:458
 msgid "Lynx cannot currently (e)dit remote WWW files."
 msgstr "Lynx kan ännu inte redigera fjärrwebbfiler."
 
 #. #define CANNOT_EDIT_FIELD
-#: LYMessages.c:459
+#: LYMessages.c:460
 msgid "This field cannot be (e)dited with an external editor."
 msgstr "Detta fält kan inte redigeras med en extern redigerare."
 
-#: LYMessages.c:460
+#: LYMessages.c:461
 msgid "Bad rule"
 msgstr "Felaktig regel"
 
-#: LYMessages.c:461
+#: LYMessages.c:462
 msgid "Insufficient operands:"
 msgstr "Otillräckliga operander:"
 
-#: LYMessages.c:462
+#: LYMessages.c:463
 msgid "You are not authorized to edit this file."
 msgstr "Du har inte rättighet att redigera filen."
 
-#: LYMessages.c:463
+#: LYMessages.c:464
 msgid "Title: "
 msgstr "Titel: "
 
-#: LYMessages.c:464
+#: LYMessages.c:465
 msgid "Subject: "
 msgstr "Ärende: "
 
-#: LYMessages.c:465
+#: LYMessages.c:466
 msgid "Username: "
 msgstr "Användar-id: "
 
-#: LYMessages.c:466
+#: LYMessages.c:467
 msgid "Password: "
 msgstr "Lösenord: "
 
-#: LYMessages.c:467
+#: LYMessages.c:468
 msgid "lynx: Username and Password required!!!"
 msgstr "lynx: Användar-id och lösenord krävs!!!"
 
-#: LYMessages.c:468
+#: LYMessages.c:469
 msgid "lynx: Password required!!!"
 msgstr "lynx: Lösenord krävs!!!"
 
-#: LYMessages.c:469
+#: LYMessages.c:470
 msgid "Clear all authorization info for this session?"
 msgstr "Rensa all auktoriseringsinformation från denna session?"
 
-#: LYMessages.c:470
+#: LYMessages.c:471
 msgid "Authorization info cleared."
 msgstr "Auktoriseringsinformation rensad."
 
-#: LYMessages.c:471
+#: LYMessages.c:472
 msgid "Authorization failed.  Retry?"
 msgstr "Auktorisering misslyckades. Försök igen?"
 
-#: LYMessages.c:472
+#: LYMessages.c:473
 msgid "cgi support has been disabled."
 msgstr "cgi-stöd har deaktiverats."
 
 #. #define CGI_NOT_COMPILED
-#: LYMessages.c:474
+#: LYMessages.c:475
 msgid "Lynxcgi capabilities are not compiled into this version."
 msgstr "Lynxcgi-stöd är inte inkompilerade i denna version."
 
-#: LYMessages.c:475
+#: LYMessages.c:476
 #, c-format
 msgid "Sorry, no known way of converting %s to %s."
 msgstr "Tyvärr, kan inte konvertera %s till %s."
 
-#: LYMessages.c:476
+#: LYMessages.c:477
 msgid "Unable to set up connection."
 msgstr "Kan inte ställa in anslutning."
 
-#: LYMessages.c:477
+#: LYMessages.c:478
 msgid "Unable to make connection"
 msgstr "Kan inte skapa anslutning"
 
 #. #define MALFORMED_EXEC_REQUEST
-#: LYMessages.c:479
+#: LYMessages.c:480
 msgid "Executable link rejected due to malformed request."
 msgstr "Körbar länk förkastad på grund av trasig förfrågan."
 
 #. #define BADCHAR_IN_EXEC_LINK
-#: LYMessages.c:481
+#: LYMessages.c:482
 #, c-format
 msgid "Executable link rejected due to `%c' character."
 msgstr "Körbar länk förkastad på grund av tecknet \"%c\"."
 
 #. #define RELPATH_IN_EXEC_LINK
-#: LYMessages.c:483
+#: LYMessages.c:484
 msgid "Executable link rejected due to relative path string ('../')."
 msgstr "Körbar länk förkastad på grund av relativ sökvägssträng (\"../\")."
 
 #. #define BADLOCPATH_IN_EXEC_LINK
-#: LYMessages.c:485
+#: LYMessages.c:486
 msgid "Executable link rejected due to location or path."
 msgstr "Körbar länk förkastad på grund av placering eller sökväg."
 
-#: LYMessages.c:486
+#: LYMessages.c:487
 msgid "Mail access is disabled!"
 msgstr "Åtkomst till e-post deaktiverad!"
 
 #. #define ACCESS_ONLY_LOCALHOST
-#: LYMessages.c:488
+#: LYMessages.c:489
 msgid "Only files and servers on the local host can be accessed."
 msgstr "Endast filer och servrar på den lokala värden kan nås."
 
-#: LYMessages.c:489
+#: LYMessages.c:490
 msgid "Telnet access is disabled!"
 msgstr "Telnetåtkomst är deaktiverad!"
 
 #. #define TELNET_PORT_SPECS_DISABLED
-#: LYMessages.c:491
+#: LYMessages.c:492
 msgid "Telnet port specifications are disabled."
 msgstr "Specificering av telnetport är deaktiverad."
 
-#: LYMessages.c:492
+#: LYMessages.c:493
 msgid "USENET news access is disabled!"
 msgstr "Åtkomst till Usenet news är deaktiverad!"
 
-#: LYMessages.c:493
+#: LYMessages.c:494
 msgid "Rlogin access is disabled!"
 msgstr "Rloginåtkomst är deaktiverad!"
 
-#: LYMessages.c:494
+#: LYMessages.c:495
 msgid "Ftp access is disabled!"
 msgstr "Ftpåtkomst är deaktiverad!"
 
-#: LYMessages.c:495
+#: LYMessages.c:496
 msgid "There are no references from this document."
 msgstr "Det finns inga referenser i detta dokument."
 
-#: LYMessages.c:496
+#: LYMessages.c:497
 msgid "There are only hidden links from this document."
 msgstr "Det finns inga dolda länkar i detta dokument."
 
-#: LYMessages.c:498
+#: LYMessages.c:499
 msgid "Unable to open command file."
 msgstr "Kan inte öppna kommandofil."
 
-#: LYMessages.c:500
+#: LYMessages.c:501
 msgid "News Post Cancelled!!!"
 msgstr "Postning av inlägg avbruten!!!"
 
 #. #define SPAWNING_EDITOR_FOR_NEWS
-#: LYMessages.c:502
+#: LYMessages.c:503
 msgid "Spawning your selected editor to edit news message"
 msgstr "Startar ditt valda textredigeringsprogram för att redigera inlägg"
 
-#: LYMessages.c:503
+#: LYMessages.c:504
 msgid "Post this message?"
 msgstr "Posta inlägget?"
 
-#: LYMessages.c:504
+#: LYMessages.c:505
 #, c-format
 msgid "Append '%s'?"
 msgstr "Lägga till \"%s\"?"
 
-#: LYMessages.c:505
+#: LYMessages.c:506
 msgid "Posting to newsgroup(s)..."
 msgstr "Postar till diskussionsgrupp(er)..."
 
-#: LYMessages.c:507
+#: LYMessages.c:508
 msgid "*** You have unread mail. ***"
 msgstr "*** Du har oläst e-post. ***"
 
-#: LYMessages.c:509
+#: LYMessages.c:510
 msgid "*** You have mail. ***"
 msgstr "*** Du har e-post. ***"
 
-#: LYMessages.c:511
+#: LYMessages.c:512
 msgid "*** You have new mail. ***"
 msgstr "*** Du har ny e-post. ***"
 
-#: LYMessages.c:512
+#: LYMessages.c:513
 msgid "File insert cancelled!!!"
 msgstr "Filinläggning avbruten!!!"
 
-#: LYMessages.c:513
+#: LYMessages.c:514
 msgid "Not enough memory for file!"
 msgstr "Minnet slut för fil!"
 
-#: LYMessages.c:514
+#: LYMessages.c:515
 msgid "Can't open file for reading."
 msgstr "Kan inte öppna fil för läsning."
 
-#: LYMessages.c:515
+#: LYMessages.c:516
 msgid "File does not exist."
 msgstr "Filen existerar inte."
 
-#: LYMessages.c:516
+#: LYMessages.c:517
 msgid "File does not exist - reenter or cancel:"
 msgstr "Filen existerar inte - ange igen eller avbryt:"
 
-#: LYMessages.c:517
+#: LYMessages.c:518
 msgid "File is not readable."
 msgstr "Filen är inte läsbar."
 
-#: LYMessages.c:518
+#: LYMessages.c:519
 msgid "File is not readable - reenter or cancel:"
 msgstr "Filen är inte läsbar - ange igen eller avbryt:"
 
-#: LYMessages.c:519
+#: LYMessages.c:520
 msgid "Nothing to insert - file is 0-length."
 msgstr "Inget att lägga in - filen har nollstorlek."
 
-#: LYMessages.c:520
+#: LYMessages.c:521
 msgid "Save request cancelled!!!"
 msgstr "Sparning avbruten!!!"
 
-#: LYMessages.c:521
+#: LYMessages.c:522
 msgid "Mail request cancelled!!!"
 msgstr "E-post avbrutet!!!"
 
 #. #define CONFIRM_MAIL_SOURCE_PREPARSED
-#: LYMessages.c:523
+#: LYMessages.c:524
 msgid "Viewing preparsed source.  Are you sure you want to mail it?"
 msgstr "Visar tolkad källkod. Är du säker på att du vill skicka den?"
 
-#: LYMessages.c:524
+#: LYMessages.c:525
 msgid "Please wait..."
 msgstr "Var god vänta..."
 
-#: LYMessages.c:525
+#: LYMessages.c:526
 msgid "Mailing file.  Please wait..."
 msgstr "Skickar fil. Var god vänta..."
 
-#: LYMessages.c:526
+#: LYMessages.c:527
 msgid "ERROR - Unable to mail file"
 msgstr "FEL - Kan inte skicka fil per e-post"
 
 #. #define CONFIRM_LONG_SCREEN_PRINT
-#: LYMessages.c:528
+#: LYMessages.c:529
 #, c-format
 msgid "File is %d screens long.  Are you sure you want to print?"
 msgstr "Filen är %d skärmar lång. Är du säker att du vill skriva ut?"
 
-#: LYMessages.c:529
+#: LYMessages.c:530
 msgid "Print request cancelled!!!"
 msgstr "Utskrift avbruten!!!"
 
-#: LYMessages.c:530
+#: LYMessages.c:531
 msgid "Press <return> to begin: "
 msgstr "Tryck <Enter> för att börja: "
 
-#: LYMessages.c:531
+#: LYMessages.c:532
 msgid "Press <return> to finish: "
 msgstr "Tryck <Enter> för att avsluta: "
 
 #. #define CONFIRM_LONG_PAGE_PRINT
-#: LYMessages.c:533
+#: LYMessages.c:534
 #, c-format
 msgid "File is %d pages long.  Are you sure you want to print?"
 msgstr "Filen är %d sidor lång. Är du säker att du vill skriva ut?"
 
 #. #define CHECK_PRINTER
-#: LYMessages.c:535
+#: LYMessages.c:536
 msgid "Be sure your printer is on-line.  Press <return> to start printing:"
 msgstr "Försäkra dig om att skrivaren är inkopplad. Tryck <Enter> för att påbörja utskriften:"
 
-#: LYMessages.c:536
+#: LYMessages.c:537
 msgid "ERROR - Unable to allocate file space!!!"
 msgstr "FEL - kan inte reservera filutrymme!!!"
 
-#: LYMessages.c:537
+#: LYMessages.c:538
 msgid "Unable to open tempfile"
 msgstr "Kan inte öppna temporärfil"
 
-#: LYMessages.c:538
+#: LYMessages.c:539
 msgid "Unable to open print options file"
 msgstr "Kan inte öppna utskriftsalternativfil"
 
-#: LYMessages.c:539
+#: LYMessages.c:540
 msgid "Printing file.  Please wait..."
 msgstr "Skriver ut fil. Var god vänta..."
 
-#: LYMessages.c:540
+#: LYMessages.c:541
 msgid "Please enter a valid internet mail address: "
 msgstr "Ange en giltig Internet-e-postadress: "
 
-#: LYMessages.c:541
+#: LYMessages.c:542
 msgid "ERROR! - printer is misconfigured!"
 msgstr "FEL! - skrivaren är felkonfigurerad!"
 
-#: LYMessages.c:542
+#: LYMessages.c:543
 msgid "Image map from POST response not available!"
 msgstr "Bildkarta från \"POST\"-svar ej tillgänglig!"
 
-#: LYMessages.c:543
+#: LYMessages.c:544
 msgid "Misdirected client-side image MAP request!"
 msgstr "Feldirigerad klientbildkarteförfrågan!"
 
-#: LYMessages.c:544
+#: LYMessages.c:545
 msgid "Client-side image MAP is not accessible!"
 msgstr "Klientbildkarta ej åtkomlig!"
 
-#: LYMessages.c:545
+#: LYMessages.c:546
 msgid "No client-side image MAPs are available!"
 msgstr "Inga klientbildkartor är tillgängliga!"
 
-#: LYMessages.c:546
+#: LYMessages.c:547
 msgid "Client-side image MAP is not available!"
 msgstr "Klientbildkarta ej tillgänglig!"
 
 #. #define OPTION_SCREEN_NEEDS_24
-#: LYMessages.c:549
+#: LYMessages.c:550
 msgid "Screen height must be at least 24 lines for the Options menu!"
 msgstr "Skärmhöjden måste vara minst 24 rader för alternativmenyn!"
 
 #. #define OPTION_SCREEN_NEEDS_23
-#: LYMessages.c:551
+#: LYMessages.c:552
 msgid "Screen height must be at least 23 lines for the Options menu!"
 msgstr "Skärmhöjden måste vara minst 23 rader för alternativmenyn!"
 
 #. #define OPTION_SCREEN_NEEDS_22
-#: LYMessages.c:553
+#: LYMessages.c:554
 msgid "Screen height must be at least 22 lines for the Options menu!"
 msgstr "Skärmhöjden måste vara minst 22 rader för alternativmenyn!"
 
-#: LYMessages.c:555
+#: LYMessages.c:556
 msgid "That key requires Advanced User mode."
 msgstr "Den knappen kräver avancerat användarläge."
 
-#: LYMessages.c:556
+#: LYMessages.c:557
 #, c-format
 msgid "Content-type: %s"
 msgstr "Datatyp: %s"
 
-#: LYMessages.c:557
+#: LYMessages.c:558
 msgid "Command: "
 msgstr "Kommando: "
 
-#: LYMessages.c:558
+#: LYMessages.c:559
 msgid "Unknown or ambiguous command"
 msgstr "Okänt eller tvetydigt kommando"
 
-#: LYMessages.c:559
+#: LYMessages.c:560
 msgid " Version "
 msgstr " Version "
 
-#: LYMessages.c:560
+#: LYMessages.c:561
 msgid " first"
 msgstr " först"
 
-#: LYMessages.c:561
+#: LYMessages.c:562
 msgid ", guessing..."
 msgstr ", gissar..."
 
-#: LYMessages.c:562
+#: LYMessages.c:563
 msgid "Permissions for "
 msgstr "Behörighet för "
 
-#: LYMessages.c:563
+#: LYMessages.c:564
 msgid "Select "
 msgstr "Välj "
 
-#: LYMessages.c:564
+#: LYMessages.c:565
 msgid "capital letter"
 msgstr "stora bokstaven"
 
-#: LYMessages.c:565
+#: LYMessages.c:566
 msgid " of option line,"
 msgstr " i alternativet,"
 
-#: LYMessages.c:566
+#: LYMessages.c:567
 msgid " to save,"
 msgstr " för att lagra,"
 
-#: LYMessages.c:567
+#: LYMessages.c:568
 msgid " to "
 msgstr " till "
 
-#: LYMessages.c:568
+#: LYMessages.c:569
 msgid " or "
 msgstr " eller "
 
-#: LYMessages.c:569
+#: LYMessages.c:570
 msgid " index"
 msgstr " index"
 
-#: LYMessages.c:570
+#: LYMessages.c:571
 msgid " to return to Lynx."
 msgstr " för att återgå till Lynx"
 
-#: LYMessages.c:571
+#: LYMessages.c:572
 msgid "Accept Changes"
 msgstr "Bekräfta ändringar"
 
-#: LYMessages.c:572
+#: LYMessages.c:573
 msgid "Reset Changes"
 msgstr "Nollställ ändringar"
 
-#: LYMessages.c:573
+#: LYMessages.c:574
 msgid "Left Arrow cancels changes"
 msgstr "Vänsterpil avbryter ändringar"
 
-#: LYMessages.c:574
+#: LYMessages.c:575
 msgid "Save options to disk"
 msgstr "Spara inställningar till disk"
 
-#: LYMessages.c:575
+#: LYMessages.c:576
 msgid "Hit RETURN to accept entered data."
 msgstr "Tryck ENTER för att bekräfta angiven data."
 
 #. #define ACCEPT_DATA_OR_DEFAULT
-#: LYMessages.c:577
+#: LYMessages.c:578
 msgid "Hit RETURN to accept entered data.  Delete data to invoke the default."
 msgstr "Tryck ENTER för att bekräfta angiven data. Ta bort för att återställa förval."
 
-#: LYMessages.c:578
+#: LYMessages.c:579
 msgid "Value accepted!"
 msgstr "Värdet accepterat!"
 
 #. #define VALUE_ACCEPTED_WARNING_X
-#: LYMessages.c:580
+#: LYMessages.c:581
 msgid "Value accepted! -- WARNING: Lynx is configured for XWINDOWS!"
 msgstr "Värdet accepterat! -- VARNING: Lynx har ställts in för XWINDOWS!"
 
 #. #define VALUE_ACCEPTED_WARNING_NONX
-#: LYMessages.c:582
+#: LYMessages.c:583
 msgid "Value accepted! -- WARNING: Lynx is NOT configured for XWINDOWS!"
 msgstr "Värdet accepterat! -- VARNING: Lynx har INTE ställts in för XWINDOWS!"
 
-#: LYMessages.c:583
+#: LYMessages.c:584
 msgid "You are not allowed to change which editor to use!"
 msgstr "Du har inte rättighet att ändra textredigeringsprogram!"
 
-#: LYMessages.c:584
+#: LYMessages.c:585
 msgid "Failed to set DISPLAY variable!"
 msgstr "Kunde inte ställa in DISPLAY-variabel!"
 
-#: LYMessages.c:585
+#: LYMessages.c:586
 msgid "Failed to clear DISPLAY variable!"
 msgstr "Kunde inte ta bort DISPLAY-variabel!"
 
 #. #define BOOKMARK_CHANGE_DISALLOWED
-#: LYMessages.c:587
+#: LYMessages.c:588
 msgid "You are not allowed to change the bookmark file!"
 msgstr "Du har inte rättighet att ändra bokmärkesfil!"
 
-#: LYMessages.c:588
+#: LYMessages.c:589
 msgid "Terminal does not support color"
 msgstr "Terminalen stöder inte färg"
 
-#: LYMessages.c:589
+#: LYMessages.c:590
 #, c-format
 msgid "Your '%s' terminal does not support color."
 msgstr "Din \"%s\"-terminal stöder inte färg."
 
-#: LYMessages.c:590
+#: LYMessages.c:591
 msgid "Access to dot files is disabled!"
 msgstr "Tillgång till punktfiler är deaktiverad!"
 
 #. #define UA_NO_LYNX_WARNING
-#: LYMessages.c:592
+#: LYMessages.c:593
 msgid "User-Agent string does not contain \"Lynx\" or \"L_y_n_x\""
 msgstr "Identifieringssträngen innehåller inte \"Lynx\" eller \"L_y_n_x\""
 
 #. #define UA_PLEASE_USE_LYNX
-#: LYMessages.c:594
+#: LYMessages.c:595
 msgid "Use \"L_y_n_x\" or \"Lynx\" in User-Agent, or it looks like intentional deception!"
 msgstr "Använd \"L_y_n_x\" eller \"Lynx\" i identifieringen, annars ser det ut som medvetet bedrägeri"
 
 #. #define UA_CHANGE_DISABLED
-#: LYMessages.c:596
+#: LYMessages.c:597
 msgid "Changing of the User-Agent string is disabled!"
 msgstr "Ändring av identifieringssträngen är deaktiverad!"
 
 #. #define CHANGE_OF_SETTING_DISALLOWED
-#: LYMessages.c:598
+#: LYMessages.c:599
 msgid "You are not allowed to change this setting."
 msgstr "Du har inte behörighet att ändra denna inställning."
 
-#: LYMessages.c:599
+#: LYMessages.c:600
 msgid "Saving Options..."
 msgstr "Sparar inställningar..."
 
-#: LYMessages.c:600
+#: LYMessages.c:601
 msgid "Options saved!"
 msgstr "Inställningar sparade!"
 
-#: LYMessages.c:601
+#: LYMessages.c:602
 msgid "Unable to save Options!"
 msgstr "Kan inte spara inställningar!"
 
-#: LYMessages.c:602
+#: LYMessages.c:603
 msgid " 'r' to return to Lynx "
 msgstr " 'r' återgår till Lynx "
 
-#: LYMessages.c:603
+#: LYMessages.c:604
 msgid " '>' to save, or 'r' to return to Lynx "
 msgstr " '>' sparar, 'r' återgår till Lynx "
 
 #. #define ANY_KEY_CHANGE_RET_ACCEPT
-#: LYMessages.c:605
+#: LYMessages.c:606
 msgid "Hit any key to change value; RETURN to accept."
 msgstr "Valfri tangent ändrar, förutom ENTER som accepterar."
 
-#: LYMessages.c:606
+#: LYMessages.c:607
 msgid "Error uncompressing temporary file!"
 msgstr "Fel vid dekomprimering av temporärfil!"
 
-#: LYMessages.c:607
+#: LYMessages.c:608
 msgid "Unsupported URL scheme!"
 msgstr "Adresstypen stöds ej!"
 
-#: LYMessages.c:608
+#: LYMessages.c:609
 msgid "Unsupported data: URL!  Use SHOWINFO, for now."
 msgstr "Data stöds ej: URL! Använd SHOWINFO så länge."
 
-#: LYMessages.c:609
+#: LYMessages.c:610
 msgid "Redirection limit of 10 URL's reached."
 msgstr "Gräns på 10 adressomdirigeringar nådd."
 
-#: LYMessages.c:610
+#: LYMessages.c:611
 msgid "Illegal redirection URL received from server!"
 msgstr "Felaktig omdirigeringsadress mottagen från servern!"
 
 #. #define SERVER_ASKED_FOR_REDIRECTION
-#: LYMessages.c:612
+#: LYMessages.c:613
 #, c-format
 msgid "Server asked for %d redirection of POST content to"
 msgstr "Servern bad om %d-omdirigering för POST-data till"
 
-#: LYMessages.c:615
+#: LYMessages.c:616
 msgid "P)roceed, use G)ET or C)ancel "
 msgstr "P=Fortsätt, G=använd Get, C=Avbryt"
 
-#: LYMessages.c:616
+#: LYMessages.c:617
 msgid "P)roceed, or C)ancel "
 msgstr "P=Fortsätt, C=Avbryt "
 
 #. #define ADVANCED_POST_GET_REDIRECT
-#: LYMessages.c:618
+#: LYMessages.c:619
 msgid "Redirection of POST content.  P)roceed, see U)RL, use G)ET or C)ancel"
 msgstr "Omdirigering av POST-data. P=Fortsätt, U=Se adress, G=använd GET, C=Avbryt"
 
 #. #define ADVANCED_POST_REDIRECT
-#: LYMessages.c:620
+#: LYMessages.c:621
 msgid "Redirection of POST content.  P)roceed, see U)RL, or C)ancel"
 msgstr "Omdirigering av POST-data. P=Fortsätt, U=Se adress, C=Avbryt"
 
 #. #define CONFIRM_POST_RESUBMISSION
-#: LYMessages.c:622
+#: LYMessages.c:623
 msgid "Document from Form with POST content.  Resubmit?"
 msgstr "Dokument från formulär med POST-data. Skicka igen?"
 
 #. #define CONFIRM_POST_RESUBMISSION_TO
-#: LYMessages.c:624
+#: LYMessages.c:625
 #, c-format
 msgid "Resubmit POST content to %s ?"
 msgstr "Skicka POST-data till %s igen?"
 
 #. #define CONFIRM_POST_LIST_RELOAD
-#: LYMessages.c:626
+#: LYMessages.c:627
 #, c-format
 msgid "List from document with POST data.  Reload %s ?"
 msgstr "Lista från dokument med POST-data. Hämta om %s?"
 
 #. #define CONFIRM_POST_DOC_HEAD
-#: LYMessages.c:628
+#: LYMessages.c:629
 msgid "Document from POST action, HEAD may not be understood.  Proceed?"
 msgstr "Dokument från POST-formulär, HEAD kanske inte förstås. Fortsätta?"
 
 #. #define CONFIRM_POST_LINK_HEAD
-#: LYMessages.c:630
+#: LYMessages.c:631
 msgid "Form submit action is POST, HEAD may not be understood.  Proceed?"
 msgstr "Formulärmetod är POST, HEAD kanske inte förstås. Fortsätta?"
 
-#: LYMessages.c:631
+#: LYMessages.c:632
 msgid "Proceed without a username and password?"
 msgstr "Fortsätta utan användar-id och lösenord?"
 
-#: LYMessages.c:632
+#: LYMessages.c:633
 #, c-format
 msgid "Proceed (%s)?"
 msgstr "Fortsätta (%s)?"
 
-#: LYMessages.c:633
+#: LYMessages.c:634
 msgid "Cannot POST to this host."
 msgstr "Kan inte skicka POST-data till denna värd."
 
-#: LYMessages.c:634
+#: LYMessages.c:635
 msgid "POST not supported for this URL - ignoring POST data!"
 msgstr "POST stöds inte för denna adress - ignorerar POST-data!"
 
-#: LYMessages.c:635
+#: LYMessages.c:636
 msgid "Discarding POST data..."
 msgstr "Kastar POST-data..."
 
-#: LYMessages.c:636
+#: LYMessages.c:637
 msgid "Document will not be reloaded!"
 msgstr "Dokumentet hämtas inte om!"
 
-#: LYMessages.c:637
+#: LYMessages.c:638
 msgid "Location: "
 msgstr "Plats: "
 
-#: LYMessages.c:638
+#: LYMessages.c:639
 #, c-format
 msgid "'%s' not found!"
 msgstr "'%s' hittades ej!"
 
-#: LYMessages.c:639
+#: LYMessages.c:640
 msgid "Default Bookmark File"
 msgstr "Förinställd bokmärkesfil"
 
-#: LYMessages.c:640
+#: LYMessages.c:641
 msgid "Screen too small! (8x35 min)"
 msgstr "Skärm för liten! (min. 8x35)"
 
-#: LYMessages.c:641
+#: LYMessages.c:642
 msgid "Select destination or ^G to Cancel: "
 msgstr "Välj destination eller ^G för att avbryta: "
 
 #. #define MULTIBOOKMARKS_SELECT
-#: LYMessages.c:643
+#: LYMessages.c:644
 msgid "Select subbookmark, '=' for menu, or ^G to cancel: "
 msgstr "Välj underbokmärke. '=' ger meny, ^G avbryter: "
 
 #. #define MULTIBOOKMARKS_SELF
-#: LYMessages.c:645
+#: LYMessages.c:646
 msgid "Reproduce L)ink in this bookmark file or C)ancel? (l,c): "
 msgstr "L=Avbilda länk i bokmärkesfil, C=Avbryt? (l,c): "
 
-#: LYMessages.c:646
+#: LYMessages.c:647
 msgid "Multiple bookmark support is not available."
 msgstr "Stöd för multipla bokmärken ej tillgängligt."
 
-#: LYMessages.c:647
+#: LYMessages.c:648
 #, c-format
 msgid " Select Bookmark (screen %d of %d)"
 msgstr " Välj bokmärke (skärm %d av %d)"
 
-#: LYMessages.c:648
+#: LYMessages.c:649
 msgid "       Select Bookmark"
 msgstr "       Välj bokmärke"
 
 #. #define MULTIBOOKMARKS_EHEAD_MASK
-#: LYMessages.c:650
+#: LYMessages.c:651
 #, c-format
 msgid "Editing Bookmark DESCRIPTION and FILEPATH (%d of 2)"
 msgstr "Redigerar bokmärkes-BESKRIVNING och SÖKVÄG (%d av 2)"
 
 #. #define MULTIBOOKMARKS_EHEAD
-#: LYMessages.c:652
+#: LYMessages.c:653
 msgid "         Editing Bookmark DESCRIPTION and FILEPATH"
 msgstr "         Redigerar bokmärkes-BESKRIVNING och SÖKVÄG"
 
-#: LYMessages.c:653
+#: LYMessages.c:654
 msgid "Letter: "
 msgstr "Bokstav: "
 
 #. #define USE_PATH_OFF_HOME
-#: LYMessages.c:656
+#: LYMessages.c:657
 msgid "Use a filepath off your login directory in SHELL syntax!"
 msgstr "Använd en sökväg från din inloggningskatalog enligt SKAL-syntax!"
 
-#: LYMessages.c:658
+#: LYMessages.c:659
 msgid "Use a filepath off your home directory!"
 msgstr "Använd en sökväg från din hemkatalog!"
 
 #. #define MAXLINKS_REACHED
-#: LYMessages.c:661
+#: LYMessages.c:662
 msgid "Maximum links per page exceeded!  Use half-page or two-line scrolling."
 msgstr "Max antal länkar per sida överskreds! Använd halvsides- eller tvåradsrullning."
 
-#: LYMessages.c:662
+#: LYMessages.c:663
 msgid "No previously visited links available!"
 msgstr "Inga tidigare besökta länkar tillgängliga!"
 
-#: LYMessages.c:663
+#: LYMessages.c:664
 msgid "Memory exhausted!  Program aborted!"
 msgstr "Minnet slut! Programmet avbrutet!"
 
-#: LYMessages.c:664
+#: LYMessages.c:665
 msgid "Memory exhausted!  Aborting..."
 msgstr "Minnet slut! Avbryter..."
 
-#: LYMessages.c:665
+#: LYMessages.c:666
 msgid "Not enough memory!"
 msgstr "Ej tillräckligt minne!"
 
-#: LYMessages.c:666
+#: LYMessages.c:667
 msgid "Directory/File Manager not available"
 msgstr "Katalog-/filhanterare ej tillgänglig"
 
-#: LYMessages.c:667
+#: LYMessages.c:668
 msgid "HREF in BASE tag is not an absolute URL."
 msgstr "HREF i BASE-märke är inte en absolut adress."
 
-#: LYMessages.c:668
+#: LYMessages.c:669
 msgid "Location URL is not absolute."
 msgstr "\"Location\"-adress ej absolut."
 
-#: LYMessages.c:669
+#: LYMessages.c:670
 msgid "Refresh URL is not absolute."
 msgstr "\"Refresh\"-adress ej absolut."
 
 #. #define SENDING_MESSAGE_WITH_BODY_TO
-#: LYMessages.c:671
+#: LYMessages.c:672
 msgid ""
 "You are sending a message with body to:\n"
 "  "
@@ -2051,7 +2053,7 @@ msgstr ""
 "Du sänder ett meddelande med textkropp till:\n"
 "  "
 
-#: LYMessages.c:672
+#: LYMessages.c:673
 msgid ""
 "You are sending a comment to:\n"
 "  "
@@ -2059,7 +2061,7 @@ msgstr ""
 "Du sänder en kommentar till:\n"
 "  "
 
-#: LYMessages.c:673
+#: LYMessages.c:674
 msgid ""
 "\n"
 " With copy to:\n"
@@ -2069,7 +2071,7 @@ msgstr ""
 " Med kopia till:\n"
 "  "
 
-#: LYMessages.c:674
+#: LYMessages.c:675
 msgid ""
 "\n"
 " With copies to:\n"
@@ -2080,7 +2082,7 @@ msgstr ""
 "  "
 
 #. #define CTRL_G_TO_CANCEL_SEND
-#: LYMessages.c:676
+#: LYMessages.c:677
 msgid ""
 "\n"
 "\n"
@@ -2091,7 +2093,7 @@ msgstr ""
 "Använd Ctrl-G för att avbryta om du inte vill skicka ett meddelande\n"
 
 #. #define ENTER_NAME_OR_BLANK
-#: LYMessages.c:678
+#: LYMessages.c:679
 msgid ""
 "\n"
 " Please enter your name, or leave it blank to remain anonymous\n"
@@ -2100,7 +2102,7 @@ msgstr ""
 " Ange ditt namn eller lämna blankt för att förbli anonym\n"
 
 #. #define ENTER_MAIL_ADDRESS_OR_OTHER
-#: LYMessages.c:680
+#: LYMessages.c:681
 msgid ""
 "\n"
 " Please enter a mail address or some other\n"
@@ -2109,11 +2111,11 @@ msgstr ""
 " Skriv din e-postadress eller något annat\n"
 
 #. #define MEANS_TO_CONTACT_FOR_RESPONSE
-#: LYMessages.c:682
+#: LYMessages.c:683
 msgid " means to contact you, if you desire a response.\n"
 msgstr " sätt du kan nås på, om du vill ha ett svar.\n"
 
-#: LYMessages.c:683
+#: LYMessages.c:684
 msgid ""
 "\n"
 " Please enter a subject line.\n"
@@ -2122,7 +2124,7 @@ msgstr ""
 " Ange en ärenderad.\n"
 
 #. #define ENTER_ADDRESS_FOR_CC
-#: LYMessages.c:685
+#: LYMessages.c:686
 msgid ""
 "\n"
 " Enter a mail address for a CC of your message.\n"
@@ -2130,11 +2132,11 @@ msgstr ""
 "\n"
 " Ange e-postadress som får kopia på ditt meddelande.\n"
 
-#: LYMessages.c:686
+#: LYMessages.c:687
 msgid " (Leave blank if you don't want a copy.)\n"
 msgstr " (Lämna blankt om du inte vill ha en kopia).\n"
 
-#: LYMessages.c:687
+#: LYMessages.c:688
 msgid ""
 "\n"
 " Please review the message body:\n"
@@ -2144,7 +2146,7 @@ msgstr ""
 " Se över meddelandekroppen:\n"
 "\n"
 
-#: LYMessages.c:688
+#: LYMessages.c:689
 msgid ""
 "\n"
 "Press RETURN to continue: "
@@ -2152,7 +2154,7 @@ msgstr ""
 "\n"
 "Tryck ENTER för att fortsätta: "
 
-#: LYMessages.c:689
+#: LYMessages.c:690
 msgid ""
 "\n"
 "Press RETURN to clean up: "
@@ -2160,11 +2162,11 @@ msgstr ""
 "\n"
 "Tryck ENTER för att städa upp: "
 
-#: LYMessages.c:690
+#: LYMessages.c:691
 msgid " Use Control-U to erase the default.\n"
 msgstr " Använd Control-U för att rensa förvalet.\n"
 
-#: LYMessages.c:691
+#: LYMessages.c:692
 msgid ""
 "\n"
 " Please enter your message below."
@@ -2173,7 +2175,7 @@ msgstr ""
 " Skriv ditt meddelande nedan."
 
 #. #define ENTER_PERIOD_WHEN_DONE_A
-#: LYMessages.c:693 src/LYNews.c:360
+#: LYMessages.c:694 src/LYNews.c:360
 msgid ""
 "\n"
 " When you are done, press enter and put a single period (.)"
@@ -2182,7 +2184,7 @@ msgstr ""
 " När du är klar, tryck Enter och skriv en ensam punkt (.)"
 
 #. #define ENTER_PERIOD_WHEN_DONE_B
-#: LYMessages.c:695 src/LYNews.c:361
+#: LYMessages.c:696 src/LYNews.c:361
 msgid ""
 "\n"
 " on a line and press enter again."
@@ -2192,257 +2194,257 @@ msgstr ""
 
 #. Cookies messages
 #. #define ADVANCED_COOKIE_CONFIRMATION
-#: LYMessages.c:699
+#: LYMessages.c:700
 #, c-format
 msgid "%s cookie: %.*s=%.*s  Allow? (Y/N/Always/neVer)"
 msgstr "%s kaka: %.*s=%.*s  Tillåta? (J/N/Alltid/aLdrig)"
 
 #. #define INVALID_COOKIE_DOMAIN_CONFIRMATION
-#: LYMessages.c:701
+#: LYMessages.c:702
 #, c-format
 msgid "Accept invalid cookie domain=%s for '%s'?"
 msgstr "Tillåta ogiltig kakdomän=%s för \"%s\"?"
 
 #. #define INVALID_COOKIE_PATH_CONFIRMATION
-#: LYMessages.c:703
+#: LYMessages.c:704
 #, c-format
 msgid "Accept invalid cookie path=%s as a prefix of '%s'?"
 msgstr "Tillåta ogiltig kaksökväg=%s som prefix för \"%s\"?"
 
-#: LYMessages.c:704
+#: LYMessages.c:705
 msgid "Allowing this cookie."
 msgstr "Tillåter kakan."
 
-#: LYMessages.c:705
+#: LYMessages.c:706
 msgid "Rejecting this cookie."
 msgstr "Avvisar kakan."
 
-#: LYMessages.c:706
+#: LYMessages.c:707
 msgid "The Cookie Jar is empty."
 msgstr "Kakburken är tom."
 
-#: LYMessages.c:707
+#: LYMessages.c:708
 msgid "The Cache Jar is empty."
 msgstr "Cacheburken är tom."
 
 #. #define ACTIVATE_TO_GOBBLE
-#: LYMessages.c:709
+#: LYMessages.c:710
 msgid "Activate links to gobble up cookies or entire domains,"
 msgstr "Aktivera länk för att äta upp kakor eller hela domäner,"
 
-#: LYMessages.c:710
+#: LYMessages.c:711
 msgid "or to change a domain's 'allow' setting."
-msgstr "eller ändra ändra domänens \"tillåt\"-inställning."
+msgstr "eller ändra domänens \"tillåt\"-inställning."
 
-#: LYMessages.c:711
+#: LYMessages.c:712
 msgid "(Cookies never allowed.)"
 msgstr "(Kakor tillåts aldrig)"
 
-#: LYMessages.c:712
+#: LYMessages.c:713
 msgid "(Cookies always allowed.)"
 msgstr "(Kakor tillåts alltid)"
 
-#: LYMessages.c:713
+#: LYMessages.c:714
 msgid "(Cookies allowed via prompt.)"
 msgstr "(Kakor tillåts via fråga)"
 
-#: LYMessages.c:714
+#: LYMessages.c:715
 msgid "(Persistent Cookies.)"
 msgstr "(Persistenta kakor)"
 
-#: LYMessages.c:715
+#: LYMessages.c:716
 msgid "(No title.)"
 msgstr "(Titel saknas)"
 
-#: LYMessages.c:716
+#: LYMessages.c:717
 msgid "(No name.)"
 msgstr "(Inget namn)"
 
-#: LYMessages.c:717
+#: LYMessages.c:718
 msgid "(No value.)"
 msgstr "(Inget värde)"
 
-#: LYMessages.c:718 src/LYOptions.c:2409
+#: LYMessages.c:719 src/LYOptions.c:2424
 msgid "None"
 msgstr "Ingen"
 
-#: LYMessages.c:719
+#: LYMessages.c:720
 msgid "(End of session.)"
 msgstr "(Slut på session)"
 
-#: LYMessages.c:720
+#: LYMessages.c:721
 msgid "Delete this cookie?"
 msgstr "Radera denna kaka?"
 
-#: LYMessages.c:721
+#: LYMessages.c:722
 msgid "The cookie has been eaten!"
 msgstr "Kakan har ätits upp!"
 
-#: LYMessages.c:722
+#: LYMessages.c:723
 msgid "Delete this empty domain?"
 msgstr "Radera denna tomma domän?"
 
-#: LYMessages.c:723
+#: LYMessages.c:724
 msgid "The domain has been eaten!"
 msgstr "Domänen har ätits upp!"
 
 #. #define DELETE_COOKIES_SET_ALLOW_OR_CANCEL
-#: LYMessages.c:725
+#: LYMessages.c:726
 msgid "D)elete domain's cookies, set allow A)lways/P)rompt/neV)er, or C)ancel? "
 msgstr "D=Radera domänens kakor, ställ in A=Alltid/P=Fråga/V=Aldrig, C=Avbryt? "
 
 #. #define DELETE_DOMAIN_SET_ALLOW_OR_CANCEL
-#: LYMessages.c:727
+#: LYMessages.c:728
 msgid "D)elete domain, set allow A)lways/P)rompt/neV)er, or C)ancel? "
 msgstr "D=Radera domän, ställ in A=Alltid/P=Fråga/V=Aldrig, C=Avbryt? "
 
-#: LYMessages.c:728
+#: LYMessages.c:729
 msgid "All cookies in the domain have been eaten!"
 msgstr "Alla kakor från domänen har ätits upp!"
 
-#: LYMessages.c:729
+#: LYMessages.c:730
 #, c-format
 msgid "'A'lways allowing from domain '%s'."
 msgstr "Tillåter alla kakor från domänen \"%s\"."
 
-#: LYMessages.c:730
+#: LYMessages.c:731
 #, c-format
 msgid "ne'V'er allowing from domain '%s'."
 msgstr "Avvisar alla kakor från domänen \"%s\"."
 
-#: LYMessages.c:731
+#: LYMessages.c:732
 #, c-format
 msgid "'P'rompting to allow from domain '%s'."
 msgstr "Frågar om alla kakor från domänen \"%s\"."
 
-#: LYMessages.c:732
+#: LYMessages.c:733
 msgid "Delete all cookies in this domain?"
 msgstr "Radera alla kakor i denna domän?"
 
-#: LYMessages.c:733
+#: LYMessages.c:734
 msgid "All of the cookies in the jar have been eaten!"
 msgstr "Alla kakor i kakburken har ätits upp!"
 
-#: LYMessages.c:735
+#: LYMessages.c:736
 msgid "Port 19 not permitted in URLs."
 msgstr "Port 19 ej tillåten i adress."
 
-#: LYMessages.c:736
+#: LYMessages.c:737
 msgid "Port 25 not permitted in URLs."
 msgstr "Port 25 ej tillåten i adress."
 
-#: LYMessages.c:737
+#: LYMessages.c:738
 #, c-format
 msgid "Port %lu not permitted in URLs."
 msgstr "Port %lu ej tillåten i adress."
 
-#: LYMessages.c:738
+#: LYMessages.c:739
 msgid "URL has a bad port field."
 msgstr "Adressen har ett felaktigt portfält."
 
-#: LYMessages.c:739
+#: LYMessages.c:740
 msgid "Maximum nesting of HTML elements exceeded."
 msgstr "Maximal stapling av HTML-element överskreds."
 
-#: LYMessages.c:740
+#: LYMessages.c:741
 msgid "Bad partial reference!  Stripping lead dots."
 msgstr "Felaktig partiell referens! Raderar inledande punkter."
 
-#: LYMessages.c:741
+#: LYMessages.c:742
 msgid "Trace Log open failed.  Trace off!"
 msgstr "Öppning av spårningslogg misslyckades. Spårning avslagen!"
 
-#: LYMessages.c:742
+#: LYMessages.c:743
 msgid "Lynx Trace Log"
 msgstr "Lynx' spårningslogg"
 
-#: LYMessages.c:743
+#: LYMessages.c:744
 msgid "No trace log has been started for this session."
 msgstr "Ingen spårningslogg har startats för denna session."
 
 #. #define MAX_TEMPCOUNT_REACHED
-#: LYMessages.c:745
+#: LYMessages.c:746
 msgid "The maximum temporary file count has been reached!"
 msgstr "Maximalt antal temporärfiler har nåtts!"
 
 #. #define FORM_VALUE_TOO_LONG
-#: LYMessages.c:747
+#: LYMessages.c:748
 msgid "Form field value exceeds buffer length!  Trim the tail."
 msgstr "Värdet för formulärfält är längre än bufferten! Klipp på slutet."
 
 #. #define FORM_TAIL_COMBINED_WITH_HEAD
-#: LYMessages.c:749
+#: LYMessages.c:750
 msgid "Modified tail combined with head of form field value."
 msgstr "Modifierad avslutning kombinerad med huvudet i formulärfältsvärdet."
 
 #. HTFile.c
-#: LYMessages.c:752
+#: LYMessages.c:753
 msgid "Directory"
 msgstr "Katalog"
 
-#: LYMessages.c:753
+#: LYMessages.c:754
 msgid "Directory browsing is not allowed."
 msgstr "Katalogbläddring tillåts ej."
 
-#: LYMessages.c:754
+#: LYMessages.c:755
 msgid "Selective access is not enabled for this directory"
 msgstr "Selektiv åtkomst är inte tillgänglig för denna katalog"
 
-#: LYMessages.c:755
+#: LYMessages.c:756
 msgid "Multiformat: directory scan failed."
 msgstr "Multiformat: katalogavsökning misslyckades."
 
-#: LYMessages.c:756
+#: LYMessages.c:757
 msgid "This directory is not readable."
 msgstr "Denna katalog är inte läsbar."
 
-#: LYMessages.c:757
+#: LYMessages.c:758
 msgid "Can't access requested file."
 msgstr "Kan inte komma åt vald fil."
 
-#: LYMessages.c:758
+#: LYMessages.c:759
 msgid "Could not find suitable representation for transmission."
 msgstr "Kunde inte hitta en lämplig representation för överföring."
 
-#: LYMessages.c:759
+#: LYMessages.c:760
 msgid "Could not open file for decompression!"
 msgstr "Kunde inte öppna filen för dekomprimering!"
 
-#: LYMessages.c:760
+#: LYMessages.c:761
 msgid "Files:"
 msgstr "Filer:"
 
-#: LYMessages.c:761
+#: LYMessages.c:762
 msgid "Subdirectories:"
 msgstr "Underkataloger:"
 
-#: LYMessages.c:762
+#: LYMessages.c:763
 msgid " directory"
 msgstr " katalog"
 
-#: LYMessages.c:763
+#: LYMessages.c:764
 msgid "Up to "
 msgstr "Upp till "
 
-#: LYMessages.c:764
+#: LYMessages.c:765
 msgid "Current directory is "
 msgstr "Aktuell katalog är "
 
 #. HTFTP.c
-#: LYMessages.c:767
+#: LYMessages.c:768
 msgid "Symbolic Link"
 msgstr "Symbolisk länk"
 
 #. HTGopher.c
-#: LYMessages.c:770
+#: LYMessages.c:771
 msgid "No response from server!"
 msgstr "Inget svar från servern!"
 
-#: LYMessages.c:771
+#: LYMessages.c:772
 msgid "CSO index"
 msgstr "CSO-index"
 
-#: LYMessages.c:772
+#: LYMessages.c:773
 msgid ""
 "\n"
 "This is a searchable index of a CSO database.\n"
@@ -2450,16 +2452,16 @@ msgstr ""
 "\n"
 "Detta är ett sökbart index i en CSO-databas.\n"
 
-#: LYMessages.c:773
+#: LYMessages.c:774
 msgid "CSO Search Results"
 msgstr "CSO-sökresultat"
 
-#: LYMessages.c:774
+#: LYMessages.c:775
 #, c-format
 msgid "Seek fail on %s\n"
 msgstr "Sökning misslyckades på %s\n"
 
-#: LYMessages.c:775
+#: LYMessages.c:776
 msgid ""
 "\n"
 "Press the 's' key and enter search keywords.\n"
@@ -2467,7 +2469,7 @@ msgstr ""
 "\n"
 "Tryck \"s\"-tangenten och ange söknyckelord.\n"
 
-#: LYMessages.c:776
+#: LYMessages.c:777
 msgid ""
 "\n"
 "This is a searchable Gopher index.\n"
@@ -2475,35 +2477,35 @@ msgstr ""
 "\n"
 "Detta är ett sökbart Gopherindex.\n"
 
-#: LYMessages.c:777
+#: LYMessages.c:778
 msgid "Gopher index"
 msgstr "Gopherindex"
 
-#: LYMessages.c:778
+#: LYMessages.c:779
 msgid "Gopher Menu"
 msgstr "Gophermeny"
 
-#: LYMessages.c:779
+#: LYMessages.c:780
 msgid " Search Results"
 msgstr " Sökresultats"
 
-#: LYMessages.c:780
+#: LYMessages.c:781
 msgid "Sending CSO/PH request."
 msgstr "Sänder CSO/PH-fråga."
 
-#: LYMessages.c:781
+#: LYMessages.c:782
 msgid "Sending Gopher request."
 msgstr "Sänder Gopherfråga."
 
-#: LYMessages.c:782
+#: LYMessages.c:783
 msgid "CSO/PH request sent; waiting for response."
 msgstr "CSO/PH-fråga sänd; väntar på svar."
 
-#: LYMessages.c:783
+#: LYMessages.c:784
 msgid "Gopher request sent; waiting for response."
 msgstr "Gopherfråga sänd; väntar på svar."
 
-#: LYMessages.c:784
+#: LYMessages.c:785
 msgid ""
 "\n"
 "Please enter search keywords.\n"
@@ -2511,7 +2513,7 @@ msgstr ""
 "\n"
 "Ange söknyckelord.\n"
 
-#: LYMessages.c:785
+#: LYMessages.c:786
 msgid ""
 "\n"
 "The keywords that you enter will allow you to search on a"
@@ -2519,201 +2521,205 @@ msgstr ""
 "\n"
 "Nyckelorden du anger gör det möjligt att söka på en"
 
-#: LYMessages.c:786
+#: LYMessages.c:787
 msgid " person's name in the database.\n"
 msgstr " persons namn i databasen.\n"
 
 #. HTNews.c
-#: LYMessages.c:789
+#: LYMessages.c:790
 msgid "Connection closed ???"
 msgstr "Anslutning stängd???"
 
-#: LYMessages.c:790
+#: LYMessages.c:791
 msgid "Cannot open temporary file for news POST."
 msgstr "Kan inte öppna temporärfil för diskussionsinlägg."
 
-#: LYMessages.c:791
+#: LYMessages.c:792
 msgid "This client does not contain support for posting to news with SSL."
 msgstr "Denna klient innehåller inte stöd för att posta inlägg över SSL."
 
 #. HTStyle.c
-#: LYMessages.c:794
+#: LYMessages.c:795
 #, c-format
 msgid "Style %d `%s' SGML:%s.  Font %s %.1f point.\n"
 msgstr "Stil %d \"%s\" SGML:%s. Teckensnitt %s %.1f punkter.\n"
 
-#: LYMessages.c:796
+#: LYMessages.c:797
 #, c-format
 msgid "\tAlign=%d, %d tabs. (%.0f before, %.0f after)\n"
 msgstr "\tJustering=%d, %d tabbar. (%.0f före, %.0f efter)\n"
 
-#: LYMessages.c:797
+#: LYMessages.c:798
 #, c-format
 msgid "\t\tTab kind=%d at %.0f\n"
 msgstr "\t\tTabbsort=%d på %.0f\n"
 
 #. HTTP.c
-#: LYMessages.c:800
+#: LYMessages.c:801
 msgid "Can't proceed without a username and password."
 msgstr "Kan inte fortsätta utan användar-id och lösenord."
 
-#: LYMessages.c:801
+#: LYMessages.c:802
 msgid "Can't retry with authorization!  Contact the server's WebMaster."
 msgstr "Kan inte försöka igen utan tillåtelse! Kontakta serverns ansvariga."
 
-#: LYMessages.c:802
+#: LYMessages.c:803
 msgid "Can't retry with proxy authorization!  Contact the server's WebMaster."
 msgstr "Kan ej försöka igen utan mellanserverauktorisering! Kontakta serverns ansvariga."
 
-#: LYMessages.c:803
+#: LYMessages.c:804
 msgid "Retrying with proxy authorization information."
 msgstr "Försöker igen med mellanserverauktoriseringsinformation."
 
-#: LYMessages.c:804
+#: LYMessages.c:805
 #, c-format
 msgid "SSL error:%s-Continue?"
 msgstr "SSL-fel:%s-Fortsätta?"
 
 #. HTWAIS.c
-#: LYMessages.c:807
+#: LYMessages.c:808
 msgid "HTWAIS: Return message too large."
 msgstr "HTWAIS: Returmeddelande för stort."
 
-#: LYMessages.c:808
+#: LYMessages.c:809
 msgid "Enter WAIS query: "
 msgstr "Ange WAIS-fråga: "
 
 #. Miscellaneous status
-#: LYMessages.c:811
+#: LYMessages.c:812
 msgid "Retrying as HTTP0 request."
 msgstr "Försöker ingen som HTTP0-fråga."
 
-#: LYMessages.c:812
+#: LYMessages.c:813
 #, c-format
 msgid "Transferred %d bytes"
 msgstr "Överförde %d byte"
 
-#: LYMessages.c:813
+#: LYMessages.c:814
 msgid "Data transfer complete"
 msgstr "Dataöverföring färdig"
 
-#: LYMessages.c:814
+#: LYMessages.c:815
 #, c-format
 msgid "Error processing line %d of %s\n"
 msgstr "Fel vid tolkning av rad %d i %s\n"
 
 #. Lynx internal page titles
-#: LYMessages.c:817
+#: LYMessages.c:818
 msgid "Address List Page"
 msgstr "Adresslistesida"
 
-#: LYMessages.c:818
+#: LYMessages.c:819
 msgid "Bookmark file"
 msgstr "Bokmärkesfil"
 
-#: LYMessages.c:819
+#: LYMessages.c:820
 msgid "Configuration Definitions"
 msgstr "Konfigurationsdefinitioner"
 
-#: LYMessages.c:820
+#: LYMessages.c:821
 msgid "Cookie Jar"
 msgstr "Kakburk"
 
-#: LYMessages.c:821
+#: LYMessages.c:822
+msgid "Current Edit-Key Map"
+msgstr "Aktuella tangentbordsbindningar för redigering"
+
+#: LYMessages.c:823
 msgid "Current Key Map"
 msgstr "Aktuella tangentbordsbindningar"
 
-#: LYMessages.c:822
+#: LYMessages.c:824
 msgid "File Management Options"
 msgstr "Filhanteringsalternativ"
 
-#: LYMessages.c:823
+#: LYMessages.c:825
 msgid "Download Options"
 msgstr "Hämtningalternativ"
 
-#: LYMessages.c:824
+#: LYMessages.c:826
 msgid "History Page"
 msgstr "Historiksida"
 
-#: LYMessages.c:825
+#: LYMessages.c:827
 msgid "Cache Jar"
 msgstr "Cacheburk"
 
-#: LYMessages.c:826
+#: LYMessages.c:828
 msgid "List Page"
 msgstr "Listsida"
 
-#: LYMessages.c:827
+#: LYMessages.c:829
 msgid "Lynx.cfg Information"
 msgstr "Lynx.cfg-information"
 
-#: LYMessages.c:828
+#: LYMessages.c:830
 msgid "Converted Mosaic Hotlist"
 msgstr "Konverterade Mosaicbokmärken"
 
-#: LYMessages.c:829
+#: LYMessages.c:831
 msgid "Options Menu"
 msgstr "Alternativmeny"
 
-#: LYMessages.c:830
+#: LYMessages.c:832
 msgid "File Permission Options"
 msgstr "Filbehörighetsalternativ"
 
-#: LYMessages.c:831
+#: LYMessages.c:833
 msgid "Printing Options"
 msgstr "Utskriftsalternativ"
 
-#: LYMessages.c:832
+#: LYMessages.c:834
 msgid "Information about the current document"
 msgstr "Information om det aktuella dokumentet"
 
-#: LYMessages.c:833
+#: LYMessages.c:835
 msgid "Your recent statusline messages"
 msgstr "Dina senaste statusradmeddelanden"
 
-#: LYMessages.c:834
+#: LYMessages.c:836
 msgid "Upload Options"
 msgstr "Insändningsalternativ"
 
-#: LYMessages.c:835
+#: LYMessages.c:837
 msgid "Visited Links Page"
 msgstr "Använda länkar"
 
 #. CONFIG_DEF_TITLE subtitles
-#: LYMessages.c:838
+#: LYMessages.c:840
 msgid "See also"
 msgstr "Se även"
 
-#: LYMessages.c:839
+#: LYMessages.c:841
 msgid "your"
 msgstr "din"
 
-#: LYMessages.c:840
+#: LYMessages.c:842
 msgid "for runtime options"
 msgstr "för körningsalternativ"
 
-#: LYMessages.c:841
+#: LYMessages.c:843
 msgid "compile time options"
 msgstr "kompileringsalternativ"
 
-#: LYMessages.c:842
+#: LYMessages.c:844
 msgid "color-style configuration"
 msgstr "konfigurering av color-style"
 
-#: LYMessages.c:843
+#: LYMessages.c:845
 msgid "latest release"
 msgstr "senaste utgåva"
 
-#: LYMessages.c:844
+#: LYMessages.c:846
 msgid "pre-release version"
 msgstr "förhandsversion"
 
-#: LYMessages.c:845
+#: LYMessages.c:847
 msgid "development version"
 msgstr "utvecklingsversion"
 
 #. #define AUTOCONF_CONFIG_CACHE
-#: LYMessages.c:847
+#: LYMessages.c:849
 msgid ""
 "The following data were derived during the automatic configuration/build\n"
 "process of this copy of Lynx.  When reporting a bug, please include a copy\n"
@@ -2724,7 +2730,7 @@ msgstr ""
 "inkludera en kopia av denna sida."
 
 #. #define AUTOCONF_LYNXCFG_H
-#: LYMessages.c:851
+#: LYMessages.c:853
 msgid ""
 "The following data were used as automatically-configured compile-time\n"
 "definitions when this copy of Lynx was built."
@@ -2733,53 +2739,53 @@ msgstr ""
 "när denna kopia av Lynx kompilerades."
 
 #. #define DIRED_NOVICELINE
-#: LYMessages.c:856
+#: LYMessages.c:858
 msgid "  C)reate  D)ownload  E)dit  F)ull menu  M)odify  R)emove  T)ag  U)pload     \n"
 msgstr "C=Skapa  D=Hämta  E=Redigera  F=Full meny  M=Ändra  R=Radera  T=Märk  U=Skicka\n"
 
-#: LYMessages.c:857
+#: LYMessages.c:859
 msgid "Failed to obtain status of current link!"
 msgstr "Kunde inte hämta status för aktuell länk!"
 
 #. #define INVALID_PERMIT_URL
-#: LYMessages.c:860
+#: LYMessages.c:862
 msgid "Special URL only valid from current File Permission menu!"
 msgstr "Speciell adress endast giltig i menyn för filbehörigheter!"
 
-#: LYMessages.c:864
+#: LYMessages.c:866
 msgid "External support is currently disabled."
 msgstr "Externt stöd är just nu deaktiverat."
 
 #. new with 2.8.4dev.21
-#: LYMessages.c:868
+#: LYMessages.c:870
 msgid "Changing working-directory is currently disabled."
 msgstr "Byte av arbetskatalog tillåts ej just nu."
 
-#: LYMessages.c:869
+#: LYMessages.c:871
 msgid "Linewrap OFF!"
 msgstr "Radbrytning AV!"
 
-#: LYMessages.c:870
+#: LYMessages.c:872
 msgid "Linewrap ON!"
 msgstr "Radbrytning PÅ!"
 
-#: LYMessages.c:871
+#: LYMessages.c:873
 msgid "Parsing nested-tables toggled OFF!  Reloading..."
 msgstr "Tolkning av nästlade tabeller AV! Hämtar om..."
 
-#: LYMessages.c:872
+#: LYMessages.c:874
 msgid "Parsing nested-tables toggled ON!  Reloading..."
 msgstr "Tolkning av nästlade tabeller PÅ! Hämtar om..."
 
-#: LYMessages.c:873
+#: LYMessages.c:875
 msgid "Shifting is disabled while line-wrap is in effect"
 msgstr "Skiftning är deaktiverad när radbrytning är aktiv"
 
-#: LYMessages.c:874
+#: LYMessages.c:876
 msgid "Trace not supported"
 msgstr "Spårning stöds ej"
 
-#: LYMessages.c:795
+#: LYMessages.c:796
 #, c-format
 msgid "\tIndents: first=%.0f others=%.0f, Height=%.1f Desc=%.1f\n"
 msgstr "\tIndrag: första=%.0f övriga=%.0f, Höjd=%.1f Djup=%.1f\n"
@@ -2803,12 +2809,12 @@ msgstr "Denna klient kan inte skapa mellanserverauktoriseringsinformation för p
 msgid "This client doesn't know how to compose authorization information for scheme"
 msgstr "Denna klient kan inte skapa auktoriseringsinformation för protokolltyp"
 
-#: WWW/Library/Implementation/HTAABrow.c:1093
+#: WWW/Library/Implementation/HTAABrow.c:1094
 #, c-format
 msgid "Invalid header '%s%s%s%s%s'"
 msgstr "Felaktigt huvud \"%s%s%s%s%s\""
 
-#: WWW/Library/Implementation/HTAABrow.c:1198
+#: WWW/Library/Implementation/HTAABrow.c:1200
 msgid "Proxy authorization required -- retrying"
 msgstr "Mellanserverauktorisering krävs -- försöker igen"
 
@@ -2824,25 +2830,25 @@ msgstr "Åtkomst förbjuden av regel"
 msgid "Document with POST content not found in cache.  Resubmit?"
 msgstr "Dokument med POST-data hittades ej i cache. Skicka in igen?"
 
-#: WWW/Library/Implementation/HTAccess.c:949
+#: WWW/Library/Implementation/HTAccess.c:947
 msgid "Loading failed, use a previous copy."
 msgstr "Hämtningen misslyckades, använder tidigare exemplar."
 
-#: WWW/Library/Implementation/HTAccess.c:1058 src/GridText.c:8867
+#: WWW/Library/Implementation/HTAccess.c:1056 src/GridText.c:8875
 msgid "Loading incomplete."
 msgstr "Hämtning ej komplett."
 
-#: WWW/Library/Implementation/HTAccess.c:1089
+#: WWW/Library/Implementation/HTAccess.c:1087
 #, c-format
 msgid "**** HTAccess: socket or file number returned by obsolete load routine!\n"
 msgstr "**** HTAccess: uttag eller filnummer returnerad av föråldrad inläsningsrutin!\n"
 
-#: WWW/Library/Implementation/HTAccess.c:1091
+#: WWW/Library/Implementation/HTAccess.c:1089
 #, c-format
 msgid "**** HTAccess: Internal software error.  Please mail lynx-dev@nongnu.org!\n"
 msgstr "**** HTAccess: Internt programvarufel. Meddela lynx-dev@nongnu.org!\n"
 
-#: WWW/Library/Implementation/HTAccess.c:1092
+#: WWW/Library/Implementation/HTAccess.c:1090
 #, c-format
 msgid "**** HTAccess: Status returned was: %d\n"
 msgstr "**** HTAccess: Returnerad status var: %d\n"
@@ -2851,65 +2857,65 @@ msgstr "**** HTAccess: Returnerad status var: %d\n"
 #. * hack: if we fail in HTAccess.c
 #. * avoid duplicating URL, oh.
 #.
-#: WWW/Library/Implementation/HTAccess.c:1098 src/LYMainLoop.c:8050
+#: WWW/Library/Implementation/HTAccess.c:1096 src/LYMainLoop.c:8074
 msgid "Can't Access"
 msgstr "Kan inte komma åt"
 
-#: WWW/Library/Implementation/HTAccess.c:1106
+#: WWW/Library/Implementation/HTAccess.c:1104
 msgid "Unable to access document."
 msgstr "Kan inte komma åt dokument."
 
-#: WWW/Library/Implementation/HTFTP.c:849
+#: WWW/Library/Implementation/HTFTP.c:875
 #, c-format
 msgid "Enter password for user %s@%s:"
 msgstr "Ange lösenord för användar-id %s@%s:"
 
-#: WWW/Library/Implementation/HTFTP.c:877
+#: WWW/Library/Implementation/HTFTP.c:903
 msgid "Unable to connect to FTP host."
 msgstr "Kan inte ansluta till ftp-värd."
 
-#: WWW/Library/Implementation/HTFTP.c:1158
+#: WWW/Library/Implementation/HTFTP.c:1142
 msgid "close master socket"
 msgstr "stängd huvuduttag (master socket)"
 
-#: WWW/Library/Implementation/HTFTP.c:1220
+#: WWW/Library/Implementation/HTFTP.c:1204
 msgid "socket for master socket"
 msgstr "uttag (socket) för huvuduttag"
 
-#: WWW/Library/Implementation/HTFTP.c:2986
+#: WWW/Library/Implementation/HTFTP.c:2952
 msgid "Receiving FTP directory."
 msgstr "Hämtar ftp-katalog."
 
-#: WWW/Library/Implementation/HTFTP.c:3122
+#: WWW/Library/Implementation/HTFTP.c:3090
 #, c-format
 msgid "Transferred %d bytes (%5d)"
 msgstr "Överförde %d byte (%5d)"
 
-#: WWW/Library/Implementation/HTFTP.c:3480
+#: WWW/Library/Implementation/HTFTP.c:3448
 msgid "connect for data"
 msgstr "ansluter för data"
 
-#: WWW/Library/Implementation/HTFTP.c:4141
+#: WWW/Library/Implementation/HTFTP.c:4120
 msgid "Receiving FTP file."
 msgstr "Hämtar ftp-fil."
 
-#: WWW/Library/Implementation/HTFinger.c:278
+#: WWW/Library/Implementation/HTFinger.c:274
 msgid "Could not set up finger connection."
 msgstr "Kunde inte skapa \"finger\"-anslutning."
 
-#: WWW/Library/Implementation/HTFinger.c:325
+#: WWW/Library/Implementation/HTFinger.c:321
 msgid "Could not load data (no sitename in finger URL)"
 msgstr "Kunde inte hämta data (inget värdnamn i \"finger\"-adress)"
 
-#: WWW/Library/Implementation/HTFinger.c:329
+#: WWW/Library/Implementation/HTFinger.c:325
 msgid "Invalid port number - will only use port 79!"
 msgstr "Felaktigt portnummer - använder endast port 79!"
 
-#: WWW/Library/Implementation/HTFinger.c:395
+#: WWW/Library/Implementation/HTFinger.c:391
 msgid "Could not access finger host."
 msgstr "Kunde inta komma åt \"finger\"-värd."
 
-#: WWW/Library/Implementation/HTFinger.c:403
+#: WWW/Library/Implementation/HTFinger.c:399
 msgid "No response from finger server."
 msgstr "Inget svar från \"finger\"-server."
 
@@ -3011,7 +3017,7 @@ msgstr "Kunde inte komma åt %s."
 #: WWW/Library/Implementation/HTNews.c:2733
 #, c-format
 msgid "Can't read news info.  News host %.20s responded: %.200s"
-msgstr "Kan inte läsa dikussionsinformation. Värden %.20s svarade %.200s"
+msgstr "Kan inte läsa diskussionsinformation. Värden %.20s svarade %.200s"
 
 #: WWW/Library/Implementation/HTNews.c:2737
 #, c-format
@@ -3040,16 +3046,16 @@ msgstr "Läser artikel."
 msgid "Sorry, could not load requested news."
 msgstr "Kunde inte hämta begärda artiklar."
 
-#: WWW/Library/Implementation/HTTCP.c:1286
+#: WWW/Library/Implementation/HTTCP.c:1323
 msgid "Address has invalid port"
 msgstr "Adressen har en ogiltig port"
 
-#: WWW/Library/Implementation/HTTCP.c:1362
+#: WWW/Library/Implementation/HTTCP.c:1397
 msgid "Address length looks invalid"
 msgstr "Adresslängden verkar ogiltig"
 
-#: WWW/Library/Implementation/HTTCP.c:1622
-#: WWW/Library/Implementation/HTTCP.c:1640
+#: WWW/Library/Implementation/HTTCP.c:1845
+#: WWW/Library/Implementation/HTTCP.c:1863
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr "Kan inte hitta värd %s."
@@ -3058,39 +3064,39 @@ msgstr "Kan inte hitta värd %s."
 #. * but not HTAlert, because typically there will be other
 #. * alerts from the callers.  - kw
 #.
-#: WWW/Library/Implementation/HTTCP.c:1637
+#: WWW/Library/Implementation/HTTCP.c:1860
 #: WWW/Library/Implementation/HTTelnet.c:115
 #, c-format
 msgid "Invalid hostname %s"
 msgstr "Ogiltigt värdnamn %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1651
+#: WWW/Library/Implementation/HTTCP.c:1874
 #, c-format
 msgid "Making %s connection to %s"
 msgstr "Kopplar upp %s-anslutning till %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1662
+#: WWW/Library/Implementation/HTTCP.c:1885
 msgid "socket failed."
 msgstr "uttag misslyckades."
 
-#: WWW/Library/Implementation/HTTCP.c:1676
+#: WWW/Library/Implementation/HTTCP.c:1899
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
 msgstr "uttag misslyckades: familj %d adress %s port %s."
 
-#: WWW/Library/Implementation/HTTCP.c:1700
+#: WWW/Library/Implementation/HTTCP.c:1923
 msgid "Could not make connection non-blocking."
 msgstr "Kunde inte koppla upp icke-blockerande anslutning."
 
-#: WWW/Library/Implementation/HTTCP.c:1768
+#: WWW/Library/Implementation/HTTCP.c:1991
 msgid "Connection failed (too many retries)."
 msgstr "Uppkoppling misslyckades (för många försök)."
 
-#: WWW/Library/Implementation/HTTCP.c:1955
+#: WWW/Library/Implementation/HTTCP.c:2180
 msgid "Could not restore socket to blocking."
 msgstr "Kunde inte återställa blockering i uttag."
 
-#: WWW/Library/Implementation/HTTCP.c:2021
+#: WWW/Library/Implementation/HTTCP.c:2248
 msgid "Socket read failed (too many tries)."
 msgstr "Fel vid läsning från uttag (för många försök)."
 
@@ -3099,68 +3105,72 @@ msgstr "Fel vid läsning från uttag (för många försök)."
 msgid "SSL callback:%s, preverify_ok=%d, ssl_okay=%d"
 msgstr "SSL-återanrop:%s, preverify_ok=%d, ssl_okay=%d"
 
-#: WWW/Library/Implementation/HTTP.c:432
+#: WWW/Library/Implementation/HTTP.c:438
 #, c-format
 msgid "Address contains a username: %s"
 msgstr "Adress innehåller användar-id: %s"
 
-#: WWW/Library/Implementation/HTTP.c:486
+#: WWW/Library/Implementation/HTTP.c:492
 #, c-format
 msgid "Certificate issued by: %s"
 msgstr "Certifikatutfärdare: %s"
 
-#: WWW/Library/Implementation/HTTP.c:673
+#: WWW/Library/Implementation/HTTP.c:679
 msgid "This client does not contain support for HTTPS URLs."
 msgstr "Denna klient innehåller inte stöd för HTTPS-adresser."
 
-#: WWW/Library/Implementation/HTTP.c:698
+#: WWW/Library/Implementation/HTTP.c:704
 msgid "Unable to connect to remote host."
 msgstr "Kan inte ansluta till värd."
 
-#: WWW/Library/Implementation/HTTP.c:730
+#: WWW/Library/Implementation/HTTP.c:744
 msgid "Retrying connection without TLS."
 msgstr "Gör nytt försök; ansluter utan TLS."
 
-#: WWW/Library/Implementation/HTTP.c:773
+#: WWW/Library/Implementation/HTTP.c:794
+msgid "GnuTLS error when trying to verify certificate."
+msgstr "Fel i GnuTLS när certifikatet skulle bekräftas."
+
+#: WWW/Library/Implementation/HTTP.c:806
+msgid "the certificate has no known issuer"
+msgstr "certifikatet har ingen känd utfärdare"
+
+#: WWW/Library/Implementation/HTTP.c:808
 msgid "no issuer was found"
 msgstr "ingen utfärdare hittades"
 
-#: WWW/Library/Implementation/HTTP.c:775
+#: WWW/Library/Implementation/HTTP.c:810
 msgid "issuer is not a CA"
 msgstr "utfärdaren är inte ett certifieringsorgan"
 
-#: WWW/Library/Implementation/HTTP.c:777
-msgid "the certificate has no known issuer"
-msgstr "certifikatet har ingen känd utfärdare"
-
-#: WWW/Library/Implementation/HTTP.c:779
+#: WWW/Library/Implementation/HTTP.c:812
 msgid "the certificate has been revoked"
 msgstr "certifikatet har återkallats"
 
-#: WWW/Library/Implementation/HTTP.c:781
+#: WWW/Library/Implementation/HTTP.c:814
 msgid "the certificate is not trusted"
 msgstr "certifikatet är inte betrott"
 
-#: WWW/Library/Implementation/HTTP.c:855
+#: WWW/Library/Implementation/HTTP.c:889
 #, c-format
 msgid "Verified connection to %s (cert=%s)"
 msgstr "Verifierade anslutning mot %s (cert=%s)"
 
-#: WWW/Library/Implementation/HTTP.c:903 WWW/Library/Implementation/HTTP.c:945
+#: WWW/Library/Implementation/HTTP.c:937 WWW/Library/Implementation/HTTP.c:979
 #, c-format
 msgid "Verified connection to %s (subj=%s)"
 msgstr "Verifierade anslutning mot %s (subj=%s)"
 
-#: WWW/Library/Implementation/HTTP.c:975
+#: WWW/Library/Implementation/HTTP.c:1009
 msgid "Can't find common name in certificate"
 msgstr "Hittar inte vanligt namn i certifikatet"
 
-#: WWW/Library/Implementation/HTTP.c:978
+#: WWW/Library/Implementation/HTTP.c:1012
 #, c-format
 msgid "SSL error:host(%s)!=cert(%s)-Continue?"
 msgstr "SSL-fel:värd(%s)!=cert(%s)-Fortsätta?"
 
-#: WWW/Library/Implementation/HTTP.c:991
+#: WWW/Library/Implementation/HTTP.c:1025
 #, c-format
 msgid "UNVERIFIED connection to %s (cert=%s)"
 msgstr "OVERIFIERAD anslutning mot %s (cert=%s)"
@@ -3168,25 +3178,25 @@ msgstr "OVERIFIERAD anslutning mot %s (cert=%s)"
 # %d = SSL_get_cipher_bits(handle,NULL)
 # %s = SSL_get_cipher_version(handle)
 # %s = SSL_get_cipher(handle)
-#: WWW/Library/Implementation/HTTP.c:1000
+#: WWW/Library/Implementation/HTTP.c:1034
 #, c-format
 msgid "Secure %d-bit %s (%s) HTTP connection"
 msgstr "Säker %d-bitars HTTP-anslutning med %s (%s)"
 
-#: WWW/Library/Implementation/HTTP.c:1467
+#: WWW/Library/Implementation/HTTP.c:1497
 msgid "Sending HTTP request."
 msgstr "Sänder HTTP-fråga."
 
-#: WWW/Library/Implementation/HTTP.c:1509
+#: WWW/Library/Implementation/HTTP.c:1539
 msgid "Unexpected network write error; connection aborted."
 msgstr "Oväntat skrivfel på nätverket; uppkopplingen avbröts."
 
-#: WWW/Library/Implementation/HTTP.c:1515
+#: WWW/Library/Implementation/HTTP.c:1545
 msgid "HTTP request sent; waiting for response."
 msgstr "HTTP-fråga sänd; väntar på svar."
 
-#: WWW/Library/Implementation/HTTP.c:1588
-#: WWW/Library/Implementation/HTTP.c:1598
+#: WWW/Library/Implementation/HTTP.c:1618
+#: WWW/Library/Implementation/HTTP.c:1628
 msgid "Unexpected network read error; connection aborted."
 msgstr "Oväntat läsfel på nätverket; uppkopplingen avbröts."
 
@@ -3199,7 +3209,7 @@ msgstr "Oväntat läsfel på nätverket; uppkopplingen avbröts."
 #. * line and possibly other headers, so we'll deal with them by
 #. * showing the full header to the user as text/plain.  - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1800
+#: WWW/Library/Implementation/HTTP.c:1830
 msgid "Got unexpected Informational Status."
 msgstr "Fick oväntad informationsstatus."
 
@@ -3209,7 +3219,7 @@ msgstr "Fick oväntad informationsstatus."
 #. * content.  We'll instruct the user to do that, and
 #. * restore the current document.  - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1834
+#: WWW/Library/Implementation/HTTP.c:1864
 msgid "Request fulfilled.  Reset Content."
 msgstr "Frågan slutförd. Nollställ innehåll."
 
@@ -3219,27 +3229,27 @@ msgstr "Frågan slutförd. Nollställ innehåll."
 #. * status is inappropriate.  We'll deal with it by showing
 #. * the full header to the user as text/plain.  - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1949
+#: WWW/Library/Implementation/HTTP.c:1979
 msgid "Got unexpected 304 Not Modified status."
 msgstr "Fick oväntad \"ej modifierad\"-(304)-status."
 
-#: WWW/Library/Implementation/HTTP.c:2012
+#: WWW/Library/Implementation/HTTP.c:2042
 msgid "Redirection of POST content requires user approval."
 msgstr "Omdirigering av POST-innehåll kräver användarens samtycke."
 
-#: WWW/Library/Implementation/HTTP.c:2027
+#: WWW/Library/Implementation/HTTP.c:2057
 msgid "Have POST content.  Treating Permanent Redirection as Temporary.\n"
 msgstr "Har POST-innehåll. Behandlar permanent omdirigering som temporär.\n"
 
-#: WWW/Library/Implementation/HTTP.c:2071
+#: WWW/Library/Implementation/HTTP.c:2101
 msgid "Retrying with access authorization information."
 msgstr "Försöker igen med auktoriseringsinformation."
 
-#: WWW/Library/Implementation/HTTP.c:2083
+#: WWW/Library/Implementation/HTTP.c:2113
 msgid "Show the 401 message body?"
 msgstr "Visa kroppen för 401-meddelandet?"
 
-#: WWW/Library/Implementation/HTTP.c:2127
+#: WWW/Library/Implementation/HTTP.c:2157
 msgid "Show the 407 message body?"
 msgstr "Via kroppen för 407-meddelandet?"
 
@@ -3247,7 +3257,7 @@ msgstr "Via kroppen för 407-meddelandet?"
 #. * Bad or unknown server_status number.  Take a chance and hope
 #. * there is something to display.  - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:2227
+#: WWW/Library/Implementation/HTTP.c:2257
 msgid "Unknown status reply from server!"
 msgstr "Okänt statussvar från server!"
 
@@ -3268,36 +3278,36 @@ msgstr "Kunde inte öppna WAIS-anslutning för läsning."
 msgid "Diagnostic code is "
 msgstr "Diagnostisk kod är "
 
-#: WWW/Library/Implementation/HTWAIS.c:464
+#: WWW/Library/Implementation/HTWAIS.c:460
 msgid "Index "
 msgstr "Index "
 
-#: WWW/Library/Implementation/HTWAIS.c:468
+#: WWW/Library/Implementation/HTWAIS.c:464
 #, c-format
 msgid " contains the following %d item%s relevant to \""
 msgstr " innehåller följande %d%s poster relevanta för \""
 
-#: WWW/Library/Implementation/HTWAIS.c:476
+#: WWW/Library/Implementation/HTWAIS.c:472
 msgid "The first figure after each entry is its relative score, "
 msgstr "Den första siffran efter varje post är dess relativa poäng, "
 
-#: WWW/Library/Implementation/HTWAIS.c:477
+#: WWW/Library/Implementation/HTWAIS.c:473
 msgid "the second is the number of lines in the item."
 msgstr "den andra är antalet rader i posten"
 
-#: WWW/Library/Implementation/HTWAIS.c:519
+#: WWW/Library/Implementation/HTWAIS.c:515
 msgid " (bad file name)"
 msgstr " (felaktigt filnamn)"
 
-#: WWW/Library/Implementation/HTWAIS.c:545
+#: WWW/Library/Implementation/HTWAIS.c:541
 msgid "(bad doc id)"
 msgstr "(felaktig dokument-id)"
 
-#: WWW/Library/Implementation/HTWAIS.c:561
+#: WWW/Library/Implementation/HTWAIS.c:557
 msgid "(Short Header record, can't display)"
 msgstr "(Kort huvudpost, kan inte visa)"
 
-#: WWW/Library/Implementation/HTWAIS.c:568
+#: WWW/Library/Implementation/HTWAIS.c:564
 msgid ""
 "\n"
 "Long Header record, can't display\n"
@@ -3305,7 +3315,7 @@ msgstr ""
 "\n"
 "Lång huvudpost, kan inte visa\n"
 
-#: WWW/Library/Implementation/HTWAIS.c:575
+#: WWW/Library/Implementation/HTWAIS.c:571
 msgid ""
 "\n"
 "Text record\n"
@@ -3313,7 +3323,7 @@ msgstr ""
 "\n"
 "Textfält\n"
 
-#: WWW/Library/Implementation/HTWAIS.c:584
+#: WWW/Library/Implementation/HTWAIS.c:580
 msgid ""
 "\n"
 "Headline record, can't display\n"
@@ -3321,7 +3331,7 @@ msgstr ""
 "\n"
 "Rubrikfält, kan inte visa\n"
 
-#: WWW/Library/Implementation/HTWAIS.c:592
+#: WWW/Library/Implementation/HTWAIS.c:588
 msgid ""
 "\n"
 "Code record, can't display\n"
@@ -3329,27 +3339,27 @@ msgstr ""
 "\n"
 "Kodfält, kan inte visa\n"
 
-#: WWW/Library/Implementation/HTWAIS.c:696
+#: WWW/Library/Implementation/HTWAIS.c:692
 msgid "Syntax error in WAIS URL"
 msgstr "Syntaxfel i WAIS-adress"
 
-#: WWW/Library/Implementation/HTWAIS.c:768
+#: WWW/Library/Implementation/HTWAIS.c:764
 msgid " (WAIS Index)"
 msgstr " (WAIS-index)"
 
-#: WWW/Library/Implementation/HTWAIS.c:775
+#: WWW/Library/Implementation/HTWAIS.c:771
 msgid "WAIS Index: "
 msgstr "WAIS-index: "
 
-#: WWW/Library/Implementation/HTWAIS.c:781
+#: WWW/Library/Implementation/HTWAIS.c:777
 msgid "This is a link for searching the "
 msgstr "Detta är en länk för att söka i "
 
-#: WWW/Library/Implementation/HTWAIS.c:785
+#: WWW/Library/Implementation/HTWAIS.c:781
 msgid " WAIS Index.\n"
 msgstr " WAIS-index.\n"
 
-#: WWW/Library/Implementation/HTWAIS.c:814
+#: WWW/Library/Implementation/HTWAIS.c:810
 msgid ""
 "\n"
 "Enter the 's'earch command and then specify search words.\n"
@@ -3357,188 +3367,188 @@ msgstr ""
 "\n"
 "Välj S=sök och ange sedan sökord.\n"
 
-#: WWW/Library/Implementation/HTWAIS.c:836
+#: WWW/Library/Implementation/HTWAIS.c:832
 msgid " (in "
 msgstr " (i "
 
-#: WWW/Library/Implementation/HTWAIS.c:845
+#: WWW/Library/Implementation/HTWAIS.c:841
 msgid "WAIS Search of \""
 msgstr "WAIS-sökning efter \""
 
-#: WWW/Library/Implementation/HTWAIS.c:849
+#: WWW/Library/Implementation/HTWAIS.c:845
 msgid "\" in: "
 msgstr "\" i: "
 
-#: WWW/Library/Implementation/HTWAIS.c:864
+#: WWW/Library/Implementation/HTWAIS.c:860
 msgid "HTWAIS: Request too large."
 msgstr "HTWAIS: Fråga för stor."
 
-#: WWW/Library/Implementation/HTWAIS.c:873
+#: WWW/Library/Implementation/HTWAIS.c:869
 msgid "Searching WAIS database..."
 msgstr "Söker WAIS-databas..."
 
-#: WWW/Library/Implementation/HTWAIS.c:883
+#: WWW/Library/Implementation/HTWAIS.c:879
 msgid "Search interrupted."
 msgstr "Sökning avbruten."
 
-#: WWW/Library/Implementation/HTWAIS.c:934
+#: WWW/Library/Implementation/HTWAIS.c:930
 msgid "Can't convert format of WAIS document"
 msgstr "Kan inte konvertera WAIS-dokumentformat"
 
-#: WWW/Library/Implementation/HTWAIS.c:978
+#: WWW/Library/Implementation/HTWAIS.c:974
 msgid "HTWAIS: Request too long."
 msgstr "HTWAIS: Fråga för lång."
 
 #.
 #. * Actually do the transaction given by request_message.
 #.
-#: WWW/Library/Implementation/HTWAIS.c:992
+#: WWW/Library/Implementation/HTWAIS.c:988
 msgid "Fetching WAIS document..."
 msgstr "Hämtar WAIS-dokument..."
 
 #. display_search_response(target, retrieval_response,
 #. wais_database, keywords);
-#: WWW/Library/Implementation/HTWAIS.c:1031
+#: WWW/Library/Implementation/HTWAIS.c:1027
 msgid "No text was returned!\n"
 msgstr "Ingen text returnerades!\n"
 
-#: WWW/Library/Implementation/HTWSRC.c:301
+#: WWW/Library/Implementation/HTWSRC.c:302
 msgid " NOT GIVEN in source file; "
 msgstr " EJ ANGIVEN i källfilen; "
 
-#: WWW/Library/Implementation/HTWSRC.c:324
+#: WWW/Library/Implementation/HTWSRC.c:325
 msgid " WAIS source file"
 msgstr " WAIS-källfil"
 
-#: WWW/Library/Implementation/HTWSRC.c:331
+#: WWW/Library/Implementation/HTWSRC.c:332
 msgid " description"
 msgstr " beskrivning"
 
-#: WWW/Library/Implementation/HTWSRC.c:341
+#: WWW/Library/Implementation/HTWSRC.c:342
 msgid "Access links"
 msgstr "Åtkomstlänkar"
 
-#: WWW/Library/Implementation/HTWSRC.c:362
+#: WWW/Library/Implementation/HTWSRC.c:363
 msgid "Direct access"
 msgstr "Direktåtkomst"
 
 #. * Proxy will be used if defined, so let user know that - FM *
-#: WWW/Library/Implementation/HTWSRC.c:365
+#: WWW/Library/Implementation/HTWSRC.c:366
 msgid " (or via proxy server, if defined)"
 msgstr " (eller via mellanserver, om angiven)"
 
-#: WWW/Library/Implementation/HTWSRC.c:380
+#: WWW/Library/Implementation/HTWSRC.c:381
 msgid "Maintainer"
 msgstr "Ansvarig"
 
-#: WWW/Library/Implementation/HTWSRC.c:388
+#: WWW/Library/Implementation/HTWSRC.c:389
 msgid "Host"
 msgstr "Värd"
 
-#: src/GridText.c:699
+#: src/GridText.c:691
 msgid "Memory exhausted, display interrupted!"
 msgstr "Minnet slut, visning avbruten!"
 
-#: src/GridText.c:704
+#: src/GridText.c:696
 msgid "Memory exhausted, will interrupt transfer!"
 msgstr "Minnet slut, avbryter överföring!"
 
-#: src/GridText.c:3685
+#: src/GridText.c:3674
 msgid " *** MEMORY EXHAUSTED ***"
 msgstr " *** MINNET SLUT ***"
 
-#: src/GridText.c:6146
+#: src/GridText.c:6152
 msgid "text entry field"
 msgstr "textinmatningsfält"
 
-#: src/GridText.c:6149
+#: src/GridText.c:6155
 msgid "password entry field"
 msgstr "lösenordsinmatningsfält"
 
-#: src/GridText.c:6152
+#: src/GridText.c:6158
 msgid "checkbox"
 msgstr "kryssruta"
 
-#: src/GridText.c:6155
+#: src/GridText.c:6161
 msgid "radio button"
 msgstr "radioknapp"
 
-#: src/GridText.c:6158
+#: src/GridText.c:6164
 msgid "submit button"
 msgstr "sändknapp"
 
-#: src/GridText.c:6161
+#: src/GridText.c:6167
 msgid "reset button"
 msgstr "nollställningsknapp"
 
-#: src/GridText.c:6164
+#: src/GridText.c:6170
 msgid "script button"
 msgstr "skriptknapp"
 
-#: src/GridText.c:6167
+#: src/GridText.c:6173
 msgid "popup menu"
 msgstr "popup-meny"
 
-#: src/GridText.c:6170
+#: src/GridText.c:6176
 msgid "hidden form field"
 msgstr "dolt formulärfält"
 
-#: src/GridText.c:6173
+#: src/GridText.c:6179
 msgid "text entry area"
 msgstr "textinmatningsområde"
 
-#: src/GridText.c:6176
+#: src/GridText.c:6182
 msgid "range entry field"
 msgstr "områdesinmatningsfält"
 
-#: src/GridText.c:6179
+#: src/GridText.c:6185
 msgid "file entry field"
 msgstr "filinmatningsfält"
 
-#: src/GridText.c:6182
+#: src/GridText.c:6188
 msgid "text-submit field"
 msgstr "textsändfält"
 
-#: src/GridText.c:6185
+#: src/GridText.c:6191
 msgid "image-submit button"
 msgstr "bildsändfält"
 
-#: src/GridText.c:6188
+#: src/GridText.c:6194
 msgid "keygen field"
 msgstr "nyckelgenerering misslyckades"
 
-#: src/GridText.c:6191
+#: src/GridText.c:6197
 msgid "unknown form field"
 msgstr "okänt formulärfält"
 
-#: src/GridText.c:6211 src/GridText.c:6218 src/LYList.c:248
+#: src/GridText.c:6217 src/GridText.c:6224 src/LYList.c:249
 msgid "unknown field or link"
 msgstr "okänt fält eller länk"
 
-#: src/GridText.c:10649
+#: src/GridText.c:10650
 msgid "Can't open file for uploading"
 msgstr "Kan inte öppna fil för sändning"
 
-#: src/GridText.c:11837
+#: src/GridText.c:11843
 #, c-format
 msgid "Submitting %s"
 msgstr "Skickar %s"
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12894
+#: src/GridText.c:12919
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr "Hängning upptäckt: TextAnchor-struktur förstörd - föreslår avbrott!"
 
 #. don't show previous state
-#: src/GridText.c:13056
+#: src/GridText.c:13083
 msgid "Wrap lines to fit displayed area?"
 msgstr "Ombryt rader så att de passar i visat fält?"
 
-#: src/GridText.c:13696
+#: src/GridText.c:13719
 msgid "Very long lines have been truncated!"
 msgstr "mycket långa rader har trunkerats!"
 
-#: src/HTAlert.c:164 src/LYShowInfo.c:364 src/LYShowInfo.c:368
+#: src/HTAlert.c:164 src/LYShowInfo.c:386 src/LYShowInfo.c:390
 msgid "bytes"
 msgstr "byte"
 
@@ -3546,32 +3556,32 @@ msgstr "byte"
 #. * If we know the total size of the file, we can compute
 #. * a percentage, and show a corresponding progress bar.
 #.
-#: src/HTAlert.c:303 src/HTAlert.c:329
+#: src/HTAlert.c:328 src/HTAlert.c:354
 #, c-format
 msgid "Read %s of data"
 msgstr "Läste %s data"
 
-#: src/HTAlert.c:326
+#: src/HTAlert.c:351
 #, c-format
 msgid "Read %s of %s of data"
 msgstr "Läste %s av %s data"
 
-#: src/HTAlert.c:335
+#: src/HTAlert.c:360
 #, c-format
 msgid ", %s/sec"
 msgstr ", %s/s"
 
-#: src/HTAlert.c:347
+#: src/HTAlert.c:374
 #, c-format
 msgid " (stalled for %s)"
 msgstr " (avstannad i %s)"
 
-#: src/HTAlert.c:351
+#: src/HTAlert.c:378
 #, c-format
 msgid ", ETA %s"
 msgstr ", %s kvar"
 
-#: src/HTAlert.c:373
+#: src/HTAlert.c:400
 msgid " (Press 'z' to abort)"
 msgstr " (\"z\" avbryter)"
 
@@ -3600,11 +3610,11 @@ msgstr " (\"z\" avbryter)"
 #. * Lynx will also accept y Y n N as responses unless there is a conflict
 #. * with the first letter of the "yes" or "no" translation.
 #.
-#: src/HTAlert.c:411 src/HTAlert.c:459
+#: src/HTAlert.c:438 src/HTAlert.c:486
 msgid "yes"
 msgstr "ja"
 
-#: src/HTAlert.c:414 src/HTAlert.c:460
+#: src/HTAlert.c:441 src/HTAlert.c:487
 msgid "no"
 msgstr "nej"
 
@@ -3624,7 +3634,7 @@ msgstr "nej"
 #. * (Y/N/Always/neVer)              - English (original)
 #. * (O/N/Toujours/Jamais)           - French
 #.
-#: src/HTAlert.c:913
+#: src/HTAlert.c:940
 msgid "Y/N/A/V"
 msgstr "J/N/A/L"
 
@@ -3668,7 +3678,7 @@ msgstr ""
 "     kommandot radera bokmärke, vilket vanligtvis nås via tangenten \"R\",\n"
 "     men som kan ha ändrats av dig eller din systemadministratör."
 
-#: src/LYBookmark.c:376
+#: src/LYBookmark.c:378
 #, c-format
 msgid ""
 "     You can delete links by the 'R' key<br>\n"
@@ -3677,7 +3687,7 @@ msgstr ""
 "     Du kan ta bort länkar med \"R\"-tangenten<br>\n"
 "<ol>\n"
 
-#: src/LYBookmark.c:379
+#: src/LYBookmark.c:381
 msgid ""
 "     You can delete links using the remove bookmark command.  It is usually\n"
 "     the 'R' key but may have been remapped by you or your system\n"
@@ -3687,7 +3697,7 @@ msgstr ""
 "     nås via tangenten \"R\", men som kan ha ändrats av dig eller din\n"
 "     systemadministratör."
 
-#: src/LYBookmark.c:383
+#: src/LYBookmark.c:385
 msgid ""
 "     This file also may be edited with a standard text editor to delete\n"
 "     outdated or invalid links, or to change their order."
@@ -3696,7 +3706,7 @@ msgstr ""
 "     att ta bort föråldrade eller ogiltiga länkar, eller ändra den inbördes\n"
 "     ordningen."
 
-#: src/LYBookmark.c:386
+#: src/LYBookmark.c:388
 msgid ""
 "Note: if you edit this file manually\n"
 "      you should not change the format within the lines\n"
@@ -3713,7 +3723,7 @@ msgstr ""
 msgid "File may be recoverable from %s during this session"
 msgstr "Filen kan kanske återskapas från %s under denna session"
 
-#: src/LYCgi.c:158
+#: src/LYCgi.c:162
 #, c-format
 msgid "Do you want to execute \"%s\"?"
 msgstr "Vill du starta \"%s\"?"
@@ -3722,71 +3732,75 @@ msgstr "Vill du starta \"%s\"?"
 #. * Neither the path as given nor any components examined by backing up
 #. * were stat()able.  - kw
 #.
-#: src/LYCgi.c:273
+#: src/LYCgi.c:277
 msgid "Unable to access cgi script"
 msgstr "Kan inte nå cgi-skript"
 
-#: src/LYCgi.c:707 src/LYCgi.c:710
+#: src/LYCgi.c:711 src/LYCgi.c:714
 msgid "Good Advice"
 msgstr "Gott råd"
 
-#: src/LYCgi.c:714
+#: src/LYCgi.c:718
 msgid "An excellent http server for VMS is available via"
 msgstr "En utmärkt http-server för VMS är tillgänglig via"
 
-#: src/LYCgi.c:721
+#: src/LYCgi.c:725
 msgid "this link"
 msgstr "denna länk"
 
-#: src/LYCgi.c:725
+#: src/LYCgi.c:729
 msgid "It provides state of the art CGI script support.\n"
 msgstr "Den ger förstklassigt stöd för CGI-skript.\n"
 
-#: src/LYClean.c:122
+#: src/LYClean.c:115
 msgid "Exiting via interrupt:"
 msgstr "Avslutar via avbrott:"
 
-#: src/LYCookie.c:2537
+#: src/LYCookie.c:2538
 msgid "(from a previous session)"
 msgstr "(från en tidigare session)"
 
-#: src/LYCookie.c:2598
+#: src/LYCookie.c:2599
 msgid "Maximum Gobble Date:"
 msgstr "Maximalt ätdatum:"
 
-#: src/LYCookie.c:2637
+#: src/LYCookie.c:2638
 msgid "Internal"
 msgstr "Intern"
 
-#: src/LYCookie.c:2638
+#: src/LYCookie.c:2639
 msgid "cookie_domain_flag_set error, aborting program"
 msgstr "\"cookie_domain_flag_set\"-fel, avbryter programmet"
 
-#: src/LYCurses.c:1297
+#: src/LYCurses.c:1170
+msgid "Terminal reinitialisation failed - unknown terminal type?"
+msgstr "Ominitiering av terminalen misslyckades - okänd terminaltyp?"
+
+#: src/LYCurses.c:1377
 msgid "Terminal initialisation failed - unknown terminal type?"
-msgstr "Terminalinitiering misslyckades - okänd terminaltyp?"
+msgstr "Initiering av terminalen misslyckades - okänd terminaltyp?"
 
-#: src/LYCurses.c:1780
+#: src/LYCurses.c:1863
 msgid "Terminal ="
 msgstr "Terminal ="
 
-#: src/LYCurses.c:1784
+#: src/LYCurses.c:1867
 msgid "You must use a vt100, 200, etc. terminal with this program."
 msgstr "Du måste använda en vt100-, -200-, etc. -terminal med detta program."
 
-#: src/LYCurses.c:1833
+#: src/LYCurses.c:1916
 msgid "Your Terminal type is unknown!"
 msgstr "Din terminaltyp är okänd!"
 
-#: src/LYCurses.c:1834
+#: src/LYCurses.c:1917
 msgid "Enter a terminal type:"
 msgstr "Ange en terminaltyp:"
 
-#: src/LYCurses.c:1848
+#: src/LYCurses.c:1931
 msgid "TERMINAL TYPE IS SET TO"
 msgstr "TERMINALTYP SATT TILL"
 
-#: src/LYCurses.c:2398
+#: src/LYCurses.c:2483
 #, c-format
 msgid ""
 "\n"
@@ -3795,7 +3809,7 @@ msgstr ""
 "\n"
 "Ett fatalt fel har uppstått i %s ver. %s\n"
 
-#: src/LYCurses.c:2401
+#: src/LYCurses.c:2486
 #, c-format
 msgid ""
 "\n"
@@ -3854,39 +3868,39 @@ msgstr "Visa temporär fil"
 msgid "Save to disk disabled."
 msgstr "\"Spara på disk\" deaktiverad."
 
-#: src/LYDownload.c:561 src/LYPrint.c:1322
+#: src/LYDownload.c:561 src/LYPrint.c:1330
 msgid "Local additions:"
 msgstr "Lokala tillägg:"
 
-#: src/LYDownload.c:572 src/LYUpload.c:209
+#: src/LYDownload.c:572 src/LYUpload.c:206
 msgid "No Name Given"
 msgstr "Inget namn har angetts"
 
-#: src/LYHistory.c:679
+#: src/LYHistory.c:680
 msgid "You selected:"
 msgstr "Du valde:"
 
-#: src/LYHistory.c:703 src/LYHistory.c:932
+#: src/LYHistory.c:704 src/LYHistory.c:933
 msgid "(no address)"
 msgstr "(ingen adress)"
 
-#: src/LYHistory.c:707
+#: src/LYHistory.c:708
 msgid " (internal)"
 msgstr " (intern)"
 
-#: src/LYHistory.c:709
+#: src/LYHistory.c:710
 msgid " (was internal)"
 msgstr " (var intern)"
 
-#: src/LYHistory.c:807
+#: src/LYHistory.c:808
 msgid " (From History)"
 msgstr " (Från historik)"
 
-#: src/LYHistory.c:852
+#: src/LYHistory.c:853
 msgid "You visited (POSTs, bookmark, menu and list files excluded):"
 msgstr "Du besökte (POST, bokmärkes-, meny- och listfiler ej medräknade):"
 
-#: src/LYHistory.c:1154
+#: src/LYHistory.c:1155
 msgid "(No messages yet)"
 msgstr "(Inga meddelanden ännu)"
 
@@ -3946,27 +3960,27 @@ msgstr "Totalt antal malloc"
 msgid "Total frees"
 msgstr "Totalt antal free"
 
-#: src/LYList.c:88
+#: src/LYList.c:89
 msgid "References in "
 msgstr "Referenser i "
 
-#: src/LYList.c:91
+#: src/LYList.c:92
 msgid "this document:"
 msgstr "detta dokument:"
 
-#: src/LYList.c:97
+#: src/LYList.c:98
 msgid "Visible links:"
 msgstr "Besökta länkar:"
 
-#: src/LYList.c:201 src/LYList.c:312
+#: src/LYList.c:202 src/LYList.c:321
 msgid "Hidden links:"
 msgstr "Dolda länkar:"
 
-#: src/LYList.c:349
+#: src/LYList.c:358
 msgid "References"
 msgstr "Referenser"
 
-#: src/LYList.c:353
+#: src/LYList.c:362
 msgid "Visible links"
 msgstr "Synliga länkar"
 
@@ -3979,305 +3993,305 @@ msgstr "Kan inte ta status på \"%s\"."
 msgid "The selected item is not a file or a directory!  Request ignored."
 msgstr "Vald post är inte en fil eller en katalog! Begäran ignoreras."
 
-#: src/LYLocal.c:455
+#: src/LYLocal.c:456
 #, c-format
 msgid "Unable to %s due to system error!"
 msgstr "Kan inte %s på grund av systemfel!"
 
-#: src/LYLocal.c:489
+#: src/LYLocal.c:490
 #, c-format
 msgid "Probable failure to %s due to system error!"
 msgstr "Möjligt misslyckande i %s på grund av systemfel!"
 
-#: src/LYLocal.c:554 src/LYLocal.c:577
+#: src/LYLocal.c:555 src/LYLocal.c:578
 #, c-format
 msgid "remove %s"
 msgstr "ta bort %s"
 
-#: src/LYLocal.c:597
+#: src/LYLocal.c:598
 #, c-format
 msgid "touch %s"
 msgstr "ändra datum på %s"
 
-#: src/LYLocal.c:627
+#: src/LYLocal.c:628
 #, c-format
 msgid "move %s to %s"
 msgstr "flytta %s till %s"
 
-#: src/LYLocal.c:675
+#: src/LYLocal.c:676
 msgid "There is already a directory with that name!  Request ignored."
 msgstr "Det finns redan en katalog med det namnet! Begäran ignoreras."
 
-#: src/LYLocal.c:677
+#: src/LYLocal.c:678
 msgid "There is already a file with that name!  Request ignored."
 msgstr "Det finns redan en fil med det namnet! Begäran ignoreras."
 
-#: src/LYLocal.c:679
+#: src/LYLocal.c:680
 msgid "The specified name is already in use!  Request ignored."
 msgstr "Angivet filnamn används redan! Begäran ignoreras."
 
-#: src/LYLocal.c:691
+#: src/LYLocal.c:692
 msgid "Destination has different owner!  Request denied."
 msgstr "Målet har annan ägare! Begäran avvisas."
 
-#: src/LYLocal.c:694
+#: src/LYLocal.c:695
 msgid "Destination is not a valid directory!  Request denied."
 msgstr "Målet är inte en giltig katalog! Begäran avvisas."
 
-#: src/LYLocal.c:710
+#: src/LYLocal.c:711
 msgid "Source and destination are the same location!  Request ignored!"
 msgstr "Källa och mål är samma plats! Begäran ignorerad."
 
-#: src/LYLocal.c:734
+#: src/LYLocal.c:735
 msgid "Remove all tagged files and directories?"
 msgstr "Ta bort alla markerade filer och kataloger?"
 
-#: src/LYLocal.c:807
+#: src/LYLocal.c:808
 msgid "Enter new location for tagged items: "
 msgstr "Ange ny plats för markerade poster: "
 
-#: src/LYLocal.c:905
+#: src/LYLocal.c:906
 msgid "Enter new name for directory: "
 msgstr "Ange nytt namn för katalog: "
 
-#: src/LYLocal.c:907
+#: src/LYLocal.c:908
 msgid "Enter new name for file: "
 msgstr "Ange nytt namn för fil: "
 
-#: src/LYLocal.c:919
+#: src/LYLocal.c:920
 msgid "Illegal character (path-separator) found! Request ignored."
 msgstr "Felaktigt tecken (sökvägsavdelare) funnen! Begäran ignorerad."
 
-#: src/LYLocal.c:969
+#: src/LYLocal.c:970
 msgid "Enter new location for directory: "
 msgstr "Ange ny plats för katalog: "
 
-#: src/LYLocal.c:971
+#: src/LYLocal.c:972
 msgid "Enter new location for file: "
 msgstr "Ange ny plats för fil: "
 
-#: src/LYLocal.c:998
+#: src/LYLocal.c:999
 msgid "Unexpected failure - unable to find trailing path separator"
 msgstr "Oväntat misslyckande - kan inte hitta avslutande sökvägsavdelare"
 
-#: src/LYLocal.c:1060
+#: src/LYLocal.c:1061
 msgid "Modify name, location, or permission (n, l, or p): "
 msgstr "Ända N=namn, L=plats eller P=behörighet? "
 
-#: src/LYLocal.c:1062
+#: src/LYLocal.c:1063
 msgid "Modify name or location (n or l): "
 msgstr "Ändra N=namn eller L=plats? "
 
 #.
 #. * Code for changing ownership needed here.
 #.
-#: src/LYLocal.c:1091
+#: src/LYLocal.c:1092
 msgid "This feature not yet implemented!"
 msgstr "Denna funktion är ännu ej implementerad!"
 
-#: src/LYLocal.c:1112
+#: src/LYLocal.c:1113
 msgid "Enter name of file to create: "
 msgstr "Ange namn på fil att skapa: "
 
-#: src/LYLocal.c:1115 src/LYLocal.c:1152
+#: src/LYLocal.c:1116 src/LYLocal.c:1153
 msgid "Illegal redirection \"//\" found! Request ignored."
 msgstr "Felaktig omdirigering \"//\" funnen! Begäran ignoreras."
 
-#: src/LYLocal.c:1149
+#: src/LYLocal.c:1150
 msgid "Enter name for new directory: "
 msgstr "Ange namn på ny katalog: "
 
-#: src/LYLocal.c:1190
+#: src/LYLocal.c:1191
 msgid "Create file or directory (f or d): "
 msgstr "Skapa F=fil eller D=katalog? "
 
-#: src/LYLocal.c:1232
+#: src/LYLocal.c:1233
 #, c-format
 msgid "Remove directory '%s'?"
 msgstr "Ta bort katalogen \"%s\"?"
 
-#: src/LYLocal.c:1235
+#: src/LYLocal.c:1236
 msgid "Remove directory?"
 msgstr "Ta bort katalogen?"
 
-#: src/LYLocal.c:1240
+#: src/LYLocal.c:1241
 #, c-format
 msgid "Remove file '%s'?"
 msgstr "Ta bort fil \"%s\"?"
 
-#: src/LYLocal.c:1242
+#: src/LYLocal.c:1243
 msgid "Remove file?"
 msgstr "Ta bort fil?"
 
-#: src/LYLocal.c:1247
+#: src/LYLocal.c:1248
 #, c-format
 msgid "Remove symbolic link '%s'?"
 msgstr "Ta bort symbolisk länk \"%s\"?"
 
-#: src/LYLocal.c:1249
+#: src/LYLocal.c:1250
 msgid "Remove symbolic link?"
 msgstr "Ta bort symbolisk länk?"
 
-#: src/LYLocal.c:1347
+#: src/LYLocal.c:1348
 msgid "Sorry, don't know how to permit non-UNIX files yet."
 msgstr "Tyvärr, kan inte ändra behörighet för icke-Unixfiler ännu."
 
-#: src/LYLocal.c:1376
+#: src/LYLocal.c:1377
 msgid "Unable to open permit options file"
 msgstr "Kan inte öppna behörighetsalternativfil"
 
-#: src/LYLocal.c:1404
+#: src/LYLocal.c:1405
 msgid "Specify permissions below:"
 msgstr "Ange behörighet nedan:"
 
-#: src/LYLocal.c:1405 src/LYShowInfo.c:265
+#: src/LYLocal.c:1406 src/LYShowInfo.c:287
 msgid "Owner:"
 msgstr "Ägare:"
 
-#: src/LYLocal.c:1421
+#: src/LYLocal.c:1422
 msgid "Group"
 msgstr "Grupp"
 
-#: src/LYLocal.c:1437
+#: src/LYLocal.c:1438
 msgid "Others:"
 msgstr "Övriga:"
 
-#: src/LYLocal.c:1455
+#: src/LYLocal.c:1456
 msgid "form to permit"
 msgstr "formulär för att ändra behörighet för"
 
-#: src/LYLocal.c:1551
+#: src/LYLocal.c:1552
 msgid "Invalid mode format."
 msgstr "Ogiltigt format på behörighet."
 
-#: src/LYLocal.c:1555
+#: src/LYLocal.c:1556
 msgid "Invalid syntax format."
 msgstr "Ogiltig syntaxformat."
 
-#: src/LYLocal.c:1742
+#: src/LYLocal.c:1743
 msgid "Warning!  UUDecoded file will exist in the directory you started Lynx."
 msgstr "Varning! UU-avkodad fil lagras i katalogen du startade Lynx från."
 
-#: src/LYLocal.c:1932
+#: src/LYLocal.c:1933
 msgid "NULL URL pointer"
 msgstr "URL-pekare är NULL"
 
-#: src/LYLocal.c:2014
+#: src/LYLocal.c:2015
 #, c-format
 msgid "Executing %s "
 msgstr "Kör %s "
 
-#: src/LYLocal.c:2017
+#: src/LYLocal.c:2018
 msgid "Executing system command. This might take a while."
 msgstr "Kör systemkommando. Detta kan ta en stund."
 
-#: src/LYLocal.c:2091
+#: src/LYLocal.c:2092
 msgid "Current directory:"
 msgstr "Aktuell katalog:"
 
-#: src/LYLocal.c:2094 src/LYLocal.c:2112
+#: src/LYLocal.c:2095 src/LYLocal.c:2113
 msgid "Current selection:"
 msgstr "Aktuell markering:"
 
-#: src/LYLocal.c:2098
+#: src/LYLocal.c:2099
 msgid "Nothing currently selected."
 msgstr "Ingenting har markerats."
 
-#: src/LYLocal.c:2114
+#: src/LYLocal.c:2115
 msgid "tagged item:"
 msgstr "markerad post:"
 
-#: src/LYLocal.c:2115
+#: src/LYLocal.c:2116
 msgid "tagged items:"
 msgstr "markerade poster:"
 
-#: src/LYLocal.c:2215 src/LYLocal.c:2224
+#: src/LYLocal.c:2216 src/LYLocal.c:2225
 msgid "Illegal filename; request ignored."
 msgstr "Ogiltigt filnamn; begäran ignorerad."
 
 #. directory not writable
-#: src/LYLocal.c:2322 src/LYLocal.c:2381
+#: src/LYLocal.c:2323 src/LYLocal.c:2382
 msgid "Install in the selected directory not permitted."
 msgstr "Installation i vald katalog ej tillåten."
 
-#: src/LYLocal.c:2377
+#: src/LYLocal.c:2378
 msgid "The selected item is not a directory!  Request ignored."
 msgstr "Vald post är inte en katalog! Begäran ignorerad."
 
-#: src/LYLocal.c:2386
+#: src/LYLocal.c:2387
 msgid "Just a moment, ..."
 msgstr "Ett ögonblick, ..."
 
-#: src/LYLocal.c:2403
+#: src/LYLocal.c:2404
 msgid "Error building install args"
 msgstr "Fel vid uppbyggning av installationsflaggor"
 
-#: src/LYLocal.c:2418 src/LYLocal.c:2449
+#: src/LYLocal.c:2419 src/LYLocal.c:2450
 #, c-format
 msgid "Source and target are the same: %s"
 msgstr "Källa och mål är samma: %s"
 
-#: src/LYLocal.c:2425 src/LYLocal.c:2456
+#: src/LYLocal.c:2426 src/LYLocal.c:2457
 #, c-format
 msgid "Already in target directory: %s"
 msgstr "Redan i målkatalog: %s"
 
-#: src/LYLocal.c:2474
+#: src/LYLocal.c:2475
 msgid "Installation complete"
 msgstr "Installation färdig"
 
-#: src/LYLocal.c:2666
+#: src/LYLocal.c:2680
 msgid "Temporary URL or list would be too long."
 msgstr "Temporär adress eller lista skulle vara för lång."
 
-#: src/LYMail.c:544
+#: src/LYMail.c:566
 msgid "Sending"
 msgstr "Skickar"
 
-#: src/LYMail.c:1030
+#: src/LYMail.c:1050
 #, c-format
 msgid "The link   %s :?: %s \n"
 msgstr "Länken %s :?: %s \n"
 
-#: src/LYMail.c:1032
+#: src/LYMail.c:1052
 #, c-format
 msgid "called \"%s\"\n"
 msgstr "anropade \"%s\"\n"
 
-#: src/LYMail.c:1033
+#: src/LYMail.c:1053
 #, c-format
 msgid "in the file \"%s\" called \"%s\"\n"
 msgstr "i filen \"%s\" anropade \"%s\"\n"
 
-#: src/LYMail.c:1034
+#: src/LYMail.c:1054
 msgid "was requested but was not available."
 msgstr "efterfrågades men var inte tillgänglig."
 
-#: src/LYMail.c:1035
+#: src/LYMail.c:1055
 msgid "Thought you might want to know."
 msgstr "Tänkte att du kanske ville veta."
 
-#: src/LYMail.c:1037
+#: src/LYMail.c:1057
 msgid "This message was automatically generated by"
 msgstr "Detta meddelande automatgenererades av"
 
-#: src/LYMail.c:1751
+#: src/LYMail.c:1770
 msgid "No system mailer configured"
 msgstr "E-postprogram inte konfigurerat i systemet"
 
-#: src/LYMain.c:1049
+#: src/LYMain.c:1069
 msgid "No Winsock found, sorry."
 msgstr "Ingen Winsock hittades, ursäkta."
 
-#: src/LYMain.c:1240
+#: src/LYMain.c:1260
 msgid "You MUST define a valid TMP or TEMP area!"
 msgstr "Du MÅSTE ange ett giltigt TMP- eller TEMP-område!"
 
-#: src/LYMain.c:1293 src/LYMainLoop.c:5260
+#: src/LYMain.c:1313 src/LYMainLoop.c:5283
 msgid "No such directory"
 msgstr "Katalogen finns ej"
 
-#: src/LYMain.c:1487
+#: src/LYMain.c:1507
 #, c-format
 msgid ""
 "\n"
@@ -4288,7 +4302,7 @@ msgstr ""
 "Konfigurationsfilen \"%s\" ej tillgänglig.\n"
 "\n"
 
-#: src/LYMain.c:1497
+#: src/LYMain.c:1517
 #, c-format
 msgid ""
 "\n"
@@ -4299,201 +4313,179 @@ msgstr ""
 "Lynxteckenuppsättningar ej deklarerade.\n"
 "\n"
 
-#: src/LYMain.c:1526
-#, c-format
-msgid ""
-"\n"
-"Lynx edit map not declared.\n"
-"\n"
-msgstr ""
-"\n"
-"Lynxredigeringskarta ej deklarerad.\n"
-"\n"
-
-#: src/LYMain.c:1608
-#, c-format
-msgid ""
-"\n"
-"Lynx file \"%s\" is not available.\n"
-"\n"
-msgstr ""
-"\n"
-"Lynxfilen \"%s\" ej tillgänglig.\n"
-"\n"
-
-#: src/LYMain.c:1683
+#: src/LYMain.c:1654
 #, c-format
 msgid "Ignored %d characters from standard input.\n"
 msgstr "Ignorerade %d tecken från standard in.\n"
 
-#: src/LYMain.c:1685
+#: src/LYMain.c:1656
 #, c-format
 msgid "Use \"-stdin\" or \"-\" to tell how to handle piped input.\n"
 msgstr "Använd \"-stdin\" eller \"-\" för att beskriva hur indata från rör skall hanteras.\n"
 
-#: src/LYMain.c:1843
+#: src/LYMain.c:1814
 msgid "Warning:"
 msgstr "Varning:"
 
-#: src/LYMain.c:2408
+#: src/LYMain.c:2384
 msgid "persistent cookies state will be changed in next session only."
 msgstr "varaktiga kakinställningar ändras endast i nästa session."
 
-#: src/LYMain.c:2644 src/LYMain.c:2689
+#: src/LYMain.c:2621 src/LYMain.c:2666
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr "Lynx: ignorerar okänd teckenuppsättning %s\n"
 
-#: src/LYMain.c:3208
+#: src/LYMain.c:3185
 #, c-format
 msgid "%s Version %s (%s)"
 msgstr "%s version %s (%s)"
 
-#: src/LYMain.c:3246
+#: src/LYMain.c:3223
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr "Byggd %s %s %s\n"
 
-#: src/LYMain.c:3268
+#: src/LYMain.c:3245
 msgid "Copyrights held by the Lynx Developers Group,"
 msgstr "Upphovsrätten ligger hos Lynx-utvecklargruppen,"
 
-#: src/LYMain.c:3269
+#: src/LYMain.c:3246
 msgid "the University of Kansas, CERN, and other contributors."
 msgstr "Kansas Universitet, CERN, och andra bidragslämnare."
 
-#: src/LYMain.c:3270
+#: src/LYMain.c:3247
 msgid "Distributed under the GNU General Public License (Version 2)."
 msgstr "Distribuerad enligt GNU General Public License (version 2)."
 
-#: src/LYMain.c:3271
+#: src/LYMain.c:3248
 msgid "See http://lynx.isc.org/ and the online help for more information."
 msgstr "Se http://lynx.isc.org/ och direkthjälpen för ytterligare information."
 
-#: src/LYMain.c:4104
+#: src/LYMain.c:4091
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "ANVÄNDNING: %s [flaggor] [fil]\n"
 
-#: src/LYMain.c:4105
+#: src/LYMain.c:4092
 #, c-format
 msgid "Options are:\n"
 msgstr "Flaggorna är:\n"
 
-#: src/LYMain.c:4406
+#: src/LYMain.c:4395
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr "%s: Okänd flagga: %s\n"
 
-#: src/LYMainLoop.c:575
+#: src/LYMainLoop.c:572
 #, c-format
 msgid "Internal error: Invalid mouse link %d!"
 msgstr "Internt fel: Ogiltig muslänk %d!"
 
-#: src/LYMainLoop.c:696 src/LYMainLoop.c:5282
+#: src/LYMainLoop.c:693 src/LYMainLoop.c:5305
 msgid "A URL specified by the user"
 msgstr "En adress angiven av användaren"
 
-#: src/LYMainLoop.c:1148
+#: src/LYMainLoop.c:1142
 msgid "Enctype multipart/form-data not yet supported!  Cannot submit."
 msgstr "Kodningen multiport/form-data stöds inte ännu! Kan inte skicka."
 
 #.
 #. * Make a name for this help file.
 #.
-#: src/LYMainLoop.c:3177
+#: src/LYMainLoop.c:3196
 msgid "Help Screen"
 msgstr "Hjälpskärm"
 
-#: src/LYMainLoop.c:3308
+#: src/LYMainLoop.c:3327
 msgid "System Index"
 msgstr "Systemindex"
 
-#: src/LYMainLoop.c:3556
+#: src/LYMainLoop.c:3575
 #, c-format
 msgid "Query parameter %d: "
 msgstr "Anropsparameter %d: "
 
-#: src/LYMainLoop.c:3781 src/LYMainLoop.c:5558
+#: src/LYMainLoop.c:3804 src/LYMainLoop.c:5581
 msgid "Entry into main screen"
 msgstr "Ingång till huvudskärm"
 
-#: src/LYMainLoop.c:4039
+#: src/LYMainLoop.c:4062
 msgid "No next document present"
 msgstr "Det finns inget nästa dokument"
 
-#: src/LYMainLoop.c:4334
+#: src/LYMainLoop.c:4357
 msgid "charset for this document specified explicitly, sorry..."
 msgstr "teckenuppsättning för detta dokumentet explicit deklarerat, ursäkta..."
 
-#: src/LYMainLoop.c:5240
+#: src/LYMainLoop.c:5263
 msgid "cd to:"
 msgstr "byt katalog till:"
 
-#: src/LYMainLoop.c:5263
+#: src/LYMainLoop.c:5286
 msgid "A component of path is not a directory"
 msgstr "En del av sökvägen är inte en katalog"
 
-#: src/LYMainLoop.c:5266
+#: src/LYMainLoop.c:5289
 msgid "failed to change directory"
 msgstr "lyckades inte byta katalog"
 
-#: src/LYMainLoop.c:6496
+#: src/LYMainLoop.c:6515
 msgid "Reparsing document under current settings..."
 msgstr "Tolkar om dokumentet med aktuella inställningar..."
 
-#: src/LYMainLoop.c:6790
+#: src/LYMainLoop.c:6809
 #, c-format
 msgid "Fatal error - could not open output file %s\n"
 msgstr "Fatalt fel - kunde inte öppna utdatafil %s\n"
 
 # Kollas!
-#: src/LYMainLoop.c:7128
+#: src/LYMainLoop.c:7151
 msgid "TABLE center enable."
 msgstr "Tabellcentrering aktiverad."
 
 # Kollas!
-#: src/LYMainLoop.c:7131
+#: src/LYMainLoop.c:7154
 msgid "TABLE center disable."
 msgstr "Tabellcentrering inaktiverad."
 
-#: src/LYMainLoop.c:7211
+#: src/LYMainLoop.c:7234
 msgid "Current URL is empty."
 msgstr "Nuvarande adress är tom."
 
-#: src/LYMainLoop.c:7213 src/LYUtils.c:1881
+#: src/LYMainLoop.c:7236 src/LYUtils.c:1917
 msgid "Copy to clipboard failed."
 msgstr "Misslyckades kopiera till urklipp."
 
-#: src/LYMainLoop.c:7215
+#: src/LYMainLoop.c:7238
 msgid "Document URL put to clipboard."
 msgstr "Dokumentadress lagd i urklipp."
 
-#: src/LYMainLoop.c:7217
+#: src/LYMainLoop.c:7240
 msgid "Link URL put to clipboard."
 msgstr "Länkadress lagd i urklipp."
 
-#: src/LYMainLoop.c:7244
+#: src/LYMainLoop.c:7267
 msgid "No URL in the clipboard."
 msgstr "Ingen adress i urklipp."
 
-#: src/LYMainLoop.c:7936 src/LYMainLoop.c:8105
+#: src/LYMainLoop.c:7960 src/LYMainLoop.c:8131
 msgid "-index-"
 msgstr "-index-"
 
-#: src/LYMainLoop.c:8045
+#: src/LYMainLoop.c:8069
 msgid "lynx: Can't access startfile"
 msgstr "lynx: Kan inte komma åt startfil"
 
-#: src/LYMainLoop.c:8057
+#: src/LYMainLoop.c:8081
 msgid "lynx: Start file could not be found or is not text/html or text/plain"
 msgstr "lynx: Startfilen hittades inte eller är varken text/html eller text/plain"
 
-#: src/LYMainLoop.c:8058
+#: src/LYMainLoop.c:8082
 msgid "      Exiting..."
 msgstr "      Avslutar..."
 
-#: src/LYMainLoop.c:8099
+#: src/LYMainLoop.c:8125
 msgid "-more-"
 msgstr "-mer-"
 
@@ -4557,370 +4549,375 @@ msgstr ""
 msgid "Message has no original text!"
 msgstr "Inlägget har ingen ursprunglig text!"
 
-#: src/LYOptions.c:770
+#: src/LYOptions.c:774
 msgid "review/edit B)ookmarks files"
 msgstr "se/redigera B)okmärkesfiler"
 
-#: src/LYOptions.c:772
+#: src/LYOptions.c:776
 msgid "B)ookmark file: "
 msgstr "B)okmärkesfil: "
 
-#: src/LYOptions.c:2120 src/LYOptions.c:2127
+#: src/LYOptions.c:2123 src/LYOptions.c:2130
 msgid "ON"
 msgstr "PÅ"
 
 #. verbose_img variable
-#: src/LYOptions.c:2121 src/LYOptions.c:2126 src/LYOptions.c:2289
-#: src/LYOptions.c:2300
+#: src/LYOptions.c:2124 src/LYOptions.c:2129 src/LYOptions.c:2302
+#: src/LYOptions.c:2313
 msgid "OFF"
 msgstr "AV"
 
-#: src/LYOptions.c:2122
+#: src/LYOptions.c:2125
 msgid "NEVER"
 msgstr "ALDRIG"
 
-#: src/LYOptions.c:2123
+#: src/LYOptions.c:2126
 msgid "ALWAYS"
 msgstr "ALLTID"
 
-#: src/LYOptions.c:2139 src/LYOptions.c:2281
+#: src/LYOptions.c:2142 src/LYOptions.c:2294
 msgid "ignore"
 msgstr "ignorera"
 
-#: src/LYOptions.c:2140
+#: src/LYOptions.c:2143
 msgid "ask user"
 msgstr "fråga användaren"
 
-#: src/LYOptions.c:2141
+#: src/LYOptions.c:2144
 msgid "accept all"
 msgstr "ta emot alla"
 
-#: src/LYOptions.c:2153
+#: src/LYOptions.c:2156
 msgid "ALWAYS OFF"
 msgstr "ALLTID AV"
 
-#: src/LYOptions.c:2154
+#: src/LYOptions.c:2157
 msgid "FOR LOCAL FILES ONLY"
 msgstr "ENDAST FÖR LOKALA FILER"
 
-#: src/LYOptions.c:2156
+#: src/LYOptions.c:2159
 msgid "ALWAYS ON"
 msgstr "ALLTID PÅ"
 
 # Numeriskt tangentbord
-#: src/LYOptions.c:2168
+#: src/LYOptions.c:2171
 msgid "Numbers act as arrows"
 msgstr "Siffror som pilar"
 
-#: src/LYOptions.c:2170
+#: src/LYOptions.c:2173
 msgid "Links are numbered"
 msgstr "Numrerade länkar"
 
-#: src/LYOptions.c:2173
+#: src/LYOptions.c:2176
 msgid "Links and form fields are numbered"
 msgstr "Numrerade länkar och formulärfält"
 
-#: src/LYOptions.c:2176
+#: src/LYOptions.c:2179
 msgid "Form fields are numbered"
 msgstr "Numrerade formulärfält"
 
-#: src/LYOptions.c:2191
+#: src/LYOptions.c:2194
 msgid "Case insensitive"
 msgstr "Skilj inte VERSALER och gemener"
 
-#: src/LYOptions.c:2192
+#: src/LYOptions.c:2195
 msgid "Case sensitive"
 msgstr "Skilj VERSALER och gemener"
 
-#: src/LYOptions.c:2216
+#: src/LYOptions.c:2229
 msgid "prompt normally"
 msgstr "fråga som vanligt"
 
-#: src/LYOptions.c:2217
+#: src/LYOptions.c:2230
 msgid "force yes-response"
 msgstr "svara alltid ja"
 
-#: src/LYOptions.c:2218
+#: src/LYOptions.c:2231
 msgid "force no-response"
 msgstr "svara alltid nej"
 
-#: src/LYOptions.c:2236
+#: src/LYOptions.c:2249
 msgid "Novice"
 msgstr "Nybörjare"
 
-#: src/LYOptions.c:2237
+#: src/LYOptions.c:2250
 msgid "Intermediate"
 msgstr "Amatör"
 
-#: src/LYOptions.c:2238
+#: src/LYOptions.c:2251
 msgid "Advanced"
 msgstr "Avancerad"
 
-#: src/LYOptions.c:2247
+#: src/LYOptions.c:2260
 msgid "By First Visit"
 msgstr "Efter första besök"
 
-#: src/LYOptions.c:2249
+#: src/LYOptions.c:2262
 msgid "By First Visit Reversed"
 msgstr "Efter första användning, omvänt"
 
-#: src/LYOptions.c:2250
+#: src/LYOptions.c:2263
 msgid "As Visit Tree"
 msgstr "Som besöksträd"
 
-#: src/LYOptions.c:2251
+#: src/LYOptions.c:2264
 msgid "By Last Visit"
 msgstr "Efter senaste besök"
 
-#: src/LYOptions.c:2253
+#: src/LYOptions.c:2266
 msgid "By Last Visit Reversed"
 msgstr "Efter senaste besök, omvänt"
 
 #. Old_DTD variable
-#: src/LYOptions.c:2264
+#: src/LYOptions.c:2277
 msgid "relaxed (TagSoup mode)"
 msgstr "avslappnad (TagSoup-läge)"
 
-#: src/LYOptions.c:2265
+#: src/LYOptions.c:2278
 msgid "strict (SortaSGML mode)"
 msgstr "strikt (SortaSGML-läge)"
 
-#: src/LYOptions.c:2272
+#: src/LYOptions.c:2285
 msgid "Ignore"
 msgstr "Ignorera"
 
-#: src/LYOptions.c:2273
+#: src/LYOptions.c:2286
 msgid "Add to trace-file"
 msgstr "Lägg till spårningsfil"
 
-#: src/LYOptions.c:2274
+#: src/LYOptions.c:2287
 msgid "Add to LYNXMESSAGES"
 msgstr "Lägg till LYNXMESSAGES"
 
-#: src/LYOptions.c:2275
+#: src/LYOptions.c:2288
 msgid "Warn, point to trace-file"
 msgstr "Varna, visa mot spårfil"
 
-#: src/LYOptions.c:2282
+#: src/LYOptions.c:2295
 msgid "as labels"
 msgstr "som etiketter"
 
-#: src/LYOptions.c:2283
+#: src/LYOptions.c:2296
 msgid "as links"
 msgstr "som länkar"
 
-#: src/LYOptions.c:2290
+#: src/LYOptions.c:2303
 msgid "show filename"
 msgstr "visa filnamn"
 
-#: src/LYOptions.c:2301
+#: src/LYOptions.c:2314
 msgid "STANDARD"
 msgstr "NORMAL"
 
-#: src/LYOptions.c:2302
+#: src/LYOptions.c:2315
 msgid "ADVANCED"
 msgstr "AVANCERAD"
 
-#: src/LYOptions.c:2336
+#: src/LYOptions.c:2349
 msgid "Directories first"
 msgstr "Kataloger först"
 
-#: src/LYOptions.c:2337
+#: src/LYOptions.c:2350
 msgid "Files first"
 msgstr "Filer först"
 
-#: src/LYOptions.c:2338
+#: src/LYOptions.c:2351
 msgid "Mixed style"
 msgstr "Blandad visning"
 
-#: src/LYOptions.c:2346 src/LYOptions.c:2366
+#: src/LYOptions.c:2359 src/LYOptions.c:2379
 msgid "By Name"
 msgstr "Efter namn"
 
-#: src/LYOptions.c:2347 src/LYOptions.c:2367
+#: src/LYOptions.c:2360 src/LYOptions.c:2380
 msgid "By Type"
 msgstr "Efter typ"
 
-#: src/LYOptions.c:2348 src/LYOptions.c:2368
+#: src/LYOptions.c:2361 src/LYOptions.c:2381
 msgid "By Size"
 msgstr "Efter storlek"
 
-#: src/LYOptions.c:2349 src/LYOptions.c:2369
+#: src/LYOptions.c:2362 src/LYOptions.c:2382
 msgid "By Date"
 msgstr "Efter datum"
 
-#: src/LYOptions.c:2350
+#: src/LYOptions.c:2363
 msgid "By Mode"
 msgstr "Efter läge"
 
-#: src/LYOptions.c:2352
+#: src/LYOptions.c:2365
 msgid "By User"
 msgstr "Efter användare"
 
-#: src/LYOptions.c:2353
+#: src/LYOptions.c:2366
 msgid "By Group"
 msgstr "Efter grupp"
 
-#: src/LYOptions.c:2378
+#: src/LYOptions.c:2391
 msgid "Do not show rate"
-msgstr "Visa inte hastighe"
+msgstr "Visa inte hastighet"
 
-#: src/LYOptions.c:2379 src/LYOptions.c:2380
+#: src/LYOptions.c:2392 src/LYOptions.c:2393
 #, c-format
 msgid "Show %s/sec rate"
 msgstr "Visa hastighet som %s/s"
 
-#: src/LYOptions.c:2382 src/LYOptions.c:2383
+#: src/LYOptions.c:2395 src/LYOptions.c:2396
 #, c-format
 msgid "Show %s/sec, ETA"
 msgstr "Visa %s/s, tid kvar"
 
-#: src/LYOptions.c:2386
+#: src/LYOptions.c:2397 src/LYOptions.c:2398
+#, c-format
+msgid "Show %s/sec (2-digits), ETA"
+msgstr "Visa %s/s (2 siffror), tid kvar"
+
+#: src/LYOptions.c:2401
 msgid "Show progressbar"
 msgstr "Visa förloppsindikator"
 
-#: src/LYOptions.c:2398
+#: src/LYOptions.c:2413
 msgid "Accept lynx's internal types"
 msgstr "Godta lynx interna typer"
 
-#: src/LYOptions.c:2399
+#: src/LYOptions.c:2414
 msgid "Also accept lynx.cfg's types"
 msgstr "Godta även typer från lynx.cfg"
 
-#: src/LYOptions.c:2400
+#: src/LYOptions.c:2415
 msgid "Also accept user's types"
 msgstr "Godta även användarens typer"
 
-#: src/LYOptions.c:2401
+#: src/LYOptions.c:2416
 msgid "Also accept system's types"
 msgstr "Godta även systemets typer"
 
-#: src/LYOptions.c:2402
+#: src/LYOptions.c:2417
 msgid "Accept all types"
 msgstr "Godta alla typer"
 
-#: src/LYOptions.c:2411
+#: src/LYOptions.c:2426
 msgid "gzip"
 msgstr "gzip"
 
-#: src/LYOptions.c:2412
+#: src/LYOptions.c:2427
 msgid "deflate"
 msgstr "deflate"
 
-#: src/LYOptions.c:2415
+#: src/LYOptions.c:2430
 msgid "compress"
 msgstr "compress"
 
-#: src/LYOptions.c:2418
+#: src/LYOptions.c:2433
 msgid "bzip2"
 msgstr "bzip2"
 
-#: src/LYOptions.c:2420
+#: src/LYOptions.c:2435
 msgid "All"
 msgstr "Alla"
 
-#: src/LYOptions.c:2699 src/LYOptions.c:2728
+#: src/LYOptions.c:2798 src/LYOptions.c:2827
 #, c-format
 msgid "Use %s to invoke the Options menu!"
 msgstr "Använd %s för att nå alternativmenyn!"
 
-#: src/LYOptions.c:3541
+#: src/LYOptions.c:3675
 msgid "(options marked with (!) will not be saved)"
 msgstr "(inställningar markerade med (!) kommer ej att sparas)"
 
-#: src/LYOptions.c:3549
+#: src/LYOptions.c:3683
 msgid "General Preferences"
 msgstr "Allmänna inställningar"
 
 #. ***************************************************************
 #. User Mode: SELECT
-#: src/LYOptions.c:3553
+#: src/LYOptions.c:3687
 msgid "User mode"
 msgstr "Användarläge"
 
 #. Editor: INPUT
-#: src/LYOptions.c:3559
+#: src/LYOptions.c:3693
 msgid "Editor"
 msgstr "Redigeringsprogram"
 
 #. Search Type: SELECT
-#: src/LYOptions.c:3564
+#: src/LYOptions.c:3698
 msgid "Type of Search"
 msgstr "Söktyp"
 
-#: src/LYOptions.c:3569
+#: src/LYOptions.c:3703
 msgid "Security and Privacy"
-msgstr "Säkerhet och personlig integritet"
+msgstr "Säkerhet och sekretess"
 
 #. ***************************************************************
 #. Cookies: SELECT
-#: src/LYOptions.c:3573
+#: src/LYOptions.c:3707
 msgid "Cookies"
 msgstr "Kakor"
 
 #. Cookie Prompting: SELECT
-#: src/LYOptions.c:3587
+#: src/LYOptions.c:3721
 msgid "Invalid-Cookie Prompting"
 msgstr "Fråga för ogiltiga kakor"
 
 #. SSL Prompting: SELECT
-#: src/LYOptions.c:3594
+#: src/LYOptions.c:3728
 msgid "SSL Prompting"
 msgstr "Fråga för SSL"
 
-#: src/LYOptions.c:3600
+#: src/LYOptions.c:3734
 msgid "Keyboard Input"
 msgstr "Tangentbordsindata"
 
 #. ***************************************************************
 #. Keypad Mode: SELECT
-#: src/LYOptions.c:3604
+#: src/LYOptions.c:3738
 msgid "Keypad mode"
 msgstr "Numeriskt tangentbord"
 
 #. Emacs keys: ON/OFF
-#: src/LYOptions.c:3610
+#: src/LYOptions.c:3744
 msgid "Emacs keys"
 msgstr "Emacstangenter"
 
 #. VI Keys: ON/OFF
-#: src/LYOptions.c:3616
+#: src/LYOptions.c:3750
 msgid "VI keys"
 msgstr "VI-tangenter"
 
 #. Line edit style: SELECT
 #. well, at least 2 line edit styles available
-#: src/LYOptions.c:3623
+#: src/LYOptions.c:3757
 msgid "Line edit style"
 msgstr "Radredigeringsstil"
 
 #. Keyboard layout: SELECT
-#: src/LYOptions.c:3635
+#: src/LYOptions.c:3769
 msgid "Keyboard layout"
 msgstr "Tangentbordsmall"
 
 #.
 #. * Display and Character Set
 #.
-#: src/LYOptions.c:3649
+#: src/LYOptions.c:3783
 msgid "Display and Character Set"
 msgstr "Visning och teckenuppsättning"
 
 #. Use locale-based character set: ON/OFF
-#: src/LYOptions.c:3654
+#: src/LYOptions.c:3788
 msgid "Use locale-based character set"
 msgstr "Lokalbaserad teckenuppsättning"
 
-#: src/LYOptions.c:3661
+#: src/LYOptions.c:3795
 msgid "Use HTML5 charset replacements"
 msgstr "Använd HTML5:s ersättande teckenkoder"
 
 #. Display Character Set: SELECT
-#: src/LYOptions.c:3667
+#: src/LYOptions.c:3801
 msgid "Display character set"
 msgstr "Teckenuppsättning för visning"
 
-#: src/LYOptions.c:3698
+#: src/LYOptions.c:3832
 msgid "Assumed document character set"
 msgstr "Förvald dokumentteckenuppsättning"
 
@@ -4929,263 +4926,272 @@ msgstr "Förvald dokumentteckenuppsättning"
 #. * we split the header to make it more readable:
 #. * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others.
 #.
-#: src/LYOptions.c:3718
+#: src/LYOptions.c:3852
 msgid "CJK mode"
 msgstr "CJK-läge"
 
-#: src/LYOptions.c:3720
+#: src/LYOptions.c:3854
 msgid "Raw 8-bit"
 msgstr "Rå 8-bitars"
 
 #. X Display: INPUT
-#: src/LYOptions.c:3728
+#: src/LYOptions.c:3862
 msgid "X Display"
 msgstr "X-display"
 
 #.
 #. * Document Appearance
 #.
-#: src/LYOptions.c:3734
+#: src/LYOptions.c:3868
 msgid "Document Appearance"
 msgstr "Dokumentutseende"
 
-#: src/LYOptions.c:3740
+#: src/LYOptions.c:3874
 msgid "Show color"
 msgstr "Visa färg"
 
+#. Color style: ON/OFF
+#: src/LYOptions.c:3899
+msgid "Color style"
+msgstr "Färgstil"
+
+#: src/LYOptions.c:3908
+msgid "Default colors"
+msgstr "Förvalda färger"
+
 #. Show cursor: ON/OFF
-#: src/LYOptions.c:3764
+#: src/LYOptions.c:3916
 msgid "Show cursor"
 msgstr "Visa markör"
 
 #. Underline links: ON/OFF
-#: src/LYOptions.c:3770
+#: src/LYOptions.c:3922
 msgid "Underline links"
 msgstr "Stryk under länkar"
 
 #. Show scrollbar: ON/OFF
-#: src/LYOptions.c:3777
+#: src/LYOptions.c:3929
 msgid "Show scrollbar"
 msgstr "Visa rullningslist"
 
 #. Select Popups: ON/OFF
-#: src/LYOptions.c:3784
+#: src/LYOptions.c:3936
 msgid "Popups for select fields"
 msgstr "Popup för valfält"
 
 #. HTML error recovery: SELECT
-#: src/LYOptions.c:3790
+#: src/LYOptions.c:3942
 msgid "HTML error recovery"
 msgstr "HTML-felåterhämtning"
 
 #. Bad HTML messages: SELECT
-#: src/LYOptions.c:3796
+#: src/LYOptions.c:3948
 msgid "Bad HTML messages"
 msgstr "Meddelanden om trasig HTML"
 
 #. Show Images: SELECT
-#: src/LYOptions.c:3802
+#: src/LYOptions.c:3954
 msgid "Show images"
 msgstr "Visa bilder"
 
 #. Verbose Images: ON/OFF
-#: src/LYOptions.c:3816
+#: src/LYOptions.c:3968
 msgid "Verbose images"
 msgstr "Pratsamma bilder"
 
 #.
 #. * Headers Transferred to Remote Servers
 #.
-#: src/LYOptions.c:3824
+#: src/LYOptions.c:3976
 msgid "Headers Transferred to Remote Servers"
 msgstr "Frågehuvud överfört till fjärrservrar"
 
 #. ***************************************************************
 #. Mail Address: INPUT
-#: src/LYOptions.c:3828
+#: src/LYOptions.c:3980
 msgid "Personal mail address"
 msgstr "Egen e-postadress"
 
-#: src/LYOptions.c:3833
+#: src/LYOptions.c:3985
 msgid "Personal name for mail"
 msgstr "Eget namn för e-post"
 
-#: src/LYOptions.c:3840
+#: src/LYOptions.c:3992
 msgid "Password for anonymous ftp"
 msgstr "Lösenord för anonym ftp"
 
 #. Preferred media type: SELECT
-#: src/LYOptions.c:3846
+#: src/LYOptions.c:3998
 msgid "Preferred media type"
 msgstr "Önskad mediatyp"
 
 #. Preferred encoding: SELECT
-#: src/LYOptions.c:3852
+#: src/LYOptions.c:4004
 msgid "Preferred encoding"
 msgstr "Önskade kodningsform"
 
 #. Preferred Document Character Set: INPUT
-#: src/LYOptions.c:3858
+#: src/LYOptions.c:4010
 msgid "Preferred document character set"
 msgstr "Önskad dokumentteckenuppsättning"
 
 #. Preferred Document Language: INPUT
-#: src/LYOptions.c:3863
+#: src/LYOptions.c:4015
 msgid "Preferred document language"
 msgstr "Önskade dokumentspråk"
 
-#: src/LYOptions.c:3869
+#: src/LYOptions.c:4021
 msgid "Send User-Agent header"
 msgstr "Sänd webbläsaridentifiering"
 
-#: src/LYOptions.c:3871
+#: src/LYOptions.c:4023
 msgid "User-Agent header"
 msgstr "Webbläsaridentifiering"
 
 #.
 #. * Listing and Accessing Files
 #.
-#: src/LYOptions.c:3879
+#: src/LYOptions.c:4031
 msgid "Listing and Accessing Files"
 msgstr "Visning av och åtkomst till filer"
 
 #. FTP sort: SELECT
-#: src/LYOptions.c:3884
+#: src/LYOptions.c:4036
 msgid "Use Passive FTP"
 msgstr "Använd passiv ftp"
 
 #. FTP sort: SELECT
-#: src/LYOptions.c:3890
+#: src/LYOptions.c:4042
 msgid "FTP sort criteria"
 msgstr "Sortering för ftp-kataloger"
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:3898
+#: src/LYOptions.c:4050
 msgid "Local directory sort criteria"
 msgstr "Sortering för lokala kataloger"
 
 #. Local Directory Order: SELECT
-#: src/LYOptions.c:3904
+#: src/LYOptions.c:4056
 msgid "Local directory sort order"
 msgstr "Sortering för lokala kataloger"
 
-#: src/LYOptions.c:3913
+#: src/LYOptions.c:4065
 msgid "Show dot files"
 msgstr "Visa punktfiler"
 
-#: src/LYOptions.c:3921
+#: src/LYOptions.c:4073
 msgid "Execution links"
 msgstr "Exekveringslänkar"
 
-#: src/LYOptions.c:3939
+#: src/LYOptions.c:4091
 msgid "Pause when showing message"
 msgstr "Pausa vid visning av meddelande"
 
 #. Show transfer rate: SELECT
-#: src/LYOptions.c:3946
+#: src/LYOptions.c:4098
 msgid "Show transfer rate"
 msgstr "Visa överföringshastighet"
 
 #.
 #. * Special Files and Screens
 #.
-#: src/LYOptions.c:3966
+#: src/LYOptions.c:4118
 msgid "Special Files and Screens"
 msgstr "Speciella filer och skärmar"
 
-#: src/LYOptions.c:3971
+#: src/LYOptions.c:4123
 msgid "Multi-bookmarks"
 msgstr "Multibokmärken"
 
-#: src/LYOptions.c:3979
+#: src/LYOptions.c:4131
 msgid "Review/edit Bookmarks files"
 msgstr "Se/ändra bokmärkesfiler"
 
-#: src/LYOptions.c:3982
+#: src/LYOptions.c:4134
 msgid "Goto multi-bookmark menu"
 msgstr "Gå till multibokmärkesmenyn"
 
-#: src/LYOptions.c:3984
+#: src/LYOptions.c:4136
 msgid "Bookmarks file"
 msgstr "Bokmärkesfil"
 
 #. Auto Session: ON/OFF
-#: src/LYOptions.c:3991
+#: src/LYOptions.c:4143
 msgid "Auto Session"
 msgstr "Automatiskt arbetspass"
 
 #. Session File Menu: INPUT
-#: src/LYOptions.c:3997
+#: src/LYOptions.c:4149
 msgid "Session file"
 msgstr "Arbetspassfil"
 
 #. Visited Pages: SELECT
-#: src/LYOptions.c:4003
+#: src/LYOptions.c:4155
 msgid "Visited Pages"
 msgstr "Besökta sidor"
 
-#: src/LYOptions.c:4008
+#: src/LYOptions.c:4160
 msgid "View the file "
 msgstr "Visa filen "
 
-#: src/LYPrint.c:947
+#: src/LYPrint.c:955
 #, c-format
 msgid " Print job complete.\n"
 msgstr " Utskriftsjobb färdigt.\n"
 
-#: src/LYPrint.c:1274
+#: src/LYPrint.c:1282
 msgid "Document:"
 msgstr "Dokument:"
 
-#: src/LYPrint.c:1275
+#: src/LYPrint.c:1283
 msgid "Number of lines:"
 msgstr "Antal länkar:"
 
-#: src/LYPrint.c:1276
+#: src/LYPrint.c:1284
 msgid "Number of pages:"
 msgstr "Antal sidor:"
 
-#: src/LYPrint.c:1277
+#: src/LYPrint.c:1285
 msgid "pages"
 msgstr "sidor"
 
-#: src/LYPrint.c:1277
+#: src/LYPrint.c:1285
 msgid "page"
 msgstr "sida"
 
-#: src/LYPrint.c:1278
+#: src/LYPrint.c:1286
 msgid "(approximately)"
 msgstr "(ungefär)"
 
-#: src/LYPrint.c:1285
+#: src/LYPrint.c:1293
 msgid "Some print functions have been disabled!"
 msgstr "Vissa utskriftsfunktioner har deaktiverats!"
 
-#: src/LYPrint.c:1289
+#: src/LYPrint.c:1297
 msgid "Standard print options:"
 msgstr "Fördefinierade utskriftsalternativ:"
 
-#: src/LYPrint.c:1290
+#: src/LYPrint.c:1298
 msgid "Print options:"
 msgstr "Utskriftsalternativ"
 
-#: src/LYPrint.c:1297
+#: src/LYPrint.c:1305
 msgid "Save to a local file"
 msgstr "Spara som lokal fil"
 
-#: src/LYPrint.c:1299
+#: src/LYPrint.c:1307
 msgid "Save to disk disabled"
 msgstr "\"Spara på disk\" deaktiverad"
 
-#: src/LYPrint.c:1306
+#: src/LYPrint.c:1314
 msgid "Mail the file"
 msgstr "Sänd filer per e-post"
 
-#: src/LYPrint.c:1313
+#: src/LYPrint.c:1321
 msgid "Print to the screen"
 msgstr "Skriv ut på skärmen"
 
-#: src/LYPrint.c:1318
+#: src/LYPrint.c:1326
 msgid "Print out on a printer attached to your vt100 terminal"
 msgstr "Skriv ut på en skrivare ansluten till din vt100-terminal"
 
@@ -5210,291 +5216,291 @@ msgstr ""
 msgid "Offending line:"
 msgstr "Felaktig rad:"
 
-#: src/LYReadCFG.c:757
+#: src/LYReadCFG.c:769
 #, c-format
 msgid "key remapping of %s to %s for %s failed\n"
 msgstr "tangentomdefiniering av %s till %s för %s misslyckades\n"
 
-#: src/LYReadCFG.c:764
+#: src/LYReadCFG.c:776
 #, c-format
 msgid "key remapping of %s to %s failed\n"
 msgstr "tangentomdefiniering av %s till %s misslyckades\n"
 
-#: src/LYReadCFG.c:785
+#: src/LYReadCFG.c:797
 #, c-format
 msgid "invalid line-editor selection %s for key %s, selecting all\n"
 msgstr "ogiltig radredigeringsval %s för tangent %s, väljer alla\n"
 
-#: src/LYReadCFG.c:810 src/LYReadCFG.c:822
+#: src/LYReadCFG.c:822 src/LYReadCFG.c:834
 #, c-format
 msgid "setting of line-editor binding for key %s (0x%x) to 0x%x for %s failed\n"
 msgstr "inställning av radredigeringsdefinition för tangent %s (0x%x) till 0x%x för %s misslyckades\n"
 
-#: src/LYReadCFG.c:826
+#: src/LYReadCFG.c:838
 #, c-format
 msgid "setting of line-editor binding for key %s (0x%x) for %s failed\n"
 msgstr "inställning av radredigeringsdefinition för tangent %s (0x%x) för %s misslyckades\n"
 
-#: src/LYReadCFG.c:922
+#: src/LYReadCFG.c:934
 #, c-format
 msgid "Lynx: cannot start, CERN rules file %s is not available\n"
 msgstr "Lynx: kan inte börja, CERN-regelfilen %s ej tillgänglig\n"
 
-#: src/LYReadCFG.c:923
+#: src/LYReadCFG.c:935
 msgid "(no name)"
 msgstr "(inget namn)"
 
-#: src/LYReadCFG.c:2044
+#: src/LYReadCFG.c:2073
 #, c-format
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
 msgstr "Mer än %d staplade lynx.cfg-inkluderingar -- kanske en slinga?!?\n"
 
-#: src/LYReadCFG.c:2046
+#: src/LYReadCFG.c:2075
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr "Sista försökta inkludering var \"%s\",\n"
 
-#: src/LYReadCFG.c:2047
+#: src/LYReadCFG.c:2076
 #, c-format
 msgid "included from '%s'.\n"
 msgstr "inkluderad från \"%s\".\n"
 
-#: src/LYReadCFG.c:2450 src/LYReadCFG.c:2463 src/LYReadCFG.c:2521
+#: src/LYReadCFG.c:2479 src/LYReadCFG.c:2492 src/LYReadCFG.c:2550
 msgid "The following is read from your lynx.cfg file."
 msgstr "Följande läses från din lynx.cfg-fil."
 
-#: src/LYReadCFG.c:2451 src/LYReadCFG.c:2464
+#: src/LYReadCFG.c:2480 src/LYReadCFG.c:2493
 msgid "Please read the distribution"
 msgstr "Se distributionens"
 
-#: src/LYReadCFG.c:2457 src/LYReadCFG.c:2467
+#: src/LYReadCFG.c:2486 src/LYReadCFG.c:2496
 msgid "for more comments."
 msgstr "för ytterligare kommentarer."
 
-#: src/LYReadCFG.c:2503
+#: src/LYReadCFG.c:2532
 msgid "RELOAD THE CHANGES"
 msgstr "HÄMTA OM ÄNDRINGARNA"
 
-#: src/LYReadCFG.c:2511
+#: src/LYReadCFG.c:2540
 msgid "Your primary configuration"
 msgstr "Din primära konfiguration"
 
-#: src/LYShowInfo.c:177
+#: src/LYShowInfo.c:111
+msgid "URL:"
+msgstr "Adress:"
+
+#: src/LYShowInfo.c:196
 msgid "Directory that you are currently viewing"
 msgstr "Visad katalog"
 
-#: src/LYShowInfo.c:180
+#: src/LYShowInfo.c:199
 msgid "Name:"
 msgstr "Namn:"
 
-#: src/LYShowInfo.c:183
-msgid "URL:"
-msgstr "Adress:"
-
-#: src/LYShowInfo.c:197
+#: src/LYShowInfo.c:216
 msgid "Directory that you have currently selected"
 msgstr "Markerade kataloger"
 
-#: src/LYShowInfo.c:199
+#: src/LYShowInfo.c:218
 msgid "File that you have currently selected"
 msgstr "Markerade filer"
 
-#: src/LYShowInfo.c:202
+#: src/LYShowInfo.c:221
 msgid "Symbolic link that you have currently selected"
 msgstr "Markerade symboliska länkar"
 
-#: src/LYShowInfo.c:205
+#: src/LYShowInfo.c:224
 msgid "Item that you have currently selected"
 msgstr "Markerade poster"
 
-#: src/LYShowInfo.c:207
+#: src/LYShowInfo.c:226
 msgid "Full name:"
 msgstr "Fullt namn:"
 
-#: src/LYShowInfo.c:217
+#: src/LYShowInfo.c:239
 msgid "Unable to follow link"
 msgstr "Kan inte följa länk"
 
-#: src/LYShowInfo.c:219
+#: src/LYShowInfo.c:241
 msgid "Points to file:"
 msgstr "Pekar på fil:"
 
-#: src/LYShowInfo.c:224
+#: src/LYShowInfo.c:246
 msgid "Name of owner:"
 msgstr "Namn på ägare:"
 
-#: src/LYShowInfo.c:227
+#: src/LYShowInfo.c:249
 msgid "Group name:"
 msgstr "Gruppnamn:"
 
-#: src/LYShowInfo.c:229
+#: src/LYShowInfo.c:251
 msgid "File size:"
 msgstr "Filstorlek:"
 
-#: src/LYShowInfo.c:231
+#: src/LYShowInfo.c:253
 msgid "(bytes)"
 msgstr "(byte)"
 
 #.
 #. * Include date and time information.
 #.
-#: src/LYShowInfo.c:236
+#: src/LYShowInfo.c:258
 msgid "Creation date:"
 msgstr "Skapad den:"
 
-#: src/LYShowInfo.c:239
+#: src/LYShowInfo.c:261
 msgid "Last modified:"
 msgstr "Senast ändrad:"
 
-#: src/LYShowInfo.c:242
+#: src/LYShowInfo.c:264
 msgid "Last accessed:"
 msgstr "Senast åtkommen:"
 
-#: src/LYShowInfo.c:248
+#: src/LYShowInfo.c:270
 msgid "Access Permissions"
 msgstr "Åtkomstbehörighet"
 
-#: src/LYShowInfo.c:283
+#: src/LYShowInfo.c:305
 msgid "Group:"
 msgstr "Grupp:"
 
-#: src/LYShowInfo.c:303
+#: src/LYShowInfo.c:325
 msgid "World:"
 msgstr "Övriga:"
 
-#: src/LYShowInfo.c:310
+#: src/LYShowInfo.c:332
 msgid "File that you are currently viewing"
 msgstr "Visad fil"
 
-#: src/LYShowInfo.c:318 src/LYShowInfo.c:422
+#: src/LYShowInfo.c:340 src/LYShowInfo.c:444
 msgid "Linkname:"
 msgstr "Länknamn:"
 
-#: src/LYShowInfo.c:324 src/LYShowInfo.c:339
+#: src/LYShowInfo.c:346 src/LYShowInfo.c:361
 msgid "Charset:"
 msgstr "Teckenuppsättning:"
 
-#: src/LYShowInfo.c:338
+#: src/LYShowInfo.c:360
 msgid "(assumed)"
 msgstr "(antogs)"
 
-#: src/LYShowInfo.c:345
+#: src/LYShowInfo.c:367
 msgid "Server:"
 msgstr "Server:"
 
-#: src/LYShowInfo.c:348
+#: src/LYShowInfo.c:370
 msgid "Date:"
 msgstr "Datum:"
 
-#: src/LYShowInfo.c:351
+#: src/LYShowInfo.c:373
 msgid "Last Mod:"
 msgstr "Senaste ändring:"
 
-#: src/LYShowInfo.c:356
+#: src/LYShowInfo.c:378
 msgid "Expires:"
 msgstr "Utgår:"
 
-#: src/LYShowInfo.c:359
+#: src/LYShowInfo.c:381
 msgid "Cache-Control:"
 msgstr "Cachekontroll:"
 
-#: src/LYShowInfo.c:362
+#: src/LYShowInfo.c:384
 msgid "Content-Length:"
 msgstr "Datalängd:"
 
-#: src/LYShowInfo.c:366
+#: src/LYShowInfo.c:388
 msgid "Length:"
 msgstr "Längd:"
 
-#: src/LYShowInfo.c:371
+#: src/LYShowInfo.c:393
 msgid "Language:"
 msgstr "Språk:"
 
-#: src/LYShowInfo.c:378
+#: src/LYShowInfo.c:400
 msgid "Post Data:"
 msgstr "\"POST\"-data:"
 
-#: src/LYShowInfo.c:381
+#: src/LYShowInfo.c:403
 msgid "Post Content Type:"
 msgstr "\"POST\"-datatyp:"
 
-#: src/LYShowInfo.c:384
+#: src/LYShowInfo.c:406
 msgid "Owner(s):"
 msgstr "Ägare:"
 
-#: src/LYShowInfo.c:389
+#: src/LYShowInfo.c:411
 msgid "size:"
 msgstr "storlek:"
 
-#: src/LYShowInfo.c:391
+#: src/LYShowInfo.c:413
 msgid "lines"
 msgstr "rader"
 
-#: src/LYShowInfo.c:395
+#: src/LYShowInfo.c:417
 msgid "forms mode"
 msgstr "formulärläge"
 
-#: src/LYShowInfo.c:397
+#: src/LYShowInfo.c:419
 msgid "source"
 msgstr "källkod"
 
-#: src/LYShowInfo.c:398
+#: src/LYShowInfo.c:420
 msgid "normal"
 msgstr "normal"
 
-#: src/LYShowInfo.c:400
+#: src/LYShowInfo.c:422
 msgid ", safe"
 msgstr ", säker"
 
-#: src/LYShowInfo.c:402
+#: src/LYShowInfo.c:424
 msgid ", via internal link"
 msgstr ", via intern länk"
 
-#: src/LYShowInfo.c:407
+#: src/LYShowInfo.c:429
 msgid ", no-cache"
 msgstr ", ingen cache"
 
-#: src/LYShowInfo.c:409
+#: src/LYShowInfo.c:431
 msgid ", ISMAP script"
 msgstr ", ISMAP-skript"
 
-#: src/LYShowInfo.c:411
+#: src/LYShowInfo.c:433
 msgid ", bookmark file"
 msgstr ", bokmärkesfil"
 
-#: src/LYShowInfo.c:415
+#: src/LYShowInfo.c:437
 msgid "mode:"
 msgstr "läge:"
 
-#: src/LYShowInfo.c:421
+#: src/LYShowInfo.c:443
 msgid "Link that you currently have selected"
 msgstr "Markerad länk"
 
-#: src/LYShowInfo.c:430
+#: src/LYShowInfo.c:452
 msgid "Method:"
 msgstr "Metod:"
 
-#: src/LYShowInfo.c:434
+#: src/LYShowInfo.c:456
 msgid "Enctype:"
 msgstr "Kodningstyp:"
 
-#: src/LYShowInfo.c:440
+#: src/LYShowInfo.c:462
 msgid "Action:"
 msgstr "Åtgärd:"
 
-#: src/LYShowInfo.c:446
+#: src/LYShowInfo.c:468
 msgid "(Form field)"
 msgstr "(Formulärfält)"
 
-#: src/LYShowInfo.c:457
+#: src/LYShowInfo.c:478
 msgid "No Links on the current page"
 msgstr "Ingen länk på aktuell sida"
 
-#: src/LYShowInfo.c:463
+#: src/LYShowInfo.c:484
 msgid "Server Headers:"
 msgstr "Serverhuvuden:"
 
-#: src/LYStyle.c:331
+#: src/LYStyle.c:338
 #, c-format
 msgid ""
 "Syntax Error parsing style in lss file:\n"
@@ -5511,6 +5517,17 @@ msgstr ""
 "där OBJEKT är en av EM,STRONG,B,I,U,BLINK etc.\n"
 "\n"
 
+#: src/LYStyle.c:933
+#, c-format
+msgid ""
+"\n"
+"Lynx file \"%s\" is not available.\n"
+"\n"
+msgstr ""
+"\n"
+"Lynxfilen \"%s\" ej tillgänglig.\n"
+"\n"
+
 #: src/LYTraversal.c:111
 msgid "here is a list of the history stack so that you may rebuild"
 msgstr "här finns en lista över historikstacken så att du kan bygga om"
@@ -5535,41 +5552,41 @@ msgstr "Ogiltig omdirigering med \"~\" hittad! Begäran ignorerad."
 msgid "Unable to upload file."
 msgstr "Kan inte skicka fil."
 
-#: src/LYUpload.c:199
+#: src/LYUpload.c:196
 msgid "Upload To:"
 msgstr "Skicka till:"
 
-#: src/LYUpload.c:200
+#: src/LYUpload.c:197
 msgid "Upload options:"
 msgstr "Insändningsalternativ:"
 
-#: src/LYUtils.c:1883
+#: src/LYUtils.c:1919
 msgid "Download document URL put to clipboard."
 msgstr "Adress till hämtat dokument lagt i urklipp."
 
-#: src/LYUtils.c:2668
+#: src/LYUtils.c:2666
 msgid "Unexpected access protocol for this URL scheme."
 msgstr "Oväntat åtkomstprotokoll för denna adresstyp."
 
-#: src/LYUtils.c:3492
+#: src/LYUtils.c:3571
 msgid "Too many tempfiles"
 msgstr "För många temporärfiler"
 
-#: src/LYUtils.c:3792
+#: src/LYUtils.c:3871
 msgid "unknown restriction"
 msgstr "okänd begränsning"
 
-#: src/LYUtils.c:3823
+#: src/LYUtils.c:3902
 #, c-format
 msgid "No restrictions set.\n"
 msgstr "Inga begränsningar satta.\n"
 
-#: src/LYUtils.c:3826
+#: src/LYUtils.c:3905
 #, c-format
 msgid "Restrictions set:\n"
 msgstr "Satta begränsningar:\n"
 
-#: src/LYUtils.c:5212
+#: src/LYUtils.c:5279
 msgid "Cannot find HOME directory"
 msgstr "Hittar inte hemkatalogen (HOME)"
 
@@ -5577,7 +5594,7 @@ msgstr "Hittar inte hemkatalogen (HOME)"
 msgid "Normally disabled.  See ENABLE_LYNXRC in lynx.cfg\n"
 msgstr "Vanligtvis avstängd. Se ENABLE_LYNXRC i lynx.cfg\n"
 
-#: src/LYrcFile.c:325
+#: src/LYrcFile.c:327
 msgid ""
 "accept_all_cookies allows the user to tell Lynx to automatically\n"
 "accept all cookies if desired.  The default is \"FALSE\" which will\n"
@@ -5589,7 +5606,7 @@ msgstr ""
 "varje kaka. Sätt accept_all_cookies till \"TRUE\" för att acceptera\n"
 "alla kakor.\n"
 
-#: src/LYrcFile.c:333
+#: src/LYrcFile.c:335
 msgid ""
 "anonftp_password allows the user to tell Lynx to use the personal\n"
 "email address as the password for anonymous ftp.  If no value is given,\n"
@@ -5601,7 +5618,7 @@ msgstr ""
 "kommer Lynx använda den personliga e-postadressen. Sätt anonftp_password\n"
 "till ett annat värde om du vill välja.\n"
 
-#: src/LYrcFile.c:342
+#: src/LYrcFile.c:344
 msgid ""
 "bookmark_file specifies the name and location of the default bookmark\n"
 "file into which the user can paste links for easy access at a later\n"
@@ -5610,7 +5627,7 @@ msgstr ""
 "bookmark_file anger namn och plats för standardbokmärkesfilen, i vilken\n"
 "användaren kan klistra in länkar för att lätt komma åt dem senare.\n"
 
-#: src/LYrcFile.c:347
+#: src/LYrcFile.c:349
 msgid ""
 "If case_sensitive_searching is \"on\" then when the user invokes a search\n"
 "using the 's' or '/' keys, the search performed will be case sensitive\n"
@@ -5620,7 +5637,7 @@ msgstr ""
 "med \"s\" eller \"/\" kommer sökningen som genomförs att göra skillnad på\n"
 "gemener och versaler. Förvalet är normalt sett av (\"off\").\n"
 
-#: src/LYrcFile.c:352
+#: src/LYrcFile.c:354
 msgid ""
 "The character_set definition controls the representation of 8 bit\n"
 "characters for your terminal.  If 8 bit characters do not show up\n"
@@ -5634,7 +5651,7 @@ msgstr ""
 "använda sjubitarstolkningarna.\n"
 "Giltiga teckenuppsättningar är:\n"
 
-#: src/LYrcFile.c:359
+#: src/LYrcFile.c:361
 msgid ""
 "cookie_accept_domains and cookie_reject_domains are comma-delimited\n"
 "lists of domains from which Lynx should automatically accept or reject\n"
@@ -5648,7 +5665,7 @@ msgstr ""
 "att gå före. Flaggan accept_all_cookies går före alla inställningar\n"
 "som görs här.\n"
 
-#: src/LYrcFile.c:367
+#: src/LYrcFile.c:369
 msgid ""
 "cookie_file specifies the file from which to read persistent cookies.\n"
 "The default is ~/"
@@ -5656,7 +5673,7 @@ msgstr ""
 "cookie_file anger filen som varaktiga kakor skall läsas från.\n"
 "Förval är ~/"
 
-#: src/LYrcFile.c:372
+#: src/LYrcFile.c:374
 msgid ""
 "cookie_loose_invalid_domains, cookie_strict_invalid_domains, and\n"
 "cookie_query_invalid_domains are comma-delimited lists of which domains\n"
@@ -5674,7 +5691,7 @@ msgstr ""
 "sökväg- eller domänattribut. Alla domäner får som förval frågor till\n"
 "användaren för felaktiga sökvägar eller domäner.\n"
 
-#: src/LYrcFile.c:386
+#: src/LYrcFile.c:388
 msgid ""
 "dir_list_order specifies the directory list order under DIRED_SUPPORT\n"
 "(if implemented).  The default is \"ORDER_BY_NAME\"\n"
@@ -5682,7 +5699,7 @@ msgstr ""
 "dir_list_order anger kataloglistesortering i DIRED_SUPPORT (om det är\n"
 "implementerat). Förvalet är \"ORDER_BY_NAME\"\n"
 
-#: src/LYrcFile.c:391
+#: src/LYrcFile.c:393
 msgid ""
 "dir_list_styles specifies the directory list style under DIRED_SUPPORT\n"
 "(if implemented).  The default is \"MIXED_STYLE\", which sorts both\n"
@@ -5691,22 +5708,22 @@ msgid ""
 msgstr ""
 "dir_list_styles anger kataloglistestil i DIRED_SUPPORT (om det är\n"
 "implementerat). Förvalet är \"MIXED_STYLE\", vilket sorterar filer\n"
-"och kataloger tillsammanns. \"FILES_FIRST\" listar filer först, och\n"
+"och kataloger tillsammans. \"FILES_FIRST\" listar filer först, och\n"
 "\"DIRECTORIES_FIRST\" listar kataloger först.\n"
 
-#: src/LYrcFile.c:399
+#: src/LYrcFile.c:401
 msgid ""
 "If emacs_keys is to \"on\" then the normal EMACS movement keys:\n"
 "  ^N = down    ^P = up\n"
 "  ^B = left    ^F = right\n"
 "will be enabled.\n"
 msgstr ""
-"Om emacs_keys sätts till \"on\" kommer EMACS-förflyttningstangeter att\n"
+"Om emacs_keys sätts till \"on\" kommer EMACS-förflyttningstangenter att\n"
 "aktiveras:\n"
 "  ^N = ned      ^P = upp\n"
 "  ^B = vänster  ^F = höger\n"
 
-#: src/LYrcFile.c:405
+#: src/LYrcFile.c:407
 msgid ""
 "file_editor specifies the editor to be invoked when editing local files\n"
 "or sending mail.  If no editor is specified, then file editing is disabled\n"
@@ -5718,7 +5735,7 @@ msgstr ""
 "filredigering, såvida det inte aktiveras från kommandoraden, och den inbyggda\n"
 "radredigeraren används för e-post.\n"
 
-#: src/LYrcFile.c:412
+#: src/LYrcFile.c:414
 msgid ""
 "The file_sorting_method specifies which value to sort on when viewing\n"
 "file lists such as FTP directories.  The options are:\n"
@@ -5734,7 +5751,7 @@ msgstr ""
 "   BY_SIZE     -- sorterar efter filstorlek\n"
 "   BY_DATE     -- sorterar efter fildatum\n"
 
-#: src/LYrcFile.c:435
+#: src/LYrcFile.c:437
 msgid ""
 "lineedit_mode specifies the key binding used for inputting strings in\n"
 "prompts and forms.  If lineedit_mode is set to \"Default Binding\" then\n"
@@ -5760,7 +5777,7 @@ msgstr ""
 "    Radera ord: ^B    ^F        ^E    = Radslut\n"
 "\n"
 
-#: src/LYrcFile.c:453
+#: src/LYrcFile.c:455
 msgid ""
 "The following allow you to define sub-bookmark files and descriptions.\n"
 "The format is multi_bookmark<capital_letter>=<filename>,<description>\n"
@@ -5773,7 +5790,7 @@ msgstr ""
 "Upp till 26 bokmärkesfiler (de stora bokstäverna A-Z) tillåts.\n"
 "Vi börjar med \"multi_bookmarkB\" eftersom \"A\" är förvalet (se ovan).\n"
 
-#: src/LYrcFile.c:459
+#: src/LYrcFile.c:461
 msgid ""
 "personal_mail_address specifies your personal mail address.  The\n"
 "address will be sent during HTTP file transfers for authorization and\n"
@@ -5783,7 +5800,7 @@ msgid ""
 "could leave this field blank, but then you won't have it included in\n"
 "your mailed comments.\n"
 msgstr ""
-"personal_mail_address anger din personliga e-postaderss. Adressen\n"
+"personal_mail_address anger din personliga e-postadress. Adressen\n"
 "sänds under HTTP-filöverföringar för auktoriserings- och\n"
 "loggningsändamål, samt för att sända kommentarer per e-post\n"
 "Om du inte vill att denna information skall sändas, sätt NO_FROM_HEADER\n"
@@ -5791,7 +5808,7 @@ msgstr ""
 "även lämna detta fält blankt, men då inkluderas det inte i kommentarer\n"
 "du sänder.\n"
 
-#: src/LYrcFile.c:468
+#: src/LYrcFile.c:470
 msgid ""
 "personal_mail_name specifies your personal name, for mail.  The\n"
 "name is sent for mailed comments.  Lynx will prompt for this,\n"
@@ -5811,7 +5828,7 @@ msgstr ""
 "sidoeffekt av att sända e-post. För att ändra standardvärdet måste\n"
 "du använda inställningsmenyn, eller redigera den här filen direkt.\n"
 
-#: src/LYrcFile.c:478
+#: src/LYrcFile.c:480
 msgid ""
 "preferred_charset specifies the character set in MIME notation (e.g.,\n"
 "ISO-8859-2, ISO-8859-5) which Lynx will indicate you prefer in requests\n"
@@ -5838,7 +5855,7 @@ msgstr ""
 "servern sända ett felmeddelande, även om det är tillåtet att sända även\n"
 "ett icke-acceptabelt svar.\n"
 
-#: src/LYrcFile.c:494
+#: src/LYrcFile.c:496
 msgid ""
 "preferred_language specifies the language in MIME notation (e.g., en,\n"
 "fr, may be a comma-separated list in decreasing preference)\n"
@@ -5852,7 +5869,7 @@ msgstr ""
 "Om en fil i det språket finns att tillgå kommer servern sända den.\n"
 "Annars kommer servern sända filen i sitt standardspråk.\n"
 
-#: src/LYrcFile.c:505
+#: src/LYrcFile.c:507
 msgid ""
 "If run_all_execution_links is set \"on\" then all local execution links\n"
 "will be executed when they are selected.\n"
@@ -5874,7 +5891,7 @@ msgstr ""
 "          Detta bör endast aktiveras (\"on\") om du visar information från\n"
 "          tillförlitliga källor.\n"
 
-#: src/LYrcFile.c:516
+#: src/LYrcFile.c:518
 msgid ""
 "If run_execution_links_on_local_files is set \"on\" then all local\n"
 "execution links that are found in LOCAL files will be executed when they\n"
@@ -5902,7 +5919,7 @@ msgstr ""
 "          Detta bör endast aktiveras (\"on\") om du visar information från\n"
 "          tillförlitliga källor.\n"
 
-#: src/LYrcFile.c:534
+#: src/LYrcFile.c:536
 msgid ""
 "select_popups specifies whether the OPTIONs in a SELECT block which\n"
 "lacks a MULTIPLE attribute are presented as a vertical list of radio\n"
@@ -5914,13 +5931,13 @@ msgid ""
 msgstr ""
 "select_popups anger huruvida OPTION i ett SELECT-block som saknar\n"
 "MULTIPLE-attribut skall visas som en vertikal lista med radioknappar\n"
-"eller via en popupmuni. Observera att om MULTIPLE-attributet finns i\n"
+"eller via en popupmeny. Observera att om MULTIPLE-attributet finns i\n"
 "SELECT-märket kommer Lynx alltid skapa en vertikal lista med kryssrutor\n"
 "för varje OPTION. Värdet \"on\" skapar som förval popupmenyer, medan\n"
 "värdet \"off\" väljer radioknappar. Förvalet kan gås förbi via\n"
 "kommandoradsflaggan -popup.\n"
 
-#: src/LYrcFile.c:545
+#: src/LYrcFile.c:547
 msgid ""
 "show_color specifies how to set the color mode at startup.  A value of\n"
 "\"never\" will force color mode off (treat the terminal as monochrome)\n"
@@ -5953,7 +5970,7 @@ msgstr ""
 "alternativmenyn. Om alternativen sparas kommer inställningarna \"on\" och\n"
 "\"off\" att tolkas som \"default\".\n"
 
-#: src/LYrcFile.c:562
+#: src/LYrcFile.c:564
 msgid ""
 "show_cursor specifies whether to 'hide' the cursor to the right (and\n"
 "bottom, if possible) of the screen, or to place it to the left of the\n"
@@ -5974,7 +5991,7 @@ msgstr ""
 "\"on\" placerar markören till vänster som förval, medan \"off\" \"gömmer\"\n"
 "markören. Förvalet kan gås förbi via kommandoradsflaggan -show_cursor.\n"
 
-#: src/LYrcFile.c:573
+#: src/LYrcFile.c:575
 msgid ""
 "show_dotfiles specifies that the directory listing should include\n"
 "\"hidden\" (dot) files/directories.  If set \"on\", this will be\n"
@@ -5989,7 +6006,7 @@ msgstr ""
 "filer är deaktiverat kommer skapandet av sådana filer via Lynx\n"
 "också att deaktiveras.\n"
 
-#: src/LYrcFile.c:584
+#: src/LYrcFile.c:586
 msgid ""
 "If sub_bookmarks is not turned \"off\", and multiple bookmarks have\n"
 "been defined (see below), then all bookmark operations will first\n"
@@ -6011,7 +6028,7 @@ msgstr ""
 "mellannivåer. Om detta alternativ sätts till \"standard\" visas menyn\n"
 "oavsett användarläge.\n"
 
-#: src/LYrcFile.c:598
+#: src/LYrcFile.c:600
 msgid ""
 "user_mode specifies the users level of knowledge with Lynx.  The\n"
 "default is \"NOVICE\" which displays two extra lines of help at the\n"
@@ -6027,7 +6044,7 @@ msgstr ""
 "stänga av extrainformationen. Använd \"ADVANCED\" för att se adressen\n"
 "för den markerade länken nederst på skärmen.\n"
 
-#: src/LYrcFile.c:607
+#: src/LYrcFile.c:609
 msgid ""
 "If verbose_images is \"on\", lynx will print the name of the image\n"
 "source file in place of [INLINE], [LINK] or [IMAGE]\n"
@@ -6037,7 +6054,7 @@ msgstr ""
 "istället för [INLINE], [LINK] eller [IMAGE]\n"
 "Se även VERBOSE_IMAGES i lynx.cfg\n"
 
-#: src/LYrcFile.c:612
+#: src/LYrcFile.c:614
 msgid ""
 "If vi_keys is set to \"on\", then the normal VI movement keys:\n"
 "  j = down    k = up\n"
@@ -6046,14 +6063,14 @@ msgid ""
 "Capital 'H', 'J' and 'K will still activate help, jump shortcuts,\n"
 "and the keymap display, respectively.\n"
 msgstr ""
-"Om vi_keys sätts till \"on\" kommer VI-förflyttningstangeter att aktiveras:\n"
+"Om vi_keys sätts till \"on\" kommer VI-förflyttningstangenter att aktiveras:\n"
 "  j = ned      k = upp\n"
 "  h = vänster  l = höger\n"
 "Dessa tangenter gäller bara som gemener.\n"
-"Versala \"H\", \"J\" och \"K\" aktiverar hjälp, hoppgenvägar respektiva\n"
+"Versala \"H\", \"J\" och \"K\" aktiverar hjälp, hoppgenvägar respektive\n"
 "tangentbordsinställningarna.\n"
 
-#: src/LYrcFile.c:620
+#: src/LYrcFile.c:622
 msgid ""
 "The visited_links setting controls how Lynx organizes the information\n"
 "in the Visited Links Page.\n"
@@ -6061,7 +6078,7 @@ msgstr ""
 "Inställningen visited_links anger hur Lynx organiserar informationen\n"
 "på sidan Använda länkar.\n"
 
-#: src/LYrcFile.c:845
+#: src/LYrcFile.c:861
 msgid ""
 "If keypad_mode is set to \"NUMBERS_AS_ARROWS\", then the numbers on\n"
 "your keypad when the numlock is on will act as arrow keys:\n"
@@ -6072,14 +6089,14 @@ msgid ""
 "regardless of whether numlock is on.\n"
 msgstr ""
 "Om keypad_mode sätts till \"NUMBERS_AS_ARROWS\" fungerar siffrorna på\n"
-"ditt numeriska tangentbord som piltangeter när NumLock är aktivt:\n"
-"            8 = Upppil\n"
+"ditt numeriska tangentbord som piltangenter när NumLock är aktivt:\n"
+"            8 = Upp-pil\n"
 "  4 = Vänsterpil   6 = Högerpil\n"
 "            2 = Nedpil\n"
 "och motsvarande siffertangenter på tangentbordet fungerar som\n"
-"piltangetner, oavsett om NumLock är aktivt eller inte.\n"
+"piltangenter, oavsett om NumLock är aktivt eller inte.\n"
 
-#: src/LYrcFile.c:854
+#: src/LYrcFile.c:870
 msgid ""
 "If keypad_mode is set to \"LINKS_ARE_NUMBERED\", then numbers will\n"
 "appear next to each link and numbers are used to select links.\n"
@@ -6087,7 +6104,7 @@ msgstr ""
 "Om keypad_mode sätts till \"LINKS_ARE_NUMBERED\" kommer siffror\n"
 "att visas vid varje länk, och siffror används för att välja länk.\n"
 
-#: src/LYrcFile.c:858
+#: src/LYrcFile.c:874
 msgid ""
 "If keypad_mode is set to \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\", then\n"
 "numbers will appear next to each link and visible form input field.\n"
@@ -6106,7 +6123,7 @@ msgstr ""
 "alternativet inte är synligt på skärmen. Referenslistor och utdata från\n"
 "listkommandot kommer även de att numrera formulärindatafält.\n"
 
-#: src/LYrcFile.c:867
+#: src/LYrcFile.c:883
 msgid ""
 "NOTE: Some fixed format documents may look disfigured when\n"
 "\"LINKS_ARE_NUMBERED\" or \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\" are\n"
@@ -6116,7 +6133,7 @@ msgstr ""
 "\"LINKS_ARE_NUMBERED\" eller \"LINKS_AND_FORM_FILES_ARE_NUMBERED\" är\n"
 "aktiva.\n"
 
-#: src/LYrcFile.c:899
+#: src/LYrcFile.c:915
 msgid ""
 "Lynx User Defaults File\n"
 "\n"
@@ -6124,7 +6141,7 @@ msgstr ""
 "Standardanvändarinställningsfil för Lynx\n"
 "\n"
 
-#: src/LYrcFile.c:908
+#: src/LYrcFile.c:924
 msgid ""
 "This file contains options saved from the Lynx Options Screen (normally\n"
 "with the 'o' key).  To save options with that screen, you must select the\n"
@@ -6134,7 +6151,7 @@ msgstr ""
 "(vanligtvis med knappen \"o\"). För att spara inställningar därifrån måste\n"
 "du markera kryssrutan:\n"
 
-#: src/LYrcFile.c:915
+#: src/LYrcFile.c:931
 msgid ""
 "You must then save the settings using the link on the line above the\n"
 "checkbox:\n"
@@ -6142,7 +6159,7 @@ msgstr ""
 "Du måste sedan spara inställningarna med hjälp av länken på raden\n"
 "ovanför kryssrutan:\n"
 
-#: src/LYrcFile.c:922
+#: src/LYrcFile.c:938
 msgid ""
 "You may also use the command-line option \"-forms_options\", which displays\n"
 "the simpler Options Menu instead.  Save options with that using the '>' key.\n"
@@ -6153,7 +6170,7 @@ msgstr ""
 "knappen \">\".\n"
 "\n"
 
-#: src/LYrcFile.c:929
+#: src/LYrcFile.c:945
 msgid ""
 "This file contains options saved from the Lynx Options Screen (normally\n"
 "with the '>' key).\n"
@@ -6163,7 +6180,7 @@ msgstr ""
 "(normalt med \">\"-knappen).\n"
 "\n"
 
-#: src/LYrcFile.c:936
+#: src/LYrcFile.c:952
 msgid ""
 "There is normally no need to edit this file manually, since the defaults\n"
 "here can be controlled from the Options Screen, and the next time options\n"
@@ -6183,6 +6200,15 @@ msgstr ""
 "\"lynx.cfg\". Den har ett annat innehåll och ett annat format.\n"
 "Det är inte den här filen.\n"
 
+#~ msgid ""
+#~ "\n"
+#~ "Lynx edit map not declared.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Lynxredigeringskarta ej deklarerad.\n"
+#~ "\n"
+
 #~ msgid "Very long lines have been wrapped!"
 #~ msgstr "Mycket långa rader har ombrutits!"
 
diff --git a/src/LYrcFile.c b/src/LYrcFile.c
index fd751e49..4b9ab83b 100644
--- a/src/LYrcFile.c
+++ b/src/LYrcFile.c
@@ -1,4 +1,4 @@
-/* $LynxId: LYrcFile.c,v 1.92 2013/11/28 11:22:53 tom Exp $ */
+/* $LynxId: LYrcFile.c,v 1.93 2015/05/28 00:19:00 Ruda.Moura Exp $ */
 #include <HTUtils.h>
 #include <HTFTP.h>
 #include <LYUtils.h>
@@ -661,8 +661,10 @@ BOOL LYsetRcValue(const char *name, const char *param)
     ParseUnionPtr q;
     BOOL changed = TRUE;
     char *value = NULL;
+    char *orig_value = NULL;
 
     StrAllocCopy(value, param);
+    orig_value = value;
     value = LYSkipBlanks(value);
     CTRACE2(TRACE_CFG, (tfp, "LYrcFile %s:%s\n", name, value));
 
@@ -754,7 +756,7 @@ BOOL LYsetRcValue(const char *name, const char *param)
 	changed = FALSE;
 	break;
     }
-    FREE(value);
+    FREE(orig_value);
 
     return changed;
 }
diff --git a/src/tidy_tls.c b/src/tidy_tls.c
index f6dea810..8ebaa6b8 100644
--- a/src/tidy_tls.c
+++ b/src/tidy_tls.c
@@ -1,6 +1,6 @@
 /*
- * $LynxId: tidy_tls.c,v 1.24 2014/11/30 23:28:13 tom Exp $
- * Copyright 2008-2013,2014 Thomas E. Dickey
+ * $LynxId: tidy_tls.c,v 1.27 2015/06/02 00:39:46 tom Exp $
+ * Copyright 2008-2014,2015 Thomas E. Dickey
  * with fix Copyright 2008 by Thomas Viehmann
  *
  * Required libraries:
@@ -19,12 +19,6 @@
 #include <libtasn1.h>		/* ASN1_SUCCESS,etc */
 #include <string.h>
 
-#ifdef HAVE_GNUTLS_PRIORITY_SET_DIRECT
-#define USE_SET_DIRECT 1
-#else
-#define USE_SET_DIRECT 0
-#endif
-
 #define typeCalloc(type) (type *) calloc(1, sizeof(type))
 
 static int last_error = 0;
@@ -268,116 +262,6 @@ void SSL_CTX_set_verify(SSL_CTX * ctx, int verify_mode,
     ctx->verify_callback = verify_callback;
 }
 
-#if USE_SET_DIRECT
-/*
- * Functions such as this are normally part of an API; lack of planning makes
- * these necessary in application code.
- */
-#define IdsToString(type, func, ids) \
-	char *result = 0; \
-	size_t need = 8 + strlen(type); \
-	const char *name; \
-	int pass; \
-	int n; \
-	for (pass = 0; pass < 2; ++pass) { \
-	    for (n = 0; n < GNUTLS_MAX_ALGORITHM_NUM; ++n) { \
-		name = 0; \
-		if (ids[n] == 0) \
-		    break; \
-		if ((name = func(ids[n])) != 0) { \
-		    if (pass) { \
-			sprintf(result + strlen(result), ":+%s%s", type, name); \
-		    } else { \
-			need += 4 + strlen(type) + strlen(name); \
-		    } \
-		} \
-	    } \
-	    if (!pass) { \
-		result = malloc(need); \
-		if (!result) \
-		    break; \
-		result[0] = '\0'; \
-	    } \
-	} \
-	CTRACE((tfp, "->%s\n", result)); \
-	return result
-
-/*
- * Given an array of compression id's, convert to string for GNUTLS.
- */
-static char *StringOfCIPHER(int *id_ptr)
-{
-    IdsToString("", gnutls_cipher_get_name, id_ptr);
-}
-
-/*
- * Given an array of compression id's, convert to string for GNUTLS.
- */
-static char *StringOfCOMP(int *id_ptr)
-{
-    IdsToString("COMP-", gnutls_compression_get_name, id_ptr);
-}
-
-/*
- * Given an array of key-exchange id's, convert to string for GNUTLS.
- */
-static char *StringOfKX(int *id_ptr)
-{
-    IdsToString("", gnutls_kx_get_name, id_ptr);
-}
-
-/*
- * Given an array of MAC algorithm id's, convert to string for GNUTLS.
- */
-static char *StringOfMAC(int *id_ptr)
-{
-    IdsToString("", gnutls_mac_get_name, id_ptr);
-}
-
-/*
- * Given an array of protocol id's, convert to string for GNUTLS.
- */
-static char *StringOfVERS(int *vers_ptr)
-{
-    IdsToString("VERS-", gnutls_protocol_get_name, vers_ptr);
-}
-
-static void UpdatePriority(SSL * ssl)
-{
-    SSL_METHOD *method = ssl->ctx->method;
-    char *complete = 0;
-    char *pnames;
-    const char *err_pos = 0;
-    int code;
-
-    StrAllocCopy(complete, "NONE");
-    if ((pnames = StringOfVERS(method->priority.protocol)) != 0) {
-	StrAllocCat(complete, pnames);
-	free(pnames);
-    }
-    if ((pnames = StringOfCIPHER(method->priority.encrypts)) != 0) {
-	StrAllocCat(complete, pnames);
-	free(pnames);
-    }
-    if ((pnames = StringOfCOMP(method->priority.compress)) != 0) {
-	StrAllocCat(complete, pnames);
-	free(pnames);
-    }
-    if ((pnames = StringOfKX(method->priority.key_xchg)) != 0) {
-	StrAllocCat(complete, pnames);
-	free(pnames);
-    }
-    if ((pnames = StringOfMAC(method->priority.msg_code)) != 0) {
-	StrAllocCat(complete, pnames);
-	free(pnames);
-    }
-    CTRACE((tfp, "set priorities %s\n", complete));
-    code = gnutls_priority_set_direct(ssl->gnutls_state, complete, &err_pos);
-    CTRACE((tfp, "CHECK %d:%s\n", code, NonNull(err_pos)));
-    FREE(complete);
-}
-#endif /* USE_SET_DIRECT */
-
 static void RemoveProtocol(SSL * ssl, int protocol)
 {
     int j, k;
@@ -395,12 +279,7 @@ static void RemoveProtocol(SSL * ssl, int protocol)
     }
 
     if (changed) {
-#if USE_SET_DIRECT
-	CTRACE((tfp, "RemoveProtocol\n"));
-	UpdatePriority(ssl);
-#else
 	gnutls_protocol_set_priority(ssl->gnutls_state, protocols);
-#endif
     }
 }
 
@@ -542,21 +421,7 @@ SSL *SSL_new(SSL_CTX * ctx)
 	    ssl->ctx = ctx;
 
 	    gnutls_init(&ssl->gnutls_state, ctx->method->connend);
-
-#if USE_SET_DIRECT
-	    UpdatePriority(ssl);
-#else
-	    gnutls_protocol_set_priority(ssl->gnutls_state,
-					 ctx->method->priority.protocol);
-	    gnutls_cipher_set_priority(ssl->gnutls_state,
-				       ctx->method->priority.encrypts);
-	    gnutls_compression_set_priority(ssl->gnutls_state,
-					    ctx->method->priority.compress);
-	    gnutls_kx_set_priority(ssl->gnutls_state,
-				   ctx->method->priority.key_xchg);
-	    gnutls_mac_set_priority(ssl->gnutls_state,
-				    ctx->method->priority.msg_code);
-#endif
+	    gnutls_set_default_priority(ssl->gnutls_state);
 
 	    gnutls_credentials_set(ssl->gnutls_state, GNUTLS_CRD_CERTIFICATE,
 				   ssl->gnutls_cred);