snapshot of project "lynx", label v2-8-9dev_5e

8 files changed, 3546 insertions, 3464 deletions

diff --git a/CHANGES b/CHANGES
index 51a96129..ad287b9a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,17 +1,19 @@
--- $LynxId: CHANGES,v 1.791 2015/04/25 01:07:46 tom Exp $
+-- $LynxId: CHANGES,v 1.794 2015/05/04 10:37:55 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
 
-2015-04-24 (2.8.9dev.6)
+2015-05-04 (2.8.9dev.6)
+* update test-packages to use ncurses6 test-packages -TD
 * modify configure script to check for ncurses ".pc" files first before looking
   for the "ncurses*-config" scripts -TD
 * 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, vi.po from
+* 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)
 
 2015-04-12 (2.8.9dev.5)
 * add codes U+200A, U+200B to def7_uni.tbl (prompted by report by Sven
diff --git a/PACKAGE/debian/rules b/PACKAGE/debian/rules
index 895e93e0..c9a22268 100755
--- a/PACKAGE/debian/rules
+++ b/PACKAGE/debian/rules
@@ -90,7 +90,7 @@ configure-stamp:
 		--enable-source-cache \
 		--enable-syslog \
 		--with-gnutls=/usr \
-		--with-screen=ncursesw \
+		--with-screen=ncursesw6 \
 		--with-textdomain=$(PACKAGE) \
 		--with-zlib \
 		--without-included-gettext \
diff --git a/PACKAGE/lynx.spec b/PACKAGE/lynx.spec
index 22a6ef7c..6a2ba0bc 100644
--- a/PACKAGE/lynx.spec
+++ b/PACKAGE/lynx.spec
@@ -1,4 +1,4 @@
-# $LynxId: lynx.spec,v 1.31 2015/04/15 00:19:14 tom Exp $
+# $LynxId: lynx.spec,v 1.32 2015/05/04 10:37:30 tom Exp $
 Summary: A text-based Web browser
 Name: lynx
 Version: 2.8.9
@@ -80,7 +80,7 @@ CPPFLAGS="-DMISC_EXP -DEXP_HTTP_HEADERS" \
 	--enable-syslog \
 	--enable-warnings \
 	--with-bzlib \
-	--with-screen=ncursesw \
+	--with-screen=ncursesw6 \
 	--with-ssl \
 	--with-zlib
 make \
diff --git a/aclocal.m4 b/aclocal.m4
index 08a06d85..6cc3e773 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $LynxId: aclocal.m4,v 1.223 2015/04/25 00:52:45 tom Exp $
+dnl $LynxId: aclocal.m4,v 1.225 2015/04/27 00:38:54 tom Exp $
 dnl Macros for auto-configure script.
 dnl by Thomas E. Dickey <dickey@invisible-island.net>
 dnl and Jim Spath <jspath@mail.bcpl.lib.md.us>
@@ -3718,11 +3718,13 @@ printf("old\n");
 	,[$1=no])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_NCURSES_CONFIG version: 11 updated: 2015/04/23 20:35:30
+dnl CF_NCURSES_CONFIG version: 13 updated: 2015/04/26 18:06:58
 dnl -----------------
-dnl Tie together the configure-script macros for ncurses.
-dnl Prefer the "-config" script from ncurses 6.x, to simplify analysis.
-dnl Allow that to be overridden using the $NCURSES_CONFIG environment variable.
+dnl Tie together the configure-script macros for ncurses, preferring these in
+dnl order:
+dnl a) ".pc" files for pkg-config, using $NCURSES_CONFIG_PKG
+dnl b) the "-config" script from ncurses, using $NCURSES_CONFIG
+dnl c) just plain libraries
 dnl
 dnl $1 is the root library name (default: "ncurses")
 AC_DEFUN([CF_NCURSES_CONFIG],[
@@ -3758,13 +3760,18 @@ if test "x$PKG_CONFIG" != xnone; then
 		then
 			CPPFLAGS="$cf_save_CPPFLAGS"
 			LIBS="$cf_save_LIBS"
+			NCURSES_CONFIG_PKG=none
 		else
 			AC_DEFINE(NCURSES,1,[Define to 1 if we are using ncurses headers/libraries])
+			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 		fi
 
 	else
 		AC_MSG_RESULT(no)
+		NCURSES_CONFIG_PKG=none
 	fi
+else
+	NCURSES_CONFIG_PKG=none
 fi
 
 if test "x$cf_have_ncuconfig" = "xno"; then
@@ -3798,6 +3805,8 @@ if test "x$cf_have_ncuconfig" = "xno"; then
 		CF_NCURSES_LIBS(ifelse($1,,ncurses,$1))
 
 	fi
+else
+	NCURSES_CONFIG=none
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
@@ -4494,7 +4503,7 @@ else
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_PKG_CONFIG version: 9 updated: 2015/04/12 15:39:00
+dnl CF_PKG_CONFIG version: 10 updated: 2015/04/26 18:06:58
 dnl -------------
 dnl Check for the package-config program, unless disabled by command-line.
 AC_DEFUN([CF_PKG_CONFIG],
@@ -4523,7 +4532,7 @@ esac
 test -z "$PKG_CONFIG" && PKG_CONFIG=none
 if test "$PKG_CONFIG" != none ; then
 	CF_PATH_SYNTAX(PKG_CONFIG)
-else
+elif test "x$cf_pkg_config" != xno ; then
 	AC_MSG_WARN(pkg-config is not installed)
 fi
 
diff --git a/config.guess b/config.guess
index 1f5c50c0..f7eb141e 100755
--- a/config.guess
+++ b/config.guess
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2014 Free Software Foundation, Inc.
+#   Copyright 1992-2015 Free Software Foundation, Inc.
 
-timestamp='2014-03-23'
+timestamp='2015-03-04'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -24,12 +24,12 @@ timestamp='2014-03-23'
 # program.  This Exception is an additional permission under section 7
 # of the GNU General Public License, version 3 ("GPLv3").
 #
-# Originally written by Per Bothner.
+# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
 #
 # You can get the latest version of this script from:
 # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 #
-# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+# Please send patches to <config-patches@gnu.org>.
 
 
 me=`echo "$0" | sed -e 's,.*/,,'`
@@ -50,7 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2014 Free Software Foundation, Inc.
+Copyright 1992-2015 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -168,20 +168,27 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# Note: NetBSD doesn't particularly care about the vendor
 	# portion of the name.  We always set it to "unknown".
 	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
+	    /sbin/$sysctl 2>/dev/null || \
+	    /usr/sbin/$sysctl 2>/dev/null || \
+	    echo unknown)`
 	case "${UNAME_MACHINE_ARCH}" in
 	    armeb) machine=armeb-unknown ;;
 	    arm*) machine=arm-unknown ;;
 	    sh3el) machine=shl-unknown ;;
 	    sh3eb) machine=sh-unknown ;;
 	    sh5el) machine=sh5le-unknown ;;
+	    earmv*)
+		arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
+		endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
+		machine=${arch}${endian}-unknown
+		;;
 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
 	# to ELF recently, or will in the future.
 	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+	    arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
 			| grep -q __ELF__
@@ -197,6 +204,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 		os=netbsd
 		;;
 	esac
+	# Determine ABI tags.
+	case "${UNAME_MACHINE_ARCH}" in
+	    earm*)
+		expr='s/^earmv[0-9]/-eabi/;s/eb$//'
+		abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
+		;;
+	esac
 	# The OS release
 	# Debian GNU/NetBSD machines have a different userland, and
 	# thus, need a distinct triplet. However, they do not need
@@ -213,7 +227,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
 	# contains redundant information, the shorter form:
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
+	echo "${machine}-${os}${release}${abi}"
 	exit ;;
     *:Bitrig:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
@@ -579,8 +593,9 @@ EOF
 	else
 		IBM_ARCH=powerpc
 	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
+	if [ -x /usr/bin/lslpp ] ; then
+		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
+			   awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
 	else
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
@@ -932,6 +947,9 @@ EOF
     crisv32:Linux:*:*)
 	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
+    e2k:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     frv:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
diff --git a/config.sub b/config.sub
index 88a0cb46..8f1229c6 100755
--- a/config.sub
+++ b/config.sub
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2014 Free Software Foundation, Inc.
+#   Copyright 1992-2015 Free Software Foundation, Inc.
 
-timestamp='2014-07-28'
+timestamp='2015-03-08'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@ timestamp='2014-07-28'
 # of the GNU General Public License, version 3 ("GPLv3").
 
 
-# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+# Please send patches to <config-patches@gnu.org>.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -68,7 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2014 Free Software Foundation, Inc.
+Copyright 1992-2015 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -117,7 +117,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
   linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
-  knetbsd*-gnu* | netbsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
   kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
@@ -259,8 +259,8 @@ case $basic_machine in
 	| bfin \
 	| c4x | c8051 | clipper \
 	| d10v | d30v | dlx | dsp16xx \
-	| epiphany \
-	| fido | fr30 | frv \
+	| e2k | epiphany \
+	| fido | fr30 | frv | ft32 \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| hexagon \
 	| i370 | i860 | i960 | ia64 \
@@ -302,6 +302,7 @@ case $basic_machine in
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
+	| riscv32 | riscv64 \
 	| rl78 | rx \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
@@ -312,6 +313,7 @@ case $basic_machine in
 	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 	| ubicom32 \
 	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+	| visium \
 	| we32k \
 	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
@@ -326,6 +328,9 @@ case $basic_machine in
 	c6x)
 		basic_machine=tic6x-unknown
 		;;
+	leon|leon[3-9])
+		basic_machine=sparc-$basic_machine
+		;;
 	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
@@ -376,7 +381,7 @@ case $basic_machine in
 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
 	| c8051-* | clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
-	| elxsi-* \
+	| e2k-* | elxsi-* \
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
@@ -436,6 +441,7 @@ case $basic_machine in
 	| ubicom32-* \
 	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
 	| vax-* \
+	| visium-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
@@ -512,6 +518,9 @@ case $basic_machine in
 		basic_machine=i386-pc
 		os=-aros
 		;;
+        asmjs)
+		basic_machine=asmjs-unknown
+		;;
 	aux)
 		basic_machine=m68k-apple
 		os=-aux
@@ -773,6 +782,9 @@ case $basic_machine in
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
+	leon-*|leon[3-9]-*)
+		basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
+		;;
 	m68knommu)
 		basic_machine=m68k-unknown
 		os=-linux
@@ -1364,7 +1376,7 @@ case $os in
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
 	      | -sym* | -kopensolaris* | -plan9* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* | -aros* \
+	      | -aos* | -aros* | -cloudabi* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
diff --git a/configure b/configure
index 0b541269..26638fdf 100755
--- a/configure
+++ b/configure
@@ -13328,7 +13328,7 @@ echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;}
 	;;
 esac
 
-else
+elif test "x$cf_pkg_config" != xno ; then
 	{ echo "$as_me:13332: WARNING: pkg-config is not installed" >&5
 echo "$as_me: WARNING: pkg-config is not installed" >&2;}
 fi
@@ -20190,18 +20190,23 @@ echo "${ECHO_T}$cf_have_ncuconfig" >&6
 		then
 			CPPFLAGS="$cf_save_CPPFLAGS"
 			LIBS="$cf_save_LIBS"
+			NCURSES_CONFIG_PKG=none
 		else
 
 cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
+			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 		fi
 
 	else
-		echo "$as_me:20202: result: no" >&5
+		echo "$as_me:20204: result: no" >&5
 echo "${ECHO_T}no" >&6
+		NCURSES_CONFIG_PKG=none
 	fi
+else
+	NCURSES_CONFIG_PKG=none
 fi
 
 if test "x$cf_have_ncuconfig" = "xno"; then
@@ -20212,7 +20217,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:20215: checking for $ac_word" >&5
+echo "$as_me:20220: 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
@@ -20227,7 +20232,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:20230: found $ac_dir/$ac_word" >&5
+echo "$as_me:20235: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -20235,10 +20240,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:20238: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:20243: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:20241: result: no" >&5
+  echo "$as_me:20246: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -20251,7 +20256,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:20254: checking for $ac_word" >&5
+echo "$as_me:20259: 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
@@ -20266,7 +20271,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:20269: found $ac_dir/$ac_word" >&5
+echo "$as_me:20274: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -20274,10 +20279,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:20277: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:20282: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:20280: result: no" >&5
+  echo "$as_me:20285: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -20310,7 +20315,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:20313: checking if we have identified curses headers" >&5
+echo "$as_me:20318: 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
@@ -20322,7 +20327,7 @@ for cf_header in \
 	curses.h $cf_cv_screen/curses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 20325 "configure"
+#line 20330 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -20334,16 +20339,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20337: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20342: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20340: \$? = $ac_status" >&5
+  echo "$as_me:20345: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20343: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20348: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20346: \$? = $ac_status" >&5
+  echo "$as_me:20351: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -20354,11 +20359,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:20357: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:20362: 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:20361: error: No curses header-files found" >&5
+	{ { echo "$as_me:20366: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -20368,23 +20373,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:20371: checking for $ac_header" >&5
+echo "$as_me:20376: 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 20377 "configure"
+#line 20382 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20381: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:20386: \"$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:20387: \$? = $ac_status" >&5
+  echo "$as_me:20392: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20403,7 +20408,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:20406: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:20411: 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
@@ -20456,7 +20461,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 20459 "configure"
+#line 20464 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -20468,16 +20473,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20471: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20476: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20474: \$? = $ac_status" >&5
+  echo "$as_me:20479: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20477: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20482: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20480: \$? = $ac_status" >&5
+  echo "$as_me:20485: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -20494,7 +20499,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}:20497: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:20502: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -20511,7 +20516,7 @@ fi
 
 }
 
-echo "$as_me:20514: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:20519: 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
@@ -20523,7 +20528,7 @@ else
 	do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 20526 "configure"
+#line 20531 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -20547,16 +20552,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20550: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20555: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20553: \$? = $ac_status" >&5
+  echo "$as_me:20558: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20556: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20561: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20559: \$? = $ac_status" >&5
+  echo "$as_me:20564: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -20571,14 +20576,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 	done
 
 fi
-echo "$as_me:20574: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:20579: 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:20581: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:20586: 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
@@ -20696,7 +20701,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 20699 "configure"
+#line 20704 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -20708,16 +20713,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20711: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20716: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20714: \$? = $ac_status" >&5
+  echo "$as_me:20719: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20717: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20722: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20720: \$? = $ac_status" >&5
+  echo "$as_me:20725: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -20734,7 +20739,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}:20737: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:20742: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -20755,7 +20760,7 @@ fi
 		do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 20758 "configure"
+#line 20763 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -20779,16 +20784,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20782: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20787: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20785: \$? = $ac_status" >&5
+  echo "$as_me:20790: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20788: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20793: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20791: \$? = $ac_status" >&5
+  echo "$as_me:20796: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -20809,12 +20814,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:20812: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:20817: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:20817: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:20822: 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%/[^/]*$%%'`
@@ -20847,7 +20852,7 @@ if test -n "$cf_1st_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 20850 "configure"
+#line 20855 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -20859,16 +20864,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20862: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20867: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20865: \$? = $ac_status" >&5
+  echo "$as_me:20870: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20868: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20873: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20871: \$? = $ac_status" >&5
+  echo "$as_me:20876: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -20885,7 +20890,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}:20888: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:20893: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -20931,7 +20936,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:20934: checking for terminfo header" >&5
+echo "$as_me:20939: 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
@@ -20949,7 +20954,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 20952 "configure"
+#line 20957 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -20964,16 +20969,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20967: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20972: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20970: \$? = $ac_status" >&5
+  echo "$as_me:20975: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20973: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20978: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20976: \$? = $ac_status" >&5
+  echo "$as_me:20981: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -20989,7 +20994,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:20992: result: $cf_cv_term_header" >&5
+echo "$as_me:20997: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -21027,7 +21032,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:21030: checking for ncurses version" >&5
+echo "$as_me:21035: 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
@@ -21053,10 +21058,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:21056: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:21061: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:21059: \$? = $ac_status" >&5
+  echo "$as_me:21064: \$? = $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%".*%%'`
@@ -21066,7 +21071,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 21069 "configure"
+#line 21074 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -21091,15 +21096,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:21094: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21099: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21097: \$? = $ac_status" >&5
+  echo "$as_me:21102: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:21099: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21104: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21102: \$? = $ac_status" >&5
+  echo "$as_me:21107: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -21113,7 +21118,7 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:21116: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:21121: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -21126,7 +21131,7 @@ cf_nculib_root=$cf_cv_screen
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:21129: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:21134: 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
@@ -21134,7 +21139,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 21137 "configure"
+#line 21142 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21153,16 +21158,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21156: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21161: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21159: \$? = $ac_status" >&5
+  echo "$as_me:21164: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21162: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21167: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21165: \$? = $ac_status" >&5
+  echo "$as_me:21170: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -21173,10 +21178,10 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21176: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:21181: 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:21179: checking for initscr in -lgpm" >&5
+  echo "$as_me:21184: 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
@@ -21184,7 +21189,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 21187 "configure"
+#line 21192 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21203,16 +21208,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21206: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21211: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21209: \$? = $ac_status" >&5
+  echo "$as_me:21214: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21212: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21217: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21215: \$? = $ac_status" >&5
+  echo "$as_me:21220: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -21223,7 +21228,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21226: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:21231: 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"
@@ -21238,7 +21243,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:21241: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:21246: 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
@@ -21246,7 +21251,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 21249 "configure"
+#line 21254 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21265,16 +21270,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21268: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21273: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21271: \$? = $ac_status" >&5
+  echo "$as_me:21276: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21274: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21279: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21277: \$? = $ac_status" >&5
+  echo "$as_me:21282: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -21285,7 +21290,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21288: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:21293: 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"
@@ -21334,13 +21339,13 @@ else
 
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
-	echo "$as_me:21337: checking for initscr" >&5
+	echo "$as_me:21342: 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 21343 "configure"
+#line 21348 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */
@@ -21371,16 +21376,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:21374: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21379: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21377: \$? = $ac_status" >&5
+  echo "$as_me:21382: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21380: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21385: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21383: \$? = $ac_status" >&5
+  echo "$as_me:21388: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -21390,18 +21395,18 @@ ac_cv_func_initscr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:21393: result: $ac_cv_func_initscr" >&5
+echo "$as_me:21398: 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:21400: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:21405: 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 21404 "configure"
+#line 21409 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -21413,25 +21418,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21416: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21421: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21419: \$? = $ac_status" >&5
+  echo "$as_me:21424: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21422: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21427: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21425: \$? = $ac_status" >&5
+  echo "$as_me:21430: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:21427: result: yes" >&5
+  echo "$as_me:21432: 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:21434: result: no" >&5
+echo "$as_me:21439: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -21499,11 +21504,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:21502: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:21507: 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 21506 "configure"
+#line 21511 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -21515,25 +21520,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21518: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21523: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21521: \$? = $ac_status" >&5
+  echo "$as_me:21526: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21524: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21529: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21527: \$? = $ac_status" >&5
+  echo "$as_me:21532: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:21529: result: yes" >&5
+  echo "$as_me:21534: 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:21536: result: no" >&5
+echo "$as_me:21541: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -21548,7 +21553,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:21551: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:21556: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -21556,7 +21561,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:21559: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:21564: 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
@@ -21566,7 +21571,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >conftest.$ac_ext <<_ACEOF
-#line 21569 "configure"
+#line 21574 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -21578,23 +21583,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21581: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21586: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21584: \$? = $ac_status" >&5
+  echo "$as_me:21589: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21587: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21592: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21590: \$? = $ac_status" >&5
+  echo "$as_me:21595: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:21592: result: yes" >&5
+  echo "$as_me:21597: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:21597: result: no" >&5
+echo "$as_me:21602: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -21608,6 +21613,8 @@ cat >>confdefs.h <<EOF
 EOF
 
 	fi
+else
+	NCURSES_CONFIG=none
 fi
 
 	cf_wide_curses=yes
@@ -21618,13 +21625,13 @@ cf_ncuconfig_root=$cf_cv_screen
 cf_have_ncuconfig=no
 
 if test "x$PKG_CONFIG" != xnone; then
-	echo "$as_me:21621: checking pkg-config for $cf_ncuconfig_root" >&5
+	echo "$as_me:21628: 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:21624: result: yes" >&5
+		echo "$as_me:21631: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:21627: checking if the $cf_ncuconfig_root package files work" >&5
+		echo "$as_me:21634: 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
 
@@ -21650,7 +21657,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 21653 "configure"
+#line 21660 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -21662,39 +21669,39 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21665: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21672: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21668: \$? = $ac_status" >&5
+  echo "$as_me:21675: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21671: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21678: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21674: \$? = $ac_status" >&5
+  echo "$as_me:21681: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:21677: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:21684: 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 21682 "configure"
+#line 21689 "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:21689: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21696: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21692: \$? = $ac_status" >&5
+  echo "$as_me:21699: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:21694: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21701: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21697: \$? = $ac_status" >&5
+  echo "$as_me:21704: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -21712,24 +21719,29 @@ cf_have_ncuconfig=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
-		echo "$as_me:21715: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:21722: result: $cf_have_ncuconfig" >&5
 echo "${ECHO_T}$cf_have_ncuconfig" >&6
 		if test "$cf_have_ncuconfig" != "yes"
 		then
 			CPPFLAGS="$cf_save_CPPFLAGS"
 			LIBS="$cf_save_LIBS"
+			NCURSES_CONFIG_PKG=none
 		else
 
 cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
+			NCURSES_CONFIG_PKG=$cf_ncuconfig_root
 		fi
 
 	else
-		echo "$as_me:21730: result: no" >&5
+		echo "$as_me:21739: result: no" >&5
 echo "${ECHO_T}no" >&6
+		NCURSES_CONFIG_PKG=none
 	fi
+else
+	NCURSES_CONFIG_PKG=none
 fi
 
 if test "x$cf_have_ncuconfig" = "xno"; then
@@ -21740,7 +21752,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:21743: checking for $ac_word" >&5
+echo "$as_me:21755: 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
@@ -21755,7 +21767,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:21758: found $ac_dir/$ac_word" >&5
+echo "$as_me:21770: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -21763,10 +21775,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:21766: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:21778: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:21769: result: no" >&5
+  echo "$as_me:21781: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -21779,7 +21791,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:21782: checking for $ac_word" >&5
+echo "$as_me:21794: 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
@@ -21794,7 +21806,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:21797: found $ac_dir/$ac_word" >&5
+echo "$as_me:21809: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -21802,10 +21814,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:21805: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:21817: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:21808: result: no" >&5
+  echo "$as_me:21820: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -21838,7 +21850,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:21841: checking if we have identified curses headers" >&5
+echo "$as_me:21853: 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
@@ -21850,7 +21862,7 @@ for cf_header in \
 	curses.h $cf_cv_screen/curses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 21853 "configure"
+#line 21865 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -21862,16 +21874,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21865: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21877: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21868: \$? = $ac_status" >&5
+  echo "$as_me:21880: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21871: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21883: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21874: \$? = $ac_status" >&5
+  echo "$as_me:21886: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -21882,11 +21894,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:21885: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:21897: 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:21889: error: No curses header-files found" >&5
+	{ { echo "$as_me:21901: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -21896,23 +21908,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:21899: checking for $ac_header" >&5
+echo "$as_me:21911: 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 21905 "configure"
+#line 21917 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:21909: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:21921: \"$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:21915: \$? = $ac_status" >&5
+  echo "$as_me:21927: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -21931,7 +21943,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:21934: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:21946: 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
@@ -21984,7 +21996,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 21987 "configure"
+#line 21999 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -21996,16 +22008,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21999: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22011: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22002: \$? = $ac_status" >&5
+  echo "$as_me:22014: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22005: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22017: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22008: \$? = $ac_status" >&5
+  echo "$as_me:22020: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -22022,7 +22034,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}:22025: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:22037: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -22039,7 +22051,7 @@ fi
 
 }
 
-echo "$as_me:22042: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:22054: 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
@@ -22051,7 +22063,7 @@ else
 	do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 22054 "configure"
+#line 22066 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -22075,16 +22087,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22078: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22090: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22081: \$? = $ac_status" >&5
+  echo "$as_me:22093: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22084: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22096: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22087: \$? = $ac_status" >&5
+  echo "$as_me:22099: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -22099,14 +22111,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 	done
 
 fi
-echo "$as_me:22102: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:22114: 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:22109: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:22121: 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
@@ -22224,7 +22236,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 22227 "configure"
+#line 22239 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -22236,16 +22248,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22239: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22251: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22242: \$? = $ac_status" >&5
+  echo "$as_me:22254: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22245: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22257: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22248: \$? = $ac_status" >&5
+  echo "$as_me:22260: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -22262,7 +22274,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}:22265: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:22277: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -22283,7 +22295,7 @@ fi
 		do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 22286 "configure"
+#line 22298 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -22307,16 +22319,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22310: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22322: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22313: \$? = $ac_status" >&5
+  echo "$as_me:22325: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22316: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22328: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22319: \$? = $ac_status" >&5
+  echo "$as_me:22331: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -22337,12 +22349,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:22340: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:22352: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:22345: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:22357: 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%/[^/]*$%%'`
@@ -22375,7 +22387,7 @@ if test -n "$cf_1st_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 22378 "configure"
+#line 22390 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -22387,16 +22399,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22390: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22402: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22393: \$? = $ac_status" >&5
+  echo "$as_me:22405: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22396: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22408: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22399: \$? = $ac_status" >&5
+  echo "$as_me:22411: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -22413,7 +22425,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}:22416: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:22428: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -22459,7 +22471,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:22462: checking for terminfo header" >&5
+echo "$as_me:22474: 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
@@ -22477,7 +22489,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 22480 "configure"
+#line 22492 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -22492,16 +22504,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22495: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22507: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22498: \$? = $ac_status" >&5
+  echo "$as_me:22510: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22501: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22513: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22504: \$? = $ac_status" >&5
+  echo "$as_me:22516: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -22517,7 +22529,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:22520: result: $cf_cv_term_header" >&5
+echo "$as_me:22532: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -22555,7 +22567,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:22558: checking for ncurses version" >&5
+echo "$as_me:22570: 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
@@ -22581,10 +22593,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:22584: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:22596: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:22587: \$? = $ac_status" >&5
+  echo "$as_me:22599: \$? = $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%".*%%'`
@@ -22594,7 +22606,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 22597 "configure"
+#line 22609 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -22619,15 +22631,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:22622: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22634: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22625: \$? = $ac_status" >&5
+  echo "$as_me:22637: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:22627: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22639: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22630: \$? = $ac_status" >&5
+  echo "$as_me:22642: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -22641,7 +22653,7 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:22644: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:22656: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -22654,7 +22666,7 @@ cf_nculib_root=$cf_cv_screen
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:22657: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:22669: 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
@@ -22662,7 +22674,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 22665 "configure"
+#line 22677 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22681,16 +22693,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22684: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22696: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22687: \$? = $ac_status" >&5
+  echo "$as_me:22699: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22690: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22702: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22693: \$? = $ac_status" >&5
+  echo "$as_me:22705: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -22701,10 +22713,10 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22704: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:22716: 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:22707: checking for initscr in -lgpm" >&5
+  echo "$as_me:22719: 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
@@ -22712,7 +22724,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 22715 "configure"
+#line 22727 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22731,16 +22743,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22734: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22746: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22737: \$? = $ac_status" >&5
+  echo "$as_me:22749: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22740: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22752: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22743: \$? = $ac_status" >&5
+  echo "$as_me:22755: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -22751,7 +22763,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22754: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:22766: 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"
@@ -22766,7 +22778,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:22769: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:22781: 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
@@ -22774,7 +22786,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 22777 "configure"
+#line 22789 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22793,16 +22805,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22796: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22808: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22799: \$? = $ac_status" >&5
+  echo "$as_me:22811: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22802: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22814: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22805: \$? = $ac_status" >&5
+  echo "$as_me:22817: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -22813,7 +22825,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22816: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:22828: 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"
@@ -22862,13 +22874,13 @@ else
 
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
-	echo "$as_me:22865: checking for initscr" >&5
+	echo "$as_me:22877: 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 22871 "configure"
+#line 22883 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */
@@ -22899,16 +22911,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:22902: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22914: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22905: \$? = $ac_status" >&5
+  echo "$as_me:22917: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22908: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22920: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22911: \$? = $ac_status" >&5
+  echo "$as_me:22923: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -22918,18 +22930,18 @@ ac_cv_func_initscr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:22921: result: $ac_cv_func_initscr" >&5
+echo "$as_me:22933: 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:22928: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:22940: 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 22932 "configure"
+#line 22944 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -22941,25 +22953,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22944: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22956: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22947: \$? = $ac_status" >&5
+  echo "$as_me:22959: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22950: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22962: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22953: \$? = $ac_status" >&5
+  echo "$as_me:22965: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:22955: result: yes" >&5
+  echo "$as_me:22967: 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:22962: result: no" >&5
+echo "$as_me:22974: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -23027,11 +23039,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:23030: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:23042: 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 23034 "configure"
+#line 23046 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -23043,25 +23055,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23046: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23058: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23049: \$? = $ac_status" >&5
+  echo "$as_me:23061: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23052: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23064: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23055: \$? = $ac_status" >&5
+  echo "$as_me:23067: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:23057: result: yes" >&5
+  echo "$as_me:23069: 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:23064: result: no" >&5
+echo "$as_me:23076: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -23076,7 +23088,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:23079: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:23091: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -23084,7 +23096,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:23087: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:23099: 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
@@ -23094,7 +23106,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >conftest.$ac_ext <<_ACEOF
-#line 23097 "configure"
+#line 23109 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -23106,23 +23118,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23109: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23121: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23112: \$? = $ac_status" >&5
+  echo "$as_me:23124: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23115: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23127: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23118: \$? = $ac_status" >&5
+  echo "$as_me:23130: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:23120: result: yes" >&5
+  echo "$as_me:23132: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:23125: result: no" >&5
+echo "$as_me:23137: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -23136,6 +23148,8 @@ cat >>confdefs.h <<EOF
 EOF
 
 	fi
+else
+	NCURSES_CONFIG=none
 fi
 
 	;;
@@ -23152,7 +23166,7 @@ fi
 	;;
 (slang)
 
-echo "$as_me:23155: checking for slang header file" >&5
+echo "$as_me:23169: 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
@@ -23160,7 +23174,7 @@ else
 
 	cf_cv_slang_header=no
 	cat >conftest.$ac_ext <<_ACEOF
-#line 23163 "configure"
+#line 23177 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -23172,16 +23186,16 @@ printf("%s\n", SLANG_VERSION)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23175: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23189: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23178: \$? = $ac_status" >&5
+  echo "$as_me:23192: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23181: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23195: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23184: \$? = $ac_status" >&5
+  echo "$as_me:23198: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_header=predefined
 else
@@ -23286,7 +23300,7 @@ cf_search="$cf_search $cf_header_path_list"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:23289: result: $cf_cv_slang_header" >&5
+echo "$as_me:23303: result: $cf_cv_slang_header" >&5
 echo "${ECHO_T}$cf_cv_slang_header" >&6
 
 if test "x$cf_cv_slang_header" != xno
@@ -23327,7 +23341,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 23330 "configure"
+#line 23344 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -23339,16 +23353,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23342: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23356: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23345: \$? = $ac_status" >&5
+  echo "$as_me:23359: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23348: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23362: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23351: \$? = $ac_status" >&5
+  echo "$as_me:23365: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -23365,7 +23379,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}:23368: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:23382: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -23395,7 +23409,7 @@ else
 
 cf_cv_termlib=none
 cat >conftest.$ac_ext <<_ACEOF
-#line 23398 "configure"
+#line 23412 "configure"
 #include "confdefs.h"
 
 int
@@ -23407,19 +23421,19 @@ char *x=(char*)tgoto("",0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23410: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23424: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23413: \$? = $ac_status" >&5
+  echo "$as_me:23427: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23416: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23430: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23419: \$? = $ac_status" >&5
+  echo "$as_me:23433: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 23422 "configure"
+#line 23436 "configure"
 #include "confdefs.h"
 
 int
@@ -23431,16 +23445,16 @@ int x=tigetstr("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23434: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23448: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23437: \$? = $ac_status" >&5
+  echo "$as_me:23451: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23440: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23454: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23443: \$? = $ac_status" >&5
+  echo "$as_me:23457: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termlib=terminfo
 else
@@ -23451,7 +23465,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}:23454: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
+echo "${as_me:-configure}:23468: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
 
 else
   echo "$as_me: failed program was:" >&5
@@ -23466,10 +23480,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:23469: checking for $cf_func in -l$cf_lib" >&5
+			echo "$as_me:23483: 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 23472 "configure"
+#line 23486 "configure"
 #include "confdefs.h"
 
 int
@@ -23481,16 +23495,16 @@ int x=$cf_func("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23484: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23498: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23487: \$? = $ac_status" >&5
+  echo "$as_me:23501: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23490: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23504: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23493: \$? = $ac_status" >&5
+  echo "$as_me:23507: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -23499,7 +23513,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-			echo "$as_me:23502: result: $cf_result" >&5
+			echo "$as_me:23516: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				if test "$cf_func" = tigetstr ; then
@@ -23516,7 +23530,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:23519: checking for initscr in -lcurses" >&5
+	echo "$as_me:23533: 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
@@ -23524,7 +23538,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 23527 "configure"
+#line 23541 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23543,16 +23557,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23546: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23560: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23549: \$? = $ac_status" >&5
+  echo "$as_me:23563: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23552: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23566: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23555: \$? = $ac_status" >&5
+  echo "$as_me:23569: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_curses_initscr=yes
 else
@@ -23563,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:23566: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:23580: 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
 
@@ -23585,7 +23599,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-	echo "$as_me:23588: checking for tgoto in -ltermcap" >&5
+	echo "$as_me:23602: 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
@@ -23593,7 +23607,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 23596 "configure"
+#line 23610 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23612,16 +23626,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23615: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23629: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23618: \$? = $ac_status" >&5
+  echo "$as_me:23632: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23621: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23635: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23624: \$? = $ac_status" >&5
+  echo "$as_me:23638: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_termcap_tgoto=yes
 else
@@ -23632,7 +23646,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23635: result: $ac_cv_lib_termcap_tgoto" >&5
+echo "$as_me:23649: 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
 
@@ -23659,20 +23673,20 @@ fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 if test "$cf_cv_termlib" = none; then
-	{ echo "$as_me:23662: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
+	{ echo "$as_me:23676: 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:23669: checking for acos" >&5
+echo "$as_me:23683: 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 23675 "configure"
+#line 23689 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char acos (); below.  */
@@ -23703,16 +23717,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:23706: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23720: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23709: \$? = $ac_status" >&5
+  echo "$as_me:23723: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23712: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23726: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23715: \$? = $ac_status" >&5
+  echo "$as_me:23729: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_acos=yes
 else
@@ -23722,13 +23736,13 @@ ac_cv_func_acos=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:23725: result: $ac_cv_func_acos" >&5
+echo "$as_me:23739: 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:23731: checking for acos in -lm" >&5
+echo "$as_me:23745: 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
@@ -23736,7 +23750,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm $LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 23739 "configure"
+#line 23753 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23755,16 +23769,16 @@ acos ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23758: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23772: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23761: \$? = $ac_status" >&5
+  echo "$as_me:23775: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23764: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23778: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23767: \$? = $ac_status" >&5
+  echo "$as_me:23781: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_m_acos=yes
 else
@@ -23775,7 +23789,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23778: result: $ac_cv_lib_m_acos" >&5
+echo "$as_me:23792: 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
 
@@ -23801,13 +23815,13 @@ case $host_os in
 
 	eval 'cf_cv_have_lib_'video'=no'
 	cf_libdir=""
-	echo "$as_me:23804: checking for v_init" >&5
+	echo "$as_me:23818: 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 23810 "configure"
+#line 23824 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char v_init (); below.  */
@@ -23838,16 +23852,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:23841: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23855: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23844: \$? = $ac_status" >&5
+  echo "$as_me:23858: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23847: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23861: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23850: \$? = $ac_status" >&5
+  echo "$as_me:23864: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_v_init=yes
 else
@@ -23857,18 +23871,18 @@ ac_cv_func_v_init=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:23860: result: $ac_cv_func_v_init" >&5
+echo "$as_me:23874: 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:23867: checking for v_init in -lvideo" >&5
+		echo "$as_me:23881: 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 23871 "configure"
+#line 23885 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -23880,25 +23894,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23883: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23897: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23886: \$? = $ac_status" >&5
+  echo "$as_me:23900: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23889: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23903: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23892: \$? = $ac_status" >&5
+  echo "$as_me:23906: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:23894: result: yes" >&5
+  echo "$as_me:23908: 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:23901: result: no" >&5
+echo "$as_me:23915: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -23966,11 +23980,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:23969: checking for -lvideo in $cf_libdir" >&5
+				echo "$as_me:23983: 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 23973 "configure"
+#line 23987 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -23982,25 +23996,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23985: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23999: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23988: \$? = $ac_status" >&5
+  echo "$as_me:24002: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23991: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24005: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23994: \$? = $ac_status" >&5
+  echo "$as_me:24008: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:23996: result: yes" >&5
+  echo "$as_me:24010: 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:24003: result: no" >&5
+echo "$as_me:24017: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -24015,7 +24029,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'video
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:24018: error: Cannot link video library" >&5
+	{ { echo "$as_me:24032: error: Cannot link video library" >&5
 echo "$as_me: error: Cannot link video library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -24025,13 +24039,13 @@ esac
 
 	eval 'cf_cv_have_lib_'slang'=no'
 	cf_libdir=""
-	echo "$as_me:24028: checking for SLtt_get_screen_size" >&5
+	echo "$as_me:24042: 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 24034 "configure"
+#line 24048 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char SLtt_get_screen_size (); below.  */
@@ -24062,16 +24076,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:24065: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24079: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24068: \$? = $ac_status" >&5
+  echo "$as_me:24082: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24071: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24085: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24074: \$? = $ac_status" >&5
+  echo "$as_me:24088: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_SLtt_get_screen_size=yes
 else
@@ -24081,18 +24095,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:24084: result: $ac_cv_func_SLtt_get_screen_size" >&5
+echo "$as_me:24098: 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:24091: checking for SLtt_get_screen_size in -lslang" >&5
+		echo "$as_me:24105: 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 24095 "configure"
+#line 24109 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -24104,25 +24118,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24107: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24121: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24110: \$? = $ac_status" >&5
+  echo "$as_me:24124: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24113: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24127: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24116: \$? = $ac_status" >&5
+  echo "$as_me:24130: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:24118: result: yes" >&5
+  echo "$as_me:24132: 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:24125: result: no" >&5
+echo "$as_me:24139: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -24190,11 +24204,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:24193: checking for -lslang in $cf_libdir" >&5
+				echo "$as_me:24207: 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 24197 "configure"
+#line 24211 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -24206,25 +24220,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24209: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24223: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24212: \$? = $ac_status" >&5
+  echo "$as_me:24226: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24215: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24229: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24218: \$? = $ac_status" >&5
+  echo "$as_me:24232: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:24220: result: yes" >&5
+  echo "$as_me:24234: 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:24227: result: no" >&5
+echo "$as_me:24241: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -24239,13 +24253,13 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'slang
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:24242: error: Cannot link slang library" >&5
+	{ { echo "$as_me:24256: 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:24248: checking if we can link slang without termcap" >&5
+echo "$as_me:24262: 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%^.%%'`
@@ -24254,7 +24268,7 @@ else
 fi
 LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s%$cf_exclude%%" -e 's%^.%%'`
 cat >conftest.$ac_ext <<_ACEOF
-#line 24257 "configure"
+#line 24271 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -24266,16 +24280,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24269: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24283: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24272: \$? = $ac_status" >&5
+  echo "$as_me:24286: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24275: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24289: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24278: \$? = $ac_status" >&5
+  echo "$as_me:24292: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -24284,13 +24298,13 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:24287: result: $cf_result" >&5
+echo "$as_me:24301: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 test $cf_result = no && LIBS="$cf_slang_LIBS3"
 
 else
 
-echo "$as_me:24293: checking for slang2 header file" >&5
+echo "$as_me:24307: 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
@@ -24298,7 +24312,7 @@ else
 
 	cf_cv_slang2_header=no
 	cat >conftest.$ac_ext <<_ACEOF
-#line 24301 "configure"
+#line 24315 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -24310,16 +24324,16 @@ printf("%s\n", SLANG_VERSION)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24313: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24327: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24316: \$? = $ac_status" >&5
+  echo "$as_me:24330: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24319: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24333: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24322: \$? = $ac_status" >&5
+  echo "$as_me:24336: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang2_header=predefined
 else
@@ -24424,7 +24438,7 @@ cf_search="$cf_search $cf_header_path_list"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:24427: result: $cf_cv_slang2_header" >&5
+echo "$as_me:24441: result: $cf_cv_slang2_header" >&5
 echo "${ECHO_T}$cf_cv_slang2_header" >&6
 
 if test "x$cf_cv_slang2_header" != xno
@@ -24465,7 +24479,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 24468 "configure"
+#line 24482 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24477,16 +24491,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24480: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24494: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24483: \$? = $ac_status" >&5
+  echo "$as_me:24497: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24486: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24500: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24489: \$? = $ac_status" >&5
+  echo "$as_me:24503: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -24503,7 +24517,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}:24506: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:24520: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24533,7 +24547,7 @@ else
 
 cf_cv_termlib=none
 cat >conftest.$ac_ext <<_ACEOF
-#line 24536 "configure"
+#line 24550 "configure"
 #include "confdefs.h"
 
 int
@@ -24545,19 +24559,19 @@ char *x=(char*)tgoto("",0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24548: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24562: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24551: \$? = $ac_status" >&5
+  echo "$as_me:24565: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24554: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24568: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24557: \$? = $ac_status" >&5
+  echo "$as_me:24571: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 24560 "configure"
+#line 24574 "configure"
 #include "confdefs.h"
 
 int
@@ -24569,16 +24583,16 @@ int x=tigetstr("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24572: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24586: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24575: \$? = $ac_status" >&5
+  echo "$as_me:24589: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24578: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24592: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24581: \$? = $ac_status" >&5
+  echo "$as_me:24595: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termlib=terminfo
 else
@@ -24589,7 +24603,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}:24592: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
+echo "${as_me:-configure}:24606: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
 
 else
   echo "$as_me: failed program was:" >&5
@@ -24604,10 +24618,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:24607: checking for $cf_func in -l$cf_lib" >&5
+			echo "$as_me:24621: 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 24610 "configure"
+#line 24624 "configure"
 #include "confdefs.h"
 
 int
@@ -24619,16 +24633,16 @@ int x=$cf_func("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24622: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24636: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24625: \$? = $ac_status" >&5
+  echo "$as_me:24639: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24628: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24642: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24631: \$? = $ac_status" >&5
+  echo "$as_me:24645: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -24637,7 +24651,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-			echo "$as_me:24640: result: $cf_result" >&5
+			echo "$as_me:24654: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				if test "$cf_func" = tigetstr ; then
@@ -24654,7 +24668,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:24657: checking for initscr in -lcurses" >&5
+	echo "$as_me:24671: 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
@@ -24662,7 +24676,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 24665 "configure"
+#line 24679 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24681,16 +24695,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24684: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24698: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24687: \$? = $ac_status" >&5
+  echo "$as_me:24701: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24690: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24704: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24693: \$? = $ac_status" >&5
+  echo "$as_me:24707: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_curses_initscr=yes
 else
@@ -24701,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:24704: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:24718: 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
 
@@ -24723,7 +24737,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-	echo "$as_me:24726: checking for tgoto in -ltermcap" >&5
+	echo "$as_me:24740: 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
@@ -24731,7 +24745,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 24734 "configure"
+#line 24748 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24750,16 +24764,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24753: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24767: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24756: \$? = $ac_status" >&5
+  echo "$as_me:24770: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24759: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24773: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24762: \$? = $ac_status" >&5
+  echo "$as_me:24776: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_termcap_tgoto=yes
 else
@@ -24770,7 +24784,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24773: result: $ac_cv_lib_termcap_tgoto" >&5
+echo "$as_me:24787: 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
 
@@ -24797,20 +24811,20 @@ fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 if test "$cf_cv_termlib" = none; then
-	{ echo "$as_me:24800: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
+	{ echo "$as_me:24814: 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:24807: checking for acos" >&5
+echo "$as_me:24821: 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 24813 "configure"
+#line 24827 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char acos (); below.  */
@@ -24841,16 +24855,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:24844: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24858: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24847: \$? = $ac_status" >&5
+  echo "$as_me:24861: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24850: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24864: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24853: \$? = $ac_status" >&5
+  echo "$as_me:24867: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_acos=yes
 else
@@ -24860,13 +24874,13 @@ ac_cv_func_acos=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:24863: result: $ac_cv_func_acos" >&5
+echo "$as_me:24877: 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:24869: checking for acos in -lm" >&5
+echo "$as_me:24883: 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
@@ -24874,7 +24888,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm $LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 24877 "configure"
+#line 24891 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24893,16 +24907,16 @@ acos ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24896: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24910: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24899: \$? = $ac_status" >&5
+  echo "$as_me:24913: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24902: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24916: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24905: \$? = $ac_status" >&5
+  echo "$as_me:24919: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_m_acos=yes
 else
@@ -24913,7 +24927,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24916: result: $ac_cv_lib_m_acos" >&5
+echo "$as_me:24930: 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
 
@@ -24939,13 +24953,13 @@ case $host_os in
 
 	eval 'cf_cv_have_lib_'video'=no'
 	cf_libdir=""
-	echo "$as_me:24942: checking for v_init" >&5
+	echo "$as_me:24956: 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 24948 "configure"
+#line 24962 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char v_init (); below.  */
@@ -24976,16 +24990,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:24979: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24993: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24982: \$? = $ac_status" >&5
+  echo "$as_me:24996: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24985: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24999: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24988: \$? = $ac_status" >&5
+  echo "$as_me:25002: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_v_init=yes
 else
@@ -24995,18 +25009,18 @@ ac_cv_func_v_init=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:24998: result: $ac_cv_func_v_init" >&5
+echo "$as_me:25012: 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:25005: checking for v_init in -lvideo" >&5
+		echo "$as_me:25019: 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 25009 "configure"
+#line 25023 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -25018,25 +25032,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25021: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25035: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25024: \$? = $ac_status" >&5
+  echo "$as_me:25038: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25027: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25041: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25030: \$? = $ac_status" >&5
+  echo "$as_me:25044: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:25032: result: yes" >&5
+  echo "$as_me:25046: 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:25039: result: no" >&5
+echo "$as_me:25053: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -25104,11 +25118,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:25107: checking for -lvideo in $cf_libdir" >&5
+				echo "$as_me:25121: 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 25111 "configure"
+#line 25125 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -25120,25 +25134,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25123: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25137: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25126: \$? = $ac_status" >&5
+  echo "$as_me:25140: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25129: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25143: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25132: \$? = $ac_status" >&5
+  echo "$as_me:25146: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:25134: result: yes" >&5
+  echo "$as_me:25148: 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:25141: result: no" >&5
+echo "$as_me:25155: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -25153,7 +25167,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'video
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:25156: error: Cannot link video library" >&5
+	{ { echo "$as_me:25170: error: Cannot link video library" >&5
 echo "$as_me: error: Cannot link video library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -25163,13 +25177,13 @@ esac
 
 	eval 'cf_cv_have_lib_'slang2'=no'
 	cf_libdir=""
-	echo "$as_me:25166: checking for SLtt_get_screen_size" >&5
+	echo "$as_me:25180: 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 25172 "configure"
+#line 25186 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char SLtt_get_screen_size (); below.  */
@@ -25200,16 +25214,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:25203: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25217: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25206: \$? = $ac_status" >&5
+  echo "$as_me:25220: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25209: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25223: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25212: \$? = $ac_status" >&5
+  echo "$as_me:25226: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_SLtt_get_screen_size=yes
 else
@@ -25219,18 +25233,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:25222: result: $ac_cv_func_SLtt_get_screen_size" >&5
+echo "$as_me:25236: 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:25229: checking for SLtt_get_screen_size in -lslang2" >&5
+		echo "$as_me:25243: 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 25233 "configure"
+#line 25247 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -25242,25 +25256,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25245: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25259: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25248: \$? = $ac_status" >&5
+  echo "$as_me:25262: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25251: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25265: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25254: \$? = $ac_status" >&5
+  echo "$as_me:25268: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:25256: result: yes" >&5
+  echo "$as_me:25270: 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:25263: result: no" >&5
+echo "$as_me:25277: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -25328,11 +25342,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:25331: checking for -lslang2 in $cf_libdir" >&5
+				echo "$as_me:25345: 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 25335 "configure"
+#line 25349 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -25344,25 +25358,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25347: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25361: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25350: \$? = $ac_status" >&5
+  echo "$as_me:25364: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25353: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25367: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25356: \$? = $ac_status" >&5
+  echo "$as_me:25370: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:25358: result: yes" >&5
+  echo "$as_me:25372: 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:25365: result: no" >&5
+echo "$as_me:25379: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -25377,13 +25391,13 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'slang2
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:25380: error: Cannot link slang2 library" >&5
+	{ { echo "$as_me:25394: 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:25386: checking if we can link slang2 without termcap" >&5
+echo "$as_me:25400: 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%^.%%'`
@@ -25392,7 +25406,7 @@ else
 fi
 LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s%$cf_exclude%%" -e 's%^.%%'`
 cat >conftest.$ac_ext <<_ACEOF
-#line 25395 "configure"
+#line 25409 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -25404,16 +25418,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25407: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25421: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25410: \$? = $ac_status" >&5
+  echo "$as_me:25424: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25413: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25427: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25416: \$? = $ac_status" >&5
+  echo "$as_me:25430: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -25422,12 +25436,12 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:25425: result: $cf_result" >&5
+echo "$as_me:25439: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 test $cf_result = no && LIBS="$cf_slang_LIBS3"
 
 	else
-		{ { echo "$as_me:25430: error: cannot find slang headers" >&5
+		{ { echo "$as_me:25444: error: cannot find slang headers" >&5
 echo "$as_me: error: cannot find slang headers" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -25435,14 +25449,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:25438: checking if we must define UTF8" >&5
+echo "$as_me:25452: 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 25445 "configure"
+#line 25459 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -25454,16 +25468,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25457: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25471: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25460: \$? = $ac_status" >&5
+  echo "$as_me:25474: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25463: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25477: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25466: \$? = $ac_status" >&5
+  echo "$as_me:25480: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_utf8=no
 else
@@ -25471,7 +25485,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 25474 "configure"
+#line 25488 "configure"
 #include "confdefs.h"
 
 #define UTF8
@@ -25485,16 +25499,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25488: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25502: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25491: \$? = $ac_status" >&5
+  echo "$as_me:25505: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25494: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25508: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25497: \$? = $ac_status" >&5
+  echo "$as_me:25511: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_utf8=yes
 else
@@ -25507,7 +25521,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:25510: result: $cf_cv_slang_utf8" >&5
+echo "$as_me:25524: result: $cf_cv_slang_utf8" >&5
 echo "${ECHO_T}$cf_cv_slang_utf8" >&6
 
 if test "$cf_cv_slang_utf8" = yes ; then
@@ -25518,14 +25532,14 @@ EOF
 
 fi
 
-echo "$as_me:25521: checking if we must tell slang this is UNIX" >&5
+echo "$as_me:25535: 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 25528 "configure"
+#line 25542 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -25544,16 +25558,16 @@ SLang_TT_Baud_Rate = 1
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25547: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25561: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25550: \$? = $ac_status" >&5
+  echo "$as_me:25564: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25553: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25567: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25556: \$? = $ac_status" >&5
+  echo "$as_me:25570: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_unix=yes
 else
@@ -25564,20 +25578,20 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:25567: result: $cf_cv_slang_unix" >&5
+echo "$as_me:25581: 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:25574: checking for SLsmg_Color_Type" >&5
+	echo "$as_me:25588: 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 25580 "configure"
+#line 25594 "configure"
 #include "confdefs.h"
 #include <slang.h>
 
@@ -25593,16 +25607,16 @@ if (sizeof (SLsmg_Color_Type))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25596: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25610: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25599: \$? = $ac_status" >&5
+  echo "$as_me:25613: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25602: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25616: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25605: \$? = $ac_status" >&5
+  echo "$as_me:25619: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_SLsmg_Color_Type=yes
 else
@@ -25612,7 +25626,7 @@ ac_cv_type_SLsmg_Color_Type=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:25615: result: $ac_cv_type_SLsmg_Color_Type" >&5
+echo "$as_me:25629: 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
@@ -25628,13 +25642,13 @@ EOF
 
 fi
 
-	echo "$as_me:25631: checking for SLtt_Char_Type" >&5
+	echo "$as_me:25645: 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 25637 "configure"
+#line 25651 "configure"
 #include "confdefs.h"
 #include <slang.h>
 
@@ -25650,16 +25664,16 @@ if (sizeof (SLtt_Char_Type))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25653: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25667: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25656: \$? = $ac_status" >&5
+  echo "$as_me:25670: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25659: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25673: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25662: \$? = $ac_status" >&5
+  echo "$as_me:25676: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_SLtt_Char_Type=yes
 else
@@ -25669,7 +25683,7 @@ ac_cv_type_SLtt_Char_Type=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:25672: result: $ac_cv_type_SLtt_Char_Type" >&5
+echo "$as_me:25686: 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
@@ -25689,14 +25703,14 @@ fi
 	;;
 esac
 
-echo "$as_me:25692: checking for chtype typedef" >&5
+echo "$as_me:25706: 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 25699 "configure"
+#line 25713 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -25708,16 +25722,16 @@ chtype foo
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25711: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25725: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25714: \$? = $ac_status" >&5
+  echo "$as_me:25728: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25717: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25731: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25720: \$? = $ac_status" >&5
+  echo "$as_me:25734: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_chtype_decl=yes
 else
@@ -25727,7 +25741,7 @@ cf_cv_chtype_decl=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:25730: result: $cf_cv_chtype_decl" >&5
+echo "$as_me:25744: result: $cf_cv_chtype_decl" >&5
 echo "${ECHO_T}$cf_cv_chtype_decl" >&6
 if test $cf_cv_chtype_decl = yes ; then
 
@@ -25735,14 +25749,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_TYPE_CHTYPE 1
 EOF
 
-	echo "$as_me:25738: checking if chtype is scalar or struct" >&5
+	echo "$as_me:25752: 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 25745 "configure"
+#line 25759 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -25754,16 +25768,16 @@ chtype foo; long x = foo
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25757: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25771: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25760: \$? = $ac_status" >&5
+  echo "$as_me:25774: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25763: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25777: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25766: \$? = $ac_status" >&5
+  echo "$as_me:25780: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_chtype_type=scalar
 else
@@ -25773,7 +25787,7 @@ cf_cv_chtype_type=struct
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:25776: result: $cf_cv_chtype_type" >&5
+echo "$as_me:25790: result: $cf_cv_chtype_type" >&5
 echo "${ECHO_T}$cf_cv_chtype_type" >&6
 	if test $cf_cv_chtype_type = scalar ; then
 
@@ -25784,7 +25798,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:25787: checking if you want the wide-curses features" >&5
+echo "$as_me:25801: 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.
@@ -25801,10 +25815,10 @@ else
   use_wide_curses=$cf_wide_curses
 
 fi;
-echo "$as_me:25804: result: $use_wide_curses" >&5
+echo "$as_me:25818: result: $use_wide_curses" >&5
 echo "${ECHO_T}$use_wide_curses" >&6
 
-echo "$as_me:25807: checking if color-style code should be used" >&5
+echo "$as_me:25821: 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.
@@ -25824,7 +25838,7 @@ fi;
 
 case $use_color_style in
 (no)
-	echo "$as_me:25827: result: no" >&5
+	echo "$as_me:25841: result: no" >&5
 echo "${ECHO_T}no" >&6
 	INSTALL_LSS=
 	;;
@@ -25834,10 +25848,10 @@ cat >>confdefs.h <<\EOF
 #define USE_COLOR_STYLE 1
 EOF
 
-	echo "$as_me:25837: result: yes" >&5
+	echo "$as_me:25851: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-	echo "$as_me:25840: checking for location of style-sheet file" >&5
+	echo "$as_me:25854: 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.
@@ -25873,7 +25887,7 @@ case ".$withval" in
 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:25876: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:25890: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -25882,7 +25896,7 @@ esac
 fi
 eval LYNX_LSS_FILE="$withval"
 
-	echo "$as_me:25885: result: $LYNX_LSS_FILE" >&5
+	echo "$as_me:25899: result: $LYNX_LSS_FILE" >&5
 echo "${ECHO_T}$LYNX_LSS_FILE" >&6
 
 	test "$LYNX_LSS_FILE" = no && LYNX_LSS_FILE=
@@ -25895,7 +25909,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:25898: checking for the default configuration-file" >&5
+echo "$as_me:25912: 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.
@@ -25931,7 +25945,7 @@ case ".$withval" in
 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:25934: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:25948: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -25940,7 +25954,7 @@ esac
 fi
 eval LYNX_CFG_FILE="$withval"
 
-echo "$as_me:25943: result: $LYNX_CFG_FILE" >&5
+echo "$as_me:25957: result: $LYNX_CFG_FILE" >&5
 echo "${ECHO_T}$LYNX_CFG_FILE" >&6
 
 test "$LYNX_CFG_FILE" = no && LYNX_CFG_FILE=
@@ -25949,7 +25963,7 @@ cat >>confdefs.h <<EOF
 #define LYNX_CFG_FILE "$LYNX_CFG_FILE"
 EOF
 
-echo "$as_me:25952: checking for the default configuration-path" >&5
+echo "$as_me:25966: 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.
@@ -25985,7 +25999,7 @@ case ".$withval" in
 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:25988: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:26002: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -25994,7 +26008,7 @@ esac
 fi
 eval LYNX_CFG_PATH="$withval"
 
-echo "$as_me:25997: result: $LYNX_CFG_PATH" >&5
+echo "$as_me:26011: result: $LYNX_CFG_PATH" >&5
 echo "${ECHO_T}$LYNX_CFG_PATH" >&6
 
 test -z "$LYNX_CFG_PATH" && `echo "$LYNX_CFG_FILE" | sed -e 's%/[^/]*$%%'`
@@ -26004,7 +26018,7 @@ cat >>confdefs.h <<EOF
 #define LYNX_CFG_PATH "$LYNX_CFG_PATH"
 EOF
 
-echo "$as_me:26007: checking if htmlized lynx.cfg should be built" >&5
+echo "$as_me:26021: 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.
@@ -26021,7 +26035,7 @@ else
   use_htmlized_cfg=no
 
 fi;
-echo "$as_me:26024: result: $use_htmlized_cfg" >&5
+echo "$as_me:26038: result: $use_htmlized_cfg" >&5
 echo "${ECHO_T}$use_htmlized_cfg" >&6
 
 LYNXCFG_MAKE=''
@@ -26029,7 +26043,7 @@ if test $use_htmlized_cfg = no ; then
 	LYNXCFG_MAKE='#'
 fi
 
-echo "$as_me:26032: checking if local doc directory should be linked to help page" >&5
+echo "$as_me:26046: 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.
@@ -26046,7 +26060,7 @@ else
   use_local_docs=no
 
 fi;
-echo "$as_me:26049: result: $use_local_docs" >&5
+echo "$as_me:26063: result: $use_local_docs" >&5
 echo "${ECHO_T}$use_local_docs" >&6
 
 LYNXDOC_MAKE=''
@@ -26054,7 +26068,7 @@ if test $use_local_docs = no ; then
 	LYNXDOC_MAKE='#'
 fi
 
-echo "$as_me:26057: checking for MIME library directory" >&5
+echo "$as_me:26071: 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.
@@ -26090,7 +26104,7 @@ case ".$withval" in
 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:26093: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:26107: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -26099,7 +26113,7 @@ esac
 fi
 eval MIME_LIBDIR="$withval"
 
-echo "$as_me:26102: result: $MIME_LIBDIR" >&5
+echo "$as_me:26116: result: $MIME_LIBDIR" >&5
 echo "${ECHO_T}$MIME_LIBDIR" >&6
 MIME_LIBDIR=`echo "$MIME_LIBDIR" | sed -e 's,/$,,' -e 's,$,/,'`
 
@@ -26107,7 +26121,7 @@ cat >>confdefs.h <<EOF
 #define MIME_LIBDIR "$MIME_LIBDIR"
 EOF
 
-echo "$as_me:26110: checking if locale-charset selection logic should be used" >&5
+echo "$as_me:26124: 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.
@@ -26124,7 +26138,7 @@ else
   use_locale_charset=yes
 
 fi;
-echo "$as_me:26127: result: $use_locale_charset" >&5
+echo "$as_me:26141: result: $use_locale_charset" >&5
 echo "${ECHO_T}$use_locale_charset" >&6
 test $use_locale_charset != no &&
 cat >>confdefs.h <<\EOF
@@ -26133,7 +26147,7 @@ EOF
 
 CHARSET_DEFS=
 
-echo "$as_me:26136: checking if you want only a few charsets" >&5
+echo "$as_me:26150: 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.
@@ -26145,7 +26159,7 @@ else
 fi;
 
 if test -n "$cf_charsets" ; then
-	echo "$as_me:26148: result: yes" >&5
+	echo "$as_me:26162: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 cat >>confdefs.h <<\EOF
@@ -26159,7 +26173,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}:26162: testing using minimal list of charsets: $cf_min_charsets ..." 1>&5
+echo "${as_me:-configure}:26176: 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'`
@@ -26186,28 +26200,28 @@ echo "${as_me:-configure}:26162: testing using minimal list of charsets: $cf_min
 		then
 			test -n "$verbose" && echo "	found $cf_charset" 1>&6
 
-echo "${as_me:-configure}:26189: testing found $cf_charset ..." 1>&5
+echo "${as_me:-configure}:26203: 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}:26195: testing not found $cf_charset ..." 1>&5
+echo "${as_me:-configure}:26209: testing not found $cf_charset ..." 1>&5
 
 		fi
 	done
 else
-	echo "$as_me:26200: result: no" >&5
+	echo "$as_me:26214: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:26204: checking for ANSI C header files" >&5
+echo "$as_me:26218: 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 26210 "configure"
+#line 26224 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -26215,13 +26229,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:26218: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:26232: \"$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:26224: \$? = $ac_status" >&5
+  echo "$as_me:26238: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -26243,7 +26257,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 26246 "configure"
+#line 26260 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -26261,7 +26275,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 26264 "configure"
+#line 26278 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -26282,7 +26296,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 26285 "configure"
+#line 26299 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -26308,15 +26322,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:26311: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26325: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26314: \$? = $ac_status" >&5
+  echo "$as_me:26328: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:26316: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26330: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26319: \$? = $ac_status" >&5
+  echo "$as_me:26333: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -26329,7 +26343,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:26332: result: $ac_cv_header_stdc" >&5
+echo "$as_me:26346: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -26339,13 +26353,13 @@ EOF
 
 fi
 
-echo "$as_me:26342: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:26356: 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 26348 "configure"
+#line 26362 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -26361,16 +26375,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26364: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26378: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26367: \$? = $ac_status" >&5
+  echo "$as_me:26381: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26370: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26384: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26373: \$? = $ac_status" >&5
+  echo "$as_me:26387: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_header_time=yes
 else
@@ -26380,7 +26394,7 @@ ac_cv_header_time=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:26383: result: $ac_cv_header_time" >&5
+echo "$as_me:26397: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -26393,13 +26407,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:26396: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:26410: 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 26402 "configure"
+#line 26416 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -26414,16 +26428,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26417: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26431: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26420: \$? = $ac_status" >&5
+  echo "$as_me:26434: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26423: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26437: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26426: \$? = $ac_status" >&5
+  echo "$as_me:26440: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -26433,7 +26447,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:26436: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:26450: 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
@@ -26446,7 +26460,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:26449: checking for opendir in -ldir" >&5
+  echo "$as_me:26463: 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
@@ -26454,7 +26468,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 26457 "configure"
+#line 26471 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -26473,16 +26487,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26476: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26490: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26479: \$? = $ac_status" >&5
+  echo "$as_me:26493: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26482: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26496: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26485: \$? = $ac_status" >&5
+  echo "$as_me:26499: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -26493,14 +26507,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:26496: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:26510: 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:26503: checking for opendir in -lx" >&5
+  echo "$as_me:26517: 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
@@ -26508,7 +26522,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 26511 "configure"
+#line 26525 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -26527,16 +26541,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26530: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26544: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26533: \$? = $ac_status" >&5
+  echo "$as_me:26547: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26536: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26550: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26539: \$? = $ac_status" >&5
+  echo "$as_me:26553: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -26547,7 +26561,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:26550: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:26564: 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"
@@ -26575,23 +26589,23 @@ for ac_header in \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:26578: checking for $ac_header" >&5
+echo "$as_me:26592: 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 26584 "configure"
+#line 26598 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:26588: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:26602: \"$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:26594: \$? = $ac_status" >&5
+  echo "$as_me:26608: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -26610,7 +26624,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:26613: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:26627: 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
@@ -26620,14 +26634,14 @@ EOF
 fi
 done
 
-echo "$as_me:26623: checking termio.h and termios.h" >&5
+echo "$as_me:26637: 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 26630 "configure"
+#line 26644 "configure"
 #include "confdefs.h"
 
 #if HAVE_TERMIO_H
@@ -26645,16 +26659,16 @@ putchar (0x0a)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26648: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26662: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26651: \$? = $ac_status" >&5
+  echo "$as_me:26665: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26654: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26668: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26657: \$? = $ac_status" >&5
+  echo "$as_me:26671: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termio_and_termios=yes
 else
@@ -26665,21 +26679,21 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:26668: result: $cf_cv_termio_and_termios" >&5
+echo "$as_me:26682: 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:26675: checking for sigaction and structs" >&5
+echo "$as_me:26689: 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 26682 "configure"
+#line 26696 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -26699,16 +26713,16 @@ struct sigaction act;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26702: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26716: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26705: \$? = $ac_status" >&5
+  echo "$as_me:26719: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26708: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26722: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26711: \$? = $ac_status" >&5
+  echo "$as_me:26725: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_func_sigaction=yes
 else
@@ -26719,7 +26733,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:26722: result: $cf_cv_func_sigaction" >&5
+echo "$as_me:26736: result: $cf_cv_func_sigaction" >&5
 echo "${ECHO_T}$cf_cv_func_sigaction" >&6
 test "$cf_cv_func_sigaction" = yes &&
 cat >>confdefs.h <<\EOF
@@ -26729,23 +26743,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:26732: checking for $ac_header" >&5
+echo "$as_me:26746: 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 26738 "configure"
+#line 26752 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:26742: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:26756: \"$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:26748: \$? = $ac_status" >&5
+  echo "$as_me:26762: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -26764,7 +26778,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:26767: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:26781: 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
@@ -26785,23 +26799,23 @@ else
 for ac_header in wait.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:26788: checking for $ac_header" >&5
+echo "$as_me:26802: 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 26794 "configure"
+#line 26808 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:26798: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:26812: \"$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:26804: \$? = $ac_status" >&5
+  echo "$as_me:26818: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -26820,7 +26834,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:26823: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:26837: 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
@@ -26833,23 +26847,23 @@ done
 for ac_header in waitstatus.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:26836: checking for $ac_header" >&5
+echo "$as_me:26850: 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 26842 "configure"
+#line 26856 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:26846: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:26860: \"$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:26852: \$? = $ac_status" >&5
+  echo "$as_me:26866: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -26868,7 +26882,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:26871: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:26885: 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
@@ -26890,14 +26904,14 @@ cf_wait_headers="$cf_wait_headers
 fi
 fi
 
-echo "$as_me:26893: checking for union wait" >&5
+echo "$as_me:26907: 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 26900 "configure"
+#line 26914 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -26913,16 +26927,16 @@ int x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26916: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26930: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26919: \$? = $ac_status" >&5
+  echo "$as_me:26933: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26922: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26936: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26925: \$? = $ac_status" >&5
+  echo "$as_me:26939: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_unionwait=no
 	 echo compiles ok w/o union wait 1>&5
@@ -26932,7 +26946,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 26935 "configure"
+#line 26949 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -26952,16 +26966,16 @@ union wait x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26955: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26969: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26958: \$? = $ac_status" >&5
+  echo "$as_me:26972: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26961: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26975: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26964: \$? = $ac_status" >&5
+  echo "$as_me:26978: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_unionwait=yes
 	 echo compiles ok with union wait and possibly macros too 1>&5
@@ -26976,7 +26990,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:26979: result: $cf_cv_type_unionwait" >&5
+echo "$as_me:26993: result: $cf_cv_type_unionwait" >&5
 echo "${ECHO_T}$cf_cv_type_unionwait" >&6
 test $cf_cv_type_unionwait = yes &&
 cat >>confdefs.h <<\EOF
@@ -26985,14 +26999,14 @@ EOF
 
 if test $cf_cv_type_unionwait = yes; then
 
-	echo "$as_me:26988: checking if union wait can be used as wait-arg" >&5
+	echo "$as_me:27002: 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 26995 "configure"
+#line 27009 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -27004,16 +27018,16 @@ union wait x; wait(&x)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27007: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27021: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27010: \$? = $ac_status" >&5
+  echo "$as_me:27024: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27013: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27027: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27016: \$? = $ac_status" >&5
+  echo "$as_me:27030: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_arg_union_wait=yes
 else
@@ -27025,21 +27039,21 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-	echo "$as_me:27028: result: $cf_cv_arg_union_wait" >&5
+	echo "$as_me:27042: 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:27035: checking if union wait can be used as waitpid-arg" >&5
+	echo "$as_me:27049: 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 27042 "configure"
+#line 27056 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -27051,16 +27065,16 @@ union wait x; waitpid(0, &x, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27054: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27068: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27057: \$? = $ac_status" >&5
+  echo "$as_me:27071: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27060: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27074: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27063: \$? = $ac_status" >&5
+  echo "$as_me:27077: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_arg_union_waitpid=yes
 else
@@ -27072,7 +27086,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-	echo "$as_me:27075: result: $cf_cv_arg_union_waitpid" >&5
+	echo "$as_me:27089: 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
@@ -27081,13 +27095,13 @@ EOF
 
 fi
 
-echo "$as_me:27084: checking for uid_t in sys/types.h" >&5
+echo "$as_me:27098: 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 27090 "configure"
+#line 27104 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -27101,7 +27115,7 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:27104: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:27118: 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
 
@@ -27115,7 +27129,7 @@ EOF
 
 fi
 
-echo "$as_me:27118: checking type of array argument to getgroups" >&5
+echo "$as_me:27132: 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
@@ -27124,7 +27138,7 @@ else
   ac_cv_type_getgroups=cross
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 27127 "configure"
+#line 27141 "configure"
 #include "confdefs.h"
 /* Thanks to Mike Rendell for this test.  */
 #include <sys/types.h>
@@ -27150,15 +27164,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:27153: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27167: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27156: \$? = $ac_status" >&5
+  echo "$as_me:27170: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:27158: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27172: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27161: \$? = $ac_status" >&5
+  echo "$as_me:27175: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_getgroups=gid_t
 else
@@ -27171,7 +27185,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 27174 "configure"
+#line 27188 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 
@@ -27186,20 +27200,20 @@ rm -rf conftest*
 
 fi
 fi
-echo "$as_me:27189: result: $ac_cv_type_getgroups" >&5
+echo "$as_me:27203: 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:27196: checking for off_t" >&5
+echo "$as_me:27210: 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 27202 "configure"
+#line 27216 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27214,16 +27228,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27217: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27231: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27220: \$? = $ac_status" >&5
+  echo "$as_me:27234: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27223: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27237: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27226: \$? = $ac_status" >&5
+  echo "$as_me:27240: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -27233,7 +27247,7 @@ ac_cv_type_off_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27236: result: $ac_cv_type_off_t" >&5
+echo "$as_me:27250: 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
   :
@@ -27245,13 +27259,13 @@ EOF
 
 fi
 
-echo "$as_me:27248: checking for pid_t" >&5
+echo "$as_me:27262: 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 27254 "configure"
+#line 27268 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27266,16 +27280,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27269: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27283: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27272: \$? = $ac_status" >&5
+  echo "$as_me:27286: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27275: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27289: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27278: \$? = $ac_status" >&5
+  echo "$as_me:27292: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -27285,7 +27299,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27288: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:27302: 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
   :
@@ -27297,13 +27311,13 @@ EOF
 
 fi
 
-echo "$as_me:27300: checking for uid_t in sys/types.h" >&5
+echo "$as_me:27314: 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 27306 "configure"
+#line 27320 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -27317,7 +27331,7 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:27320: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:27334: 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
 
@@ -27331,13 +27345,13 @@ EOF
 
 fi
 
-echo "$as_me:27334: checking for mode_t" >&5
+echo "$as_me:27348: 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 27340 "configure"
+#line 27354 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27352,16 +27366,16 @@ if (sizeof (mode_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27355: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27369: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27358: \$? = $ac_status" >&5
+  echo "$as_me:27372: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27361: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27375: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27364: \$? = $ac_status" >&5
+  echo "$as_me:27378: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_mode_t=yes
 else
@@ -27371,7 +27385,7 @@ ac_cv_type_mode_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27374: result: $ac_cv_type_mode_t" >&5
+echo "$as_me:27388: 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
   :
@@ -27383,13 +27397,13 @@ EOF
 
 fi
 
-	echo "$as_me:27386: checking for ssize_t" >&5
+	echo "$as_me:27400: 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 27392 "configure"
+#line 27406 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27404,16 +27418,16 @@ if (sizeof (ssize_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27407: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27421: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27410: \$? = $ac_status" >&5
+  echo "$as_me:27424: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27413: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27427: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27416: \$? = $ac_status" >&5
+  echo "$as_me:27430: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_ssize_t=yes
 else
@@ -27423,7 +27437,7 @@ ac_cv_type_ssize_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27426: result: $ac_cv_type_ssize_t" >&5
+echo "$as_me:27440: 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
@@ -27439,13 +27453,13 @@ EOF
 
 fi
 
-	echo "$as_me:27442: checking for socklen_t" >&5
+	echo "$as_me:27456: 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 27448 "configure"
+#line 27462 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -27463,16 +27477,16 @@ if (sizeof (socklen_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27466: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27480: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27469: \$? = $ac_status" >&5
+  echo "$as_me:27483: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27472: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27486: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27475: \$? = $ac_status" >&5
+  echo "$as_me:27489: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_socklen_t=yes
 else
@@ -27482,7 +27496,7 @@ ac_cv_type_socklen_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27485: result: $ac_cv_type_socklen_t" >&5
+echo "$as_me:27499: 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
@@ -27498,7 +27512,7 @@ EOF
 
 fi
 
-echo "$as_me:27501: checking for long long type" >&5
+echo "$as_me:27515: 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
@@ -27529,7 +27543,7 @@ _CFEOF
 	rm -f conftest*
 
 fi
-echo "$as_me:27532: result: $cf_cv_type_long_long" >&5
+echo "$as_me:27546: 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
@@ -27540,14 +27554,14 @@ EOF
 
 fi
 
-echo "$as_me:27543: checking for tm.tm_gmtoff" >&5
+echo "$as_me:27557: 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 27550 "configure"
+#line 27564 "configure"
 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME
@@ -27572,16 +27586,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27575: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27589: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27578: \$? = $ac_status" >&5
+  echo "$as_me:27592: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27581: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27595: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27584: \$? = $ac_status" >&5
+  echo "$as_me:27598: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_tm_gmtoff=yes
 else
@@ -27592,20 +27606,20 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:27595: result: $cf_cv_tm_gmtoff" >&5
+echo "$as_me:27609: 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:27602: checking for int" >&5
+echo "$as_me:27616: 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 27608 "configure"
+#line 27622 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27620,16 +27634,16 @@ if (sizeof (int))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27623: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27637: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27626: \$? = $ac_status" >&5
+  echo "$as_me:27640: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27629: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27643: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27632: \$? = $ac_status" >&5
+  echo "$as_me:27646: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_int=yes
 else
@@ -27639,10 +27653,10 @@ ac_cv_type_int=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27642: result: $ac_cv_type_int" >&5
+echo "$as_me:27656: result: $ac_cv_type_int" >&5
 echo "${ECHO_T}$ac_cv_type_int" >&6
 
-echo "$as_me:27645: checking size of int" >&5
+echo "$as_me:27659: 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
@@ -27651,7 +27665,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 27654 "configure"
+#line 27668 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27663,21 +27677,21 @@ int _array_ [1 - 2 * !((sizeof (int)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27666: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27680: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27669: \$? = $ac_status" >&5
+  echo "$as_me:27683: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27672: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27686: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27675: \$? = $ac_status" >&5
+  echo "$as_me:27689: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 27680 "configure"
+#line 27694 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27689,16 +27703,16 @@ int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27692: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27706: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27695: \$? = $ac_status" >&5
+  echo "$as_me:27709: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27698: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27712: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27701: \$? = $ac_status" >&5
+  echo "$as_me:27715: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -27714,7 +27728,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 27717 "configure"
+#line 27731 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27726,16 +27740,16 @@ int _array_ [1 - 2 * !((sizeof (int)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27729: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27743: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27732: \$? = $ac_status" >&5
+  echo "$as_me:27746: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27735: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27749: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27738: \$? = $ac_status" >&5
+  echo "$as_me:27752: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -27751,7 +27765,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 27754 "configure"
+#line 27768 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27763,16 +27777,16 @@ int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27766: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27780: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27769: \$? = $ac_status" >&5
+  echo "$as_me:27783: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27772: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27786: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27775: \$? = $ac_status" >&5
+  echo "$as_me:27789: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -27785,12 +27799,12 @@ done
 ac_cv_sizeof_int=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:27788: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:27802: 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 27793 "configure"
+#line 27807 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27806,15 +27820,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:27809: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27823: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27812: \$? = $ac_status" >&5
+  echo "$as_me:27826: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:27814: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27828: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27817: \$? = $ac_status" >&5
+  echo "$as_me:27831: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_int=`cat conftest.val`
 else
@@ -27830,7 +27844,7 @@ else
   ac_cv_sizeof_int=0
 fi
 fi
-echo "$as_me:27833: result: $ac_cv_sizeof_int" >&5
+echo "$as_me:27847: 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
@@ -27838,23 +27852,23 @@ EOF
 
 if test "${ac_cv_type_int:+set}" = set; then
 	if test "${ac_cv_sizeof_int:+set}" != set; then
-		{ echo "$as_me:27841: WARNING: using 4 for sizeof int" >&5
+		{ echo "$as_me:27855: 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:27845: WARNING: sizeof int not found, using 4" >&5
+		{ echo "$as_me:27859: 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:27851: checking for long" >&5
+echo "$as_me:27865: 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 27857 "configure"
+#line 27871 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27869,16 +27883,16 @@ if (sizeof (long))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27872: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27886: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27875: \$? = $ac_status" >&5
+  echo "$as_me:27889: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27878: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27892: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27881: \$? = $ac_status" >&5
+  echo "$as_me:27895: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_long=yes
 else
@@ -27888,10 +27902,10 @@ ac_cv_type_long=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27891: result: $ac_cv_type_long" >&5
+echo "$as_me:27905: result: $ac_cv_type_long" >&5
 echo "${ECHO_T}$ac_cv_type_long" >&6
 
-echo "$as_me:27894: checking size of long" >&5
+echo "$as_me:27908: 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
@@ -27900,7 +27914,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 27903 "configure"
+#line 27917 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27912,21 +27926,21 @@ int _array_ [1 - 2 * !((sizeof (long)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27915: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27929: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27918: \$? = $ac_status" >&5
+  echo "$as_me:27932: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27921: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27935: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27924: \$? = $ac_status" >&5
+  echo "$as_me:27938: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 27929 "configure"
+#line 27943 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27938,16 +27952,16 @@ int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27941: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27955: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27944: \$? = $ac_status" >&5
+  echo "$as_me:27958: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27947: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27961: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27950: \$? = $ac_status" >&5
+  echo "$as_me:27964: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -27963,7 +27977,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 27966 "configure"
+#line 27980 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27975,16 +27989,16 @@ int _array_ [1 - 2 * !((sizeof (long)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27978: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27992: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27981: \$? = $ac_status" >&5
+  echo "$as_me:27995: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27984: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27998: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27987: \$? = $ac_status" >&5
+  echo "$as_me:28001: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -28000,7 +28014,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 28003 "configure"
+#line 28017 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28012,16 +28026,16 @@ int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28015: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28029: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28018: \$? = $ac_status" >&5
+  echo "$as_me:28032: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28021: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28035: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28024: \$? = $ac_status" >&5
+  echo "$as_me:28038: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -28034,12 +28048,12 @@ done
 ac_cv_sizeof_long=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:28037: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:28051: 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 28042 "configure"
+#line 28056 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28055,15 +28069,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:28058: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28072: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28061: \$? = $ac_status" >&5
+  echo "$as_me:28075: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:28063: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28077: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28066: \$? = $ac_status" >&5
+  echo "$as_me:28080: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_long=`cat conftest.val`
 else
@@ -28079,7 +28093,7 @@ else
   ac_cv_sizeof_long=0
 fi
 fi
-echo "$as_me:28082: result: $ac_cv_sizeof_long" >&5
+echo "$as_me:28096: 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
@@ -28087,23 +28101,23 @@ EOF
 
 if test "${ac_cv_type_long:+set}" = set; then
 	if test "${ac_cv_sizeof_long:+set}" != set; then
-		{ echo "$as_me:28090: WARNING: using 4 for sizeof long" >&5
+		{ echo "$as_me:28104: 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:28094: WARNING: sizeof long not found, using 4" >&5
+		{ echo "$as_me:28108: 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:28100: checking for off_t" >&5
+echo "$as_me:28114: 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 28106 "configure"
+#line 28120 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28118,16 +28132,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28121: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28135: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28124: \$? = $ac_status" >&5
+  echo "$as_me:28138: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28127: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28141: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28130: \$? = $ac_status" >&5
+  echo "$as_me:28144: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -28137,10 +28151,10 @@ ac_cv_type_off_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:28140: result: $ac_cv_type_off_t" >&5
+echo "$as_me:28154: result: $ac_cv_type_off_t" >&5
 echo "${ECHO_T}$ac_cv_type_off_t" >&6
 
-echo "$as_me:28143: checking size of off_t" >&5
+echo "$as_me:28157: 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
@@ -28149,7 +28163,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 28152 "configure"
+#line 28166 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28161,21 +28175,21 @@ int _array_ [1 - 2 * !((sizeof (off_t)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28164: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28178: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28167: \$? = $ac_status" >&5
+  echo "$as_me:28181: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28170: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28184: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28173: \$? = $ac_status" >&5
+  echo "$as_me:28187: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 28178 "configure"
+#line 28192 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28187,16 +28201,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28190: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28204: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28193: \$? = $ac_status" >&5
+  echo "$as_me:28207: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28196: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28210: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28199: \$? = $ac_status" >&5
+  echo "$as_me:28213: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -28212,7 +28226,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 28215 "configure"
+#line 28229 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28224,16 +28238,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28227: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28241: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28230: \$? = $ac_status" >&5
+  echo "$as_me:28244: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28233: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28247: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28236: \$? = $ac_status" >&5
+  echo "$as_me:28250: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -28249,7 +28263,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 28252 "configure"
+#line 28266 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28261,16 +28275,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28264: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28278: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28267: \$? = $ac_status" >&5
+  echo "$as_me:28281: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28270: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28284: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28273: \$? = $ac_status" >&5
+  echo "$as_me:28287: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -28283,12 +28297,12 @@ done
 ac_cv_sizeof_off_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:28286: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:28300: 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 28291 "configure"
+#line 28305 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28304,15 +28318,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:28307: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28321: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28310: \$? = $ac_status" >&5
+  echo "$as_me:28324: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:28312: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28326: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28315: \$? = $ac_status" >&5
+  echo "$as_me:28329: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_off_t=`cat conftest.val`
 else
@@ -28328,7 +28342,7 @@ else
   ac_cv_sizeof_off_t=0
 fi
 fi
-echo "$as_me:28331: result: $ac_cv_sizeof_off_t" >&5
+echo "$as_me:28345: 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
@@ -28336,23 +28350,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:28339: WARNING: using 4 for sizeof off_t" >&5
+		{ echo "$as_me:28353: 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:28343: WARNING: sizeof off_t not found, using 4" >&5
+		{ echo "$as_me:28357: 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:28349: checking for time_t" >&5
+echo "$as_me:28363: 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 28355 "configure"
+#line 28369 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28367,16 +28381,16 @@ if (sizeof (time_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28370: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28384: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28373: \$? = $ac_status" >&5
+  echo "$as_me:28387: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28376: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28390: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28379: \$? = $ac_status" >&5
+  echo "$as_me:28393: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_time_t=yes
 else
@@ -28386,10 +28400,10 @@ ac_cv_type_time_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:28389: result: $ac_cv_type_time_t" >&5
+echo "$as_me:28403: result: $ac_cv_type_time_t" >&5
 echo "${ECHO_T}$ac_cv_type_time_t" >&6
 
-echo "$as_me:28392: checking size of time_t" >&5
+echo "$as_me:28406: 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
@@ -28398,7 +28412,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 28401 "configure"
+#line 28415 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28410,21 +28424,21 @@ int _array_ [1 - 2 * !((sizeof (time_t)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28413: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28427: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28416: \$? = $ac_status" >&5
+  echo "$as_me:28430: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28419: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28433: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28422: \$? = $ac_status" >&5
+  echo "$as_me:28436: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 28427 "configure"
+#line 28441 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28436,16 +28450,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28439: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28453: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28442: \$? = $ac_status" >&5
+  echo "$as_me:28456: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28445: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28459: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28448: \$? = $ac_status" >&5
+  echo "$as_me:28462: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -28461,7 +28475,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 28464 "configure"
+#line 28478 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28473,16 +28487,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28476: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28490: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28479: \$? = $ac_status" >&5
+  echo "$as_me:28493: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28482: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28496: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28485: \$? = $ac_status" >&5
+  echo "$as_me:28499: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -28498,7 +28512,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 28501 "configure"
+#line 28515 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28510,16 +28524,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28513: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28527: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28516: \$? = $ac_status" >&5
+  echo "$as_me:28530: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28519: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28533: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28522: \$? = $ac_status" >&5
+  echo "$as_me:28536: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -28532,12 +28546,12 @@ done
 ac_cv_sizeof_time_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:28535: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:28549: 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 28540 "configure"
+#line 28554 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28553,15 +28567,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:28556: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28570: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28559: \$? = $ac_status" >&5
+  echo "$as_me:28573: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:28561: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28575: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28564: \$? = $ac_status" >&5
+  echo "$as_me:28578: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_time_t=`cat conftest.val`
 else
@@ -28577,7 +28591,7 @@ else
   ac_cv_sizeof_time_t=0
 fi
 fi
-echo "$as_me:28580: result: $ac_cv_sizeof_time_t" >&5
+echo "$as_me:28594: 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
@@ -28585,23 +28599,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:28588: WARNING: using 4 for sizeof time_t" >&5
+		{ echo "$as_me:28602: 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:28592: WARNING: sizeof time_t not found, using 4" >&5
+		{ echo "$as_me:28606: 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:28598: checking for intptr_t" >&5
+echo "$as_me:28612: 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 28604 "configure"
+#line 28618 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28616,16 +28630,16 @@ if (sizeof (intptr_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28619: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28633: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28622: \$? = $ac_status" >&5
+  echo "$as_me:28636: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28625: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28639: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28628: \$? = $ac_status" >&5
+  echo "$as_me:28642: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_intptr_t=yes
 else
@@ -28635,7 +28649,7 @@ ac_cv_type_intptr_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:28638: result: $ac_cv_type_intptr_t" >&5
+echo "$as_me:28652: 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
   :
@@ -28649,13 +28663,13 @@ fi
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo "$as_me:28652: checking for working alloca.h" >&5
+echo "$as_me:28666: 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 28658 "configure"
+#line 28672 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int
@@ -28667,16 +28681,16 @@ char *p = (char *) alloca (2 * sizeof (int));
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28670: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28684: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28673: \$? = $ac_status" >&5
+  echo "$as_me:28687: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28676: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28690: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28679: \$? = $ac_status" >&5
+  echo "$as_me:28693: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_working_alloca_h=yes
 else
@@ -28686,7 +28700,7 @@ ac_cv_working_alloca_h=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:28689: result: $ac_cv_working_alloca_h" >&5
+echo "$as_me:28703: 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
 
@@ -28696,13 +28710,13 @@ EOF
 
 fi
 
-echo "$as_me:28699: checking for alloca" >&5
+echo "$as_me:28713: 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 28705 "configure"
+#line 28719 "configure"
 #include "confdefs.h"
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -28734,16 +28748,16 @@ char *p = (char *) alloca (1);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28737: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28751: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28740: \$? = $ac_status" >&5
+  echo "$as_me:28754: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28743: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28757: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28746: \$? = $ac_status" >&5
+  echo "$as_me:28760: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_alloca_works=yes
 else
@@ -28753,7 +28767,7 @@ ac_cv_func_alloca_works=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:28756: result: $ac_cv_func_alloca_works" >&5
+echo "$as_me:28770: 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
@@ -28774,13 +28788,13 @@ cat >>confdefs.h <<\EOF
 #define C_ALLOCA 1
 EOF
 
-echo "$as_me:28777: checking whether \`alloca.c' needs Cray hooks" >&5
+echo "$as_me:28791: 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 28783 "configure"
+#line 28797 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -28798,18 +28812,18 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:28801: result: $ac_cv_os_cray" >&5
+echo "$as_me:28815: 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:28806: checking for $ac_func" >&5
+echo "$as_me:28820: 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 28812 "configure"
+#line 28826 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -28840,16 +28854,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:28843: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28857: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28846: \$? = $ac_status" >&5
+  echo "$as_me:28860: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28849: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28863: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28852: \$? = $ac_status" >&5
+  echo "$as_me:28866: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -28859,7 +28873,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:28862: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:28876: 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
 
@@ -28873,7 +28887,7 @@ fi
   done
 fi
 
-echo "$as_me:28876: checking stack direction for C alloca" >&5
+echo "$as_me:28890: 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
@@ -28882,7 +28896,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 28885 "configure"
+#line 28899 "configure"
 #include "confdefs.h"
 int
 find_stack_direction ()
@@ -28905,15 +28919,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:28908: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28922: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28911: \$? = $ac_status" >&5
+  echo "$as_me:28925: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:28913: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28927: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28916: \$? = $ac_status" >&5
+  echo "$as_me:28930: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_stack_direction=1
 else
@@ -28925,7 +28939,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:28928: result: $ac_cv_c_stack_direction" >&5
+echo "$as_me:28942: result: $ac_cv_c_stack_direction" >&5
 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
 cat >>confdefs.h <<EOF
@@ -28937,23 +28951,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:28940: checking for $ac_header" >&5
+echo "$as_me:28954: 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 28946 "configure"
+#line 28960 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:28950: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:28964: \"$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:28956: \$? = $ac_status" >&5
+  echo "$as_me:28970: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -28972,7 +28986,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:28975: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:28989: 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
@@ -28985,13 +28999,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:28988: checking for $ac_func" >&5
+echo "$as_me:29002: 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 28994 "configure"
+#line 29008 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -29022,16 +29036,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:29025: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29039: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29028: \$? = $ac_status" >&5
+  echo "$as_me:29042: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29031: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29045: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29034: \$? = $ac_status" >&5
+  echo "$as_me:29048: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -29041,7 +29055,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:29044: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:29058: 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
@@ -29053,7 +29067,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:29056: checking for working fork" >&5
+  echo "$as_me:29070: 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
@@ -29076,15 +29090,15 @@ else
       }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:29079: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29093: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29082: \$? = $ac_status" >&5
+  echo "$as_me:29096: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:29084: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29098: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29087: \$? = $ac_status" >&5
+  echo "$as_me:29101: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -29096,7 +29110,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:29099: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:29113: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -29110,12 +29124,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:29113: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:29127: 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:29118: checking for working vfork" >&5
+  echo "$as_me:29132: 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
@@ -29124,7 +29138,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 29127 "configure"
+#line 29141 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -29221,15 +29235,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:29224: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29238: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29227: \$? = $ac_status" >&5
+  echo "$as_me:29241: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:29229: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29243: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29232: \$? = $ac_status" >&5
+  echo "$as_me:29246: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -29241,13 +29255,13 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:29244: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:29258: 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:29250: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:29264: 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
 
@@ -29272,14 +29286,14 @@ EOF
 
 fi
 
-echo "$as_me:29275: checking if we should use fcntl or ioctl" >&5
+echo "$as_me:29289: 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 29282 "configure"
+#line 29296 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -29296,16 +29310,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29299: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29313: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29302: \$? = $ac_status" >&5
+  echo "$as_me:29316: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29305: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29319: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29308: \$? = $ac_status" >&5
+  echo "$as_me:29322: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fionbio=ioctl
 else
@@ -29313,7 +29327,7 @@ else
 cat conftest.$ac_ext >&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 29316 "configure"
+#line 29330 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -29335,16 +29349,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29338: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29352: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29341: \$? = $ac_status" >&5
+  echo "$as_me:29355: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29344: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29358: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29347: \$? = $ac_status" >&5
+  echo "$as_me:29361: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fionbio=fcntl
 else
@@ -29357,21 +29371,21 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:29360: result: $cf_cv_fionbio" >&5
+echo "$as_me:29374: 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:29367: checking for broken/missing definition of remove" >&5
+echo "$as_me:29381: 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 29374 "configure"
+#line 29388 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -29383,23 +29397,23 @@ remove("dummy")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29386: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29400: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29389: \$? = $ac_status" >&5
+  echo "$as_me:29403: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29392: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29406: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29395: \$? = $ac_status" >&5
+  echo "$as_me:29409: \$? = $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 29402 "configure"
+#line 29416 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 		int __unlink(name) { return unlink(name); }
@@ -29412,16 +29426,16 @@ remove("dummy")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29415: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29429: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29418: \$? = $ac_status" >&5
+  echo "$as_me:29432: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29421: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29435: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29424: \$? = $ac_status" >&5
+  echo "$as_me:29438: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_baddef_remove=yes
 else
@@ -29436,21 +29450,21 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:29439: result: $cf_cv_baddef_remove" >&5
+echo "$as_me:29453: 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:29446: checking for lstat" >&5
+echo "$as_me:29460: 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 29453 "configure"
+#line 29467 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -29464,16 +29478,16 @@ lstat(".", (struct stat *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29467: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29481: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29470: \$? = $ac_status" >&5
+  echo "$as_me:29484: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29473: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29487: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29476: \$? = $ac_status" >&5
+  echo "$as_me:29490: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_lstat=yes
 else
@@ -29485,7 +29499,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:29488: result: $ac_cv_func_lstat " >&5
+echo "$as_me:29502: result: $ac_cv_func_lstat " >&5
 echo "${ECHO_T}$ac_cv_func_lstat " >&6
 if test $ac_cv_func_lstat = yes; then
 
@@ -29520,13 +29534,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:29523: checking for $ac_func" >&5
+echo "$as_me:29537: 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 29529 "configure"
+#line 29543 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -29557,16 +29571,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:29560: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29574: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29563: \$? = $ac_status" >&5
+  echo "$as_me:29577: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29566: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29580: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29569: \$? = $ac_status" >&5
+  echo "$as_me:29583: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -29576,7 +29590,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:29579: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:29593: 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
@@ -29592,13 +29606,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:29595: checking for $ac_func" >&5
+echo "$as_me:29609: 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 29601 "configure"
+#line 29615 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -29629,16 +29643,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:29632: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29646: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29635: \$? = $ac_status" >&5
+  echo "$as_me:29649: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29638: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29652: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29641: \$? = $ac_status" >&5
+  echo "$as_me:29655: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -29648,7 +29662,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:29651: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:29665: 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
@@ -29660,7 +29674,7 @@ else
 fi
 done
 
-echo "$as_me:29663: checking for random-integer functions" >&5
+echo "$as_me:29677: 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
@@ -29680,7 +29694,7 @@ do
 	esac
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 29683 "configure"
+#line 29697 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -29699,16 +29713,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:29702: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29716: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29705: \$? = $ac_status" >&5
+  echo "$as_me:29719: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29708: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29722: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29711: \$? = $ac_status" >&5
+  echo "$as_me:29725: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_srand_func=$cf_func
  break
@@ -29720,10 +29734,10 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:29723: result: $cf_cv_srand_func" >&5
+echo "$as_me:29737: 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:29726: checking for range of random-integers" >&5
+	echo "$as_me:29740: 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
@@ -29744,7 +29758,7 @@ else
 			;;
 		esac
 		cat >conftest.$ac_ext <<_ACEOF
-#line 29747 "configure"
+#line 29761 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -29763,16 +29777,16 @@ long x = $cf_cv_rand_max
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29766: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29780: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29769: \$? = $ac_status" >&5
+  echo "$as_me:29783: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29772: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29786: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29775: \$? = $ac_status" >&5
+  echo "$as_me:29789: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -29783,15 +29797,15 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:29786: result: $cf_cv_rand_max" >&5
+echo "$as_me:29800: result: $cf_cv_rand_max" >&5
 echo "${ECHO_T}$cf_cv_rand_max" >&6
 
 	case $cf_cv_srand_func in
 	(*/arc4random)
-		echo "$as_me:29791: checking if <bsd/stdlib.h> should be included" >&5
+		echo "$as_me:29805: 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 29794 "configure"
+#line 29808 "configure"
 #include "confdefs.h"
 #include <bsd/stdlib.h>
 int
@@ -29804,23 +29818,23 @@ void *arc4random(int);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29807: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29821: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29810: \$? = $ac_status" >&5
+  echo "$as_me:29824: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29813: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29827: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29816: \$? = $ac_status" >&5
+  echo "$as_me:29830: \$? = $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 29823 "configure"
+#line 29837 "configure"
 #include "confdefs.h"
 #include <bsd/stdlib.h>
 int
@@ -29832,16 +29846,16 @@ unsigned x = arc4random()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29835: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29849: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29838: \$? = $ac_status" >&5
+  echo "$as_me:29852: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29841: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29855: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29844: \$? = $ac_status" >&5
+  echo "$as_me:29858: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_bsd_stdlib_h=yes
 else
@@ -29852,7 +29866,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-	    echo "$as_me:29855: result: $cf_bsd_stdlib_h" >&5
+	    echo "$as_me:29869: result: $cf_bsd_stdlib_h" >&5
 echo "${ECHO_T}$cf_bsd_stdlib_h" >&6
 		if test "$cf_bsd_stdlib_h" = yes
 		then
@@ -29862,10 +29876,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 		else
-			echo "$as_me:29865: checking if <bsd/random.h> should be included" >&5
+			echo "$as_me:29879: 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 29868 "configure"
+#line 29882 "configure"
 #include "confdefs.h"
 #include <bsd/random.h>
 int
@@ -29878,23 +29892,23 @@ void *arc4random(int);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29881: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29895: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29884: \$? = $ac_status" >&5
+  echo "$as_me:29898: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29887: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29901: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29890: \$? = $ac_status" >&5
+  echo "$as_me:29904: \$? = $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 29897 "configure"
+#line 29911 "configure"
 #include "confdefs.h"
 #include <bsd/random.h>
 int
@@ -29906,16 +29920,16 @@ unsigned x = arc4random()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29909: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29923: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29912: \$? = $ac_status" >&5
+  echo "$as_me:29926: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29915: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29929: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29918: \$? = $ac_status" >&5
+  echo "$as_me:29932: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_bsd_random_h=yes
 else
@@ -29926,7 +29940,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-			echo "$as_me:29929: result: $cf_bsd_random_h" >&5
+			echo "$as_me:29943: result: $cf_bsd_random_h" >&5
 echo "${ECHO_T}$cf_bsd_random_h" >&6
 			if test "$cf_bsd_random_h" = yes
 			then
@@ -29936,7 +29950,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 			else
-				{ echo "$as_me:29939: WARNING: no header file found for arc4random" >&5
+				{ echo "$as_me:29953: WARNING: no header file found for arc4random" >&5
 echo "$as_me: WARNING: no header file found for arc4random" >&2;}
 			fi
 		fi
@@ -29971,13 +29985,13 @@ fi
 for ac_func in sleep
 do
 
-echo "$as_me:29974: checking for $ac_func declaration" >&5
+echo "$as_me:29988: 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 29980 "configure"
+#line 29994 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -29998,20 +30012,20 @@ extern	int	$ac_func();
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30001: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30015: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30004: \$? = $ac_status" >&5
+  echo "$as_me:30018: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30007: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30021: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30010: \$? = $ac_status" >&5
+  echo "$as_me:30024: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 30014 "configure"
+#line 30028 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -30032,16 +30046,16 @@ int	(*p)() = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30035: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30049: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30038: \$? = $ac_status" >&5
+  echo "$as_me:30052: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30041: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30055: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30044: \$? = $ac_status" >&5
+  echo "$as_me:30058: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -30062,11 +30076,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:30065: result: yes" >&5
+  echo "$as_me:30079: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:30069: result: no" >&5
+  echo "$as_me:30083: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -30081,13 +30095,13 @@ done
 for ac_func in strstr
 do
 
-echo "$as_me:30084: checking for $ac_func declaration" >&5
+echo "$as_me:30098: 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 30090 "configure"
+#line 30104 "configure"
 #include "confdefs.h"
 #include <string.h>
 int
@@ -30101,20 +30115,20 @@ extern	int	$ac_func();
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30104: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30118: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30107: \$? = $ac_status" >&5
+  echo "$as_me:30121: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30110: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30124: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30113: \$? = $ac_status" >&5
+  echo "$as_me:30127: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 30117 "configure"
+#line 30131 "configure"
 #include "confdefs.h"
 #include <string.h>
 int
@@ -30128,16 +30142,16 @@ int	(*p)() = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30131: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30145: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30134: \$? = $ac_status" >&5
+  echo "$as_me:30148: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30137: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30151: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30140: \$? = $ac_status" >&5
+  echo "$as_me:30154: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -30158,11 +30172,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:30161: result: yes" >&5
+  echo "$as_me:30175: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:30165: result: no" >&5
+  echo "$as_me:30179: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -30177,13 +30191,13 @@ done
 for ac_func in getgrgid getgrnam
 do
 
-echo "$as_me:30180: checking for $ac_func declaration" >&5
+echo "$as_me:30194: 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 30186 "configure"
+#line 30200 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -30199,20 +30213,20 @@ extern	int	$ac_func();
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30202: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30216: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30205: \$? = $ac_status" >&5
+  echo "$as_me:30219: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30208: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30222: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30211: \$? = $ac_status" >&5
+  echo "$as_me:30225: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 30215 "configure"
+#line 30229 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -30228,16 +30242,16 @@ int	(*p)() = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30231: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30245: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30234: \$? = $ac_status" >&5
+  echo "$as_me:30248: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30237: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30251: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30240: \$? = $ac_status" >&5
+  echo "$as_me:30254: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -30258,11 +30272,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:30261: result: yes" >&5
+  echo "$as_me:30275: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:30265: result: no" >&5
+  echo "$as_me:30279: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -30274,14 +30288,14 @@ EOF
 fi
 done
 
-echo "$as_me:30277: checking if TRUE/FALSE are defined" >&5
+echo "$as_me:30291: 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 30284 "configure"
+#line 30298 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -30295,16 +30309,16 @@ int x = TRUE, y = FALSE
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30298: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30312: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30301: \$? = $ac_status" >&5
+  echo "$as_me:30315: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30304: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30318: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30307: \$? = $ac_status" >&5
+  echo "$as_me:30321: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_bool_defs=yes
 else
@@ -30315,7 +30329,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:30318: result: $cf_cv_bool_defs" >&5
+echo "$as_me:30332: result: $cf_cv_bool_defs" >&5
 echo "${ECHO_T}$cf_cv_bool_defs" >&6
 if test "$cf_cv_bool_defs" = no ; then
 
@@ -30329,14 +30343,14 @@ EOF
 
 fi
 
-echo "$as_me:30332: checking if external errno is declared" >&5
+echo "$as_me:30346: 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 30339 "configure"
+#line 30353 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -30354,16 +30368,16 @@ int x = (int) errno
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30357: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30371: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30360: \$? = $ac_status" >&5
+  echo "$as_me:30374: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30363: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30377: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30366: \$? = $ac_status" >&5
+  echo "$as_me:30380: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -30374,7 +30388,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:30377: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:30391: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -30389,14 +30403,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:30392: checking if external errno exists" >&5
+echo "$as_me:30406: 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 30399 "configure"
+#line 30413 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -30411,16 +30425,16 @@ errno = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30414: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30428: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30417: \$? = $ac_status" >&5
+  echo "$as_me:30431: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30420: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30434: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30423: \$? = $ac_status" >&5
+  echo "$as_me:30437: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_errno=yes
 else
@@ -30431,7 +30445,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:30434: result: $cf_cv_have_errno" >&5
+echo "$as_me:30448: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -30444,7 +30458,7 @@ EOF
 
 fi
 
-echo "$as_me:30447: checking if we can set errno" >&5
+echo "$as_me:30461: 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
@@ -30452,7 +30466,7 @@ else
 
 if test "$cross_compiling" = yes; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 30455 "configure"
+#line 30469 "configure"
 #include "confdefs.h"
 #include <errno.h>
 int
@@ -30464,16 +30478,16 @@ errno = 255
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30467: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30481: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30470: \$? = $ac_status" >&5
+  echo "$as_me:30484: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30473: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30487: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30476: \$? = $ac_status" >&5
+  echo "$as_me:30490: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_set_errno=maybe
 else
@@ -30484,7 +30498,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 30487 "configure"
+#line 30501 "configure"
 #include "confdefs.h"
 
 #include <errno.h>
@@ -30495,15 +30509,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:30498: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30512: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30501: \$? = $ac_status" >&5
+  echo "$as_me:30515: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:30503: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30517: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30506: \$? = $ac_status" >&5
+  echo "$as_me:30520: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_set_errno=yes
 else
@@ -30516,21 +30530,21 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:30519: result: $cf_cv_set_errno" >&5
+echo "$as_me:30533: 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:30526: checking for setlocale()" >&5
+echo "$as_me:30540: 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 30533 "configure"
+#line 30547 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int
@@ -30542,16 +30556,16 @@ setlocale(LC_ALL, "")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30545: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30559: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30548: \$? = $ac_status" >&5
+  echo "$as_me:30562: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30551: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30565: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30554: \$? = $ac_status" >&5
+  echo "$as_me:30568: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_locale=yes
 else
@@ -30563,7 +30577,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:30566: result: $cf_cv_locale" >&5
+echo "$as_me:30580: result: $cf_cv_locale" >&5
 echo "${ECHO_T}$cf_cv_locale" >&6
 test $cf_cv_locale = yes && {
 cat >>confdefs.h <<\EOF
@@ -30571,14 +30585,14 @@ cat >>confdefs.h <<\EOF
 EOF
  }
 
-echo "$as_me:30574: checking if NGROUPS is defined" >&5
+echo "$as_me:30588: 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 30581 "configure"
+#line 30595 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -30597,23 +30611,23 @@ int x = NGROUPS
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30600: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30614: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30603: \$? = $ac_status" >&5
+  echo "$as_me:30617: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30606: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30620: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30609: \$? = $ac_status" >&5
+  echo "$as_me:30623: \$? = $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 30616 "configure"
+#line 30630 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -30632,16 +30646,16 @@ int x = NGROUPS_MAX
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30635: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30649: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30638: \$? = $ac_status" >&5
+  echo "$as_me:30652: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30641: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30655: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30644: \$? = $ac_status" >&5
+  echo "$as_me:30658: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ngroups=NGROUPS_MAX
 else
@@ -30653,7 +30667,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:30656: result: $cf_cv_ngroups" >&5
+echo "$as_me:30670: result: $cf_cv_ngroups" >&5
 echo "${ECHO_T}$cf_cv_ngroups" >&6
 
 fi
@@ -30671,14 +30685,14 @@ EOF
 
 fi
 
-echo "$as_me:30674: checking if external sys_nerr is declared" >&5
+echo "$as_me:30688: 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 30681 "configure"
+#line 30695 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -30696,16 +30710,16 @@ int x = (int) sys_nerr
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30699: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30713: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30702: \$? = $ac_status" >&5
+  echo "$as_me:30716: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30705: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30719: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30708: \$? = $ac_status" >&5
+  echo "$as_me:30722: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_sys_nerr=yes
 else
@@ -30716,7 +30730,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:30719: result: $cf_cv_dcl_sys_nerr" >&5
+echo "$as_me:30733: 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
@@ -30731,14 +30745,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:30734: checking if external sys_nerr exists" >&5
+echo "$as_me:30748: 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 30741 "configure"
+#line 30755 "configure"
 #include "confdefs.h"
 
 #undef sys_nerr
@@ -30753,16 +30767,16 @@ sys_nerr = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30756: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30770: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30759: \$? = $ac_status" >&5
+  echo "$as_me:30773: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30762: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30776: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30765: \$? = $ac_status" >&5
+  echo "$as_me:30779: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_sys_nerr=yes
 else
@@ -30773,7 +30787,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:30776: result: $cf_cv_have_sys_nerr" >&5
+echo "$as_me:30790: 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
@@ -30786,14 +30800,14 @@ EOF
 
 fi
 
-echo "$as_me:30789: checking if external sys_errlist is declared" >&5
+echo "$as_me:30803: 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 30796 "configure"
+#line 30810 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -30811,16 +30825,16 @@ int x = (int) sys_errlist
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30814: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30828: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30817: \$? = $ac_status" >&5
+  echo "$as_me:30831: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30820: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30834: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30823: \$? = $ac_status" >&5
+  echo "$as_me:30837: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_sys_errlist=yes
 else
@@ -30831,7 +30845,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:30834: result: $cf_cv_dcl_sys_errlist" >&5
+echo "$as_me:30848: 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
@@ -30846,14 +30860,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:30849: checking if external sys_errlist exists" >&5
+echo "$as_me:30863: 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 30856 "configure"
+#line 30870 "configure"
 #include "confdefs.h"
 
 #undef sys_errlist
@@ -30868,16 +30882,16 @@ sys_errlist = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30871: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30885: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30874: \$? = $ac_status" >&5
+  echo "$as_me:30888: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30877: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30891: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30880: \$? = $ac_status" >&5
+  echo "$as_me:30894: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_sys_errlist=yes
 else
@@ -30888,7 +30902,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:30891: result: $cf_cv_have_sys_errlist" >&5
+echo "$as_me:30905: 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
@@ -30904,23 +30918,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:30907: checking for $ac_header" >&5
+echo "$as_me:30921: 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 30913 "configure"
+#line 30927 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:30917: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:30931: \"$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:30923: \$? = $ac_status" >&5
+  echo "$as_me:30937: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -30939,7 +30953,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:30942: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:30956: 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
@@ -30949,14 +30963,14 @@ EOF
 fi
 done
 
-echo "$as_me:30952: checking for lastlog path" >&5
+echo "$as_me:30966: 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 30959 "configure"
+#line 30973 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -30976,16 +30990,16 @@ char *path = _PATH_LASTLOG
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30979: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30993: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30982: \$? = $ac_status" >&5
+  echo "$as_me:30996: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30985: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30999: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30988: \$? = $ac_status" >&5
+  echo "$as_me:31002: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_path_lastlog="_PATH_LASTLOG"
 else
@@ -31000,14 +31014,14 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:31003: result: $cf_cv_path_lastlog" >&5
+echo "$as_me:31017: 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:31010: checking for utmp implementation" >&5
+echo "$as_me:31024: 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
@@ -31024,7 +31038,7 @@ cf_utmp_includes="
 #endif
 "
 	cat >conftest.$ac_ext <<_ACEOF
-#line 31027 "configure"
+#line 31041 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -31038,16 +31052,16 @@ struct $cf_header x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31041: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31055: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31044: \$? = $ac_status" >&5
+  echo "$as_me:31058: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31047: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31061: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31050: \$? = $ac_status" >&5
+  echo "$as_me:31064: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -31056,7 +31070,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 31059 "configure"
+#line 31073 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -31070,16 +31084,16 @@ struct $cf_header x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31073: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31087: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31076: \$? = $ac_status" >&5
+  echo "$as_me:31090: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31079: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31093: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31082: \$? = $ac_status" >&5
+  echo "$as_me:31096: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -31094,7 +31108,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:31097: result: $cf_cv_have_utmp" >&5
+echo "$as_me:31111: result: $cf_cv_have_utmp" >&5
 echo "${ECHO_T}$cf_cv_have_utmp" >&6
 
 if test $cf_cv_have_utmp != no ; then
@@ -31109,14 +31123,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:31112: checking if ${cf_cv_have_utmp}.ut_host is declared" >&5
+echo "$as_me:31126: 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 31119 "configure"
+#line 31133 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -31130,16 +31144,16 @@ struct $cf_cv_have_utmp x; char *y = &x.ut_host[0]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31133: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31147: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31136: \$? = $ac_status" >&5
+  echo "$as_me:31150: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31139: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31153: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31142: \$? = $ac_status" >&5
+  echo "$as_me:31156: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_host=yes
 else
@@ -31151,7 +31165,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:31154: result: $cf_cv_have_utmp_ut_host" >&5
+echo "$as_me:31168: 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
@@ -31161,14 +31175,14 @@ EOF
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:31164: checking if ${cf_cv_have_utmp}.ut_syslen is declared" >&5
+echo "$as_me:31178: 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 31171 "configure"
+#line 31185 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -31182,16 +31196,16 @@ struct $cf_cv_have_utmp x; int y = x.ut_syslen
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31185: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31199: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31188: \$? = $ac_status" >&5
+  echo "$as_me:31202: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31191: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31205: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31194: \$? = $ac_status" >&5
+  echo "$as_me:31208: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_syslen=yes
 else
@@ -31203,7 +31217,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:31206: result: $cf_cv_have_utmp_ut_syslen" >&5
+echo "$as_me:31220: 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
@@ -31213,7 +31227,7 @@ EOF
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:31216: checking if ${cf_cv_have_utmp}.ut_name is declared" >&5
+echo "$as_me:31230: 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
@@ -31230,7 +31244,7 @@ cf_utmp_includes="
 "
 for cf_header in ut_name ut_user ; do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 31233 "configure"
+#line 31247 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -31244,16 +31258,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31247: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31261: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31250: \$? = $ac_status" >&5
+  echo "$as_me:31264: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31253: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31267: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31256: \$? = $ac_status" >&5
+  echo "$as_me:31270: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_name=$cf_header
 	 break
@@ -31265,12 +31279,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:31268: result: $cf_cv_have_utmp_ut_name" >&5
+echo "$as_me:31282: 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:31273: error: Cannot find declaration for ut.ut_name" >&5
+	{ { echo "$as_me:31287: 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; }; }
 	;;
@@ -31285,7 +31299,7 @@ esac
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:31288: checking for exit-status in $cf_cv_have_utmp" >&5
+echo "$as_me:31302: 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
@@ -31298,7 +31312,7 @@ for cf_result in \
 	ut_exit.ut_exit
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 31301 "configure"
+#line 31315 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -31312,16 +31326,16 @@ struct $cf_cv_have_utmp x; long y = x.$cf_result = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31315: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31329: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31318: \$? = $ac_status" >&5
+  echo "$as_me:31332: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31321: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31335: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31324: \$? = $ac_status" >&5
+  echo "$as_me:31338: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_xstatus=$cf_result
 	 break
@@ -31334,7 +31348,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:31337: result: $cf_cv_have_utmp_ut_xstatus" >&5
+echo "$as_me:31351: 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
 
@@ -31350,14 +31364,14 @@ fi
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:31353: checking if ${cf_cv_have_utmp}.ut_xtime is declared" >&5
+echo "$as_me:31367: 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 31360 "configure"
+#line 31374 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -31371,23 +31385,23 @@ struct $cf_cv_have_utmp x; long y = x.ut_xtime = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31374: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31388: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31377: \$? = $ac_status" >&5
+  echo "$as_me:31391: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31380: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31394: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31383: \$? = $ac_status" >&5
+  echo "$as_me:31397: \$? = $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 31390 "configure"
+#line 31404 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -31401,16 +31415,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:31404: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31418: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31407: \$? = $ac_status" >&5
+  echo "$as_me:31421: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31410: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31424: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31413: \$? = $ac_status" >&5
+  echo "$as_me:31427: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_xtime=define
 else
@@ -31424,7 +31438,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:31427: result: $cf_cv_have_utmp_ut_xtime" >&5
+echo "$as_me:31441: 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
 
@@ -31443,14 +31457,14 @@ fi
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:31446: checking if ${cf_cv_have_utmp}.ut_session is declared" >&5
+echo "$as_me:31460: 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 31453 "configure"
+#line 31467 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -31464,16 +31478,16 @@ struct $cf_cv_have_utmp x; long y = x.ut_session
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31467: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31481: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31470: \$? = $ac_status" >&5
+  echo "$as_me:31484: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31473: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31487: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31476: \$? = $ac_status" >&5
+  echo "$as_me:31490: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_session=yes
 else
@@ -31484,7 +31498,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:31487: result: $cf_cv_have_utmp_ut_session" >&5
+echo "$as_me:31501: 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
 
@@ -31495,7 +31509,7 @@ EOF
 fi
 fi
 
-echo "$as_me:31498: checking if $cf_cv_have_utmp is SYSV flavor" >&5
+echo "$as_me:31512: 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
@@ -31503,7 +31517,7 @@ else
 
 test "$cf_cv_have_utmp" = "utmp" && cf_prefix="ut" || cf_prefix="utx"
 cat >conftest.$ac_ext <<_ACEOF
-#line 31506 "configure"
+#line 31520 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -31522,16 +31536,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31525: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31539: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31528: \$? = $ac_status" >&5
+  echo "$as_me:31542: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31531: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31545: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31534: \$? = $ac_status" >&5
+  echo "$as_me:31548: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_sysv_utmp=yes
 else
@@ -31542,7 +31556,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:31545: result: $cf_cv_sysv_utmp" >&5
+echo "$as_me:31559: result: $cf_cv_sysv_utmp" >&5
 echo "${ECHO_T}$cf_cv_sysv_utmp" >&6
 test $cf_cv_sysv_utmp = yes &&
 cat >>confdefs.h <<\EOF
@@ -31551,14 +31565,14 @@ EOF
 
 fi
 
-echo "$as_me:31554: checking if external h_errno exists" >&5
+echo "$as_me:31568: 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 31561 "configure"
+#line 31575 "configure"
 #include "confdefs.h"
 
 #undef h_errno
@@ -31573,16 +31587,16 @@ h_errno = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31576: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31590: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31579: \$? = $ac_status" >&5
+  echo "$as_me:31593: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31582: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31596: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31585: \$? = $ac_status" >&5
+  echo "$as_me:31599: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_h_errno=yes
 else
@@ -31593,7 +31607,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:31596: result: $cf_cv_have_h_errno" >&5
+echo "$as_me:31610: 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
@@ -31606,7 +31620,7 @@ EOF
 
 fi
 
-echo "$as_me:31609: checking if bibp: URLs should be supported" >&5
+echo "$as_me:31623: 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.
@@ -31623,14 +31637,14 @@ else
   use_bibp_urls=yes
 
 fi;
-echo "$as_me:31626: result: $use_bibp_urls" >&5
+echo "$as_me:31640: 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:31633: checking if configuration info should be browsable" >&5
+echo "$as_me:31647: 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.
@@ -31647,14 +31661,14 @@ else
   use_config_info=yes
 
 fi;
-echo "$as_me:31650: result: $use_config_info" >&5
+echo "$as_me:31664: 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:31657: checking if new-style forms-based options screen should be used" >&5
+echo "$as_me:31671: 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.
@@ -31671,14 +31685,14 @@ else
   use_forms_options=yes
 
 fi;
-echo "$as_me:31674: result: $use_forms_options" >&5
+echo "$as_me:31688: 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:31681: checking if old-style options menu should be used" >&5
+echo "$as_me:31695: 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.
@@ -31695,14 +31709,14 @@ else
   use_menu_options=yes
 
 fi;
-echo "$as_me:31698: result: $use_menu_options" >&5
+echo "$as_me:31712: 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:31705: checking if sessions code should be used" >&5
+echo "$as_me:31719: 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.
@@ -31719,7 +31733,7 @@ else
   use_sessions=yes
 
 fi;
-echo "$as_me:31722: result: $use_sessions" >&5
+echo "$as_me:31736: result: $use_sessions" >&5
 echo "${ECHO_T}$use_sessions" >&6
 if test $use_sessions != no ; then
 
@@ -31730,7 +31744,7 @@ EOF
 	EXTRA_OBJS="$EXTRA_OBJS LYSession\$o"
 fi
 
-echo "$as_me:31733: checking if session-caching code should be used" >&5
+echo "$as_me:31747: 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.
@@ -31747,7 +31761,7 @@ else
   use_session_cache=yes
 
 fi;
-echo "$as_me:31750: result: $use_session_cache" >&5
+echo "$as_me:31764: result: $use_session_cache" >&5
 echo "${ECHO_T}$use_session_cache" >&6
 if test $use_session_cache != no ; then
 
@@ -31757,7 +31771,7 @@ EOF
 
 fi
 
-echo "$as_me:31760: checking if address-list page should be used" >&5
+echo "$as_me:31774: 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.
@@ -31774,14 +31788,14 @@ else
   use_addrlist_page=yes
 
 fi;
-echo "$as_me:31777: result: $use_addrlist_page" >&5
+echo "$as_me:31791: 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:31784: checking if experimental CJK logic should be used" >&5
+echo "$as_me:31798: 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.
@@ -31798,14 +31812,14 @@ else
   use_cjk=no
 
 fi;
-echo "$as_me:31801: result: $use_cjk" >&5
+echo "$as_me:31815: 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:31808: checking if experimental Japanese UTF-8 logic should be used" >&5
+echo "$as_me:31822: 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.
@@ -31822,7 +31836,7 @@ else
   use_ja_utf8=no
 
 fi;
-echo "$as_me:31825: result: $use_ja_utf8" >&5
+echo "$as_me:31839: result: $use_ja_utf8" >&5
 echo "${ECHO_T}$use_ja_utf8" >&6
 if test $use_ja_utf8 != no ; then
 
@@ -31868,7 +31882,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 31871 "configure"
+#line 31885 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -31880,16 +31894,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31883: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31897: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31886: \$? = $ac_status" >&5
+  echo "$as_me:31900: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31889: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31903: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31892: \$? = $ac_status" >&5
+  echo "$as_me:31906: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -31906,7 +31920,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}:31909: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:31923: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -31947,7 +31961,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 31950 "configure"
+#line 31964 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -31959,16 +31973,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31962: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31976: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31965: \$? = $ac_status" >&5
+  echo "$as_me:31979: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31968: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31982: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31971: \$? = $ac_status" >&5
+  echo "$as_me:31985: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -31985,7 +31999,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}:31988: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:32002: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -32001,7 +32015,7 @@ echo "${as_me:-configure}:31988: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:32004: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:32018: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -32026,7 +32040,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}:32029: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:32043: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -32055,7 +32069,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}:32058: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:32072: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -32064,7 +32078,7 @@ echo "${as_me:-configure}:32058: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:32067: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:32081: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -32075,7 +32089,7 @@ done
 
 fi;
 
-  echo "$as_me:32078: checking for iconv" >&5
+  echo "$as_me:32092: 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
@@ -32086,12 +32100,12 @@ else
 cf_cv_header_path_iconv=
 cf_cv_library_path_iconv=
 
-echo "${as_me:-configure}:32089: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:32103: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 32094 "configure"
+#line 32108 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -32110,16 +32124,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32113: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32127: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32116: \$? = $ac_status" >&5
+  echo "$as_me:32130: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32119: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32133: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32122: \$? = $ac_status" >&5
+  echo "$as_me:32136: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -32133,7 +32147,7 @@ cat conftest.$ac_ext >&5
 LIBS="-liconv  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 32136 "configure"
+#line 32150 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -32152,16 +32166,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32155: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32169: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32158: \$? = $ac_status" >&5
+  echo "$as_me:32172: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32161: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32175: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32164: \$? = $ac_status" >&5
+  echo "$as_me:32178: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -32178,9 +32192,9 @@ cat conftest.$ac_ext >&5
 
 	test -n "$verbose" && echo "	find linkage for iconv library" 1>&6
 
-echo "${as_me:-configure}:32181: testing find linkage for iconv library ..." 1>&5
+echo "${as_me:-configure}:32195: testing find linkage for iconv library ..." 1>&5
 
-echo "${as_me:-configure}:32183: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:32197: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -32271,11 +32285,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}:32274: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:32288: 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 32278 "configure"
+#line 32292 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -32294,21 +32308,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32297: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32311: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32300: \$? = $ac_status" >&5
+  echo "$as_me:32314: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32303: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32317: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32306: \$? = $ac_status" >&5
+  echo "$as_me:32320: \$? = $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}:32311: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:32325: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
 
 				cf_cv_find_linkage_iconv=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -32326,7 +32340,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	if test "$cf_cv_find_linkage_iconv" = maybe ; then
 
-echo "${as_me:-configure}:32329: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:32343: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -32401,13 +32415,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}:32404: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:32418: 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 32410 "configure"
+#line 32424 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -32426,21 +32440,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32429: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32443: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32432: \$? = $ac_status" >&5
+  echo "$as_me:32446: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32435: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32449: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32438: \$? = $ac_status" >&5
+  echo "$as_me:32452: \$? = $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}:32443: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:32457: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
 
 					cf_cv_find_linkage_iconv=yes
 					cf_cv_library_file_iconv="-liconv"
@@ -32480,7 +32494,7 @@ am_cv_func_iconv="no, consider installing GNU libiconv"
 fi
 
 fi
-echo "$as_me:32483: result: $am_cv_func_iconv" >&5
+echo "$as_me:32497: result: $am_cv_func_iconv" >&5
 echo "${ECHO_T}$am_cv_func_iconv" >&6
 
   if test "$am_cv_func_iconv" = yes; then
@@ -32489,14 +32503,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_ICONV 1
 EOF
 
-    echo "$as_me:32492: checking if the declaration of iconv() needs const." >&5
+    echo "$as_me:32506: 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 32499 "configure"
+#line 32513 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -32521,16 +32535,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32524: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32538: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32527: \$? = $ac_status" >&5
+  echo "$as_me:32541: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32530: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32544: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32533: \$? = $ac_status" >&5
+  echo "$as_me:32547: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_proto_iconv_const=no
 else
@@ -32540,7 +32554,7 @@ am_cv_proto_iconv_const=yes
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:32543: result: $am_cv_proto_iconv_const" >&5
+echo "$as_me:32557: 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
@@ -32582,7 +32596,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 32585 "configure"
+#line 32599 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -32594,16 +32608,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32597: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32611: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32600: \$? = $ac_status" >&5
+  echo "$as_me:32614: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32603: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32617: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32606: \$? = $ac_status" >&5
+  echo "$as_me:32620: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -32620,7 +32634,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}:32623: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:32637: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -32657,7 +32671,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}:32660: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:32674: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -32681,7 +32695,7 @@ case $cf_cv_screen in
 esac
 
 if test "$use_dft_colors" != no ; then
-echo "$as_me:32684: checking if you want to use default-colors" >&5
+echo "$as_me:32698: 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.
@@ -32698,7 +32712,7 @@ else
   use_dft_colors=no
 
 fi;
-echo "$as_me:32701: result: $use_dft_colors" >&5
+echo "$as_me:32715: result: $use_dft_colors" >&5
 echo "${ECHO_T}$use_dft_colors" >&6
 test $use_dft_colors = "yes" &&
 cat >>confdefs.h <<\EOF
@@ -32707,7 +32721,7 @@ EOF
 
 fi
 
-echo "$as_me:32710: checking if experimental keyboard-layout logic should be used" >&5
+echo "$as_me:32724: 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.
@@ -32724,14 +32738,14 @@ else
   use_kbd_layout=no
 
 fi;
-echo "$as_me:32727: result: $use_kbd_layout" >&5
+echo "$as_me:32741: 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:32734: checking if experimental nested-table logic should be used" >&5
+echo "$as_me:32748: 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.
@@ -32748,14 +32762,14 @@ else
   use_nested_tables=no
 
 fi;
-echo "$as_me:32751: result: $use_nested_tables" >&5
+echo "$as_me:32765: 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:32758: checking if alternative line-edit bindings should be used" >&5
+echo "$as_me:32772: 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.
@@ -32772,14 +32786,14 @@ else
   use_alt_bindings=yes
 
 fi;
-echo "$as_me:32775: result: $use_alt_bindings" >&5
+echo "$as_me:32789: 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:32782: checking if ascii case-conversion should be used" >&5
+echo "$as_me:32796: 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.
@@ -32796,14 +32810,14 @@ else
   use_ascii_ctypes=yes
 
 fi;
-echo "$as_me:32799: result: $use_ascii_ctypes" >&5
+echo "$as_me:32813: 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:32806: checking if you want to use extended HTML DTD logic" >&5
+echo "$as_me:32820: 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.
@@ -32820,14 +32834,14 @@ else
   use_ext_htmldtd=yes
 
 fi;
-echo "$as_me:32823: result: $use_ext_htmldtd" >&5
+echo "$as_me:32837: 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:32830: checking if file-upload logic should be used" >&5
+echo "$as_me:32844: 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.
@@ -32844,14 +32858,14 @@ else
   use_file_upload=yes
 
 fi;
-echo "$as_me:32847: result: $use_file_upload" >&5
+echo "$as_me:32861: 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:32854: checking if IDNA support should be used" >&5
+echo "$as_me:32868: 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.
@@ -32868,7 +32882,7 @@ else
   use_idna=yes
 
 fi;
-echo "$as_me:32871: result: $use_idna" >&5
+echo "$as_me:32885: result: $use_idna" >&5
 echo "${ECHO_T}$use_idna" >&6
 
 if test "$use_idna" = yes ; then
@@ -32907,7 +32921,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 32910 "configure"
+#line 32924 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -32919,16 +32933,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32922: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32936: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32925: \$? = $ac_status" >&5
+  echo "$as_me:32939: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32928: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32942: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32931: \$? = $ac_status" >&5
+  echo "$as_me:32945: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -32945,7 +32959,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}:32948: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:32962: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -32986,7 +33000,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 32989 "configure"
+#line 33003 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -32998,16 +33012,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33001: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33015: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33004: \$? = $ac_status" >&5
+  echo "$as_me:33018: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33007: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33021: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33010: \$? = $ac_status" >&5
+  echo "$as_me:33024: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -33024,7 +33038,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}:33027: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:33041: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -33040,7 +33054,7 @@ echo "${as_me:-configure}:33027: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:33043: error: cannot find  under $use_idna" >&5
+{ { echo "$as_me:33057: error: cannot find  under $use_idna" >&5
 echo "$as_me: error: cannot find  under $use_idna" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -33065,7 +33079,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}:33068: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:33082: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -33094,7 +33108,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}:33097: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:33111: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -33103,7 +33117,7 @@ echo "${as_me:-configure}:33097: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:33106: error: cannot find  under $use_idna" >&5
+{ { echo "$as_me:33120: error: cannot find  under $use_idna" >&5
 echo "$as_me: error: cannot find  under $use_idna" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -33117,12 +33131,12 @@ done
 cf_cv_header_path_idn=
 cf_cv_library_path_idn=
 
-echo "${as_me:-configure}:33120: testing Starting FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:33134: testing Starting FIND_LINKAGE(idn,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 33125 "configure"
+#line 33139 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -33140,16 +33154,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33143: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33157: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33146: \$? = $ac_status" >&5
+  echo "$as_me:33160: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33149: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33163: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33152: \$? = $ac_status" >&5
+  echo "$as_me:33166: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_idn=yes
@@ -33163,7 +33177,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lidn $LIBICONV $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 33166 "configure"
+#line 33180 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -33181,16 +33195,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33184: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33198: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33187: \$? = $ac_status" >&5
+  echo "$as_me:33201: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33190: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33204: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33193: \$? = $ac_status" >&5
+  echo "$as_me:33207: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_idn=yes
@@ -33207,9 +33221,9 @@ cat conftest.$ac_ext >&5
 
 	test -n "$verbose" && echo "	find linkage for idn library" 1>&6
 
-echo "${as_me:-configure}:33210: testing find linkage for idn library ..." 1>&5
+echo "${as_me:-configure}:33224: testing find linkage for idn library ..." 1>&5
 
-echo "${as_me:-configure}:33212: testing Searching for headers in FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:33226: testing Searching for headers in FIND_LINKAGE(idn,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -33300,11 +33314,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}:33303: testing ... testing $cf_cv_header_path_idn ..." 1>&5
+echo "${as_me:-configure}:33317: 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 33307 "configure"
+#line 33321 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -33322,21 +33336,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33325: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33339: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33328: \$? = $ac_status" >&5
+  echo "$as_me:33342: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33331: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33345: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33334: \$? = $ac_status" >&5
+  echo "$as_me:33348: \$? = $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}:33339: testing ... found idn headers in $cf_cv_header_path_idn ..." 1>&5
+echo "${as_me:-configure}:33353: testing ... found idn headers in $cf_cv_header_path_idn ..." 1>&5
 
 				cf_cv_find_linkage_idn=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -33354,7 +33368,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	if test "$cf_cv_find_linkage_idn" = maybe ; then
 
-echo "${as_me:-configure}:33357: testing Searching for idn library in FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:33371: testing Searching for idn library in FIND_LINKAGE(idn,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -33429,13 +33443,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}:33432: testing ... testing $cf_cv_library_path_idn ..." 1>&5
+echo "${as_me:-configure}:33446: 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 33438 "configure"
+#line 33452 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -33453,21 +33467,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33456: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33470: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33459: \$? = $ac_status" >&5
+  echo "$as_me:33473: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33462: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33476: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33465: \$? = $ac_status" >&5
+  echo "$as_me:33479: \$? = $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}:33470: testing ... found idn library in $cf_cv_library_path_idn ..." 1>&5
+echo "${as_me:-configure}:33484: testing ... found idn library in $cf_cv_library_path_idn ..." 1>&5
 
 					cf_cv_find_linkage_idn=yes
 					cf_cv_library_file_idn="-lidn"
@@ -33526,7 +33540,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 33529 "configure"
+#line 33543 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -33538,16 +33552,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33541: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33555: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33544: \$? = $ac_status" >&5
+  echo "$as_me:33558: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33547: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33561: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33550: \$? = $ac_status" >&5
+  echo "$as_me:33564: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -33564,7 +33578,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}:33567: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:33581: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -33598,7 +33612,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}:33601: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:33615: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -33623,7 +33637,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:33626: WARNING: Cannot find idn library" >&5
+{ echo "$as_me:33640: WARNING: Cannot find idn library" >&5
 echo "$as_me: WARNING: Cannot find idn library" >&2;}
 fi
 
@@ -33637,7 +33651,7 @@ fi
 
 fi
 
-echo "$as_me:33640: checking if element-justification logic should be used" >&5
+echo "$as_me:33654: 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.
@@ -33654,14 +33668,14 @@ else
   use_justify_elts=yes
 
 fi;
-echo "$as_me:33657: result: $use_justify_elts" >&5
+echo "$as_me:33671: 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:33664: checking if partial-display should be used" >&5
+echo "$as_me:33678: 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.
@@ -33678,14 +33692,14 @@ else
   use_partial_display=yes
 
 fi;
-echo "$as_me:33681: result: $use_partial_display" >&5
+echo "$as_me:33695: 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:33688: checking if persistent-cookie logic should be used" >&5
+echo "$as_me:33702: 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.
@@ -33702,14 +33716,14 @@ else
   use_filed_cookies=yes
 
 fi;
-echo "$as_me:33705: result: $use_filed_cookies" >&5
+echo "$as_me:33719: 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:33712: checking if html source should be colorized" >&5
+echo "$as_me:33726: 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.
@@ -33726,14 +33740,14 @@ else
   use_prettysrc=yes
 
 fi;
-echo "$as_me:33729: result: $use_prettysrc" >&5
+echo "$as_me:33743: 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:33736: checking if progress-bar code should be used" >&5
+echo "$as_me:33750: 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.
@@ -33750,14 +33764,14 @@ else
   use_progressbar=yes
 
 fi;
-echo "$as_me:33753: result: $use_progressbar" >&5
+echo "$as_me:33767: 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:33760: checking if read-progress message should show ETA" >&5
+echo "$as_me:33774: 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.
@@ -33774,14 +33788,14 @@ else
   use_read_eta=yes
 
 fi;
-echo "$as_me:33777: result: $use_read_eta" >&5
+echo "$as_me:33791: 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:33784: checking if source caching should be used" >&5
+echo "$as_me:33798: 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.
@@ -33798,14 +33812,14 @@ else
   use_source_cache=yes
 
 fi;
-echo "$as_me:33801: result: $use_source_cache" >&5
+echo "$as_me:33815: 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:33808: checking if scrollbar code should be used" >&5
+echo "$as_me:33822: 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.
@@ -33822,10 +33836,10 @@ else
   use_scrollbar=yes
 
 fi;
-echo "$as_me:33825: result: $use_scrollbar" >&5
+echo "$as_me:33839: result: $use_scrollbar" >&5
 echo "${ECHO_T}$use_scrollbar" >&6
 
-echo "$as_me:33828: checking if charset-selection logic should be used" >&5
+echo "$as_me:33842: 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.
@@ -33842,14 +33856,14 @@ else
   use_charset_choice=no
 
 fi;
-echo "$as_me:33845: result: $use_charset_choice" >&5
+echo "$as_me:33859: 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:33852: checking if you want to use external commands" >&5
+echo "$as_me:33866: 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.
@@ -33866,7 +33880,7 @@ else
   use_externs=no
 
 fi;
-echo "$as_me:33869: result: $use_externs" >&5
+echo "$as_me:33883: result: $use_externs" >&5
 echo "${ECHO_T}$use_externs" >&6
 if test $use_externs != "no" ; then
 
@@ -33877,7 +33891,7 @@ EOF
 	EXTRA_OBJS="$EXTRA_OBJS LYExtern\$o"
 fi
 
-echo "$as_me:33880: checking if you want to use setfont support" >&5
+echo "$as_me:33894: 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.
@@ -33894,7 +33908,7 @@ else
   use_setfont=no
 
 fi;
-echo "$as_me:33897: result: $use_setfont" >&5
+echo "$as_me:33911: result: $use_setfont" >&5
 echo "${ECHO_T}$use_setfont" >&6
 if test $use_setfont = yes ; then
 	case $host_os in
@@ -33905,7 +33919,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:33908: checking for $ac_word" >&5
+echo "$as_me:33922: 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
@@ -33922,7 +33936,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:33925: found $ac_dir/$ac_word" >&5
+   echo "$as_me:33939: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -33933,10 +33947,10 @@ fi
 SETFONT=$ac_cv_path_SETFONT
 
 if test -n "$SETFONT"; then
-  echo "$as_me:33936: result: $SETFONT" >&5
+  echo "$as_me:33950: result: $SETFONT" >&5
 echo "${ECHO_T}$SETFONT" >&6
 else
-  echo "$as_me:33939: result: no" >&5
+  echo "$as_me:33953: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -33995,7 +34009,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:33998: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:34012: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define SETFONT_PATH "$cf_path_prog"
@@ -34013,19 +34027,19 @@ fi
 		SETFONT=built-in
 		test -n "$verbose" && echo "	Assume $host_os has font-switching" 1>&6
 
-echo "${as_me:-configure}:34016: testing Assume $host_os has font-switching ..." 1>&5
+echo "${as_me:-configure}:34030: 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}:34023: testing Assume $host_os has no font-switching ..." 1>&5
+echo "${as_me:-configure}:34037: testing Assume $host_os has no font-switching ..." 1>&5
 
 		;;
 	esac
 	if test -z "$SETFONT" ; then
-		{ echo "$as_me:34028: WARNING: Cannot find a font-setting program" >&5
+		{ echo "$as_me:34042: WARNING: Cannot find a font-setting program" >&5
 echo "$as_me: WARNING: Cannot find a font-setting program" >&2;}
 	elif test "$SETFONT" != unknown ; then
 
@@ -34036,7 +34050,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:34039: checking if you want cgi-link support" >&5
+echo "$as_me:34053: 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.
@@ -34053,10 +34067,10 @@ EOF
 else
   enableval=no
 fi;
-echo "$as_me:34056: result: $enableval" >&5
+echo "$as_me:34070: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:34059: checking if you want change-exec support" >&5
+echo "$as_me:34073: 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.
@@ -34073,14 +34087,14 @@ else
   use_change_exec=no
 
 fi;
-echo "$as_me:34076: result: $use_change_exec" >&5
+echo "$as_me:34090: 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:34083: checking if you want exec-links support" >&5
+echo "$as_me:34097: 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.
@@ -34097,14 +34111,14 @@ else
   use_exec_links=$enableval
 
 fi;
-echo "$as_me:34100: result: $use_exec_links" >&5
+echo "$as_me:34114: 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:34107: checking if you want exec-scripts support" >&5
+echo "$as_me:34121: 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.
@@ -34121,14 +34135,14 @@ else
   use_exec_scripts=$enableval
 
 fi;
-echo "$as_me:34124: result: $use_exec_scripts" >&5
+echo "$as_me:34138: 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:34131: checking if you want internal-links feature" >&5
+echo "$as_me:34145: 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.
@@ -34145,14 +34159,14 @@ else
   use_internal_links=no
 
 fi;
-echo "$as_me:34148: result: $use_internal_links" >&5
+echo "$as_me:34162: 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:34155: checking if you want to fork NSL requests" >&5
+echo "$as_me:34169: 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.
@@ -34169,7 +34183,7 @@ else
   use_nsl_fork=no
 
 fi;
-echo "$as_me:34172: result: $use_nsl_fork" >&5
+echo "$as_me:34186: result: $use_nsl_fork" >&5
 echo "${ECHO_T}$use_nsl_fork" >&6
 if test $use_nsl_fork = yes ; then
 	case $host_os in
@@ -34190,7 +34204,7 @@ EOF
 	esac
 fi
 
-echo "$as_me:34193: checking if you want to log URL requests via syslog" >&5
+echo "$as_me:34207: 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.
@@ -34207,14 +34221,14 @@ else
   use_syslog=no
 
 fi;
-echo "$as_me:34210: result: $use_syslog" >&5
+echo "$as_me:34224: 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:34217: checking if you want to underline links" >&5
+echo "$as_me:34231: 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.
@@ -34231,7 +34245,7 @@ else
   use_underline=no
 
 fi;
-echo "$as_me:34234: result: $use_underline" >&5
+echo "$as_me:34248: result: $use_underline" >&5
 echo "${ECHO_T}$use_underline" >&6
 test $use_underline = yes &&
 cat >>confdefs.h <<\EOF
@@ -34243,7 +34257,7 @@ cat >>confdefs.h <<\EOF
 #define UNDERLINE_LINKS 0
 EOF
 
-echo "$as_me:34246: checking if help files should be gzip'ed" >&5
+echo "$as_me:34260: 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.
@@ -34260,10 +34274,10 @@ else
   use_gzip_help=no
 
 fi;
-echo "$as_me:34263: result: $use_gzip_help" >&5
+echo "$as_me:34277: result: $use_gzip_help" >&5
 echo "${ECHO_T}$use_gzip_help" >&6
 
-echo "$as_me:34266: checking if you want to use libbz2 for decompression of some bzip2 files" >&5
+echo "$as_me:34280: 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.
@@ -34273,7 +34287,7 @@ if test "${with_bzlib+set}" = set; then
 else
   use_bzlib=no
 fi;
-echo "$as_me:34276: result: $use_bzlib" >&5
+echo "$as_me:34290: result: $use_bzlib" >&5
 echo "${ECHO_T}$use_bzlib" >&6
 
 if test ".$use_bzlib" != ".no" ; then
@@ -34312,7 +34326,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 34315 "configure"
+#line 34329 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -34324,16 +34338,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34327: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34341: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34330: \$? = $ac_status" >&5
+  echo "$as_me:34344: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:34333: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34347: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34336: \$? = $ac_status" >&5
+  echo "$as_me:34350: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -34350,7 +34364,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}:34353: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:34367: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -34391,7 +34405,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 34394 "configure"
+#line 34408 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -34403,16 +34417,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34406: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34420: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34409: \$? = $ac_status" >&5
+  echo "$as_me:34423: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:34412: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34426: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34415: \$? = $ac_status" >&5
+  echo "$as_me:34429: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -34429,7 +34443,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}:34432: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:34446: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -34445,7 +34459,7 @@ echo "${as_me:-configure}:34432: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:34448: error: cannot find  under $use_bzlib" >&5
+{ { echo "$as_me:34462: error: cannot find  under $use_bzlib" >&5
 echo "$as_me: error: cannot find  under $use_bzlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -34470,7 +34484,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}:34473: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:34487: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -34499,7 +34513,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}:34502: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:34516: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -34508,7 +34522,7 @@ echo "${as_me:-configure}:34502: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:34511: error: cannot find  under $use_bzlib" >&5
+{ { echo "$as_me:34525: error: cannot find  under $use_bzlib" >&5
 echo "$as_me: error: cannot find  under $use_bzlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -34522,12 +34536,12 @@ done
 cf_cv_header_path_bz2=
 cf_cv_library_path_bz2=
 
-echo "${as_me:-configure}:34525: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:34539: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 34530 "configure"
+#line 34544 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -34544,16 +34558,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34547: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34561: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34550: \$? = $ac_status" >&5
+  echo "$as_me:34564: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:34553: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34567: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34556: \$? = $ac_status" >&5
+  echo "$as_me:34570: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_bz2=yes
@@ -34567,7 +34581,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lbz2  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 34570 "configure"
+#line 34584 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -34584,16 +34598,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34587: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34601: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34590: \$? = $ac_status" >&5
+  echo "$as_me:34604: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:34593: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34607: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34596: \$? = $ac_status" >&5
+  echo "$as_me:34610: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_bz2=yes
@@ -34610,9 +34624,9 @@ cat conftest.$ac_ext >&5
 
 	test -n "$verbose" && echo "	find linkage for bz2 library" 1>&6
 
-echo "${as_me:-configure}:34613: testing find linkage for bz2 library ..." 1>&5
+echo "${as_me:-configure}:34627: testing find linkage for bz2 library ..." 1>&5
 
-echo "${as_me:-configure}:34615: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:34629: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -34703,11 +34717,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}:34706: testing ... testing $cf_cv_header_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:34720: 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 34710 "configure"
+#line 34724 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -34724,21 +34738,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34727: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34741: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34730: \$? = $ac_status" >&5
+  echo "$as_me:34744: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:34733: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34747: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34736: \$? = $ac_status" >&5
+  echo "$as_me:34750: \$? = $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}:34741: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:34755: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5
 
 				cf_cv_find_linkage_bz2=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -34756,7 +34770,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	if test "$cf_cv_find_linkage_bz2" = maybe ; then
 
-echo "${as_me:-configure}:34759: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:34773: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -34764,7 +34778,7 @@ echo "${as_me:-configure}:34759: testing Searching for bz2 library in FIND_LINKA
 		CPPFLAGS="$cf_test_CPPFLAGS"
 		LIBS="-lbz2  $cf_save_LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 34767 "configure"
+#line 34781 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -34781,21 +34795,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34784: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34798: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34787: \$? = $ac_status" >&5
+  echo "$as_me:34801: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:34790: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34804: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34793: \$? = $ac_status" >&5
+  echo "$as_me:34807: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 			test -n "$verbose" && echo "	... found bz2 library in system" 1>&6
 
-echo "${as_me:-configure}:34798: testing ... found bz2 library in system ..." 1>&5
+echo "${as_me:-configure}:34812: testing ... found bz2 library in system ..." 1>&5
 
 			cf_cv_find_linkage_bz2=yes
 else
@@ -34876,13 +34890,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}:34879: testing ... testing $cf_cv_library_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:34893: 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 34885 "configure"
+#line 34899 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -34899,21 +34913,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34902: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34916: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34905: \$? = $ac_status" >&5
+  echo "$as_me:34919: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:34908: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34922: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34911: \$? = $ac_status" >&5
+  echo "$as_me:34925: \$? = $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}:34916: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:34930: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5
 
 					cf_cv_find_linkage_bz2=yes
 					cf_cv_library_file_bz2="-lbz2"
@@ -34972,7 +34986,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 34975 "configure"
+#line 34989 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -34984,16 +34998,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34987: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35001: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34990: \$? = $ac_status" >&5
+  echo "$as_me:35004: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:34993: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35007: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34996: \$? = $ac_status" >&5
+  echo "$as_me:35010: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -35010,7 +35024,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}:35013: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:35027: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -35044,7 +35058,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}:35047: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:35061: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -35069,7 +35083,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:35072: WARNING: Cannot find bz2 library" >&5
+{ echo "$as_me:35086: WARNING: Cannot find bz2 library" >&5
 echo "$as_me: WARNING: Cannot find bz2 library" >&2;}
 fi
 
@@ -35080,7 +35094,7 @@ EOF
 
 fi
 
-echo "$as_me:35083: checking if you want to use zlib for decompression of some gzip files" >&5
+echo "$as_me:35097: 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.
@@ -35090,7 +35104,7 @@ if test "${with_zlib+set}" = set; then
 else
   use_zlib=no
 fi;
-echo "$as_me:35093: result: $use_zlib" >&5
+echo "$as_me:35107: result: $use_zlib" >&5
 echo "${ECHO_T}$use_zlib" >&6
 
 if test ".$use_zlib" != ".no" ; then
@@ -35129,7 +35143,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 35132 "configure"
+#line 35146 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -35141,16 +35155,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:35144: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35158: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35147: \$? = $ac_status" >&5
+  echo "$as_me:35161: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:35150: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35164: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35153: \$? = $ac_status" >&5
+  echo "$as_me:35167: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -35167,7 +35181,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}:35170: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:35184: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -35208,7 +35222,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 35211 "configure"
+#line 35225 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -35220,16 +35234,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:35223: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35237: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35226: \$? = $ac_status" >&5
+  echo "$as_me:35240: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:35229: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35243: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35232: \$? = $ac_status" >&5
+  echo "$as_me:35246: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -35246,7 +35260,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}:35249: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:35263: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -35262,7 +35276,7 @@ echo "${as_me:-configure}:35249: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:35265: error: cannot find  under $use_zlib" >&5
+{ { echo "$as_me:35279: error: cannot find  under $use_zlib" >&5
 echo "$as_me: error: cannot find  under $use_zlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -35287,7 +35301,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}:35290: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:35304: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -35316,7 +35330,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}:35319: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:35333: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -35325,7 +35339,7 @@ echo "${as_me:-configure}:35319: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:35328: error: cannot find  under $use_zlib" >&5
+{ { echo "$as_me:35342: error: cannot find  under $use_zlib" >&5
 echo "$as_me: error: cannot find  under $use_zlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -35339,12 +35353,12 @@ done
 cf_cv_header_path_z=
 cf_cv_library_path_z=
 
-echo "${as_me:-configure}:35342: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:35356: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 35347 "configure"
+#line 35361 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -35360,16 +35374,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35363: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35377: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35366: \$? = $ac_status" >&5
+  echo "$as_me:35380: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35369: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35383: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35372: \$? = $ac_status" >&5
+  echo "$as_me:35386: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_z=yes
@@ -35383,7 +35397,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lz  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 35386 "configure"
+#line 35400 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -35399,16 +35413,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35402: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35416: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35405: \$? = $ac_status" >&5
+  echo "$as_me:35419: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35408: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35422: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35411: \$? = $ac_status" >&5
+  echo "$as_me:35425: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_z=yes
@@ -35425,9 +35439,9 @@ cat conftest.$ac_ext >&5
 
 	test -n "$verbose" && echo "	find linkage for z library" 1>&6
 
-echo "${as_me:-configure}:35428: testing find linkage for z library ..." 1>&5
+echo "${as_me:-configure}:35442: testing find linkage for z library ..." 1>&5
 
-echo "${as_me:-configure}:35430: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:35444: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -35518,11 +35532,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}:35521: testing ... testing $cf_cv_header_path_z ..." 1>&5
+echo "${as_me:-configure}:35535: 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 35525 "configure"
+#line 35539 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -35538,21 +35552,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:35541: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35555: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35544: \$? = $ac_status" >&5
+  echo "$as_me:35558: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:35547: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35561: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35550: \$? = $ac_status" >&5
+  echo "$as_me:35564: \$? = $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}:35555: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5
+echo "${as_me:-configure}:35569: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5
 
 				cf_cv_find_linkage_z=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -35570,7 +35584,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	if test "$cf_cv_find_linkage_z" = maybe ; then
 
-echo "${as_me:-configure}:35573: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:35587: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -35578,7 +35592,7 @@ echo "${as_me:-configure}:35573: testing Searching for z library in FIND_LINKAGE
 		CPPFLAGS="$cf_test_CPPFLAGS"
 		LIBS="-lz  $cf_save_LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 35581 "configure"
+#line 35595 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -35594,21 +35608,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35597: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35611: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35600: \$? = $ac_status" >&5
+  echo "$as_me:35614: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35603: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35617: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35606: \$? = $ac_status" >&5
+  echo "$as_me:35620: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 			test -n "$verbose" && echo "	... found z library in system" 1>&6
 
-echo "${as_me:-configure}:35611: testing ... found z library in system ..." 1>&5
+echo "${as_me:-configure}:35625: testing ... found z library in system ..." 1>&5
 
 			cf_cv_find_linkage_z=yes
 else
@@ -35689,13 +35703,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}:35692: testing ... testing $cf_cv_library_path_z ..." 1>&5
+echo "${as_me:-configure}:35706: 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 35698 "configure"
+#line 35712 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -35711,21 +35725,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35714: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35728: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35717: \$? = $ac_status" >&5
+  echo "$as_me:35731: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35720: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35734: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35723: \$? = $ac_status" >&5
+  echo "$as_me:35737: \$? = $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}:35728: testing ... found z library in $cf_cv_library_path_z ..." 1>&5
+echo "${as_me:-configure}:35742: testing ... found z library in $cf_cv_library_path_z ..." 1>&5
 
 					cf_cv_find_linkage_z=yes
 					cf_cv_library_file_z="-lz"
@@ -35784,7 +35798,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 35787 "configure"
+#line 35801 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -35796,16 +35810,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:35799: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35813: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35802: \$? = $ac_status" >&5
+  echo "$as_me:35816: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:35805: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35819: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35808: \$? = $ac_status" >&5
+  echo "$as_me:35822: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -35822,7 +35836,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}:35825: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:35839: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -35856,7 +35870,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}:35859: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:35873: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -35881,7 +35895,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:35884: WARNING: Cannot find z library" >&5
+{ echo "$as_me:35898: WARNING: Cannot find z library" >&5
 echo "$as_me: WARNING: Cannot find z library" >&2;}
 fi
 
@@ -35890,13 +35904,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:35893: checking for $ac_func" >&5
+echo "$as_me:35907: 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 35899 "configure"
+#line 35913 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -35927,16 +35941,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:35930: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35944: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35933: \$? = $ac_status" >&5
+  echo "$as_me:35947: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35936: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35950: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35939: \$? = $ac_status" >&5
+  echo "$as_me:35953: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -35946,7 +35960,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:35949: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:35963: 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
@@ -35963,7 +35977,7 @@ EOF
 
 fi
 
-echo "$as_me:35966: checking if you want to exclude FINGER code" >&5
+echo "$as_me:35980: 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.
@@ -35980,14 +35994,14 @@ else
   use_finger=no
 
 fi;
-echo "$as_me:35983: result: $use_finger" >&5
+echo "$as_me:35997: 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:35990: checking if you want to exclude GOPHER code" >&5
+echo "$as_me:36004: 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.
@@ -36004,14 +36018,14 @@ else
   use_gopher=no
 
 fi;
-echo "$as_me:36007: result: $use_gopher" >&5
+echo "$as_me:36021: 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:36014: checking if you want to exclude NEWS code" >&5
+echo "$as_me:36028: 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.
@@ -36028,14 +36042,14 @@ else
   use_news=no
 
 fi;
-echo "$as_me:36031: result: $use_news" >&5
+echo "$as_me:36045: 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:36038: checking if you want to exclude FTP code" >&5
+echo "$as_me:36052: 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.
@@ -36052,14 +36066,14 @@ else
   use_ftp=no
 
 fi;
-echo "$as_me:36055: result: $use_ftp" >&5
+echo "$as_me:36069: 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:36062: checking if you want to include WAIS code" >&5
+echo "$as_me:36076: 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.
@@ -36076,13 +36090,13 @@ else
   use_wais=no
 
 fi;
-echo "$as_me:36079: result: $use_wais" >&5
+echo "$as_me:36093: result: $use_wais" >&5
 echo "${ECHO_T}$use_wais" >&6
 
 MAKE_WAIS="#"
 if test $use_wais != "no"
 then
-	echo "$as_me:36085: checking for fs_free in -lwais" >&5
+	echo "$as_me:36099: 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
@@ -36090,7 +36104,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lwais  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 36093 "configure"
+#line 36107 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -36109,16 +36123,16 @@ fs_free ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36112: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36126: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36115: \$? = $ac_status" >&5
+  echo "$as_me:36129: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36118: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36132: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36121: \$? = $ac_status" >&5
+  echo "$as_me:36135: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_wais_fs_free=yes
 else
@@ -36129,18 +36143,18 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:36132: result: $ac_cv_lib_wais_fs_free" >&5
+echo "$as_me:36146: 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:36136: checking if -lm needed for math functions" >&5
+echo "$as_me:36150: 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 36143 "configure"
+#line 36157 "configure"
 #include "confdefs.h"
 
 	#include <stdio.h>
@@ -36155,16 +36169,16 @@ double x = rand(); printf("result = %g\n", sin(x))
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36158: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36172: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36161: \$? = $ac_status" >&5
+  echo "$as_me:36175: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36164: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36178: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36167: \$? = $ac_status" >&5
+  echo "$as_me:36181: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_libm=no
 else
@@ -36174,7 +36188,7 @@ cf_cv_need_libm=yes
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:36177: result: $cf_cv_need_libm" >&5
+echo "$as_me:36191: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
 if test "$cf_cv_need_libm" = yes
 then
@@ -36216,23 +36230,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:36219: checking for $ac_header" >&5
+echo "$as_me:36233: 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 36225 "configure"
+#line 36239 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:36229: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:36243: \"$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:36235: \$? = $ac_status" >&5
+  echo "$as_me:36249: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -36251,7 +36265,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:36254: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:36268: 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
@@ -36264,7 +36278,7 @@ done
 		MAKE_WAIS=
 
 else
-  { echo "$as_me:36267: WARNING: could not find WAIS library" >&5
+  { echo "$as_me:36281: WARNING: could not find WAIS library" >&5
 echo "$as_me: WARNING: could not find WAIS library" >&2;}
 fi
 
@@ -36272,7 +36286,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:36275: checking if directory-editor code should be used" >&5
+echo "$as_me:36289: 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.
@@ -36289,7 +36303,7 @@ else
   use_dired=yes
 
 fi;
-echo "$as_me:36292: result: $use_dired" >&5
+echo "$as_me:36306: result: $use_dired" >&5
 echo "${ECHO_T}$use_dired" >&6
 
 if test ".$use_dired" != ".no" ; then
@@ -36299,7 +36313,7 @@ cat >>confdefs.h <<\EOF
 #define DIRED_SUPPORT 1
 EOF
 
-	echo "$as_me:36302: checking if you wish to allow extracting from archives via DirEd" >&5
+	echo "$as_me:36316: 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.
@@ -36316,10 +36330,10 @@ EOF
 else
   enableval=yes
 fi;
-	echo "$as_me:36319: result: $enableval" >&5
+	echo "$as_me:36333: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:36322: checking if DirEd mode should override keys" >&5
+	echo "$as_me:36336: 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.
@@ -36343,10 +36357,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:36346: result: $enableval" >&5
+	echo "$as_me:36360: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:36349: checking if you wish to allow permissions commands via DirEd" >&5
+	echo "$as_me:36363: 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.
@@ -36370,10 +36384,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:36373: result: $enableval" >&5
+	echo "$as_me:36387: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:36376: checking if you wish to allow executable-permission commands via DirEd" >&5
+	echo "$as_me:36390: 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.
@@ -36390,10 +36404,10 @@ EOF
 else
   enableval=yes
 fi;
-	echo "$as_me:36393: result: $enableval" >&5
+	echo "$as_me:36407: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:36396: checking if you wish to allow \"tar\" commands from DirEd" >&5
+	echo "$as_me:36410: 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.
@@ -36417,10 +36431,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:36420: result: $enableval" >&5
+	echo "$as_me:36434: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:36423: checking if you wish to allow \"uudecode\" commands from DirEd" >&5
+	echo "$as_me:36437: 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.
@@ -36444,10 +36458,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:36447: result: $enableval" >&5
+	echo "$as_me:36461: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:36450: checking if you wish to allow \"zip\" and \"unzip\" commands from DirEd" >&5
+	echo "$as_me:36464: 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.
@@ -36471,10 +36485,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:36474: result: $enableval" >&5
+	echo "$as_me:36488: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:36477: checking if you wish to allow \"gzip\" and \"gunzip\" commands from DirEd" >&5
+	echo "$as_me:36491: 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.
@@ -36498,11 +36512,11 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:36501: result: $enableval" >&5
+	echo "$as_me:36515: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 fi
 
-echo "$as_me:36505: checking if you want long-directory listings" >&5
+echo "$as_me:36519: 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.
@@ -36526,10 +36540,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-echo "$as_me:36529: result: $enableval" >&5
+echo "$as_me:36543: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:36532: checking if parent-directory references are permitted" >&5
+echo "$as_me:36546: 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.
@@ -36546,7 +36560,7 @@ EOF
 else
   enableval=yes
 fi;
-echo "$as_me:36549: result: $enableval" >&5
+echo "$as_me:36563: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 test -z "$TELNET" && TELNET=telnet
@@ -36554,7 +36568,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:36557: checking for $ac_word" >&5
+echo "$as_me:36571: 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
@@ -36571,7 +36585,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:36574: found $ac_dir/$ac_word" >&5
+   echo "$as_me:36588: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -36582,10 +36596,10 @@ fi
 TELNET=$ac_cv_path_TELNET
 
 if test -n "$TELNET"; then
-  echo "$as_me:36585: result: $TELNET" >&5
+  echo "$as_me:36599: result: $TELNET" >&5
 echo "${ECHO_T}$TELNET" >&6
 else
-  echo "$as_me:36588: result: no" >&5
+  echo "$as_me:36602: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -36644,7 +36658,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:36647: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:36661: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TELNET_PATH "$cf_path_prog"
@@ -36662,7 +36676,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:36665: checking for $ac_word" >&5
+echo "$as_me:36679: 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
@@ -36679,7 +36693,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:36682: found $ac_dir/$ac_word" >&5
+   echo "$as_me:36696: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -36690,10 +36704,10 @@ fi
 TN3270=$ac_cv_path_TN3270
 
 if test -n "$TN3270"; then
-  echo "$as_me:36693: result: $TN3270" >&5
+  echo "$as_me:36707: result: $TN3270" >&5
 echo "${ECHO_T}$TN3270" >&6
 else
-  echo "$as_me:36696: result: no" >&5
+  echo "$as_me:36710: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -36752,7 +36766,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:36755: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:36769: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TN3270_PATH "$cf_path_prog"
@@ -36770,7 +36784,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:36773: checking for $ac_word" >&5
+echo "$as_me:36787: 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
@@ -36787,7 +36801,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:36790: found $ac_dir/$ac_word" >&5
+   echo "$as_me:36804: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -36798,10 +36812,10 @@ fi
 RLOGIN=$ac_cv_path_RLOGIN
 
 if test -n "$RLOGIN"; then
-  echo "$as_me:36801: result: $RLOGIN" >&5
+  echo "$as_me:36815: result: $RLOGIN" >&5
 echo "${ECHO_T}$RLOGIN" >&6
 else
-  echo "$as_me:36804: result: no" >&5
+  echo "$as_me:36818: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -36860,7 +36874,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:36863: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:36877: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define RLOGIN_PATH "$cf_path_prog"
@@ -36878,7 +36892,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:36881: checking for $ac_word" >&5
+echo "$as_me:36895: 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
@@ -36895,7 +36909,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:36898: found $ac_dir/$ac_word" >&5
+   echo "$as_me:36912: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -36906,10 +36920,10 @@ fi
 MV=$ac_cv_path_MV
 
 if test -n "$MV"; then
-  echo "$as_me:36909: result: $MV" >&5
+  echo "$as_me:36923: result: $MV" >&5
 echo "${ECHO_T}$MV" >&6
 else
-  echo "$as_me:36912: result: no" >&5
+  echo "$as_me:36926: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -36968,7 +36982,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:36971: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:36985: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define MV_PATH "$cf_path_prog"
@@ -36986,7 +37000,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:36989: checking for $ac_word" >&5
+echo "$as_me:37003: 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
@@ -37003,7 +37017,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:37006: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37020: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37014,10 +37028,10 @@ fi
 GZIP=$ac_cv_path_GZIP
 
 if test -n "$GZIP"; then
-  echo "$as_me:37017: result: $GZIP" >&5
+  echo "$as_me:37031: result: $GZIP" >&5
 echo "${ECHO_T}$GZIP" >&6
 else
-  echo "$as_me:37020: result: no" >&5
+  echo "$as_me:37034: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37076,7 +37090,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37079: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37093: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define GZIP_PATH "$cf_path_prog"
@@ -37094,7 +37108,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:37097: checking for $ac_word" >&5
+echo "$as_me:37111: 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
@@ -37111,7 +37125,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:37114: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37128: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37122,10 +37136,10 @@ fi
 UNCOMPRESS=$ac_cv_path_UNCOMPRESS
 
 if test -n "$UNCOMPRESS"; then
-  echo "$as_me:37125: result: $UNCOMPRESS" >&5
+  echo "$as_me:37139: result: $UNCOMPRESS" >&5
 echo "${ECHO_T}$UNCOMPRESS" >&6
 else
-  echo "$as_me:37128: result: no" >&5
+  echo "$as_me:37142: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37184,7 +37198,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37187: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37201: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define UNCOMPRESS_PATH "$cf_path_prog"
@@ -37202,7 +37216,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:37205: checking for $ac_word" >&5
+echo "$as_me:37219: 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
@@ -37219,7 +37233,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:37222: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37236: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37230,10 +37244,10 @@ fi
 UNZIP=$ac_cv_path_UNZIP
 
 if test -n "$UNZIP"; then
-  echo "$as_me:37233: result: $UNZIP" >&5
+  echo "$as_me:37247: result: $UNZIP" >&5
 echo "${ECHO_T}$UNZIP" >&6
 else
-  echo "$as_me:37236: result: no" >&5
+  echo "$as_me:37250: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37292,7 +37306,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37295: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37309: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define UNZIP_PATH "$cf_path_prog"
@@ -37310,7 +37324,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:37313: checking for $ac_word" >&5
+echo "$as_me:37327: 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
@@ -37327,7 +37341,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:37330: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37344: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37338,10 +37352,10 @@ fi
 BZIP2=$ac_cv_path_BZIP2
 
 if test -n "$BZIP2"; then
-  echo "$as_me:37341: result: $BZIP2" >&5
+  echo "$as_me:37355: result: $BZIP2" >&5
 echo "${ECHO_T}$BZIP2" >&6
 else
-  echo "$as_me:37344: result: no" >&5
+  echo "$as_me:37358: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37400,7 +37414,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37403: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37417: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define BZIP2_PATH "$cf_path_prog"
@@ -37418,7 +37432,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:37421: checking for $ac_word" >&5
+echo "$as_me:37435: 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
@@ -37435,7 +37449,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:37438: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37452: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37446,10 +37460,10 @@ fi
 TAR=$ac_cv_path_TAR
 
 if test -n "$TAR"; then
-  echo "$as_me:37449: result: $TAR" >&5
+  echo "$as_me:37463: result: $TAR" >&5
 echo "${ECHO_T}$TAR" >&6
 else
-  echo "$as_me:37452: result: no" >&5
+  echo "$as_me:37466: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37508,7 +37522,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37511: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37525: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TAR_PATH "$cf_path_prog"
@@ -37566,7 +37580,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:37569: checking for $ac_word" >&5
+echo "$as_me:37583: 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
@@ -37583,7 +37597,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:37586: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37600: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37594,10 +37608,10 @@ fi
 COMPRESS=$ac_cv_path_COMPRESS
 
 if test -n "$COMPRESS"; then
-  echo "$as_me:37597: result: $COMPRESS" >&5
+  echo "$as_me:37611: result: $COMPRESS" >&5
 echo "${ECHO_T}$COMPRESS" >&6
 else
-  echo "$as_me:37600: result: no" >&5
+  echo "$as_me:37614: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37656,7 +37670,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37659: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37673: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define COMPRESS_PATH "$cf_path_prog"
@@ -37674,7 +37688,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:37677: checking for $ac_word" >&5
+echo "$as_me:37691: 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
@@ -37691,7 +37705,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:37694: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37708: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37702,10 +37716,10 @@ fi
 RM=$ac_cv_path_RM
 
 if test -n "$RM"; then
-  echo "$as_me:37705: result: $RM" >&5
+  echo "$as_me:37719: result: $RM" >&5
 echo "${ECHO_T}$RM" >&6
 else
-  echo "$as_me:37708: result: no" >&5
+  echo "$as_me:37722: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37764,7 +37778,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37767: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37781: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define RM_PATH "$cf_path_prog"
@@ -37782,7 +37796,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:37785: checking for $ac_word" >&5
+echo "$as_me:37799: 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
@@ -37799,7 +37813,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:37802: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37816: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37810,10 +37824,10 @@ fi
 UUDECODE=$ac_cv_path_UUDECODE
 
 if test -n "$UUDECODE"; then
-  echo "$as_me:37813: result: $UUDECODE" >&5
+  echo "$as_me:37827: result: $UUDECODE" >&5
 echo "${ECHO_T}$UUDECODE" >&6
 else
-  echo "$as_me:37816: result: no" >&5
+  echo "$as_me:37830: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37872,7 +37886,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37875: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37889: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define UUDECODE_PATH "$cf_path_prog"
@@ -37890,7 +37904,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:37893: checking for $ac_word" >&5
+echo "$as_me:37907: 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
@@ -37907,7 +37921,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:37910: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37924: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37918,10 +37932,10 @@ fi
 ZCAT=$ac_cv_path_ZCAT
 
 if test -n "$ZCAT"; then
-  echo "$as_me:37921: result: $ZCAT" >&5
+  echo "$as_me:37935: result: $ZCAT" >&5
 echo "${ECHO_T}$ZCAT" >&6
 else
-  echo "$as_me:37924: result: no" >&5
+  echo "$as_me:37938: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37980,7 +37994,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37983: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37997: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define ZCAT_PATH "$cf_path_prog"
@@ -37998,7 +38012,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:38001: checking for $ac_word" >&5
+echo "$as_me:38015: 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
@@ -38015,7 +38029,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:38018: found $ac_dir/$ac_word" >&5
+   echo "$as_me:38032: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -38026,10 +38040,10 @@ fi
 ZIP=$ac_cv_path_ZIP
 
 if test -n "$ZIP"; then
-  echo "$as_me:38029: result: $ZIP" >&5
+  echo "$as_me:38043: result: $ZIP" >&5
 echo "${ECHO_T}$ZIP" >&6
 else
-  echo "$as_me:38032: result: no" >&5
+  echo "$as_me:38046: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -38088,7 +38102,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:38091: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:38105: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define ZIP_PATH "$cf_path_prog"
@@ -38116,7 +38130,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:38119: checking for $ac_word" >&5
+echo "$as_me:38133: 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
@@ -38133,7 +38147,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:38136: found $ac_dir/$ac_word" >&5
+   echo "$as_me:38150: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -38144,10 +38158,10 @@ fi
 INSTALL=$ac_cv_path_INSTALL
 
 if test -n "$INSTALL"; then
-  echo "$as_me:38147: result: $INSTALL" >&5
+  echo "$as_me:38161: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 else
-  echo "$as_me:38150: result: no" >&5
+  echo "$as_me:38164: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -38206,7 +38220,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:38209: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:38223: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define INSTALL_PATH "$cf_path_prog"
@@ -38236,7 +38250,7 @@ if test $cf_cv_screen = pdcurses ; then
 	case $host_os in
 	(mingw*)
 
-echo "$as_me:38239: checking for initscr in -lpdcurses" >&5
+echo "$as_me:38253: 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
@@ -38244,7 +38258,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpdcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 38247 "configure"
+#line 38261 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -38263,16 +38277,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38266: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38280: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38269: \$? = $ac_status" >&5
+  echo "$as_me:38283: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38272: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38286: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38275: \$? = $ac_status" >&5
+  echo "$as_me:38289: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_pdcurses_initscr=yes
 else
@@ -38283,7 +38297,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:38286: result: $ac_cv_lib_pdcurses_initscr" >&5
+echo "$as_me:38300: 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
 
@@ -38305,13 +38319,13 @@ LIBS="$cf_add_libs"
 
 	cf_cv_term_header=no
 	cf_cv_unctrl_header=no
-	echo "$as_me:38308: checking for winwstr" >&5
+	echo "$as_me:38322: 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 38314 "configure"
+#line 38328 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char winwstr (); below.  */
@@ -38342,16 +38356,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:38345: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38359: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38348: \$? = $ac_status" >&5
+  echo "$as_me:38362: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38351: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38365: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38354: \$? = $ac_status" >&5
+  echo "$as_me:38368: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_winwstr=yes
 else
@@ -38361,7 +38375,7 @@ ac_cv_func_winwstr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:38364: result: $ac_cv_func_winwstr" >&5
+echo "$as_me:38378: 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
@@ -38370,13 +38384,13 @@ EOF
 
 fi
 
-	echo "$as_me:38373: checking for pdcurses_dll_iname" >&5
+	echo "$as_me:38387: 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 38379 "configure"
+#line 38393 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char pdcurses_dll_iname (); below.  */
@@ -38407,16 +38421,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:38410: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38424: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38413: \$? = $ac_status" >&5
+  echo "$as_me:38427: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38416: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38430: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38419: \$? = $ac_status" >&5
+  echo "$as_me:38433: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_pdcurses_dll_iname=yes
 else
@@ -38426,7 +38440,7 @@ ac_cv_func_pdcurses_dll_iname=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:38429: result: $ac_cv_func_pdcurses_dll_iname" >&5
+echo "$as_me:38443: 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
@@ -38439,7 +38453,7 @@ fi
 
 		;;
 	(*)
-		echo "$as_me:38442: checking for X" >&5
+		echo "$as_me:38456: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -38536,17 +38550,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 38539 "configure"
+#line 38553 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:38543: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:38557: \"$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:38549: \$? = $ac_status" >&5
+  echo "$as_me:38563: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -38579,7 +38593,7 @@ if test "$ac_x_libraries" = no; then
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >conftest.$ac_ext <<_ACEOF
-#line 38582 "configure"
+#line 38596 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -38591,16 +38605,16 @@ XtMalloc (0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38594: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38608: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38597: \$? = $ac_status" >&5
+  echo "$as_me:38611: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38600: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38614: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38603: \$? = $ac_status" >&5
+  echo "$as_me:38617: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -38638,7 +38652,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:38641: result: $have_x" >&5
+  echo "$as_me:38655: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -38648,7 +38662,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:38651: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:38665: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -38672,11 +38686,11 @@ else
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:38675: checking whether -R must be followed by a space" >&5
+      echo "$as_me:38689: 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 38679 "configure"
+#line 38693 "configure"
 #include "confdefs.h"
 
 int
@@ -38688,16 +38702,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38691: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38705: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38694: \$? = $ac_status" >&5
+  echo "$as_me:38708: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38697: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38711: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38700: \$? = $ac_status" >&5
+  echo "$as_me:38714: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_nospace=yes
 else
@@ -38707,13 +38721,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:38710: result: no" >&5
+	echo "$as_me:38724: 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 38716 "configure"
+#line 38730 "configure"
 #include "confdefs.h"
 
 int
@@ -38725,16 +38739,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38728: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38742: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38731: \$? = $ac_status" >&5
+  echo "$as_me:38745: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38734: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38748: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38737: \$? = $ac_status" >&5
+  echo "$as_me:38751: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_space=yes
 else
@@ -38744,11 +38758,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:38747: result: yes" >&5
+	  echo "$as_me:38761: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:38751: result: neither works" >&5
+	  echo "$as_me:38765: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -38768,7 +38782,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 38771 "configure"
+#line 38785 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -38787,22 +38801,22 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38790: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38804: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38793: \$? = $ac_status" >&5
+  echo "$as_me:38807: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38796: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38810: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38799: \$? = $ac_status" >&5
+  echo "$as_me:38813: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:38805: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:38819: 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
@@ -38810,7 +38824,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 38813 "configure"
+#line 38827 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -38829,16 +38843,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38832: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38846: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38835: \$? = $ac_status" >&5
+  echo "$as_me:38849: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38838: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38852: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38841: \$? = $ac_status" >&5
+  echo "$as_me:38855: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -38849,14 +38863,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:38852: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:38866: 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:38859: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:38873: 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
@@ -38864,7 +38878,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 38867 "configure"
+#line 38881 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -38883,16 +38897,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38886: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38900: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38889: \$? = $ac_status" >&5
+  echo "$as_me:38903: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38892: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38906: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38895: \$? = $ac_status" >&5
+  echo "$as_me:38909: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -38903,7 +38917,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:38906: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:38920: 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"
@@ -38922,13 +38936,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:38925: checking for gethostbyname" >&5
+    echo "$as_me:38939: 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 38931 "configure"
+#line 38945 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname (); below.  */
@@ -38959,16 +38973,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:38962: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38976: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38965: \$? = $ac_status" >&5
+  echo "$as_me:38979: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38968: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38982: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38971: \$? = $ac_status" >&5
+  echo "$as_me:38985: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -38978,11 +38992,11 @@ ac_cv_func_gethostbyname=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:38981: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:38995: 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:38985: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:38999: 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
@@ -38990,7 +39004,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 38993 "configure"
+#line 39007 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -39009,16 +39023,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39012: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39026: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39015: \$? = $ac_status" >&5
+  echo "$as_me:39029: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39018: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39032: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39021: \$? = $ac_status" >&5
+  echo "$as_me:39035: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -39029,14 +39043,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:39032: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:39046: 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:39039: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:39053: 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
@@ -39044,7 +39058,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 39047 "configure"
+#line 39061 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -39063,16 +39077,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39066: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39080: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39069: \$? = $ac_status" >&5
+  echo "$as_me:39083: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39072: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39086: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39075: \$? = $ac_status" >&5
+  echo "$as_me:39089: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -39083,7 +39097,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:39086: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:39100: 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"
@@ -39099,13 +39113,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:39102: checking for connect" >&5
+    echo "$as_me:39116: 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 39108 "configure"
+#line 39122 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect (); below.  */
@@ -39136,16 +39150,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:39139: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39153: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39142: \$? = $ac_status" >&5
+  echo "$as_me:39156: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39145: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39159: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39148: \$? = $ac_status" >&5
+  echo "$as_me:39162: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_connect=yes
 else
@@ -39155,11 +39169,11 @@ ac_cv_func_connect=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:39158: result: $ac_cv_func_connect" >&5
+echo "$as_me:39172: 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:39162: checking for connect in -lsocket" >&5
+      echo "$as_me:39176: 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
@@ -39167,7 +39181,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 39170 "configure"
+#line 39184 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -39186,16 +39200,16 @@ connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39189: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39203: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39192: \$? = $ac_status" >&5
+  echo "$as_me:39206: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39195: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39209: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39198: \$? = $ac_status" >&5
+  echo "$as_me:39212: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -39206,7 +39220,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:39209: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:39223: 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"
@@ -39215,13 +39229,13 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:39218: checking for remove" >&5
+    echo "$as_me:39232: 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 39224 "configure"
+#line 39238 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove (); below.  */
@@ -39252,16 +39266,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:39255: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39269: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39258: \$? = $ac_status" >&5
+  echo "$as_me:39272: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39261: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39275: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39264: \$? = $ac_status" >&5
+  echo "$as_me:39278: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_remove=yes
 else
@@ -39271,11 +39285,11 @@ ac_cv_func_remove=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:39274: result: $ac_cv_func_remove" >&5
+echo "$as_me:39288: 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:39278: checking for remove in -lposix" >&5
+      echo "$as_me:39292: 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
@@ -39283,7 +39297,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 39286 "configure"
+#line 39300 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -39302,16 +39316,16 @@ remove ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39305: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39319: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39308: \$? = $ac_status" >&5
+  echo "$as_me:39322: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39311: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39325: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39314: \$? = $ac_status" >&5
+  echo "$as_me:39328: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -39322,7 +39336,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:39325: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:39339: 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"
@@ -39331,13 +39345,13 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:39334: checking for shmat" >&5
+    echo "$as_me:39348: 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 39340 "configure"
+#line 39354 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat (); below.  */
@@ -39368,16 +39382,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:39371: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39385: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39374: \$? = $ac_status" >&5
+  echo "$as_me:39388: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39377: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39391: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39380: \$? = $ac_status" >&5
+  echo "$as_me:39394: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -39387,11 +39401,11 @@ ac_cv_func_shmat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:39390: result: $ac_cv_func_shmat" >&5
+echo "$as_me:39404: 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:39394: checking for shmat in -lipc" >&5
+      echo "$as_me:39408: 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
@@ -39399,7 +39413,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 39402 "configure"
+#line 39416 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -39418,16 +39432,16 @@ shmat ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39421: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39435: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39424: \$? = $ac_status" >&5
+  echo "$as_me:39438: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39427: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39441: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39430: \$? = $ac_status" >&5
+  echo "$as_me:39444: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -39438,7 +39452,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:39441: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:39455: 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"
@@ -39456,7 +39470,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:39459: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:39473: 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
@@ -39464,7 +39478,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 39467 "configure"
+#line 39481 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -39483,16 +39497,16 @@ IceConnectionNumber ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39486: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39500: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39489: \$? = $ac_status" >&5
+  echo "$as_me:39503: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39492: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39506: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39495: \$? = $ac_status" >&5
+  echo "$as_me:39509: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -39503,7 +39517,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:39506: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:39520: 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"
@@ -39515,7 +39529,7 @@ fi
 
 cf_x_athena=${cf_x_athena:-Xaw}
 
-echo "$as_me:39518: checking if you want to link with Xaw 3d library" >&5
+echo "$as_me:39532: 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=
 
@@ -39526,14 +39540,14 @@ if test "${with_Xaw3d+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3d
-	echo "$as_me:39529: result: yes" >&5
+	echo "$as_me:39543: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:39532: result: no" >&5
+	echo "$as_me:39546: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:39536: checking if you want to link with Xaw 3d xft library" >&5
+echo "$as_me:39550: 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=
 
@@ -39544,14 +39558,14 @@ if test "${with_Xaw3dxft+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3dxft
-	echo "$as_me:39547: result: yes" >&5
+	echo "$as_me:39561: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:39550: result: no" >&5
+	echo "$as_me:39564: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:39554: checking if you want to link with neXT Athena library" >&5
+echo "$as_me:39568: 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=
 
@@ -39562,14 +39576,14 @@ if test "${with_neXtaw+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=neXtaw
-	echo "$as_me:39565: result: yes" >&5
+	echo "$as_me:39579: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:39568: result: no" >&5
+	echo "$as_me:39582: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:39572: checking if you want to link with Athena-Plus library" >&5
+echo "$as_me:39586: 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=
 
@@ -39580,10 +39594,10 @@ if test "${with_XawPlus+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=XawPlus
-	echo "$as_me:39583: result: yes" >&5
+	echo "$as_me:39597: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:39586: result: no" >&5
+	echo "$as_me:39600: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -39603,17 +39617,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}:39606: testing found package $cf_athena_pkg ..." 1>&5
+echo "${as_me:-configure}:39620: 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}:39612: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:39626: 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}:39616: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:39630: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -39724,20 +39738,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}:39727: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:39741: testing ..trimmed $LIBS ..." 1>&5
 
 			;;
 		esac
 	done
 
-echo "$as_me:39733: checking for usable $cf_x_athena/Xmu package" >&5
+echo "$as_me:39747: 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 39740 "configure"
+#line 39754 "configure"
 #include "confdefs.h"
 
 #include <X11/Xmu/CharSet.h>
@@ -39753,16 +39767,16 @@ int check = XmuCompareISOLatin1("big", "small")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39756: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39770: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39759: \$? = $ac_status" >&5
+  echo "$as_me:39773: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39762: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39776: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39765: \$? = $ac_status" >&5
+  echo "$as_me:39779: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xaw_compat=yes
 else
@@ -39772,7 +39786,7 @@ cf_cv_xaw_compat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:39775: result: $cf_cv_xaw_compat" >&5
+echo "$as_me:39789: result: $cf_cv_xaw_compat" >&5
 echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 
 			if test "$cf_cv_xaw_compat" = no
@@ -39784,7 +39798,7 @@ echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 				(*)
 					test -n "$verbose" && echo "	work around broken package" 1>&6
 
-echo "${as_me:-configure}:39787: testing work around broken package ..." 1>&5
+echo "${as_me:-configure}:39801: testing work around broken package ..." 1>&5
 
 					cf_save_xmu="$LIBS"
 					cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^  *//' -e 's/ .*//'`
@@ -39792,17 +39806,17 @@ echo "${as_me:-configure}:39787: 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}:39795: testing found package xmu ..." 1>&5
+echo "${as_me:-configure}:39809: 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}:39801: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:39815: 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}:39805: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:39819: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -39902,12 +39916,12 @@ LIBS="$cf_add_libs"
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:39905: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:39919: 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}:39910: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:39924: testing ...after  $LIBS ..." 1>&5
 
 else
 	cf_pkgconfig_incs=
@@ -39915,12 +39929,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:39918: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:39932: 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}:39923: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:39937: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -39931,7 +39945,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}:39934: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:39948: testing ..trimmed $LIBS ..." 1>&5
 
 			;;
 		esac
@@ -39956,17 +39970,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}:39959: testing found package Xext ..." 1>&5
+echo "${as_me:-configure}:39973: 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}:39965: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:39979: 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}:39969: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:39983: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -40067,7 +40081,7 @@ else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
 
-	echo "$as_me:40070: checking for XextCreateExtension in -lXext" >&5
+	echo "$as_me:40084: 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
@@ -40075,7 +40089,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 40078 "configure"
+#line 40092 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -40094,16 +40108,16 @@ XextCreateExtension ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40097: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40111: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40100: \$? = $ac_status" >&5
+  echo "$as_me:40114: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40103: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40117: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40106: \$? = $ac_status" >&5
+  echo "$as_me:40120: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
@@ -40114,7 +40128,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:40117: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:40131: 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
 
@@ -40150,17 +40164,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}:40153: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:40167: 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}:40159: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:40173: 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}:40163: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:40177: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -40260,24 +40274,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:40263: WARNING: unable to find X11 library" >&5
+	{ echo "$as_me:40277: 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}:40270: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:40284: 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}:40276: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:40290: 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}:40280: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:40294: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -40377,24 +40391,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:40380: WARNING: unable to find ICE library" >&5
+	{ echo "$as_me:40394: 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}:40387: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:40401: 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}:40393: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:40407: 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}:40397: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:40411: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -40494,24 +40508,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:40497: WARNING: unable to find SM library" >&5
+	{ echo "$as_me:40511: 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}:40504: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:40518: 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}:40510: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:40524: 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}:40514: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:40528: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -40611,7 +40625,7 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:40614: WARNING: unable to find Xt library" >&5
+	{ echo "$as_me:40628: WARNING: unable to find Xt library" >&5
 echo "$as_me: WARNING: unable to find Xt library" >&2;}
 fi
 
@@ -40622,17 +40636,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}:40625: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:40639: 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}:40631: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:40645: 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}:40635: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:40649: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -40733,14 +40747,14 @@ LIBS="$cf_add_libs"
 		;;
 	(*)
 # we have an "xt" package, but it may omit Xt's dependency on X11
-echo "$as_me:40736: checking for usable X dependency" >&5
+echo "$as_me:40750: 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 40743 "configure"
+#line 40757 "configure"
 #include "confdefs.h"
 
 #include <X11/Xlib.h>
@@ -40759,16 +40773,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40762: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40776: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40765: \$? = $ac_status" >&5
+  echo "$as_me:40779: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40768: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40782: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40771: \$? = $ac_status" >&5
+  echo "$as_me:40785: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xt_x11_compat=yes
 else
@@ -40778,30 +40792,30 @@ cf_cv_xt_x11_compat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:40781: result: $cf_cv_xt_x11_compat" >&5
+echo "$as_me:40795: 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}:40787: testing work around broken X11 dependency ..." 1>&5
+echo "${as_me:-configure}:40801: 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}:40794: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:40808: 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}:40800: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:40814: 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}:40804: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:40818: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -40904,12 +40918,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:40907: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:40921: 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}:40912: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:40926: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -40917,14 +40931,14 @@ fi
 		;;
 	esac
 
-echo "$as_me:40920: checking for usable X Toolkit package" >&5
+echo "$as_me:40934: 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 40927 "configure"
+#line 40941 "configure"
 #include "confdefs.h"
 
 #include <X11/Shell.h>
@@ -40939,16 +40953,16 @@ int num = IceConnectionNumber(0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40942: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40956: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40945: \$? = $ac_status" >&5
+  echo "$as_me:40959: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40948: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40962: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40951: \$? = $ac_status" >&5
+  echo "$as_me:40965: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xt_ice_compat=yes
 else
@@ -40958,7 +40972,7 @@ cf_cv_xt_ice_compat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:40961: result: $cf_cv_xt_ice_compat" >&5
+echo "$as_me:40975: result: $cf_cv_xt_ice_compat" >&5
 echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
 
 	if test "$cf_cv_xt_ice_compat" = no
@@ -40972,22 +40986,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}:40975: testing work around broken ICE dependency ..." 1>&5
+echo "${as_me:-configure}:40989: 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}:40980: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:40994: testing found package ice ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags ice 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   ice 2>/dev/null`"
 	test -n "$verbose" && echo "	package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:40986: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:41000: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package ice LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:40990: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:41004: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -41086,17 +41100,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}:41089: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:41103: 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}:41095: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:41109: 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}:41099: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:41113: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -41205,12 +41219,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:41208: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:41222: 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}:41213: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:41227: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -41230,7 +41244,7 @@ else
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:41233: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:41247: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -41301,7 +41315,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}:41304: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:41318: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	CFLAGS="$CFLAGS $cf_new_cflags"
 fi
@@ -41309,7 +41323,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}:41312: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:41326: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
 fi
@@ -41317,14 +41331,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}:41320: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:41334: 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 41327 "configure"
+#line 41341 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -41336,16 +41350,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:41339: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41353: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41342: \$? = $ac_status" >&5
+  echo "$as_me:41356: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:41345: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41359: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41348: \$? = $ac_status" >&5
+  echo "$as_me:41362: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -41353,12 +41367,12 @@ else
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:41356: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:41370: 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}:41361: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:41375: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_flags"
@@ -41366,13 +41380,13 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-	echo "$as_me:41369: checking for XOpenDisplay" >&5
+	echo "$as_me:41383: 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 41375 "configure"
+#line 41389 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char XOpenDisplay (); below.  */
@@ -41403,16 +41417,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:41406: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41420: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41409: \$? = $ac_status" >&5
+  echo "$as_me:41423: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:41412: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41426: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41415: \$? = $ac_status" >&5
+  echo "$as_me:41429: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_XOpenDisplay=yes
 else
@@ -41422,13 +41436,13 @@ ac_cv_func_XOpenDisplay=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:41425: result: $ac_cv_func_XOpenDisplay" >&5
+echo "$as_me:41439: 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:41431: checking for XOpenDisplay in -lX11" >&5
+	echo "$as_me:41445: 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
@@ -41436,7 +41450,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 41439 "configure"
+#line 41453 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -41455,16 +41469,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:41458: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41472: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41461: \$? = $ac_status" >&5
+  echo "$as_me:41475: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:41464: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41478: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41467: \$? = $ac_status" >&5
+  echo "$as_me:41481: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -41475,7 +41489,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:41478: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:41492: 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
 
@@ -41499,13 +41513,13 @@ fi
 
 fi
 
-	echo "$as_me:41502: checking for XtAppInitialize" >&5
+	echo "$as_me:41516: 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 41508 "configure"
+#line 41522 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char XtAppInitialize (); below.  */
@@ -41536,16 +41550,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:41539: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41553: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41542: \$? = $ac_status" >&5
+  echo "$as_me:41556: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:41545: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41559: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41548: \$? = $ac_status" >&5
+  echo "$as_me:41562: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_XtAppInitialize=yes
 else
@@ -41555,13 +41569,13 @@ ac_cv_func_XtAppInitialize=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:41558: result: $ac_cv_func_XtAppInitialize" >&5
+echo "$as_me:41572: 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:41564: checking for XtAppInitialize in -lXt" >&5
+	echo "$as_me:41578: 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
@@ -41569,7 +41583,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 41572 "configure"
+#line 41586 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -41588,16 +41602,16 @@ XtAppInitialize ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:41591: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41605: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41594: \$? = $ac_status" >&5
+  echo "$as_me:41608: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:41597: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41611: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41600: \$? = $ac_status" >&5
+  echo "$as_me:41614: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xt_XtAppInitialize=yes
 else
@@ -41608,7 +41622,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:41611: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "$as_me:41625: 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
 
@@ -41625,7 +41639,7 @@ fi
 fi
 
 if test $cf_have_X_LIBS = no ; then
-	{ echo "$as_me:41628: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+	{ echo "$as_me:41642: 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
@@ -41647,14 +41661,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:41650: checking for $cf_test in $cf_path" >&5
+			echo "$as_me:41664: 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:41653: checking for $cf_test" >&5
+			echo "$as_me:41667: checking for $cf_test" >&5
 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
 		fi
 		cat >conftest.$ac_ext <<_ACEOF
-#line 41657 "configure"
+#line 41671 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -41668,16 +41682,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:41671: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:41685: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:41674: \$? = $ac_status" >&5
+  echo "$as_me:41688: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:41677: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41691: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41680: \$? = $ac_status" >&5
+  echo "$as_me:41694: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -41686,7 +41700,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-		echo "$as_me:41689: result: $cf_result" >&5
+		echo "$as_me:41703: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 		if test "$cf_result" = yes ; then
 			cf_x_athena_inc=$cf_path
@@ -41698,7 +41712,7 @@ echo "${ECHO_T}$cf_result" >&6
 done
 
 if test -z "$cf_x_athena_inc" ; then
-	{ echo "$as_me:41701: WARNING: Unable to successfully find Athena header files with test program" >&5
+	{ echo "$as_me:41715: 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"
@@ -41744,7 +41758,7 @@ do
 done
 LIBS="$cf_add_libs"
 
-				echo "$as_me:41747: checking for $cf_libs in $cf_path" >&5
+				echo "$as_me:41761: checking for $cf_libs in $cf_path" >&5
 echo $ECHO_N "checking for $cf_libs in $cf_path... $ECHO_C" >&6
 			else
 
@@ -41764,11 +41778,11 @@ do
 done
 LIBS="$cf_add_libs"
 
-				echo "$as_me:41767: checking for $cf_test in $cf_libs" >&5
+				echo "$as_me:41781: 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 41771 "configure"
+#line 41785 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -41784,16 +41798,16 @@ $cf_test((XtAppContext) 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:41787: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41801: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41790: \$? = $ac_status" >&5
+  echo "$as_me:41804: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:41793: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41807: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41796: \$? = $ac_status" >&5
+  echo "$as_me:41810: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -41802,7 +41816,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-			echo "$as_me:41805: result: $cf_result" >&5
+			echo "$as_me:41819: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				cf_x_athena_lib="$cf_libs"
@@ -41816,7 +41830,7 @@ echo "${ECHO_T}$cf_result" >&6
 done
 
 if test -z "$cf_x_athena_lib" ; then
-	{ { echo "$as_me:41819: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+	{ { echo "$as_me:41833: 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
@@ -41834,7 +41848,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:41837: checking for $ac_word" >&5
+echo "$as_me:41851: 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
@@ -41849,7 +41863,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:41852: found $ac_dir/$ac_word" >&5
+echo "$as_me:41866: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -41857,10 +41871,10 @@ fi
 fi
 XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG
 if test -n "$XCURSES_CONFIG"; then
-  echo "$as_me:41860: result: $XCURSES_CONFIG" >&5
+  echo "$as_me:41874: result: $XCURSES_CONFIG" >&5
 echo "${ECHO_T}$XCURSES_CONFIG" >&6
 else
-  echo "$as_me:41863: result: no" >&5
+  echo "$as_me:41877: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -41873,7 +41887,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:41876: checking for $ac_word" >&5
+echo "$as_me:41890: 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
@@ -41888,7 +41902,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:41891: found $ac_dir/$ac_word" >&5
+echo "$as_me:41905: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -41896,10 +41910,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:41899: result: $ac_ct_XCURSES_CONFIG" >&5
+  echo "$as_me:41913: result: $ac_ct_XCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6
 else
-  echo "$as_me:41902: result: no" >&5
+  echo "$as_me:41916: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -41938,7 +41952,7 @@ LDFLAGS="$LDFLAGS $X_LIBS"
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:41941: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:41955: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -42009,7 +42023,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}:42012: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:42026: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	CFLAGS="$CFLAGS $cf_new_cflags"
 fi
@@ -42017,7 +42031,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}:42020: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:42034: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
 fi
@@ -42025,14 +42039,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}:42028: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:42042: 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 42035 "configure"
+#line 42049 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -42044,16 +42058,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42047: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42061: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42050: \$? = $ac_status" >&5
+  echo "$as_me:42064: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42053: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42067: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42056: \$? = $ac_status" >&5
+  echo "$as_me:42070: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -42061,12 +42075,12 @@ else
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:42064: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:42078: 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}:42069: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:42083: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_flags"
@@ -42074,7 +42088,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:42077: checking for XOpenDisplay in -lX11" >&5
+echo "$as_me:42091: 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
@@ -42082,7 +42096,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 42085 "configure"
+#line 42099 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -42101,16 +42115,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42104: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42118: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42107: \$? = $ac_status" >&5
+  echo "$as_me:42121: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42110: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42124: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42113: \$? = $ac_status" >&5
+  echo "$as_me:42127: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -42121,7 +42135,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:42124: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:42138: 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
 
@@ -42143,7 +42157,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-echo "$as_me:42146: checking for XCurses library" >&5
+echo "$as_me:42160: 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
@@ -42166,7 +42180,7 @@ done
 LIBS="$cf_add_libs"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 42169 "configure"
+#line 42183 "configure"
 #include "confdefs.h"
 
 #include <xcurses.h>
@@ -42181,16 +42195,16 @@ XCursesExit();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42184: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42198: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42187: \$? = $ac_status" >&5
+  echo "$as_me:42201: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42190: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42204: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42193: \$? = $ac_status" >&5
+  echo "$as_me:42207: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_lib_XCurses=yes
 else
@@ -42201,7 +42215,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:42204: result: $cf_cv_lib_XCurses" >&5
+echo "$as_me:42218: result: $cf_cv_lib_XCurses" >&5
 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
 
 fi
@@ -42216,23 +42230,23 @@ cat >>confdefs.h <<\EOF
 #define XCURSES 1
 EOF
 
-	echo "$as_me:42219: checking for xcurses.h" >&5
+	echo "$as_me:42233: 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 42225 "configure"
+#line 42239 "configure"
 #include "confdefs.h"
 #include <xcurses.h>
 _ACEOF
-if { (eval echo "$as_me:42229: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:42243: \"$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:42235: \$? = $ac_status" >&5
+  echo "$as_me:42249: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -42251,7 +42265,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:42254: result: $ac_cv_header_xcurses_h" >&5
+echo "$as_me:42268: 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
 
@@ -42262,7 +42276,7 @@ EOF
 fi
 
 else
-	{ { echo "$as_me:42265: error: Cannot link with XCurses" >&5
+	{ { echo "$as_me:42279: error: Cannot link with XCurses" >&5
 echo "$as_me: error: Cannot link with XCurses" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -42271,7 +42285,7 @@ fi
 	esac
 else
 
-echo "$as_me:42274: checking if we can include termio.h with curses" >&5
+echo "$as_me:42288: 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
@@ -42281,7 +42295,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 42284 "configure"
+#line 42298 "configure"
 #include "confdefs.h"
 
 #include <LYCurses.h>
@@ -42295,16 +42309,16 @@ putchar(0x0a)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:42298: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42312: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:42301: \$? = $ac_status" >&5
+  echo "$as_me:42315: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:42304: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42318: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42307: \$? = $ac_status" >&5
+  echo "$as_me:42321: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termio_and_curses=yes
 else
@@ -42317,7 +42331,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
     rm -f lynx_cfg.h
 
 fi
-echo "$as_me:42320: result: $cf_cv_termio_and_curses" >&5
+echo "$as_me:42334: result: $cf_cv_termio_and_curses" >&5
 echo "${ECHO_T}$cf_cv_termio_and_curses" >&6
 
 test $cf_cv_termio_and_curses = yes &&
@@ -42334,23 +42348,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:42337: checking for $ac_header" >&5
+echo "$as_me:42351: 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 42343 "configure"
+#line 42357 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:42347: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:42361: \"$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:42353: \$? = $ac_status" >&5
+  echo "$as_me:42367: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -42369,7 +42383,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:42372: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:42386: 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
@@ -42381,7 +42395,7 @@ done
 
 	fi
 
-echo "$as_me:42384: checking if curses supports alternate-character set" >&5
+echo "$as_me:42398: 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
@@ -42390,7 +42404,7 @@ else
 for mapname in acs_map _acs_map
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 42393 "configure"
+#line 42407 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -42404,16 +42418,16 @@ chtype x = $mapname['l']; $mapname['m'] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42407: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42421: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42410: \$? = $ac_status" >&5
+  echo "$as_me:42424: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42413: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42427: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42416: \$? = $ac_status" >&5
+  echo "$as_me:42430: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_alt_char_set=$mapname
 	 break
@@ -42427,21 +42441,21 @@ done
 
 fi
 
-echo "$as_me:42430: result: $cf_cv_alt_char_set" >&5
+echo "$as_me:42444: 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:42437: checking if curses supports fancy attributes" >&5
+echo "$as_me:42451: 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 42444 "configure"
+#line 42458 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -42459,16 +42473,16 @@ attrset(A_UNDERLINE|A_BOLD|A_REVERSE);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42462: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42476: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42465: \$? = $ac_status" >&5
+  echo "$as_me:42479: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42468: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42482: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42471: \$? = $ac_status" >&5
+  echo "$as_me:42485: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fancy_curses=yes
 else
@@ -42480,14 +42494,14 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:42483: result: $cf_cv_fancy_curses" >&5
+echo "$as_me:42497: 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:42490: checking for function curses_version" >&5
+echo "$as_me:42504: 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
@@ -42497,7 +42511,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_curses_version=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 42500 "configure"
+#line 42514 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -42510,15 +42524,15 @@ int main()
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:42513: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42527: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42516: \$? = $ac_status" >&5
+  echo "$as_me:42530: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:42518: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42532: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42521: \$? = $ac_status" >&5
+  echo "$as_me:42535: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_func_curses_version=yes
 
@@ -42533,7 +42547,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core
 fi
-echo "$as_me:42536: result: $cf_cv_func_curses_version" >&5
+echo "$as_me:42550: 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
@@ -42541,14 +42555,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test "$cf_cv_ncurses_version" != no ; then
-echo "$as_me:42544: checking for obsolete/broken version of ncurses" >&5
+echo "$as_me:42558: 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 42551 "configure"
+#line 42565 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -42567,16 +42581,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:42570: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42584: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:42573: \$? = $ac_status" >&5
+  echo "$as_me:42587: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:42576: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42590: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42579: \$? = $ac_status" >&5
+  echo "$as_me:42593: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_broken=no
 else
@@ -42588,10 +42602,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:42591: result: $cf_cv_ncurses_broken" >&5
+echo "$as_me:42605: 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:42594: WARNING: hmm... you should get an up-to-date version of ncurses" >&5
+	{ echo "$as_me:42608: 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
@@ -42601,14 +42615,14 @@ EOF
 fi
 fi
 
-echo "$as_me:42604: checking if curses supports color attributes" >&5
+echo "$as_me:42618: 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 42611 "configure"
+#line 42625 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -42628,16 +42642,16 @@ chtype x = COLOR_BLUE;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42631: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42645: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42634: \$? = $ac_status" >&5
+  echo "$as_me:42648: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42637: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42651: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42640: \$? = $ac_status" >&5
+  echo "$as_me:42654: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_color_curses=yes
 else
@@ -42649,7 +42663,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:42652: result: $cf_cv_color_curses" >&5
+echo "$as_me:42666: result: $cf_cv_color_curses" >&5
 echo "${ECHO_T}$cf_cv_color_curses" >&6
 if test $cf_cv_color_curses = yes ; then
 
@@ -42671,23 +42685,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:42674: checking for $ac_header" >&5
+echo "$as_me:42688: 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 42680 "configure"
+#line 42694 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:42684: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:42698: \"$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:42690: \$? = $ac_status" >&5
+  echo "$as_me:42704: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -42706,7 +42720,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:42709: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:42723: 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
@@ -42721,23 +42735,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:42724: checking for $ac_header" >&5
+echo "$as_me:42738: 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 42730 "configure"
+#line 42744 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:42734: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:42748: \"$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:42740: \$? = $ac_status" >&5
+  echo "$as_me:42754: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -42756,7 +42770,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:42759: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:42773: 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
@@ -42774,10 +42788,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	(*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:42777: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:42791: 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 42780 "configure"
+#line 42794 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -42789,16 +42803,16 @@ struct termios foo; int x = foo.c_iflag
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:42792: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42806: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:42795: \$? = $ac_status" >&5
+  echo "$as_me:42809: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:42798: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42812: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42801: \$? = $ac_status" >&5
+  echo "$as_me:42815: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   termios_bad=no
 else
@@ -42806,7 +42820,7 @@ else
 cat conftest.$ac_ext >&5
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 42809 "configure"
+#line 42823 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -42820,16 +42834,16 @@ struct termios foo; int x = foo.c_iflag
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:42823: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42837: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:42826: \$? = $ac_status" >&5
+  echo "$as_me:42840: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:42829: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42843: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42832: \$? = $ac_status" >&5
+  echo "$as_me:42846: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   termios_bad=unknown
 else
@@ -42845,12 +42859,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-	echo "$as_me:42848: result: $termios_bad" >&5
+	echo "$as_me:42862: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:42853: checking declaration of size-change" >&5
+echo "$as_me:42867: 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
@@ -42865,7 +42879,7 @@ do
 	CPPFLAGS="$cf_save_CPPFLAGS"
 	test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 42868 "configure"
+#line 42882 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -42909,16 +42923,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:42912: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42926: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:42915: \$? = $ac_status" >&5
+  echo "$as_me:42929: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:42918: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42932: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42921: \$? = $ac_status" >&5
+  echo "$as_me:42935: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_sizechange=yes
 else
@@ -42937,7 +42951,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:42940: result: $cf_cv_sizechange" >&5
+echo "$as_me:42954: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 
@@ -42955,14 +42969,14 @@ EOF
 	esac
 fi
 
-echo "$as_me:42958: checking if ttytype is declared in curses library" >&5
+echo "$as_me:42972: 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 42965 "configure"
+#line 42979 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -42974,16 +42988,16 @@ char *x = &ttytype[1]; *x = 1
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42977: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42991: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42980: \$? = $ac_status" >&5
+  echo "$as_me:42994: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42983: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42997: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42986: \$? = $ac_status" >&5
+  echo "$as_me:43000: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_ttytype=yes
 else
@@ -42995,7 +43009,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:42998: result: $cf_cv_have_ttytype" >&5
+echo "$as_me:43012: result: $cf_cv_have_ttytype" >&5
 echo "${ECHO_T}$cf_cv_have_ttytype" >&6
 test $cf_cv_have_ttytype = yes &&
 cat >>confdefs.h <<\EOF
@@ -43004,14 +43018,14 @@ EOF
 
 	if test "$use_wide_curses" = yes ; then
 
-echo "$as_me:43007: checking if curses supports wide characters" >&5
+echo "$as_me:43021: 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 43014 "configure"
+#line 43028 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -43030,16 +43044,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:43033: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43047: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43036: \$? = $ac_status" >&5
+  echo "$as_me:43050: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:43039: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43053: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43042: \$? = $ac_status" >&5
+  echo "$as_me:43056: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_widec_curses=yes
 else
@@ -43050,7 +43064,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:43053: result: $cf_cv_widec_curses" >&5
+echo "$as_me:43067: result: $cf_cv_widec_curses" >&5
 echo "${ECHO_T}$cf_cv_widec_curses" >&6
 
 if test "$cf_cv_widec_curses" = yes ; then
@@ -43060,14 +43074,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	# This is needed on Tru64 5.0 to declare mbstate_t
-	echo "$as_me:43063: checking if we must include wchar.h to declare mbstate_t" >&5
+	echo "$as_me:43077: 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 43070 "configure"
+#line 43084 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -43081,23 +43095,23 @@ mbstate_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:43084: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:43098: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:43087: \$? = $ac_status" >&5
+  echo "$as_me:43101: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:43090: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43104: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43093: \$? = $ac_status" >&5
+  echo "$as_me:43107: \$? = $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 43100 "configure"
+#line 43114 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -43112,16 +43126,16 @@ mbstate_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:43115: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:43129: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:43118: \$? = $ac_status" >&5
+  echo "$as_me:43132: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:43121: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43135: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43124: \$? = $ac_status" >&5
+  echo "$as_me:43138: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_widec_mbstate=yes
 else
@@ -43133,7 +43147,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:43136: result: $cf_cv_widec_mbstate" >&5
+echo "$as_me:43150: result: $cf_cv_widec_mbstate" >&5
 echo "${ECHO_T}$cf_cv_widec_mbstate" >&6
 
 if test "$cf_cv_widec_mbstate" = yes ; then
@@ -43156,14 +43170,14 @@ fi
 
 	fi
 
-echo "$as_me:43159: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+echo "$as_me:43173: 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 43166 "configure"
+#line 43180 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -43185,23 +43199,23 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:43188: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43202: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43191: \$? = $ac_status" >&5
+  echo "$as_me:43205: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:43194: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43208: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43197: \$? = $ac_status" >&5
+  echo "$as_me:43211: \$? = $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 43204 "configure"
+#line 43218 "configure"
 #include "confdefs.h"
 
 #define _XOPEN_SOURCE_EXTENDED
@@ -43223,16 +43237,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:43226: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43240: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43229: \$? = $ac_status" >&5
+  echo "$as_me:43243: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:43232: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43246: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43235: \$? = $ac_status" >&5
+  echo "$as_me:43249: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_xopen_extension=yes
 else
@@ -43244,11 +43258,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:43247: result: $cf_cv_need_xopen_extension" >&5
+echo "$as_me:43261: 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:43251: checking for term.h" >&5
+echo "$as_me:43265: 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
@@ -43269,7 +43283,7 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 43272 "configure"
+#line 43286 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -43283,16 +43297,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:43286: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:43300: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:43289: \$? = $ac_status" >&5
+  echo "$as_me:43303: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:43292: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43306: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43295: \$? = $ac_status" >&5
+  echo "$as_me:43309: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_term_header=$cf_header
 	 break
@@ -43311,7 +43325,7 @@ case $cf_cv_term_header in
 	for cf_header in ncurses/term.h ncursesw/term.h
 	do
 		cat >conftest.$ac_ext <<_ACEOF
-#line 43314 "configure"
+#line 43328 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -43329,16 +43343,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:43332: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:43346: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:43335: \$? = $ac_status" >&5
+  echo "$as_me:43349: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:43338: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43352: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43341: \$? = $ac_status" >&5
+  echo "$as_me:43355: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_term_header=$cf_header
 			 break
@@ -43353,7 +43367,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 esac
 
 fi
-echo "$as_me:43356: result: $cf_cv_term_header" >&5
+echo "$as_me:43370: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 case $cf_cv_term_header in
@@ -43380,7 +43394,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:43383: checking for unctrl.h" >&5
+echo "$as_me:43397: 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
@@ -43401,7 +43415,7 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 43404 "configure"
+#line 43418 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -43415,16 +43429,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:43418: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:43432: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:43421: \$? = $ac_status" >&5
+  echo "$as_me:43435: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:43424: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43438: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43427: \$? = $ac_status" >&5
+  echo "$as_me:43441: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_unctrl_header=$cf_header
 	 break
@@ -43437,12 +43451,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:43440: result: $cf_cv_unctrl_header" >&5
+echo "$as_me:43454: result: $cf_cv_unctrl_header" >&5
 echo "${ECHO_T}$cf_cv_unctrl_header" >&6
 
 case $cf_cv_unctrl_header in
 (no)
-	{ echo "$as_me:43445: WARNING: unctrl.h header not found" >&5
+	{ echo "$as_me:43459: WARNING: unctrl.h header not found" >&5
 echo "$as_me: WARNING: unctrl.h header not found" >&2;}
 	;;
 esac
@@ -43498,10 +43512,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:43501: checking for ${cf_func}" >&5
+	echo "$as_me:43515: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me:-configure}:43504: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:43518: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -43510,7 +43524,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >conftest.$ac_ext <<_ACEOF
-#line 43513 "configure"
+#line 43527 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -43543,16 +43557,16 @@ if (foo + 1234 > 5678)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:43546: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43560: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43549: \$? = $ac_status" >&5
+  echo "$as_me:43563: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:43552: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43566: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43555: \$? = $ac_status" >&5
+  echo "$as_me:43569: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -43568,7 +43582,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:43571: result: $cf_result" >&5
+	echo "$as_me:43585: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test $cf_result != no; then
 		cat >>confdefs.h <<EOF
@@ -43584,13 +43598,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:43587: checking for $ac_func" >&5
+echo "$as_me:43601: 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 43593 "configure"
+#line 43607 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -43621,16 +43635,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:43624: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43638: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43627: \$? = $ac_status" >&5
+  echo "$as_me:43641: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:43630: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43644: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43633: \$? = $ac_status" >&5
+  echo "$as_me:43647: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -43640,7 +43654,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:43643: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:43657: 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
@@ -43654,12 +43668,12 @@ fi
 
 if test $use_color_style != no ; then
 	if test .$cf_cv_color_curses != .yes ; then
-		{ { echo "$as_me:43657: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:43671: 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:43662: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:43676: error: Configuration does not support color-styles" >&5
 echo "$as_me: error: Configuration does not support color-styles" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -43667,7 +43681,7 @@ fi
 
 if test $use_scrollbar != no ; then
 	if test .$cf_cv_fancy_curses != .yes ; then
-		{ echo "$as_me:43670: WARNING: Configuration does not support ACS_xxx definitions" >&5
+		{ echo "$as_me:43684: WARNING: Configuration does not support ACS_xxx definitions" >&5
 echo "$as_me: WARNING: Configuration does not support ACS_xxx definitions" >&2;}
 	else
 
@@ -43681,7 +43695,7 @@ fi
 # use rpath for libraries in unusual places
 
 LD_RPATH_OPT=
-echo "$as_me:43684: checking for an rpath option" >&5
+echo "$as_me:43698: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 case $cf_cv_system_name in
 (irix*)
@@ -43712,12 +43726,12 @@ case $cf_cv_system_name in
 (*)
 	;;
 esac
-echo "$as_me:43715: result: $LD_RPATH_OPT" >&5
+echo "$as_me:43729: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 case "x$LD_RPATH_OPT" in
 (x-R*)
-	echo "$as_me:43720: checking if we need a space after rpath option" >&5
+	echo "$as_me:43734: 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"
 
@@ -43738,7 +43752,7 @@ done
 LIBS="$cf_add_libs"
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 43741 "configure"
+#line 43755 "configure"
 #include "confdefs.h"
 
 int
@@ -43750,16 +43764,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:43753: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43767: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43756: \$? = $ac_status" >&5
+  echo "$as_me:43770: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:43759: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43773: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43762: \$? = $ac_status" >&5
+  echo "$as_me:43776: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_rpath_space=no
 else
@@ -43769,13 +43783,13 @@ cf_rpath_space=yes
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	LIBS="$cf_save_LIBS"
-	echo "$as_me:43772: result: $cf_rpath_space" >&5
+	echo "$as_me:43786: 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:43778: checking if rpath-hack should be disabled" >&5
+echo "$as_me:43792: 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.
@@ -43792,21 +43806,21 @@ else
   cf_disable_rpath_hack=no
 
 fi;
-echo "$as_me:43795: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:43809: 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:43799: checking for updated LDFLAGS" >&5
+echo "$as_me:43813: 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:43802: result: maybe" >&5
+	echo "$as_me:43816: 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:43809: checking for $ac_word" >&5
+echo "$as_me:43823: 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
@@ -43821,7 +43835,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:43824: found $ac_dir/$ac_word" >&5
+echo "$as_me:43838: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -43829,10 +43843,10 @@ fi
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:43832: result: $cf_ldd_prog" >&5
+  echo "$as_me:43846: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:43835: result: no" >&5
+  echo "$as_me:43849: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -43846,7 +43860,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
 		cf_rpath_oops=
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 43849 "configure"
+#line 43863 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -43858,16 +43872,16 @@ printf("Hello");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:43861: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43875: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43864: \$? = $ac_status" >&5
+  echo "$as_me:43878: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:43867: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43881: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43870: \$? = $ac_status" >&5
+  echo "$as_me:43884: \$? = $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`
@@ -43895,7 +43909,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}:43898: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:43912: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
 
 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
 						break
@@ -43907,11 +43921,11 @@ echo "${as_me:-configure}:43898: testing ...adding -L$cf_rpath_dir/lib to LDFLAG
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:43910: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:43924: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:43914: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:43928: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -43948,7 +43962,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:43951: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:43965: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -43961,11 +43975,11 @@ LDFLAGS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:43964: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:43978: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:43968: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:43982: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -44002,7 +44016,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:44005: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:44019: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -44015,14 +44029,14 @@ LIBS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:44018: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:44032: testing ...checked LIBS $LIBS ..." 1>&5
 
 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:44022: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:44036: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 else
-	echo "$as_me:44025: result: no" >&5
+	echo "$as_me:44039: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44123,7 +44137,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:44126: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:44140: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -44299,7 +44313,7 @@ cat >>$CONFIG_STATUS <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:44302: error: ambiguous option: $1
+    { { echo "$as_me:44316: 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;}
@@ -44318,7 +44332,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:44321: error: unrecognized option: $1
+  -*) { { echo "$as_me:44335: 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;}
@@ -44371,7 +44385,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:44374: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:44388: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -44705,7 +44719,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:44708: creating $ac_file" >&5
+    { echo "$as_me:44722: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -44723,7 +44737,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:44726: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:44740: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -44736,7 +44750,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:44739: error: cannot find input file: $f" >&5
+           { { echo "$as_me:44753: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -44752,7 +44766,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:44755: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:44769: 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;}
@@ -44761,7 +44775,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' $ac_item`
       if test -n "$ac_seen"; then
-        { echo "$as_me:44764: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:44778: 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;}
@@ -44798,7 +44812,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:44801: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:44815: 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;}
@@ -44809,7 +44823,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:44812: WARNING: Some variables may not be substituted:
+      { echo "$as_me:44826: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -44858,7 +44872,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:44861: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:44875: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -44869,7 +44883,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:44872: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:44886: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -44882,7 +44896,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:44885: error: cannot find input file: $f" >&5
+           { { echo "$as_me:44899: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -45000,7 +45014,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:45003: $ac_file is unchanged" >&5
+      { echo "$as_me:45017: $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/po/nl.po b/po/nl.po
index 967dab90..32b7b436 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,16 +1,18 @@
 # Dutch translations for lynx.
 # This file is distributed under the same license as the lynx package.
 #
+# "Foi toch, het zwien is dood en het schit nog!"
+#
 # Tijs van Bakel <smoke@casema.net>, 1999, 2000.
 # Luk Claes <luk.claes@ugent.be>, 2004.
+# Erwin Poeze <erwin.poeze@gmail.com>, 2012.
 # Benno Schulenberg <benno@vertaalt.nl>, 2008, 2015.
-# Erwin Poeze <erwin.poeze@gmail.com>, 2012
 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: 2015-03-22 12:57+0100\n"
+"POT-Creation-Date: 2015-04-14 20:53-0400\n"
+"PO-Revision-Date: 2015-04-28 20:49+0200\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "Language: nl\n"
@@ -18,6 +20,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Lokalize 1.0\n"
 
 #. ******************************************************************
 #. * The following definitions are for status line prompts, messages, or
@@ -33,2020 +36,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 "Let op!: %s"
 
-#: LYMessages.c:28
+#: LYMessages.c:29
 msgid "Welcome"
 msgstr "Welkom"
 
-#: LYMessages.c:29
+#: LYMessages.c:30
 msgid "Are you sure you want to quit?"
 msgstr "Afsluiten?"
 
-#: LYMessages.c:31
+#: LYMessages.c:32
 msgid "Really exit from Lynx?"
 msgstr "Lynx afsluiten?"
 
-#: LYMessages.c:33
+#: LYMessages.c:34
 msgid "Connection interrupted."
 msgstr "Verbinding is onderbroken."
 
-#: LYMessages.c:34
+#: LYMessages.c:35
 msgid "Data transfer interrupted."
 msgstr "Gegevensoverdracht is onderbroken."
 
-#: LYMessages.c:35
+#: LYMessages.c:36
 msgid "Cancelled!!!"
 msgstr "Geannuleerd!"
 
-#: LYMessages.c:36
+#: LYMessages.c:37
 msgid "Cancelling!"
 msgstr "Annuleren..."
 
-#: LYMessages.c:37
+#: LYMessages.c:38
 msgid "Excellent!!!"
 msgstr "Prima!"
 
-#: LYMessages.c:38
+#: LYMessages.c:39
 msgid "OK"
 msgstr "OK"
 
-#: LYMessages.c:39
+#: LYMessages.c:40
 msgid "Done!"
 msgstr "Klaar!"
 
-#: LYMessages.c:40
+#: LYMessages.c:41
 msgid "Bad request!"
 msgstr "Ongeldig verzoek!"
 
-#: LYMessages.c:41
+#: LYMessages.c:42
 msgid "previous"
 msgstr "vorige"
 
-#: LYMessages.c:42
+#: LYMessages.c:43
 msgid "next screen"
 msgstr "volgend scherm"
 
-#: LYMessages.c:43
+#: LYMessages.c:44
 msgid "HELP!"
 msgstr "HELP!"
 
-#: LYMessages.c:44
+#: LYMessages.c:45
 msgid ", help on "
 msgstr ", hulp bij "
 
 #. #define HELP
-#: LYMessages.c:46
+#: LYMessages.c:47
 msgid "Commands: Use arrow keys to move, '?' for help, 'q' to quit, '<-' to go back."
 msgstr "Opdrachten: pijltjes verplaatsen, '?'=hulp, 'q'=afsluiten, '<-'=terug."
 
 #. #define MOREHELP
-#: LYMessages.c:48
+#: LYMessages.c:49
 msgid "-- press space for more, use arrow keys to move, '?' for help, 'q' to quit."
 msgstr "-- spatiebalk=volgend blad, pijltjes verplaatsen, '?'=hulp, 'q'=afsluiten."
 
-#: LYMessages.c:49
+#: LYMessages.c:50
 msgid "-- press space for next page --"
 msgstr "-- druk op spatiebalk voor volgend blad --"
 
-#: LYMessages.c:50
+#: LYMessages.c:51
 msgid "URL too long"
 msgstr "URL is te lang"
 
 #. 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 "(Tekstinvoerveld) Niet actief.  Druk op <Enter> om te activeren."
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE_INA
-#: LYMessages.c:58
+#: LYMessages.c:59
 msgid "(Textarea) Inactive.  Press <return> to activate."
 msgstr "(Tekstgebied) Niet actief.  Druk op <Enter> om te activeren."
 
 #. #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 "(Tekstgebied) Niet actief.  Druk op <Enter> om te activeren (%s voor editor)."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_INA
-#: LYMessages.c:62
+#: LYMessages.c:63
 msgid "(Form field) Inactive.  Use <return> to edit."
 msgstr "(Formulierveld) Niet actief.  Gebruik <Enter> om te wijzigen."
 
 #. #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 "(Form.veld) Niet actief.  Wijzig met <Enter> (%s = verzenden zonder 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 "(Form.veld) Niet actief.  Wijzig met <Enter>, verzenden met twee keer <Enter>."
 
 #. #define FORM_TEXT_SUBMIT_MAILTO_MSG_INA
-#: LYMessages.c:68
+#: LYMessages.c:69
 msgid "(mailto form field) Inactive.  Press <return> to change."
 msgstr "(E-mailformulierveld) Niet actief.  Gebruik <Enter> om te wijzigen."
 
 #. #define FORM_LINK_PASSWORD_MESSAGE_INA
-#: LYMessages.c:70
+#: LYMessages.c:71
 msgid "(Password entry field) Inactive.  Press <return> to activate."
 msgstr "(Wachtwoordveld) Niet actief.  Gebruik <Enter> om te activeren."
 
 #. #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 "ONVERANDERBAAR bestandsnaaminvoerveld.  Ga weg met pijltjes of <Tab>."
 
 #. #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 "(Bestandsnaamveld) Voer een bestandsnaam in.  Ga weg met pijltjes of <Tab>."
 
 #. #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 "(Tekstinvoerveld) Voer tekst in.  Ga weg met pijltjes of <Tab>."
 
 #. #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 "(Tekstgebied) Voer tekst in.  Ga weg met pijltjes of <Tab>."
 
 #. #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 "(Tekstgebied) Voer tekst in.  Ga weg met pijltjes of <Tab> (%s voor editor)."
 
 #. #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 "ONVERANDERBAAR formuliertekstveld.  Ga weg met pijltjes of <Tab>."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE
-#: LYMessages.c:85
+#: LYMessages.c:86
 msgid "(Form field) Enter text.  Use <return> to submit."
 msgstr "(Formulierveld) Voer tekst in.  Verzend met <Enter>."
 
 #. #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 "(Formulierveld) Voer tekst in.  Verzend met <Enter> (%s = geen 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 "(Form.veld) Voer tekst in.  <Enter>=verzenden, ga weg met pijltjes of <Tab>."
 
 #. #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 "ONVERANDERBAAR formulierveld.  Ga weg met pijltjes of <Tab>."
 
 #. #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-mailformulierveld) Voer tekst in.  Verzend met <Enter>, ga weg met pijltjes."
 
 #. #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-mailformulierveld) Post verzenden is niet toegestaan; u kunt niets versturen."
 
 #. #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 "(Wachtwoordveld) Voer tekst in.  Ga weg met pijltjes of <Tab>."
 
 #. #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 "ONVERANDERBAAR formulierwachtwoord.  Ga weg met pijltjes of <Tab>."
 
 #. #define FORM_LINK_CHECKBOX_MESSAGE
-#: LYMessages.c:101
+#: LYMessages.c:102
 msgid "(Checkbox Field)   Use right-arrow or <return> to toggle."
 msgstr "(Aanvinkveld)   Gebruik pijltje-rechts of <Enter> om te veranderen."
 
 #. #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 "ONVERANDERBAAR formulieraanvinkveld.  Ga weg met pijltjes of <Tab>."
 
 #. #define FORM_LINK_RADIO_MESSAGE
-#: LYMessages.c:105
+#: LYMessages.c:106
 msgid "(Radio Button)   Use right-arrow or <return> to toggle."
 msgstr "(Drukknop)   Gebruik pijltje-rechts of <Enter> om te veranderen."
 
 #. #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 "ONVERANDERBARE formulierdrukknop.  Ga weg met pijltjes of <Tab>."
 
 #. #define FORM_LINK_SUBMIT_PREFIX
-#: LYMessages.c:109
+#: LYMessages.c:110
 msgid "Submit ('x' for no cache) to "
 msgstr "Verzenden ('x' voor geen cache) naar "
 
 #. #define FORM_LINK_RESUBMIT_PREFIX
-#: LYMessages.c:111
+#: LYMessages.c:112
 msgid "Submit to "
 msgstr "Verzenden naar "
 
 #. #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 "(Form.verzendknop)  Verzend met pijltje-rechts of <Enter> ('x'-geen cache)."
 
 #. #define FORM_LINK_RESUBMIT_MESSAGE
-#: LYMessages.c:115
+#: LYMessages.c:116
 msgid "(Form submit button) Use right-arrow or <return> to submit."
 msgstr "(Formulierverzendknop)  Verzend met pijltje-rechts of <Enter>."
 
 #. #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 "UITGESCHAKELDE formulierverzendknop.  Ga weg met pijltjes of <Tab>."
 
 #. #define FORM_LINK_SUBMIT_MAILTO_PREFIX
-#: LYMessages.c:119
+#: LYMessages.c:120
 msgid "Submit mailto form to "
 msgstr "E-mailformulier verzenden naar "
 
 #. #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 "(E-mailformulierverzendknop)  Verzend met pijltje-rechts of <Enter>."
 
 #. #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 "(E-mailformulierverzendknop)  Post is niet toegestaan; u kunt niet verzenden."
 
 #. #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 "(Formulierherstelknop)  Herstel standaardwaarden met pijltje-rechts of <Enter>."
 
 #. #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 "UITGESCHAKELDE formulierherstelknop.  Ga weg met pijltjes of <Tab>."
 
 #. #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 "(Scriptknop)   Ga weg met pijl-op of -neer of <Tab>."
+msgstr "(Scriptknop)   Ga weg met pijltjestoetsen of <Tab>."
 
 #. #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 "UITGESCHAKELDE scriptknop.  Ga weg met pijl-op of -neer, of <Tab>."
+msgstr "UITGESCHAKELDE scriptknop.  Ga weg met pijltjestoetsen of <Tab>."
 
 #. #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 "(Optielijst) Druk op <Enter>, dan pijltjes en vervolgens <Enter> om te kiezen."
 
 #. #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 "(Keuzelijst) Druk op <Enter>, dan pijltjes en vervolgens <Enter> om een optie te kiezen."
+msgstr "(Keuzelijst) Druk op <Enter>, dan pijltjes en vervolgens <Enter> om te kiezen."
 
 #. #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 "ONVERANDERBARE optielijst.  <Enter> en pijltjes om te bekijken of weg te gaan."
+msgstr "ONVERANDERBARE optielijst.  <Enter> of pijltjes om te bekijken of weg te gaan."
 
 #. #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 "ONVERANDERBARE keuzelijst.  <Enter> of pijltjes om te bekijken of weg te gaan."
 
-#: LYMessages.c:140
+#: LYMessages.c:141
 msgid "Submitting form..."
 msgstr "Verzenden van formulier..."
 
-#: LYMessages.c:141
+#: LYMessages.c:142
 msgid "Resetting form..."
 msgstr "Herstellen van oningevuld formulier..."
 
 #. #define RELOADING_FORM
-#: LYMessages.c:143
+#: LYMessages.c:144
 msgid "Reloading document.  Any form entries will be lost!"
 msgstr "Bezig document te herladen.  Alle formulierinvoer gaat verloren!"
 
 #. #define LINK_NOT_IN_FORM
-#: LYMessages.c:145
+#: LYMessages.c:146
 msgid "The current link is not in a FORM"
 msgstr "De huidige koppeling zit niet in een formulier"
 
-#: LYMessages.c:146
+#: LYMessages.c:147
 #, c-format
 msgid "Warning: Cannot transcode form data to charset %s!"
 msgstr "Waarschuwing: kan de formuliergegevens niet omzetten naar tekenset %s!"
 
 #. #define NORMAL_LINK_MESSAGE
-#: LYMessages.c:149
+#: LYMessages.c:150
 msgid "(NORMAL LINK)   Use right-arrow or <return> to activate."
 msgstr "(Gewone link)   Activeer met pijltje-rechts of <Enter>."
 
-#: LYMessages.c:150
+#: LYMessages.c:151
 msgid "The resource requested is not available at this time."
 msgstr "De gevraagde hulpbron is op dit moment niet beschikbaar."
 
-#: LYMessages.c:151
+#: LYMessages.c:152
 msgid "Enter Lynx keystroke command: "
 msgstr "Voer een Lynx-sneltoetscommando in: "
 
-#: LYMessages.c:152
+#: LYMessages.c:153
 msgid "Looking up "
 msgstr "Opzoeken van "
 
-#: LYMessages.c:153
+#: LYMessages.c:154
 #, c-format
 msgid "Getting %s"
 msgstr "%s wordt opgehaald"
 
-#: LYMessages.c:154
+#: LYMessages.c:155
 #, c-format
 msgid "Skipping %s"
 msgstr "%s wordt overgeslagen"
 
-#: LYMessages.c:155
+#: LYMessages.c:156
 #, c-format
 msgid "Using %s"
 msgstr "%s wordt gebruikt"
 
-#: LYMessages.c:156
+#: LYMessages.c:157
 #, c-format
 msgid "Illegal URL: %s"
 msgstr "Ongeldige URL: %s"
 
-#: LYMessages.c:157
+#: LYMessages.c:158
 #, c-format
 msgid "Badly formed address %s"
 msgstr "Foutief adres %s"
 
-#: LYMessages.c:158
+#: LYMessages.c:159
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: LYMessages.c:159
+#: LYMessages.c:160
 msgid "Unable to access WWW file!!!"
-msgstr "Kan WWW-bestand niet vinden!!!"
+msgstr "Kan WWW-bestand niet vinden!"
 
-#: LYMessages.c:160
+#: LYMessages.c:161
 #, c-format
 msgid "This is a searchable index.  Use %s to search."
 msgstr "Deze index kan doorzocht worden.  Gebruik %s om te zoeken."
 
 #. #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 "--Meer--  Deze index kan doorzocht worden.  Gebruik %s om te zoeken."
 
-#: LYMessages.c:163
+#: LYMessages.c:164
 msgid "You have entered an invalid link number."
 msgstr "U hebt een ongeldig linknummer ingevoerd."
 
 #. #define SOURCE_HELP
-#: LYMessages.c:165
+#: LYMessages.c:166
 msgid "Currently viewing document source.  Press '\\' to return to rendered version."
 msgstr "Dit is de brontekst van het document.  Druk op '\\' voor de verwerkte versie."
 
 #. #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 "  Pijltje-op/neer=verplaatsen; rechts=link volgen; links=terug.\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)ulp O)pties P)rint G)a naar M)-beginscherm Q)-stop /=zoek [bkspc]=historie\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)verige opdr H)ulp K)eymap G)a naar P)rint M)-beginscherm o)pties Q)-stop\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)verige opdr B)-terug E)dit D)ownload ^R)-herladen ^W)is scherm  doorzoeken: /\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)verige C)ommentaar <backspace>-Historie Boekenleggers: V)-inzien A)-toevoegen R)-wissen\n"
 
 #. #define FORM_NOVICELINE_ONE
-#: LYMessages.c:177
+#: LYMessages.c:178
 msgid "            Enter text into the field by typing on the keyboard              "
 msgstr "            Voer tekst in door te typen                                       "
 
 #. #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 wist alle tekst in het invoerveld, [Backspace] wist één teken.    "
 
 #. #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 wist tekst in het invoerveld, [Backspace] wist één teken.     "
+msgstr "      Ctrl-U wist tekst in het invoerveld, [Backspace] wist één teken      "
 
 #. #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 wist alle tekst in het invoerveld, [Backspace] wist één teken."
+msgstr "    %s wist alle tekst in het invoerveld, [Backspace] wist één teken     "
 
 #. #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 wist tekst in het invoerveld, [Backspace] wist één teken."
+msgstr "      %s wist tekst in het invoerveld, [Backspace] wist één teken      "
 
 #. mailto
-#: LYMessages.c:188
+#: LYMessages.c:189
 msgid "Malformed mailto form submission!  Cancelled!"
-msgstr "Verkeerd geformuleerde mailto-formulierverzending!  Geannuleerd!"
+msgstr "Onjuist gevormde mailto-formulierverzending!  Geannuleerd!"
 
-#: LYMessages.c:189
+#: LYMessages.c:190
 msgid "Warning!  Control codes in mail address replaced by ?"
 msgstr "Waarschuwing!  Stuurcodes in mailadres zijn vervangen door ?"
 
-#: LYMessages.c:190
+#: LYMessages.c:191
 msgid "Mail disallowed!  Cannot submit."
 msgstr "U mag niet e-mailen!  Gegevens kunnen niet worden verzonden."
 
-#: LYMessages.c:191
+#: LYMessages.c:192
 msgid "Mailto form submission failed!"
 msgstr "Mailto-formulierverzending is mislukt!"
 
-#: LYMessages.c:192
+#: LYMessages.c:193
 msgid "Mailto form submission Cancelled!!!"
 msgstr "Mailto-formulierverzending is geannuleerd!"
 
-#: LYMessages.c:193
+#: LYMessages.c:194
 msgid "Sending form content..."
 msgstr "Gegevens worden verzonden..."
 
-#: LYMessages.c:194
+#: LYMessages.c:195
 msgid "No email address is present in mailto URL!"
 msgstr "Er staat geen e-mailadres in de mailto-URL!"
 
 #. #define MAILTO_URL_TEMPOPEN_FAILED
-#: LYMessages.c:196
+#: LYMessages.c:197
 msgid "Unable to open temporary file for mailto URL!"
 msgstr "Kan geen tijdelijk bestand voor mailto-URL openen!"
 
 #. #define INC_ORIG_MSG_PROMPT
-#: LYMessages.c:198
+#: LYMessages.c:199
 msgid "Do you wish to include the original message?"
 msgstr "Wilt u het originele bericht opnemen?"
 
 #. #define INC_PREPARSED_MSG_PROMPT
-#: LYMessages.c:200
+#: LYMessages.c:201
 msgid "Do you wish to include the preparsed source?"
 msgstr "Wilt u de voorverwerkte brontekst opnemen?"
 
 #. #define SPAWNING_EDITOR_FOR_MAIL
-#: LYMessages.c:202
+#: LYMessages.c:203
 msgid "Spawning your selected editor to edit mail message"
 msgstr "Uw editor wordt gestart om het e-mailbericht te maken"
 
 #. #define ERROR_SPAWNING_EDITOR
-#: LYMessages.c:204
+#: LYMessages.c:205
 msgid "Error spawning editor, check your editor definition in the options menu"
 msgstr "De editor wil niet starten; controleer de instellingen in het Optiesmenu"
 
-#: LYMessages.c:205
+#: LYMessages.c:206
 msgid "Send this comment?"
 msgstr "Dit commentaar verzenden?"
 
-#: LYMessages.c:206
+#: LYMessages.c:207
 msgid "Send this message?"
 msgstr "Dit bericht verzenden?"
 
-#: LYMessages.c:207
+#: LYMessages.c:208
 msgid "Sending your message..."
 msgstr "Uw bericht wordt verzonden..."
 
-#: LYMessages.c:208
+#: LYMessages.c:209
 msgid "Sending your comment:"
 msgstr "Uw commentaar wordt verzonden:"
 
 #. textarea
-#: LYMessages.c:211
+#: LYMessages.c:212
 msgid "Not in a TEXTAREA; cannot use external editor."
 msgstr "Niet in een TEKSTVELD; kan geen externe editor gebruiken."
 
-#: LYMessages.c:212
+#: LYMessages.c:213
 msgid "Not in a TEXTAREA; cannot use command."
 msgstr "Niet in een TEKSTVELD; dit commando heeft hier geen zin."
 
-#: LYMessages.c:214
+#: LYMessages.c:215
 msgid "file: ACTIONs are disallowed!"
 msgstr "bestand: ACTIEs zijn niet toegestaan!"
 
 #. #define FILE_SERVED_LINKS_DISALLOWED
-#: LYMessages.c:216
+#: LYMessages.c:217
 msgid "file: URLs via served links are disallowed!"
 msgstr "bestand: URL's via aangeboden links zijn niet toegestaan!"
 
-#: LYMessages.c:217
+#: LYMessages.c:218
 msgid "Access to local files denied."
 msgstr "Toegang tot lokale bestanden is geweigerd."
 
-#: LYMessages.c:218
+#: LYMessages.c:219
 msgid "file: URLs via bookmarks are disallowed!"
 msgstr "bestand: URL's via boekenleggers zijn niet toegestaan!"
 
 #. #define SPECIAL_VIA_EXTERNAL_DISALLOWED
-#: LYMessages.c:220
+#: LYMessages.c:221
 msgid "This special URL is not allowed in external documents!"
 msgstr "Deze specifieke URL is niet toegestaan in externe documenten!"
 
-#: LYMessages.c:221
+#: LYMessages.c:222
 msgid "Press <return> to return to Lynx."
 msgstr "Druk op <Enter> om terug te keren naar Lynx."
 
 #. #define SPAWNING_MSG
-#: LYMessages.c:224
+#: LYMessages.c:225
 msgid "Spawning DCL subprocess.  Use 'logout' to return to Lynx.\n"
 msgstr "DCL-subproces wordt gestart.  Gebruik 'logout' om terug te keren naar Lynx.\n"
 
 #. #define SPAWNING_MSG
-#: LYMessages.c:228
+#: LYMessages.c:229
 msgid "Type EXIT to return to Lynx.\n"
 msgstr "Typ 'exit' om terug te keren naar Lynx.\n"
 
 #. #define SPAWNING_MSG
-#: LYMessages.c:231
+#: LYMessages.c:232
 msgid "Spawning your default shell.  Use 'exit' to return to Lynx.\n"
 msgstr "Uw standaardshell wordt aangeroepen.  Typ 'exit' om terug te keren naar Lynx.\n"
 
-#: LYMessages.c:234
+#: LYMessages.c:235
 msgid "Spawning is currently disabled."
 msgstr "Het starten van externe programma's is uitgeschakeld."
 
-#: LYMessages.c:235
+#: LYMessages.c:236
 msgid "The 'd'ownload command is currently disabled."
 msgstr "Het 'd'ownload-commando is momenteel uitgeschakeld."
 
-#: LYMessages.c:236
+#: LYMessages.c:237
 msgid "You cannot download an input field."
 msgstr "U kunt niet downloaden in een invoerveld."
 
-#: LYMessages.c:237
+#: LYMessages.c:238
 msgid "Form has a mailto action!  Cannot download."
 msgstr "Formulier heeft een mailto-actie!  Kan niet downloaden."
 
-#: LYMessages.c:238
+#: LYMessages.c:239
 msgid "You cannot download a mailto: link."
 msgstr "U kunt een 'mailto:'-koppeling niet downloaden."
 
-#: LYMessages.c:239
+#: LYMessages.c:240
 msgid "You cannot download cookies."
 msgstr "U kunt koekjes niet downloaden."
 
-#: LYMessages.c:240
+#: LYMessages.c:241
 msgid "You cannot download a printing option."
 msgstr "U kunt een printopdracht niet downloaden."
 
-#: LYMessages.c:241
+#: LYMessages.c:242
 msgid "You cannot download an upload option."
 msgstr "U kunt een upload-optie niet downloaden."
 
-#: LYMessages.c:242
+#: LYMessages.c:243
 msgid "You cannot download an permit option."
 msgstr "U kunt een toestemmingsoptie niet downloaden."
 
-#: LYMessages.c:243
+#: LYMessages.c:244
 msgid "This special URL cannot be downloaded!"
 msgstr "Deze specifieke URL kan niet worden gedownload!"
 
-#: LYMessages.c:244
+#: LYMessages.c:245
 msgid "Nothing to download."
 msgstr "Er is niets om te downloaden."
 
-#: LYMessages.c:245
+#: LYMessages.c:246
 msgid "Trace ON!"
 msgstr "Traceren AAN!"
 
-#: LYMessages.c:246
+#: LYMessages.c:247
 msgid "Trace OFF!"
 msgstr "Traceren UIT!"
 
 #. #define CLICKABLE_IMAGES_ON
-#: LYMessages.c:248
+#: LYMessages.c:249
 msgid "Links will be included for all images!  Reloading..."
 msgstr "Links voor alle afbeeldingen worden opgenomen!  Herladen..."
 
 #. #define CLICKABLE_IMAGES_OFF
-#: LYMessages.c:250
+#: LYMessages.c:251
 msgid "Standard image handling restored!  Reloading..."
 msgstr "Normale afhandeling van afbeeldingen is hersteld!  Herladen..."
 
 #. #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 worden ingevoegd voor inlines zonder ALT-strings!  Herladen..."
 
 #. #define PSEUDO_INLINE_ALTS_OFF
-#: LYMessages.c:254
+#: LYMessages.c:255
 msgid "Inlines without an ALT string specified will be ignored!  Reloading..."
 msgstr "Inlines zonder ALT-strings worden genegeerd!  Herladen..."
 
-#: LYMessages.c:255
+#: LYMessages.c:256
 msgid "Raw 8-bit or CJK mode toggled OFF!  Reloading..."
 msgstr "Ruwe 8-bit- of CJK-modus is UITgezet!  Herladen..."
 
-#: LYMessages.c:256
+#: LYMessages.c:257
 msgid "Raw 8-bit or CJK mode toggled ON!  Reloading..."
 msgstr "Ruwe 8-bit- of CJK-modus is AANgezet!  Herladen..."
 
 #. #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 "'HEAD'-verzoek verzenden voor D)ocument, L)ink of C)-annuleren? (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 "'HEAD'-verzoek verzenden voor D)ocument of C)-annuleren? (d,c): "
 
-#: LYMessages.c:261
+#: LYMessages.c:262
 msgid "Sorry, the document is not an http URL."
 msgstr "Sorry, het document is geen http-URL."
 
-#: LYMessages.c:262
+#: LYMessages.c:263
 msgid "Sorry, the link is not an http URL."
 msgstr "Sorry, de link is geen http-URL."
 
-#: LYMessages.c:263
+#: LYMessages.c:264
 msgid "Sorry, the ACTION for this form is disabled."
 msgstr "Sorry, de ACTIE voor dit formulier is uitgeschakeld."
 
 #. #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 "Sorry, de ACTIE voor dit formulier is geen http-URL."
 
-#: LYMessages.c:266
+#: LYMessages.c:267
 msgid "Not an http URL or form ACTION!"
 msgstr "Niet een http-URL of formulier-ACTIE!"
 
-#: LYMessages.c:267
+#: LYMessages.c:268
 msgid "This special URL cannot be a form ACTION!"
 msgstr "Deze specifieke URL kan geen formulier-ACTIE zijn!"
 
-#: LYMessages.c:268
+#: LYMessages.c:269
 msgid "URL is not in starting realm!"
 msgstr "URL is niet in begin-omgeving!"
 
-#: LYMessages.c:269
+#: LYMessages.c:270
 msgid "News posting is disabled!"
 msgstr "Nieuwsberichten zenden is uitgeschakeld!"
 
-#: LYMessages.c:270
+#: LYMessages.c:271
 msgid "File management support is disabled!"
 msgstr "Bestandsbeheer is uitgeschakeld!"
 
-#: LYMessages.c:271
+#: LYMessages.c:272
 msgid "No jump file is currently available."
 msgstr "Er is momenteel geen snelkoppelingenbestand beschikbaar."
 
-#: LYMessages.c:272
+#: LYMessages.c:273
 msgid "Jump to (use '?' for list): "
 msgstr "Spring naar ('?' toont een lijst): "
 
-#: LYMessages.c:273
+#: LYMessages.c:274
 msgid "Jumping to a shortcut URL is disallowed!"
 msgstr "Springen naar een snelkoppeling-URL is niet toegestaan!"
 
-#: LYMessages.c:274
+#: LYMessages.c:275
 msgid "Random URL is disallowed!  Use a shortcut."
 msgstr "Willekeurige URL is niet toegestaan!  Gebruik een sneltoets."
 
-#: LYMessages.c:275
+#: LYMessages.c:276
 msgid "No random URLs have been used thus far."
 msgstr "Tot nog toe zijn er geen willeukeurige URL's gebruikt."
 
-#: LYMessages.c:276
+#: LYMessages.c:277
 msgid "Bookmark features are currently disabled."
 msgstr "Boekenleggerfuncties zijn momenteel uitgeschakeld."
 
-#: LYMessages.c:277
+#: LYMessages.c:278
 msgid "Execution via bookmarks is disabled."
 msgstr "Uitvoeren via boekenleggers is uitgeschakeld."
 
 #. #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 "Boekenleggerbestand is niet opgegeven.  Gebruik %s om de opties te zien."
 
 #. #define NO_TEMP_FOR_HOTLIST
-#: LYMessages.c:281
+#: LYMessages.c:282
 msgid "Unable to open tempfile for X Mosaic hotlist conversion."
 msgstr "Kan geen tijdelijk bestand openen voor 'X Mosaic hotlist'-conversie."
 
-#: LYMessages.c:282
+#: LYMessages.c:283
 msgid "ERROR - unable to open bookmark file."
 msgstr "FOUT -- Kan boekenleggerbestand niet openen."
 
 #. #define BOOKMARK_OPEN_FAILED_FOR_DEL
-#: LYMessages.c:284
+#: LYMessages.c:285
 msgid "Unable to open bookmark file for deletion of link."
 msgstr "Kan boekenleggerbestand niet openen om link te verwijderen."
 
 #. #define BOOKSCRA_OPEN_FAILED_FOR_DEL
-#: LYMessages.c:286
+#: LYMessages.c:287
 msgid "Unable to open scratch file for deletion of link."
 msgstr "Kan geen kladbestand openen om link te verwijderen."
 
-#: LYMessages.c:288
+#: LYMessages.c:289
 msgid "Error renaming scratch file."
 msgstr "Fout bij het hernoemen van kladbestand."
 
-#: LYMessages.c:290
+#: LYMessages.c:291
 msgid "Error renaming temporary file."
 msgstr "Fout bij het hernoemen van tijdelijk bestand."
 
 #. #define BOOKTEMP_COPY_FAIL
-#: LYMessages.c:292
+#: LYMessages.c:293
 msgid "Unable to copy temporary file for deletion of link."
 msgstr "Kan tijdelijk bestand niet kopiëren om link te verwijderen."
 
 #. #define BOOKTEMP_REOPEN_FAIL_FOR_DEL
-#: LYMessages.c:294
+#: LYMessages.c:295
 msgid "Unable to reopen temporary file for deletion of link."
 msgstr "Kan tijdelijk bestand niet heropenen om link te verwijderen."
 
 #. #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 "De link gebruikt meer dan één regel in het boekenleggerbestand."
 
-#: LYMessages.c:298
+#: LYMessages.c:299
 msgid "Bookmark deletion failed."
 msgstr "Wissen van boekenlegger is mislukt."
 
 #. #define BOOKMARKS_NOT_TRAVERSED
-#: LYMessages.c:300
+#: LYMessages.c:301
 msgid "Bookmark files cannot be traversed (only http URLs)."
 msgstr "Boekenleggerbestanden kunnen niet doorkruist worden (alleen http-URL's)."
 
 #. #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 boekenleggerbestand niet openen; gebruik 'a' om de link eerst op te slaan"
 
-#: LYMessages.c:303
+#: LYMessages.c:304
 msgid "There are no links in this bookmark file!"
 msgstr "Er zijn geen links in dit boekenleggerbestand!"
 
 #. #define CACHE_D_OR_CANCEL
-#: LYMessages.c:305
+#: LYMessages.c:306
 msgid "D)elete cached document or C)ancel? (d,c): "
 msgstr "Gecachet document D)-verwijderen of C)-annuleren? (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 "Opslaan in boekenleggerbestand: D)ocument, L)ink of C)-annuleren? (d,l,c): "
 
-#: LYMessages.c:308
+#: LYMessages.c:309
 msgid "Save D)ocument to bookmark file or C)ancel? (d,c): "
 msgstr "Opslaan in boekenleggerbestand: D)ocument of C)-annuleren? (d,c): "
 
-#: LYMessages.c:309
+#: LYMessages.c:310
 msgid "Save L)ink to bookmark file or C)ancel? (l,c): "
 msgstr "Opslaan in boekenleggerbestand: L)ink of C)-annuleren? (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 "Kan geen boekenlegger maken van document van formulier met POST-informatie."
 
-#: LYMessages.c:312
+#: LYMessages.c:313
 msgid "Cannot save form fields/links"
-msgstr "Kan formuliervelden/links niet opslaan"
+msgstr "Kan formuliervelden/-links niet opslaan"
 
 #. #define NOBOOK_HSML
-#: LYMessages.c:314
+#: LYMessages.c:315
 msgid "History, showinfo, menu and list files cannot be saved as bookmarks."
 msgstr "Kan geen boekenleggers maken van historie, info-overzicht, menu of lijsten."
 
 #. #define CONFIRM_BOOKMARK_DELETE
-#: LYMessages.c:316
+#: LYMessages.c:317
 msgid "Do you really want to delete this link from your bookmark file?"
 msgstr "Deze link echt uit het boekenleggerbestand verwijderen?"
 
-#: LYMessages.c:317
+#: LYMessages.c:318
 msgid "Malformed address."
 msgstr "Ongeldig adres."
 
 #. #define HISTORICAL_ON_MINIMAL_OFF
-#: LYMessages.c:319
+#: LYMessages.c:320
 msgid "Historical comment parsing ON (Minimal is overridden)!"
 msgstr "Oorspronkelijke commentaarverwerking AAN (Minimale methode is onderdrukt)!"
 
 #. #define HISTORICAL_OFF_MINIMAL_ON
-#: LYMessages.c:321
+#: LYMessages.c:322
 msgid "Historical comment parsing OFF (Minimal is in effect)!"
 msgstr "Oorspronkelijke commentaarverwerking UIT (Minimale methode is actief)!"
 
 #. #define HISTORICAL_ON_VALID_OFF
-#: LYMessages.c:323
+#: LYMessages.c:324
 msgid "Historical comment parsing ON (Valid is overridden)!"
 msgstr "Oorspronkelijke commentaarverwerking AAN (Geldige methode is onderdrukt)!"
 
 #. #define HISTORICAL_OFF_VALID_ON
-#: LYMessages.c:325
+#: LYMessages.c:326
 msgid "Historical comment parsing OFF (Valid is in effect)!"
 msgstr "Oorspronkelijke commentaarverwerking UIT (Geldige methode is actief)!"
 
 #. #define MINIMAL_ON_IN_EFFECT
-#: LYMessages.c:327
+#: LYMessages.c:328
 msgid "Minimal comment parsing ON (and in effect)!"
 msgstr "Minimale verwerking van commentaar AAN (en actief)!"
 
 #. #define MINIMAL_OFF_VALID_ON
-#: LYMessages.c:329
+#: LYMessages.c:330
 msgid "Minimal comment parsing OFF (Valid is in effect)!"
 msgstr "Minimale verwerking van commentaar UIT (Geldige methode is actief)!"
 
 #. #define MINIMAL_ON_BUT_HISTORICAL
-#: LYMessages.c:331
+#: LYMessages.c:332
 msgid "Minimal comment parsing ON (but Historical is in effect)!"
 msgstr "Minimale verwerking van commentaar AAN (Oorspronkelijke methode is actief)!"
 
 #. #define MINIMAL_OFF_HISTORICAL_ON
-#: LYMessages.c:333
+#: LYMessages.c:334
 msgid "Minimal comment parsing OFF (Historical is in effect)!"
 msgstr "Minimale verwerking van commentaar UIT (Oorspronkelijke methode is actief)!"
 
-#: LYMessages.c:334
+#: LYMessages.c:335
 msgid "Soft double-quote parsing ON!"
 msgstr "'Soft double-quote' ontleden AAN!"
 
-#: LYMessages.c:335
+#: LYMessages.c:336
 msgid "Soft double-quote parsing OFF!"
 msgstr "'Soft double-quote' ontleden UIT!"
 
-#: LYMessages.c:336
+#: LYMessages.c:337
 msgid "Now using TagSoup parsing of HTML."
 msgstr "Vanaf nu wordt 'TagSoup' gebruikt om HTML te ontleden."
 
-#: LYMessages.c:337
+#: LYMessages.c:338
 msgid "Now using SortaSGML parsing of HTML!"
 msgstr "Vanaf nu wordt 'SortaSGML' gebruikt om HTML te ontleden."
 
-#: LYMessages.c:338
+#: LYMessages.c:339
 msgid "You are already at the end of this document."
 msgstr "Dit is het einde van het document."
 
-#: LYMessages.c:339
+#: LYMessages.c:340
 msgid "You are already at the beginning of this document."
 msgstr "Dit is het begin van het document."
 
-#: LYMessages.c:340
+#: LYMessages.c:341
 #, c-format
 msgid "You are already at page %d of this document."
 msgstr "Dit is pagina %d van dit document."
 
-#: LYMessages.c:341
+#: LYMessages.c:342
 #, c-format
 msgid "Link number %d already is current."
 msgstr "Linknummer %d is al geselecteerd."
 
-#: LYMessages.c:342
+#: LYMessages.c:343
 msgid "You are already at the first document"
 msgstr "Dit is het eerste document."
 
-#: LYMessages.c:343
+#: LYMessages.c:344
 msgid "There are no links above this line of the document."
 msgstr "Boven deze regel zijn er geen links in dit document."
 
-#: LYMessages.c:344
+#: LYMessages.c:345
 msgid "There are no links below this line of the document."
 msgstr "Beneden deze regel zijn er geen links in dit document."
 
 #. #define MAXLEN_REACHED_DEL_OR_MOV
-#: LYMessages.c:346
+#: LYMessages.c:347
 msgid "Maximum length reached!  Delete text or move off field."
 msgstr "Maximale lengte is bereikt!  Verwijder tekst of ga hier weg."
 
 #. #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 "U staat niet op een formulierverzendknop of op een normale link."
 
 #. #define NEED_CHECKED_RADIO_BUTTON
-#: LYMessages.c:350
+#: LYMessages.c:351
 msgid "One radio button must be checked at all times!"
-msgstr "Er moet altijd één drukknop ingedrukt zijn!"
+msgstr "Er moet altijd één keuzeknop ingedrukt zijn!"
 
-#: LYMessages.c:351
+#: LYMessages.c:352
 msgid "No submit button for this form, submit single text field?"
 msgstr "Geen invoerknop aanwezig voor dit formulier; het enige tekstveld verzenden?"
 
-#: LYMessages.c:352
+#: LYMessages.c:353
 msgid "Do you want to go back to the previous document?"
 msgstr "Wilt u teruggaan naar het vorige document?"
 
-#: LYMessages.c:353
+#: LYMessages.c:354
 msgid "Use arrows or tab to move off of field."
 msgstr "Gebruik pijltjes of <Tab> om weg te gaan van dit veld."
 
 #. #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 "Voer tekst in.  Ga weg met pijltjes of <Tab>."
 
-#: LYMessages.c:356
+#: LYMessages.c:357
 msgid "** Bad HTML!!  No form action defined. **"
 msgstr "** Onjuiste HTML!!  Geen formulieractie gedefinieerd. **"
 
-#: LYMessages.c:357
+#: LYMessages.c:358
 msgid "Bad HTML!!  Unable to create popup window!"
 msgstr "Onjuiste HTML!!  Kan geen popup-venster aanmaken!"
 
-#: LYMessages.c:358
+#: LYMessages.c:359
 msgid "Unable to create popup window!"
 msgstr "Kan geen popup-venster aanmaken!"
 
-#: LYMessages.c:359
+#: LYMessages.c:360
 msgid "Goto a random URL is disallowed!"
 msgstr "Naar een willekeurige URL gaan is niet toegestaan!"
 
-#: LYMessages.c:360
+#: LYMessages.c:361
 msgid "Goto a non-http URL is disallowed!"
 msgstr "Naar een niet-http-URL gaan is niet toegestaan!"
 
-#: LYMessages.c:361
+#: LYMessages.c:362
 #, c-format
 msgid "You are not allowed to goto \"%s\" URLs"
 msgstr "Het is niet toegestaan naar \"%s\"-URL's te gaan"
 
-#: LYMessages.c:362
+#: LYMessages.c:363
 msgid "URL to open: "
 msgstr "Te openen URL: "
 
-#: LYMessages.c:363
+#: LYMessages.c:364
 msgid "Edit the current Goto URL: "
 msgstr "Wijzig de huidige Ga-naar URL: "
 
-#: LYMessages.c:364
+#: LYMessages.c:365
 msgid "Edit the previous Goto URL: "
 msgstr "Wijzig de vorige Ga-naar URL: "
 
-#: LYMessages.c:365
+#: LYMessages.c:366
 msgid "Edit a previous Goto URL: "
 msgstr "Wijzig een voorgaande Ga-naar URL: "
 
-#: LYMessages.c:366
+#: LYMessages.c:367
 msgid "Current document has POST data."
 msgstr "Huidige document bevat geen POST-informatie."
 
-#: LYMessages.c:367
+#: LYMessages.c:368
 msgid "Edit this document's URL: "
 msgstr "Wijzig de URL van dit document: "
 
-#: LYMessages.c:368
+#: LYMessages.c:369
 msgid "Edit the current link's URL: "
 msgstr "Wijzig de URL van de huidige link: "
 
-#: LYMessages.c:369
+#: LYMessages.c:370
 msgid "Edit the form's submit-URL: "
 msgstr "Wijzig het verzendadres van dit formulier: "
 
-#: LYMessages.c:370
+#: LYMessages.c:371
 msgid "You cannot edit File Management URLs"
 msgstr "U kunt Bestandsbeheeradressen niet wijzigen"
 
-#: LYMessages.c:371
+#: LYMessages.c:372
 msgid "Enter a database query: "
 msgstr "Voer een databankopdracht in: "
 
-#: LYMessages.c:372
+#: LYMessages.c:373
 msgid "Enter a whereis query: "
 msgstr "Voer een zoekopdracht in: "
 
-#: LYMessages.c:373
+#: LYMessages.c:374
 msgid "Edit the current query: "
 msgstr "Wijzig de huidige opdracht: "
 
-#: LYMessages.c:374
+#: LYMessages.c:375
 msgid "Edit the previous query: "
 msgstr "Wijzig de vorige opdracht: "
 
-#: LYMessages.c:375
+#: LYMessages.c:376
 msgid "Edit a previous query: "
 msgstr "Wijzig een voorgaande opdracht: "
 
 #. #define USE_C_R_TO_RESUB_CUR_QUERY
-#: LYMessages.c:377
+#: LYMessages.c:378
 msgid "Use Control-R to resubmit the current query."
 msgstr "Gebruik Ctrl-R om de huidige opdracht nog eens te verzenden."
 
-#: LYMessages.c:378
+#: LYMessages.c:379
 msgid "Edit the current shortcut: "
 msgstr "Wijzig de huidige snelkoppeling: "
 
-#: LYMessages.c:379
+#: LYMessages.c:380
 msgid "Edit the previous shortcut: "
 msgstr "Wijzig de vorige snelkoppeling: "
 
-#: LYMessages.c:380
+#: LYMessages.c:381
 msgid "Edit a previous shortcut: "
 msgstr "Wijzig een voorgaande snelkoppeling: "
 
-#: LYMessages.c:381
+#: LYMessages.c:382
 #, c-format
 msgid "Key '%c' is not mapped to a jump file!"
 msgstr "Toets '%c' is niet gebonden aan een snelkoppelingenbestand!"
 
-#: LYMessages.c:382
+#: LYMessages.c:383
 msgid "Cannot locate jump file!"
 msgstr "Kan snelkoppelingenbestand niet vinden!"
 
-#: LYMessages.c:383
+#: LYMessages.c:384
 msgid "Cannot open jump file!"
 msgstr "Kan snelkoppelingenbestand niet openen!"
 
-#: LYMessages.c:384
+#: LYMessages.c:385
 msgid "Error reading jump file!"
 msgstr "Fout bij lezen van snelkoppelingenbestand!"
 
-#: LYMessages.c:385
+#: LYMessages.c:386
 msgid "Out of memory reading jump file!"
 msgstr "Geen geheugen meer beschikbaar tijdens lezen van snelkoppelingenbestand!"
 
-#: LYMessages.c:386
+#: LYMessages.c:387
 msgid "Out of memory reading jump table!"
 msgstr "Geen geheugen meer beschikbaar tijdens lezen van snelkoppelingentabel!"
 
-#: LYMessages.c:387
+#: LYMessages.c:388
 msgid "No index is currently available."
 msgstr "Er is momenteel geen index beschikbaar."
 
 #. #define CONFIRM_MAIN_SCREEN
-#: LYMessages.c:389
+#: LYMessages.c:390
 msgid "Do you really want to go to the Main screen?"
 msgstr "Wilt u echt naar het beginscherm gaan?"
 
-#: LYMessages.c:390
+#: LYMessages.c:391
 msgid "You are already at main screen!"
 msgstr "U bent al in het beginscherm!"
 
 #. #define NOT_ISINDEX
-#: LYMessages.c:392
+#: LYMessages.c:393
 msgid "Not a searchable indexed document -- press '/' to search for a text string"
 msgstr "Dit is geen geïndexeerd document -- gebruik '/' om een tekenreeks te zoeken"
 
 #. #define NO_OWNER
-#: LYMessages.c:394
+#: LYMessages.c:395
 msgid "No owner is defined for this file so you cannot send a comment"
 msgstr "Er is geen eigenaar genoemd voor dit bestand, dus u kunt geen commentaar zenden"
 
-#: LYMessages.c:395
+#: LYMessages.c:396
 #, c-format
 msgid "No owner is defined. Use %s?"
 msgstr "Er is geen eigenaar gedefinieerd.  %s gebruiken?"
 
-#: LYMessages.c:396
+#: LYMessages.c:397
 msgid "Do you wish to send a comment?"
 msgstr "Wilt u commentaar versturen?"
 
-#: LYMessages.c:397
+#: LYMessages.c:398
 msgid "Mail is disallowed so you cannot send a comment"
 msgstr "E-mail is niet toegestaan, dus u kunt geen commentaar zenden"
 
-#: LYMessages.c:398
+#: LYMessages.c:399
 msgid "The 'e'dit command is currently disabled."
 msgstr "Het 'e'dit-commando is momenteel uitgeschakeld."
 
-#: LYMessages.c:399
+#: LYMessages.c:400
 msgid "External editing is currently disabled."
 msgstr "Extern editen is momenteel uitgeschakeld."
 
-#: LYMessages.c:400
+#: LYMessages.c:401
 msgid "System error - failure to get status."
 msgstr "Systeemfout -- status opvragen is mislukt."
 
-#: LYMessages.c:401
+#: LYMessages.c:402
 msgid "No editor is defined!"
 msgstr "Er is geen editor opgegeven!"
 
-#: LYMessages.c:402
+#: LYMessages.c:403
 msgid "The 'p'rint command is currently disabled."
 msgstr "Het 'p'rint-commando is momenteel uitgeschakeld."
 
-#: LYMessages.c:403
+#: LYMessages.c:404
 msgid "Document has no Toolbar links or Banner."
 msgstr "Het document heeft geen Werkbalk-links of koptekst."
 
-#: LYMessages.c:404
+#: LYMessages.c:405
 msgid "Unable to open traversal file."
 msgstr "Kan bestand met doorkruisingen niet openen."
 
-#: LYMessages.c:405
+#: LYMessages.c:406
 msgid "Unable to open traversal found file."
 msgstr "Kan bestand met gevonden doorkruisingen niet openen."
 
-#: LYMessages.c:406
+#: LYMessages.c:407
 msgid "Unable to open reject file."
 msgstr "Kan bestand met verwerpingen niet openen."
 
-#: LYMessages.c:407
+#: LYMessages.c:408
 msgid "Unable to open traversal errors output file"
-msgstr "Kan bestand met fouten van doorkruisingen niet vinden"
+msgstr "Kan bestand met doorkruisingsfouten niet openen"
 
-#: LYMessages.c:408
+#: LYMessages.c:409
 msgid "TRAVERSAL WAS INTERRUPTED"
 msgstr "DOORKRUISING WERD ONDERBROKEN"
 
-#: LYMessages.c:409
+#: LYMessages.c:410
 msgid "Follow link (or goto link or page) number: "
 msgstr "Volg link (of ga naar link of pagina) met nummer: "
 
-#: LYMessages.c:410
+#: LYMessages.c:411
 msgid "Select option (or page) number: "
 msgstr "Selecteer optie (of pagina) met nummer: "
 
-#: LYMessages.c:411
+#: LYMessages.c:412
 #, c-format
 msgid "Option number %d already is current."
 msgstr "Optienummer %d is al het huidige."
 
 #. #define ALREADY_AT_OPTION_END
-#: LYMessages.c:413
+#: LYMessages.c:414
 msgid "You are already at the end of this option list."
 msgstr "Dit is het einde van deze optielijst."
 
 #. #define ALREADY_AT_OPTION_BEGIN
-#: LYMessages.c:415
+#: LYMessages.c:416
 msgid "You are already at the beginning of this option list."
 msgstr "Dit is het begin van deze optielijst."
 
 #. #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 "Dit is pagina %d van deze optielijst."
 
-#: LYMessages.c:418
+#: LYMessages.c:419
 msgid "You have entered an invalid option number."
 msgstr "U hebt een ongeldig optienummer ingevoerd."
 
-#: LYMessages.c:419
+#: LYMessages.c:420
 msgid "** Bad HTML!!  Use -trace to diagnose. **"
 msgstr "** Ongeldige HTML!!  Gebruik -trace om een diagnose op te maken. **"
 
-#: LYMessages.c:420
+#: LYMessages.c:421
 msgid "Give name of file to save in"
 msgstr "Voer de naam in van het bestand om in op te slaan"
 
-#: LYMessages.c:421
+#: LYMessages.c:422
 msgid "Can't save data to file -- please run WWW locally"
 msgstr "Kan gegevens niet opslaan in bestand -- draai WWW lokaal"
 
-#: LYMessages.c:422
+#: LYMessages.c:423
 msgid "Can't open temporary file!"
 msgstr "Kan tijdelijk bestand niet openen!"
 
-#: LYMessages.c:423
+#: LYMessages.c:424
 msgid "Can't open output file!  Cancelling!"
 msgstr "Kan uitvoerbestand niet openen!  Bezig met annuleren!"
 
-#: LYMessages.c:424
+#: LYMessages.c:425
 msgid "Execution is disabled."
 msgstr "Uitvoeren is uitgeschakeld."
 
 #. #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 "Uitvoeren is niet aangezet voor dit bestand.  Zie het Optiesmenu (gebruik %s)."
 
 #. #define EXECUTION_NOT_COMPILED
-#: LYMessages.c:428
+#: LYMessages.c:429
 msgid "Execution capabilities are not compiled into this version."
 msgstr "Uitvoermogelijkheden zijn niet ingebouwd in deze versie."
 
-#: LYMessages.c:429
+#: LYMessages.c:430
 msgid "This file cannot be displayed on this terminal."
 msgstr "Dit bestand kan niet op deze terminal getoond worden."
 
 #. #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 "Dit bestand kan niet op deze terminal getoond worden:  D)ownload, C)-annuleren"
 
-#: LYMessages.c:432
+#: LYMessages.c:433
 #, c-format
 msgid "%s  D)ownload, or C)ancel"
 msgstr "%s  D)ownloaden, of C)-annuleren"
 
-#: LYMessages.c:433
+#: LYMessages.c:434
 msgid "Cancelling file."
 msgstr "Bestand wordt geannuleerd."
 
-#: LYMessages.c:434
+#: LYMessages.c:435
 msgid "Retrieving file.  - PLEASE WAIT -"
 msgstr "Bestand wordt opgehaald.  Even geduld..."
 
-#: LYMessages.c:435
+#: LYMessages.c:436
 msgid "Enter a filename: "
 msgstr "Voer een bestandsnaam in: "
 
-#: LYMessages.c:436
+#: LYMessages.c:437
 msgid "Edit the previous filename: "
 msgstr "Wijzig de vorige bestandsnaam: "
 
-#: LYMessages.c:437
+#: LYMessages.c:438
 msgid "Edit a previous filename: "
 msgstr "Wijzig een voorgaande bestandsnaam: "
 
-#: LYMessages.c:438
+#: LYMessages.c:439
 msgid "Enter a new filename: "
 msgstr "Voer een nieuwe bestandsnaam in: "
 
-#: LYMessages.c:439
+#: LYMessages.c:440
 msgid "File name may not begin with a dot."
 msgstr "Bestandsnaam mag niet met een punt beginnen."
 
-#: LYMessages.c:441
+#: LYMessages.c:442
 msgid "File exists.  Create higher version?"
 msgstr "Bestand bestaat al.  Hogere versie aanmaken?"
 
-#: LYMessages.c:443
+#: LYMessages.c:444
 msgid "File exists.  Overwrite?"
 msgstr "Bestand bestaat al.  Overschrijven?"
 
-#: LYMessages.c:445
+#: LYMessages.c:446
 msgid "Cannot write to file."
 msgstr "Kan niet naar bestand schrijven."
 
-#: LYMessages.c:446
+#: LYMessages.c:447
 msgid "ERROR! - download command is misconfigured."
 msgstr "FOUT -- Downloadcommando is onjuist ingesteld."
 
-#: LYMessages.c:447
+#: LYMessages.c:448
 msgid "Unable to download file."
 msgstr "Kan bestand niet downloaden."
 
-#: LYMessages.c:448
+#: LYMessages.c:449
 msgid "Reading directory..."
 msgstr "Lezen van mapinhoud..."
 
-#: LYMessages.c:449
+#: LYMessages.c:450
 msgid "Building directory listing..."
 msgstr "Opbouwen van bestandenoverzicht voor map..."
 
-#: LYMessages.c:450
+#: LYMessages.c:451
 msgid "Saving..."
 msgstr "Bezig met opslaan..."
 
-#: LYMessages.c:451
+#: LYMessages.c:452
 #, c-format
 msgid "Could not edit file '%s'."
 msgstr "Kan bestand '%s' niet wijzigen."
 
-#: LYMessages.c:452
+#: LYMessages.c:453
 msgid "Unable to access document!"
 msgstr "Geen toegang tot document!"
 
-#: LYMessages.c:453
+#: LYMessages.c:454
 msgid "Could not access file."
 msgstr "Geen toegang tot bestand."
 
-#: LYMessages.c:454
+#: LYMessages.c:455
 msgid "Could not access directory."
 msgstr "Geen toegang tot map."
 
-#: LYMessages.c:455
+#: LYMessages.c:456
 msgid "Could not load data."
 msgstr "Kan gegevens niet inlezen."
 
 #. #define CANNOT_EDIT_REMOTE_FILES
-#: LYMessages.c:457
+#: LYMessages.c:458
 msgid "Lynx cannot currently (e)dit remote WWW files."
 msgstr "Lynx kan momenteel geen WWW-bestanden op een andere computer wijzigen."
 
 #. #define CANNOT_EDIT_FIELD
-#: LYMessages.c:459
+#: LYMessages.c:460
 msgid "This field cannot be (e)dited with an external editor."
 msgstr "Dit veld kan niet gewijzigd worden met een externe editor."
 
-#: LYMessages.c:460
+#: LYMessages.c:461
 msgid "Bad rule"
 msgstr "Foutieve regel"
 
-#: LYMessages.c:461
+#: LYMessages.c:462
 msgid "Insufficient operands:"
 msgstr "Onvoldoende argumenten:"
 
-#: LYMessages.c:462
+#: LYMessages.c:463
 msgid "You are not authorized to edit this file."
 msgstr "U bent niet geautoriseerd om dit bestand te wijzigen."
 
-#: LYMessages.c:463
+#: LYMessages.c:464
 msgid "Title: "
 msgstr "Titel: "
 
-#: LYMessages.c:464
+#: LYMessages.c:465
 msgid "Subject: "
 msgstr "Onderwerp: "
 
-#: LYMessages.c:465
+#: LYMessages.c:466
 msgid "Username: "
 msgstr "Gebruikersnaam: "
 
-#: LYMessages.c:466
+#: LYMessages.c:467
 msgid "Password: "
 msgstr "Wachtwoord: "
 
-#: LYMessages.c:467
+#: LYMessages.c:468
 msgid "lynx: Username and Password required!!!"
 msgstr "lynx: Gebruikersnaam en wachtwoord zijn vereist!"
 
-#: LYMessages.c:468
+#: LYMessages.c:469
 msgid "lynx: Password required!!!"
 msgstr "lynx: Wachtwoord is vereist!"
 
-#: LYMessages.c:469
+#: LYMessages.c:470
 msgid "Clear all authorization info for this session?"
 msgstr "Alle autorisatie-informatie voor deze sessie wissen?"
 
-#: LYMessages.c:470
+#: LYMessages.c:471
 msgid "Authorization info cleared."
 msgstr "Autorisatie-informatie is gewist."
 
-#: LYMessages.c:471
+#: LYMessages.c:472
 msgid "Authorization failed.  Retry?"
 msgstr "Autorisatie is mislukt.  Nog eens proberen?"
 
-#: LYMessages.c:472
+#: LYMessages.c:473
 msgid "cgi support has been disabled."
 msgstr "CGI-ondersteuning is uitgeschakeld."
 
 #. #define CGI_NOT_COMPILED
-#: LYMessages.c:474
+#: LYMessages.c:475
 msgid "Lynxcgi capabilities are not compiled into this version."
 msgstr "Lynx-CGI-functies zijn niet ingebouwd in deze versie."
 
-#: LYMessages.c:475
+#: LYMessages.c:476
 #, c-format
 msgid "Sorry, no known way of converting %s to %s."
 msgstr "Sorry, er is geen bekende manier om %s naar %s te converteren."
 
-#: LYMessages.c:476
+#: LYMessages.c:477
 msgid "Unable to set up connection."
 msgstr "Kan verbinding niet voorbereiden."
 
-#: LYMessages.c:477
+#: LYMessages.c:478
 msgid "Unable to make connection"
 msgstr "Kan verbinding niet maken"
 
 #. #define MALFORMED_EXEC_REQUEST
-#: LYMessages.c:479
+#: LYMessages.c:480
 msgid "Executable link rejected due to malformed request."
 msgstr "Uitvoerbare link is verworpen vanwege een verkeerd geformuleerde opdracht."
 
 #. #define BADCHAR_IN_EXEC_LINK
-#: LYMessages.c:481
+#: LYMessages.c:482
 #, c-format
 msgid "Executable link rejected due to `%c' character."
 msgstr "Uitvoerbare link is verworpen vanwege '%c'-teken."
 
 #. #define RELPATH_IN_EXEC_LINK
-#: LYMessages.c:483
+#: LYMessages.c:484
 msgid "Executable link rejected due to relative path string ('../')."
 msgstr "Uitvoerbare link is verworpen vanwege een relatief pad ('../')."
 
 #. #define BADLOCPATH_IN_EXEC_LINK
-#: LYMessages.c:485
+#: LYMessages.c:486
 msgid "Executable link rejected due to location or path."
 msgstr "Uitvoerbare link is verworpen vanwege locatie of pad."
 
-#: LYMessages.c:486
+#: LYMessages.c:487
 msgid "Mail access is disabled!"
 msgstr "E-mailtoegang is uitgeschakeld!"
 
 #. #define ACCESS_ONLY_LOCALHOST
-#: LYMessages.c:488
+#: LYMessages.c:489
 msgid "Only files and servers on the local host can be accessed."
 msgstr "Er is alleen toegang tot bestanden en servers op de lokale computer."
 
-#: LYMessages.c:489
+#: LYMessages.c:490
 msgid "Telnet access is disabled!"
 msgstr "Toegang via telnet is uitgeschakeld!"
 
 #. #define TELNET_PORT_SPECS_DISABLED
-#: LYMessages.c:491
+#: LYMessages.c:492
 msgid "Telnet port specifications are disabled."
 msgstr "Telnet-poortspecificaties zijn uitgeschakeld."
 
-#: LYMessages.c:492
+#: LYMessages.c:493
 msgid "USENET news access is disabled!"
 msgstr "Toegang tot USENET-nieuws is uitgeschakeld!"
 
-#: LYMessages.c:493
+#: LYMessages.c:494
 msgid "Rlogin access is disabled!"
 msgstr "Toegang via 'rlogin' is uitgeschakeld!"
 
-#: LYMessages.c:494
+#: LYMessages.c:495
 msgid "Ftp access is disabled!"
 msgstr "Toegang via FTP is uitgeschakeld!"
 
-#: LYMessages.c:495
+#: LYMessages.c:496
 msgid "There are no references from this document."
 msgstr "Er zijn geen referenties vanuit dit document."
 
-#: LYMessages.c:496
+#: LYMessages.c:497
 msgid "There are only hidden links from this document."
 msgstr "Er zijn alleen verborgen links vanuit dit document."
 
-#: LYMessages.c:498
+#: LYMessages.c:499
 msgid "Unable to open command file."
 msgstr "Kan opdrachtenbestand niet openen."
 
-#: LYMessages.c:500
+#: LYMessages.c:501
 msgid "News Post Cancelled!!!"
-msgstr "Nieuwsverzending is geannuleerd!!!"
+msgstr "Nieuwsverzending is geannuleerd!"
 
 #. #define SPAWNING_EDITOR_FOR_NEWS
-#: LYMessages.c:502
+#: LYMessages.c:503
 msgid "Spawning your selected editor to edit news message"
 msgstr "Uw geselecteerde editor wordt opgestart om een nieuwsbericht in te voeren"
 
-#: LYMessages.c:503
+#: LYMessages.c:504
 msgid "Post this message?"
 msgstr "Dit bericht posten?"
 
-#: LYMessages.c:504
+#: LYMessages.c:505
 #, c-format
 msgid "Append '%s'?"
 msgstr "'%s' aan einde toevoegen?"
 
-#: LYMessages.c:505
+#: LYMessages.c:506
 msgid "Posting to newsgroup(s)..."
 msgstr "Posten naar nieuwsgroep(en)..."
 
-#: LYMessages.c:507
+#: LYMessages.c:508
 msgid "*** You have unread mail. ***"
 msgstr "*** U hebt ongelezen e-mail. ***"
 
-#: LYMessages.c:509
+#: LYMessages.c:510
 msgid "*** You have mail. ***"
 msgstr "*** U hebt e-mail. ***"
 
-#: LYMessages.c:511
+#: LYMessages.c:512
 msgid "*** You have new mail. ***"
 msgstr "*** U hebt nieuwe e-mail. ***"
 
-#: LYMessages.c:512
+#: LYMessages.c:513
 msgid "File insert cancelled!!!"
-msgstr "Opname van bestand is geannuleerd!!!"
+msgstr "Opname van bestand is geannuleerd!"
 
-#: LYMessages.c:513
+#: LYMessages.c:514
 msgid "Not enough memory for file!"
 msgstr "Niet genoeg geheugen beschikbaar voor bestand!"
 
-#: LYMessages.c:514
+#: LYMessages.c:515
 msgid "Can't open file for reading."
 msgstr "Kan bestand niet openen om te lezen."
 
-#: LYMessages.c:515
+#: LYMessages.c:516
 msgid "File does not exist."
 msgstr "Bestand bestaat niet."
 
-#: LYMessages.c:516
+#: LYMessages.c:517
 msgid "File does not exist - reenter or cancel:"
 msgstr "Bestand bestaat niet -- voer opnieuw in of annuleer:"
 
-#: LYMessages.c:517
+#: LYMessages.c:518
 msgid "File is not readable."
 msgstr "Bestand is niet leesbaar."
 
-#: LYMessages.c:518
+#: LYMessages.c:519
 msgid "File is not readable - reenter or cancel:"
 msgstr "Bestand is niet leesbaar -- voer opnieuw in of annuleer:"
 
-#: LYMessages.c:519
+#: LYMessages.c:520
 msgid "Nothing to insert - file is 0-length."
 msgstr "Er is niets om in te voegen -- bestand heeft lengte 0."
 
-#: LYMessages.c:520
+#: LYMessages.c:521
 msgid "Save request cancelled!!!"
 msgstr "Opslagverzoek is geannuleerd!"
 
-#: LYMessages.c:521
+#: LYMessages.c:522
 msgid "Mail request cancelled!!!"
 msgstr "E-mailopdracht is geannuleerd!"
 
 #. #define CONFIRM_MAIL_SOURCE_PREPARSED
-#: LYMessages.c:523
+#: LYMessages.c:524
 msgid "Viewing preparsed source.  Are you sure you want to mail it?"
 msgstr "Voorverwerkte brontekst wordt getoond.  Verzenden?"
 
-#: LYMessages.c:524
+#: LYMessages.c:525
 msgid "Please wait..."
 msgstr "Even geduld..."
 
-#: LYMessages.c:525
+#: LYMessages.c:526
 msgid "Mailing file.  Please wait..."
 msgstr "Bestand wordt verzonden.  Even geduld..."
 
-#: LYMessages.c:526
+#: LYMessages.c:527
 msgid "ERROR - Unable to mail file"
 msgstr "FOUT -- Kan e-mailbestand niet openen."
 
 #. #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 "Bestand is %d schermen lang.  Toch afdrukken?"
 
-#: LYMessages.c:529
+#: LYMessages.c:530
 msgid "Print request cancelled!!!"
 msgstr "Adrukverzoek is geannuleerd!"
 
-#: LYMessages.c:530
+#: LYMessages.c:531
 msgid "Press <return> to begin: "
 msgstr "Druk op <Enter> om te beginnen: "
 
-#: LYMessages.c:531
+#: LYMessages.c:532
 msgid "Press <return> to finish: "
 msgstr "Druk op <Enter> om te voltooien: "
 
 #. #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 "Bestand is %d pagina's lang.  Toch afdrukken?"
 
 #. #define CHECK_PRINTER
-#: LYMessages.c:535
+#: LYMessages.c:536
 msgid "Be sure your printer is on-line.  Press <return> to start printing:"
 msgstr "Zorg dat de printer aan staat.  Druk op <Enter> om het afdrukken te beginnen:"
 
-#: LYMessages.c:536
+#: LYMessages.c:537
 msgid "ERROR - Unable to allocate file space!!!"
 msgstr "FOUT -- Kan geen ruimte voor bestand reserveren."
 
-#: LYMessages.c:537
+#: LYMessages.c:538
 msgid "Unable to open tempfile"
 msgstr "Kan tijdelijk bestand niet openen"
 
-#: LYMessages.c:538
+#: LYMessages.c:539
 msgid "Unable to open print options file"
 msgstr "Kan optiesbestand niet afdrukken"
 
-#: LYMessages.c:539
+#: LYMessages.c:540
 msgid "Printing file.  Please wait..."
 msgstr "Bestand wordt afgedrukt.  Even geduld..."
 
-#: LYMessages.c:540
+#: LYMessages.c:541
 msgid "Please enter a valid internet mail address: "
 msgstr "Voer een geldig e-mailadres in: "
 
-#: LYMessages.c:541
+#: LYMessages.c:542
 msgid "ERROR! - printer is misconfigured!"
 msgstr "FOUT -- Printer is niet goed ingesteld."
 
-#: LYMessages.c:542
+#: LYMessages.c:543
 msgid "Image map from POST response not available!"
 msgstr "Menuplaatje van POST-antwoord is niet beschikbaar!"
 
-#: LYMessages.c:543
+#: LYMessages.c:544
 msgid "Misdirected client-side image MAP request!"
 msgstr "Verkeerd gerichte opdracht voor menuplaatje aan cliëntzijde!"
 
-#: LYMessages.c:544
+#: LYMessages.c:545
 msgid "Client-side image MAP is not accessible!"
 msgstr "Menuplaatje aan cliëntzijde is niet bereikbaar!"
 
-#: LYMessages.c:545
+#: LYMessages.c:546
 msgid "No client-side image MAPs are available!"
 msgstr "Er zijn aan cliëntzijde geen menuplaatjes beschikbaar!"
 
-#: LYMessages.c:546
+#: LYMessages.c:547
 msgid "Client-side image MAP is not available!"
 msgstr "Menuplaatje aan cliëntzijde is niet beschikbaar!"
 
 #. #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 "Voor het Optiesmenu moet de schermhoogte minimaal 24 regels zijn."
 
 #. #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 "Voor het Optiesmenu moet de schermhoogte minimaal 23 regels zijn."
 
 #. #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 "Voor het Optiesmenu moet de schermhoogte minimaal 22 regels zijn."
 
-#: LYMessages.c:555
+#: LYMessages.c:556
 msgid "That key requires Advanced User mode."
 msgstr "Die toets werkt alleen in de 'expert'-gebruikersmodus."
 
-#: LYMessages.c:556
+#: LYMessages.c:557
 #, c-format
 msgid "Content-type: %s"
 msgstr "Inhoudstype: %s"
 
-#: LYMessages.c:557
+#: LYMessages.c:558
 msgid "Command: "
 msgstr "Opdracht: "
 
-#: LYMessages.c:558
+#: LYMessages.c:559
 msgid "Unknown or ambiguous command"
 msgstr "Onbekende of meerduidige opdracht"
 
-#: LYMessages.c:559
+#: LYMessages.c:560
 msgid " Version "
 msgstr " versie "
 
-#: LYMessages.c:560
+#: LYMessages.c:561
 msgid " first"
 msgstr " eerst"
 
-#: LYMessages.c:561
+#: LYMessages.c:562
 msgid ", guessing..."
 msgstr ", er naar raden..."
 
-#: LYMessages.c:562
+#: LYMessages.c:563
 msgid "Permissions for "
 msgstr "Toegangsrechten voor "
 
-#: LYMessages.c:563
+#: LYMessages.c:564
 msgid "Select "
 msgstr "Selecteer "
 
-#: LYMessages.c:564
+#: LYMessages.c:565
 msgid "capital letter"
 msgstr "hoofdletter"
 
-#: LYMessages.c:565
+#: LYMessages.c:566
 msgid " of option line,"
 msgstr " van optieregel,"
 
-#: LYMessages.c:566
+#: LYMessages.c:567
 msgid " to save,"
 msgstr " om op te slaan,"
 
-#: LYMessages.c:567
+#: LYMessages.c:568
 msgid " to "
 msgstr " aan "
 
-#: LYMessages.c:568
+#: LYMessages.c:569
 msgid " or "
 msgstr " of "
 
-#: LYMessages.c:569
+#: LYMessages.c:570
 msgid " index"
 msgstr " index"
 
-#: LYMessages.c:570
+#: LYMessages.c:571
 msgid " to return to Lynx."
 msgstr " om terug te keren naar Lynx."
 
-#: LYMessages.c:571
+#: LYMessages.c:572
 msgid "Accept Changes"
 msgstr "Wijzigen bevestigen"
 
-#: LYMessages.c:572
+#: LYMessages.c:573
 msgid "Reset Changes"
 msgstr "Wijzigingen annuleren"
 
-#: LYMessages.c:573
+#: LYMessages.c:574
 msgid "Left Arrow cancels changes"
 msgstr "(pijltje links annuleert ook)"
 
-#: LYMessages.c:574
+#: LYMessages.c:575
 msgid "Save options to disk"
 msgstr "Opties op schijf opslaan"
 
-#: LYMessages.c:575
+#: LYMessages.c:576
 msgid "Hit RETURN to accept entered data."
 msgstr "Druk op <Enter> om ingevoerde gegevens te accepteren."
 
 #. #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 "Druk op <Enter> om gegevens te accepteren.  Wis gegevens om te herstellen."
 
-#: LYMessages.c:578
+#: LYMessages.c:579
 msgid "Value accepted!"
 msgstr "Waarde is geaccepteerd!"
 
 #. #define VALUE_ACCEPTED_WARNING_X
-#: LYMessages.c:580
+#: LYMessages.c:581
 msgid "Value accepted! -- WARNING: Lynx is configured for XWINDOWS!"
 msgstr "Waarde is geaccepteerd! -- WAARSCHUWING: Lynx is geconfigureerd voor X Windows!"
 
 #. #define VALUE_ACCEPTED_WARNING_NONX
-#: LYMessages.c:582
+#: LYMessages.c:583
 msgid "Value accepted! -- WARNING: Lynx is NOT configured for XWINDOWS!"
 msgstr "Waarde is geaccepteerd! -- WAARSCHUWING: Lynx is NIET geconfigureerd voor X Windows!"
 
-#: LYMessages.c:583
+#: LYMessages.c:584
 msgid "You are not allowed to change which editor to use!"
 msgstr "U mag niet opgeven welke editor u wilt gebruiken!"
 
-#: LYMessages.c:584
+#: LYMessages.c:585
 msgid "Failed to set DISPLAY variable!"
 msgstr "Zetten van variabele DISPLAY is mislukt!"
 
-#: LYMessages.c:585
+#: LYMessages.c:586
 msgid "Failed to clear DISPLAY variable!"
 msgstr "Wissen van variabele DISPLAY is mislukt!"
 
 #. #define BOOKMARK_CHANGE_DISALLOWED
-#: LYMessages.c:587
+#: LYMessages.c:588
 msgid "You are not allowed to change the bookmark file!"
 msgstr "U mag het boekenleggerbestand niet veranderen!"
 
-#: LYMessages.c:588
+#: LYMessages.c:589
 msgid "Terminal does not support color"
 msgstr "De terminal ondersteunt geen kleur"
 
-#: LYMessages.c:589
+#: LYMessages.c:590
 #, c-format
 msgid "Your '%s' terminal does not support color."
 msgstr "Uw '%s'-terminal ondersteunt geen kleur."
 
-#: LYMessages.c:590
+#: LYMessages.c:591
 msgid "Access to dot files is disabled!"
 msgstr "Toegang tot puntbestanden is uitgeschakeld!"
 
 #. #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 "Waarde van 'User-Agent' bevat geen \"Lynx\" of \"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 "Gebruik \"L_y_n_x\" of \"Lynx\" in 'User-Agent', anders lijkt het op bedrog."
 
 #. #define UA_CHANGE_DISABLED
-#: LYMessages.c:596
+#: LYMessages.c:597
 msgid "Changing of the User-Agent string is disabled!"
 msgstr "Wijzigen van de waarde van 'User-Agent' is uitgeschakeld!"
 
 #. #define CHANGE_OF_SETTING_DISALLOWED
-#: LYMessages.c:598
+#: LYMessages.c:599
 msgid "You are not allowed to change this setting."
 msgstr "U mag deze instelling niet wijzigen."
 
-#: LYMessages.c:599
+#: LYMessages.c:600
 msgid "Saving Options..."
 msgstr "Opslaan van opties..."
 
-#: LYMessages.c:600
+#: LYMessages.c:601
 msgid "Options saved!"
 msgstr "Opties zijn opgeslagen."
 
-#: LYMessages.c:601
+#: LYMessages.c:602
 msgid "Unable to save Options!"
 msgstr "Kan opties niet opslaan!"
 
-#: LYMessages.c:602
+#: LYMessages.c:603
 msgid " 'r' to return to Lynx "
 msgstr " 'r' om terug te keren naar Lynx "
 
-#: LYMessages.c:603
+#: LYMessages.c:604
 msgid " '>' to save, or 'r' to return to Lynx "
 msgstr " '>' om op te slaan, of 'r' om terug te keren naar Lynx "
 
 #. #define ANY_KEY_CHANGE_RET_ACCEPT
-#: LYMessages.c:605
+#: LYMessages.c:606
 msgid "Hit any key to change value; RETURN to accept."
 msgstr "Druk op een toets om de waarde te veranderen; <Enter> om te accepteren."
 
-#: LYMessages.c:606
+#: LYMessages.c:607
 msgid "Error uncompressing temporary file!"
 msgstr "Fout bij decomprimeren van tijdelijk bestand!"
 
-#: LYMessages.c:607
+#: LYMessages.c:608
 msgid "Unsupported URL scheme!"
 msgstr "Niet-ondersteunde URL-methode!"
 
-#: LYMessages.c:608
+#: LYMessages.c:609
 msgid "Unsupported data: URL!  Use SHOWINFO, for now."
 msgstr "Niet-ondersteunde 'data:'-URL!  Gebruik voorlopig SHOWINFO."
 
-#: LYMessages.c:609
+#: LYMessages.c:610
 msgid "Redirection limit of 10 URL's reached."
 msgstr "Doorverwijzingslimiet van 10 URL's is bereikt."
 
-#: LYMessages.c:610
+#: LYMessages.c:611
 msgid "Illegal redirection URL received from server!"
 msgstr "Ongeldige doorverwijzing-URL ontvangen van server!"
 
 #. #define SERVER_ASKED_FOR_REDIRECTION
-#: LYMessages.c:612
+#: LYMessages.c:613
 #, c-format
 msgid "Server asked for %d redirection of POST content to"
 msgstr "Server vroeg om %d-doorverwijzing van POST-inhoud naar"
 
-#: LYMessages.c:615
+#: LYMessages.c:616
 msgid "P)roceed, use G)ET or C)ancel "
 msgstr "P)-doorgaan, G)ET gebruiken of C)-annuleren "
 
-#: LYMessages.c:616
+#: LYMessages.c:617
 msgid "P)roceed, or C)ancel "
 msgstr "P)-doorgaan, of C)-annuleren "
 
 #. #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 "Doorverwezen POST-inhoud.  P)-doorgaan, U)RL zien, G)ET of C)-annuleren"
 
 #. #define ADVANCED_POST_REDIRECT
-#: LYMessages.c:620
+#: LYMessages.c:621
 msgid "Redirection of POST content.  P)roceed, see U)RL, or C)ancel"
 msgstr "Doorverwezen POST-inhoud.  P)-doorgaan, U)RL bekijken, of C)-annuleren"
 
 #. #define CONFIRM_POST_RESUBMISSION
-#: LYMessages.c:622
+#: LYMessages.c:623
 msgid "Document from Form with POST content.  Resubmit?"
 msgstr "Document van formulier met POST-inhoud.  Opnieuw verzenden?"
 
 #. #define CONFIRM_POST_RESUBMISSION_TO
-#: LYMessages.c:624
+#: LYMessages.c:625
 #, c-format
 msgid "Resubmit POST content to %s ?"
 msgstr "Opnieuw POST-inhoud naar %s verzenden?"
 
 #. #define CONFIRM_POST_LIST_RELOAD
-#: LYMessages.c:626
+#: LYMessages.c:627
 #, c-format
 msgid "List from document with POST data.  Reload %s ?"
 msgstr "Lijst van document met POST-informatie.  Opnieuw %s laden?"
 
 #. #define CONFIRM_POST_DOC_HEAD
-#: LYMessages.c:628
+#: LYMessages.c:629
 msgid "Document from POST action, HEAD may not be understood.  Proceed?"
 msgstr "Document met POST-actie, HEAD wordt mogelijk niet begrepen.  Doorgaan?"
 
 #. #define CONFIRM_POST_LINK_HEAD
-#: LYMessages.c:630
+#: LYMessages.c:631
 msgid "Form submit action is POST, HEAD may not be understood.  Proceed?"
 msgstr "Formulierverzendactie is POST, HEAD wordt mogelijk niet begrepen.  Doorgaan?"
 
-#: LYMessages.c:631
+#: LYMessages.c:632
 msgid "Proceed without a username and password?"
 msgstr "Doorgaan zonder gebruikersnaam en wachtwoord?"
 
-#: LYMessages.c:632
+#: LYMessages.c:633
 #, c-format
 msgid "Proceed (%s)?"
 msgstr "Doorgaan (%s)?"
 
-#: LYMessages.c:633
+#: LYMessages.c:634
 msgid "Cannot POST to this host."
 msgstr "Kan geen 'POST' verzenden naar deze host."
 
-#: LYMessages.c:634
+#: LYMessages.c:635
 msgid "POST not supported for this URL - ignoring POST data!"
 msgstr "POST wordt niet ondersteund voor deze URL -- POST-informatie wordt genegeerd!"
 
-#: LYMessages.c:635
+#: LYMessages.c:636
 msgid "Discarding POST data..."
 msgstr "Weggooien van POST-informatie..."
 
-#: LYMessages.c:636
+#: LYMessages.c:637
 msgid "Document will not be reloaded!"
 msgstr "Document zal niet opnieuw geladen worden!"
 
-#: LYMessages.c:637
+#: LYMessages.c:638
 msgid "Location: "
 msgstr "Locatie: "
 
-#: LYMessages.c:638
+#: LYMessages.c:639
 #, c-format
 msgid "'%s' not found!"
 msgstr "'%s' niet gevonden!"
 
-#: LYMessages.c:639
+#: LYMessages.c:640
 msgid "Default Bookmark File"
 msgstr "Standaard boekenleggerbestand"
 
-#: LYMessages.c:640
+#: LYMessages.c:641
 msgid "Screen too small! (8x35 min)"
 msgstr "Scherm is te klein! (minimaal 8x35)"
 
-#: LYMessages.c:641
+#: LYMessages.c:642
 msgid "Select destination or ^G to Cancel: "
 msgstr "Selecteer bestemming of Ctrl-G om te annuleren: "
 
 #. #define MULTIBOOKMARKS_SELECT
-#: LYMessages.c:643
+#: LYMessages.c:644
 msgid "Select subbookmark, '=' for menu, or ^G to cancel: "
 msgstr "Selecteer subboekenlegger, '=' = menu, Ctrl-G = annuleren: "
 
 #. #define MULTIBOOKMARKS_SELF
-#: LYMessages.c:645
+#: LYMessages.c:646
 msgid "Reproduce L)ink in this bookmark file or C)ancel? (l,c): "
 msgstr "L)ink reproduceren in dit boekenleggerbestand of C)-annuleren? (l,c): "
 
-#: LYMessages.c:646
+#: LYMessages.c:647
 msgid "Multiple bookmark support is not available."
 msgstr "Meervoudige boekenleggerondersteuning is niet beschikbaar."
 
-#: LYMessages.c:647
+#: LYMessages.c:648
 #, c-format
 msgid " Select Bookmark (screen %d of %d)"
 msgstr " Selecteer boekenlegger (scherm %d van %d)"
 
-#: LYMessages.c:648
+#: LYMessages.c:649
 msgid "       Select Bookmark"
 msgstr "       Selecteer boekenlegger"
 
 #. #define MULTIBOOKMARKS_EHEAD_MASK
-#: LYMessages.c:650
+#: LYMessages.c:651
 #, c-format
 msgid "Editing Bookmark DESCRIPTION and FILEPATH (%d of 2)"
 msgstr "Wijzigen van boekenlegger-OMSCHRIJVING en -BESTANDSPAD (%d van 2)"
 
 #. #define MULTIBOOKMARKS_EHEAD
-#: LYMessages.c:652
+#: LYMessages.c:653
 msgid "         Editing Bookmark DESCRIPTION and FILEPATH"
 msgstr "        Wijzigen van boekenlegger-OMSCHRIJVING en -BESTANDSPAD"
 
-#: LYMessages.c:653
+#: LYMessages.c:654
 msgid "Letter: "
 msgstr "Letter: "
 
 #. #define USE_PATH_OFF_HOME
-#: LYMessages.c:656
+#: LYMessages.c:657
 msgid "Use a filepath off your login directory in SHELL syntax!"
 msgstr "Gebruik een bestandspad vanuit uw login-map in shell-syntaxis!"
 
-#: LYMessages.c:658
+#: LYMessages.c:659
 msgid "Use a filepath off your home directory!"
 msgstr "Gebruik een bestandspad vanuit uw persoonlijke map!"
 
 #. #define MAXLINKS_REACHED
-#: LYMessages.c:661
+#: LYMessages.c:662
 msgid "Maximum links per page exceeded!  Use half-page or two-line scrolling."
 msgstr "Te veel links per pagina!  Blader per halve pagina of tweeregelig."
 
-#: LYMessages.c:662
+#: LYMessages.c:663
 msgid "No previously visited links available!"
 msgstr "Geen voorgaande bezochte links beschikbaar!"
 
-#: LYMessages.c:663
+#: LYMessages.c:664
 msgid "Memory exhausted!  Program aborted!"
 msgstr "Geen geheugen meer beschikbaar!  Programma is afgebroken!"
 
-#: LYMessages.c:664
+#: LYMessages.c:665
 msgid "Memory exhausted!  Aborting..."
 msgstr "Geen geheugen meer beschikbaar!  Programma wordt afgebroken..."
 
-#: LYMessages.c:665
+#: LYMessages.c:666
 msgid "Not enough memory!"
 msgstr "Onvoldoende geheugen beschikbaar!"
 
-#: LYMessages.c:666
+#: LYMessages.c:667
 msgid "Directory/File Manager not available"
 msgstr "Bestandsbeheer is niet beschikbaar"
 
-#: LYMessages.c:667
+#: LYMessages.c:668
 msgid "HREF in BASE tag is not an absolute URL."
 msgstr "HREF in 'BASE'-element is niet een absolute URL."
 
-#: LYMessages.c:668
+#: LYMessages.c:669
 msgid "Location URL is not absolute."
 msgstr "Locatie-URL is niet absoluut."
 
-#: LYMessages.c:669
+#: LYMessages.c:670
 msgid "Refresh URL is not absolute."
 msgstr "Verversings-URL is niet absoluut."
 
 #. #define SENDING_MESSAGE_WITH_BODY_TO
-#: LYMessages.c:671
+#: LYMessages.c:672
 msgid ""
 "You are sending a message with body to:\n"
 "  "
@@ -2054,7 +2057,7 @@ msgstr ""
 "U zendt een bericht met inhoud naar:\n"
 "  "
 
-#: LYMessages.c:672
+#: LYMessages.c:673
 msgid ""
 "You are sending a comment to:\n"
 "  "
@@ -2062,7 +2065,7 @@ msgstr ""
 "U zendt commentaar naar:\n"
 "  "
 
-#: LYMessages.c:673
+#: LYMessages.c:674
 msgid ""
 "\n"
 " With copy to:\n"
@@ -2072,7 +2075,7 @@ msgstr ""
 " Met kopie naar:\n"
 "  "
 
-#: LYMessages.c:674
+#: LYMessages.c:675
 msgid ""
 "\n"
 " With copies to:\n"
@@ -2083,7 +2086,7 @@ msgstr ""
 "  "
 
 #. #define CTRL_G_TO_CANCEL_SEND
-#: LYMessages.c:676
+#: LYMessages.c:677
 msgid ""
 "\n"
 "\n"
@@ -2094,7 +2097,7 @@ msgstr ""
 "Gebruik Ctrl-G om te annuleren (bericht niet verzenden).\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"
@@ -2103,7 +2106,7 @@ msgstr ""
 " Voer uw naam in, of laat het leeg om anoniem te blijven\n"
 
 #. #define ENTER_MAIL_ADDRESS_OR_OTHER
-#: LYMessages.c:680
+#: LYMessages.c:681
 msgid ""
 "\n"
 " Please enter a mail address or some other\n"
@@ -2112,11 +2115,11 @@ msgstr ""
 " Vul een e-mailadres in of een andere manier om\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 " u te bereiken, als u antwoord wenst te ontvangen.\n"
 
-#: LYMessages.c:683
+#: LYMessages.c:684
 msgid ""
 "\n"
 " Please enter a subject line.\n"
@@ -2125,7 +2128,7 @@ msgstr ""
 " Vul een onderwerp in.\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"
@@ -2133,11 +2136,11 @@ msgstr ""
 "\n"
 " Voer een e-mailadres in om een kopie van het bericht naar toe te sturen.\n"
 
-#: LYMessages.c:686
+#: LYMessages.c:687
 msgid " (Leave blank if you don't want a copy.)\n"
 msgstr " (Laat dit leeg indien u geen kopie wilt.)\n"
 
-#: LYMessages.c:687
+#: LYMessages.c:688
 msgid ""
 "\n"
 " Please review the message body:\n"
@@ -2147,7 +2150,7 @@ msgstr ""
 " Controleer de inhoud van het bericht:\n"
 "\n"
 
-#: LYMessages.c:688
+#: LYMessages.c:689
 msgid ""
 "\n"
 "Press RETURN to continue: "
@@ -2155,7 +2158,7 @@ msgstr ""
 "\n"
 "Druk op <Enter> om door te gaan: "
 
-#: LYMessages.c:689
+#: LYMessages.c:690
 msgid ""
 "\n"
 "Press RETURN to clean up: "
@@ -2163,11 +2166,11 @@ msgstr ""
 "\n"
 "Druk op <Enter> om op te ruimen: "
 
-#: LYMessages.c:690
+#: LYMessages.c:691
 msgid " Use Control-U to erase the default.\n"
 msgstr " Gebruik Ctrl-U om de huidige regel te wissen.\n"
 
-#: LYMessages.c:691
+#: LYMessages.c:692
 msgid ""
 "\n"
 " Please enter your message below."
@@ -2176,7 +2179,7 @@ msgstr ""
 " Schrijf uw bericht hieronder."
 
 #. #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 (.)"
@@ -2185,7 +2188,7 @@ msgstr ""
 " Wanneer u klaar bent, druk dan op <Enter> en plaats vervolgens"
 
 #. #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."
@@ -2195,257 +2198,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 koekje: %.*s=%.*s  Toestaan? (Ja, Nee, Altijd, noOit)"
 
 #. #define INVALID_COOKIE_DOMAIN_CONFIRMATION
-#: LYMessages.c:701
+#: LYMessages.c:702
 #, c-format
 msgid "Accept invalid cookie domain=%s for '%s'?"
 msgstr "Ongeldig koekjesdomein=%s voor '%s' accepteren?"
 
 #. #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 "Ongeldig koekjespad=%s als een prefix voor '%s' accepteren?"
 
-#: LYMessages.c:704
+#: LYMessages.c:705
 msgid "Allowing this cookie."
 msgstr "Dit koekje wordt toegelaten."
 
-#: LYMessages.c:705
+#: LYMessages.c:706
 msgid "Rejecting this cookie."
 msgstr "Dit koekje wordt verworpen."
 
-#: LYMessages.c:706
+#: LYMessages.c:707
 msgid "The Cookie Jar is empty."
 msgstr "De koekjestrommel is leeg."
 
-#: LYMessages.c:707
+#: LYMessages.c:708
 msgid "The Cache Jar is empty."
 msgstr "De cachetrommel is leeg."
 
 #. #define ACTIVATE_TO_GOBBLE
-#: LYMessages.c:709
+#: LYMessages.c:710
 msgid "Activate links to gobble up cookies or entire domains,"
 msgstr "Activeer de links om koekjes over hun houdbaarheidsdatum heen te helpen,"
 
-#: LYMessages.c:710
+#: LYMessages.c:711
 msgid "or to change a domain's 'allow' setting."
 msgstr "of om de 'toelaatbaarheids'-instelling van een domein te wijzigen."
 
-#: LYMessages.c:711
+#: LYMessages.c:712
 msgid "(Cookies never allowed.)"
 msgstr "(Koekjes nooit toegestaan.)"
 
-#: LYMessages.c:712
+#: LYMessages.c:713
 msgid "(Cookies always allowed.)"
 msgstr "(Koekjes altijd toegestaan.)"
 
-#: LYMessages.c:713
+#: LYMessages.c:714
 msgid "(Cookies allowed via prompt.)"
 msgstr "(Koekjes toegestaan met prompt.)"
 
-#: LYMessages.c:714
+#: LYMessages.c:715
 msgid "(Persistent Cookies.)"
 msgstr "(Persistente koekjes.)"
 
-#: LYMessages.c:715
+#: LYMessages.c:716
 msgid "(No title.)"
 msgstr "(Geen titel.)"
 
-#: LYMessages.c:716
+#: LYMessages.c:717
 msgid "(No name.)"
 msgstr "(Geen naam.)"
 
-#: LYMessages.c:717
+#: LYMessages.c:718
 msgid "(No value.)"
 msgstr "(Geen waarde.)"
 
-#: LYMessages.c:718 src/LYOptions.c:2409
+#: LYMessages.c:719 src/LYOptions.c:2424
 msgid "None"
 msgstr "geen"
 
-#: LYMessages.c:719
+#: LYMessages.c:720
 msgid "(End of session.)"
 msgstr "(Einde van sessie.)"
 
-#: LYMessages.c:720
+#: LYMessages.c:721
 msgid "Delete this cookie?"
 msgstr "Dit koekje verwijderen?"
 
-#: LYMessages.c:721
+#: LYMessages.c:722
 msgid "The cookie has been eaten!"
 msgstr "Het koekje is opgegeten!"
 
-#: LYMessages.c:722
+#: LYMessages.c:723
 msgid "Delete this empty domain?"
 msgstr "Dit lege domein verwijderen?"
 
-#: LYMessages.c:723
+#: LYMessages.c:724
 msgid "The domain has been eaten!"
 msgstr "Het domein is opgegeten!"
 
 #. #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)omein wissen; zet toelaten op A)ltijd/P)rompt/V)-nooit, of C)-annuleren? "
 
 #. #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)omein wissen; zet toestaan op A)ltijd/P)rompt/V)-nooit, of C)-annuleren? "
 
-#: LYMessages.c:728
+#: LYMessages.c:729
 msgid "All cookies in the domain have been eaten!"
 msgstr "Alle koekjes in het domein zijn opgegeten!"
 
-#: LYMessages.c:729
+#: LYMessages.c:730
 #, c-format
 msgid "'A'lways allowing from domain '%s'."
 msgstr "(A) altijd toelaten van domein '%s'."
 
-#: LYMessages.c:730
+#: LYMessages.c:731
 #, c-format
 msgid "ne'V'er allowing from domain '%s'."
 msgstr "(V) nooit toelaten van domein '%s'."
 
-#: LYMessages.c:731
+#: LYMessages.c:732
 #, c-format
 msgid "'P'rompting to allow from domain '%s'."
 msgstr "(P) prompten voor toestaan van domein '%s'."
 
-#: LYMessages.c:732
+#: LYMessages.c:733
 msgid "Delete all cookies in this domain?"
 msgstr "Alle koekjes in dit domein verwijderen?"
 
-#: LYMessages.c:733
+#: LYMessages.c:734
 msgid "All of the cookies in the jar have been eaten!"
 msgstr "Alle koekjes in de trommel zijn opgegeten!"
 
-#: LYMessages.c:735
+#: LYMessages.c:736
 msgid "Port 19 not permitted in URLs."
 msgstr "Poort 19 is niet toegestaan in URL's."
 
-#: LYMessages.c:736
+#: LYMessages.c:737
 msgid "Port 25 not permitted in URLs."
 msgstr "Poort 25 is niet toegestaan in URL's."
 
-#: LYMessages.c:737
+#: LYMessages.c:738
 #, c-format
 msgid "Port %lu not permitted in URLs."
 msgstr "Poort %lu is niet toegestaan in URL's."
 
-#: LYMessages.c:738
+#: LYMessages.c:739
 msgid "URL has a bad port field."
 msgstr "URL heeft een foutief poortveld."
 
-#: LYMessages.c:739
+#: LYMessages.c:740
 msgid "Maximum nesting of HTML elements exceeded."
 msgstr "Maximale nestingsdiepte van HTML-elementen is overschreden."
 
-#: LYMessages.c:740
+#: LYMessages.c:741
 msgid "Bad partial reference!  Stripping lead dots."
 msgstr "Foutieve gedeeltelijke referentie!  Voorafgaande puntjes worden weggelaten."
 
-#: LYMessages.c:741
+#: LYMessages.c:742
 msgid "Trace Log open failed.  Trace off!"
 msgstr "Kan trace-logbestand niet openen.  Traceren is uitgezet!"
 
-#: LYMessages.c:742
+#: LYMessages.c:743
 msgid "Lynx Trace Log"
 msgstr "Lynx-trace-logbestand"
 
-#: LYMessages.c:743
+#: LYMessages.c:744
 msgid "No trace log has been started for this session."
 msgstr "Er is geen trace-logbestand gestart voor deze sessie."
 
 #. #define MAX_TEMPCOUNT_REACHED
-#: LYMessages.c:745
+#: LYMessages.c:746
 msgid "The maximum temporary file count has been reached!"
 msgstr "Het maximale aantal tijdelijke bestanden is bereikt!"
 
 #. #define FORM_VALUE_TOO_LONG
-#: LYMessages.c:747
+#: LYMessages.c:748
 msgid "Form field value exceeds buffer length!  Trim the tail."
 msgstr "Waarde in formulierveld overschrijdt lengte van de buffer!  Staart wordt afgeknipt."
 
 #. #define FORM_TAIL_COMBINED_WITH_HEAD
-#: LYMessages.c:749
+#: LYMessages.c:750
 msgid "Modified tail combined with head of form field value."
 msgstr "Veranderde staart samengevoegd met kop van waarde uit formulierveld."
 
 #. HTFile.c
-#: LYMessages.c:752
+#: LYMessages.c:753
 msgid "Directory"
 msgstr "Map"
 
-#: LYMessages.c:753
+#: LYMessages.c:754
 msgid "Directory browsing is not allowed."
 msgstr "Bladeren door mappen is niet toegestaan."
 
-#: LYMessages.c:754
+#: LYMessages.c:755
 msgid "Selective access is not enabled for this directory"
 msgstr "Selectieve toegang is niet aangezet voor deze map"
 
-#: LYMessages.c:755
+#: LYMessages.c:756
 msgid "Multiformat: directory scan failed."
-msgstr "Multiformat: doorzoeken van map mislukt."
+msgstr "Multiformat: doorzoeken van map is mislukt."
 
-#: LYMessages.c:756
+#: LYMessages.c:757
 msgid "This directory is not readable."
 msgstr "Deze map is niet leesbaar."
 
-#: LYMessages.c:757
+#: LYMessages.c:758
 msgid "Can't access requested file."
 msgstr "Geen toegang tot opgevraagd bestand."
 
-#: LYMessages.c:758
+#: LYMessages.c:759
 msgid "Could not find suitable representation for transmission."
 msgstr "Kan geen passende representatie vinden voor overdracht."
 
-#: LYMessages.c:759
+#: LYMessages.c:760
 msgid "Could not open file for decompression!"
 msgstr "Kan bestand niet openen voor decompressie!"
 
-#: LYMessages.c:760
+#: LYMessages.c:761
 msgid "Files:"
 msgstr "Bestanden:"
 
-#: LYMessages.c:761
+#: LYMessages.c:762
 msgid "Subdirectories:"
 msgstr "Submappen:"
 
-#: LYMessages.c:762
+#: LYMessages.c:763
 msgid " directory"
 msgstr " map"
 
-#: LYMessages.c:763
+#: LYMessages.c:764
 msgid "Up to "
 msgstr "Terug naar "
 
-#: LYMessages.c:764
+#: LYMessages.c:765
 msgid "Current directory is "
 msgstr "Huidige map is "
 
 #. HTFTP.c
-#: LYMessages.c:767
+#: LYMessages.c:768
 msgid "Symbolic Link"
 msgstr "Symbolische koppeling"
 
 #. HTGopher.c
-#: LYMessages.c:770
+#: LYMessages.c:771
 msgid "No response from server!"
 msgstr "Geen reactie van die server!"
 
-#: 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"
@@ -2453,16 +2456,16 @@ msgstr ""
 "\n"
 "Dit is een doorzoekbare index van een CSO-databank.\n"
 
-#: LYMessages.c:773
+#: LYMessages.c:774
 msgid "CSO Search Results"
 msgstr "CSO-zoekresultaten"
 
-#: LYMessages.c:774
+#: LYMessages.c:775
 #, c-format
 msgid "Seek fail on %s\n"
 msgstr "Zoekopdracht is mislukt op %s\n"
 
-#: LYMessages.c:775
+#: LYMessages.c:776
 msgid ""
 "\n"
 "Press the 's' key and enter search keywords.\n"
@@ -2470,7 +2473,7 @@ msgstr ""
 "\n"
 "Druk op de 's'-toets en voer zoektermen in.\n"
 
-#: LYMessages.c:776
+#: LYMessages.c:777
 msgid ""
 "\n"
 "This is a searchable Gopher index.\n"
@@ -2478,35 +2481,35 @@ msgstr ""
 "\n"
 "Dit is een doorzoekbare Gopher-index.\n"
 
-#: LYMessages.c:777
+#: LYMessages.c:778
 msgid "Gopher index"
 msgstr "Gopher-index"
 
-#: LYMessages.c:778
+#: LYMessages.c:779
 msgid "Gopher Menu"
 msgstr "Gopher-menu"
 
-#: LYMessages.c:779
+#: LYMessages.c:780
 msgid " Search Results"
 msgstr " Zoekresultaten"
 
-#: LYMessages.c:780
+#: LYMessages.c:781
 msgid "Sending CSO/PH request."
 msgstr "Verzenden van CSO/PH-verzoek."
 
-#: LYMessages.c:781
+#: LYMessages.c:782
 msgid "Sending Gopher request."
 msgstr "Verzenden van Gopher-verzoek."
 
-#: LYMessages.c:782
+#: LYMessages.c:783
 msgid "CSO/PH request sent; waiting for response."
 msgstr "CSO/PH-verzoek is verzonden; wacht op antwoord."
 
-#: LYMessages.c:783
+#: LYMessages.c:784
 msgid "Gopher request sent; waiting for response."
 msgstr "Gopher-verzoek is verzonden; wacht op antwoord."
 
-#: LYMessages.c:784
+#: LYMessages.c:785
 msgid ""
 "\n"
 "Please enter search keywords.\n"
@@ -2514,7 +2517,7 @@ msgstr ""
 "\n"
 "Voer zoektermen in.\n"
 
-#: LYMessages.c:785
+#: LYMessages.c:786
 msgid ""
 "\n"
 "The keywords that you enter will allow you to search on a"
@@ -2522,201 +2525,205 @@ msgstr ""
 "\n"
 "De zoektermen die u opgeeft maken het mogelijk te zoeken op"
 
-#: LYMessages.c:786
+#: LYMessages.c:787
 msgid " person's name in the database.\n"
 msgstr " een persoonsnaam in de databank.\n"
 
 #. HTNews.c
-#: LYMessages.c:789
+#: LYMessages.c:790
 msgid "Connection closed ???"
 msgstr "Verbinding gesloten???"
 
-#: LYMessages.c:790
+#: LYMessages.c:791
 msgid "Cannot open temporary file for news POST."
-msgstr "Kan tijdelijk bestand niet openen voor nieuws-POST."
+msgstr "Kan geen tijdelijk bestand openen voor nieuws-POST."
 
-#: LYMessages.c:791
+#: LYMessages.c:792
 msgid "This client does not contain support for posting to news with SSL."
 msgstr "Dit programma ondersteunt versturen van nieuwsberichten met SSL niet."
 
 #. HTStyle.c
-#: LYMessages.c:794
+#: LYMessages.c:795
 #, c-format
 msgid "Style %d `%s' SGML:%s.  Font %s %.1f point.\n"
 msgstr "Stijl %d '%s' SGML:%s.  Lettertype %s %.1f-punts.\n"
 
-#: LYMessages.c:796
+#: LYMessages.c:797
 #, c-format
 msgid "\tAlign=%d, %d tabs. (%.0f before, %.0f after)\n"
 msgstr "        Uitlijnen=%d, %d tabs. (%.0f voor, %.0f na)\n"
 
-#: LYMessages.c:797
+#: LYMessages.c:798
 #, c-format
 msgid "\t\tTab kind=%d at %.0f\n"
 msgstr "                Tabsoort=%d op %.0f\n"
 
 #. HTTP.c
-#: LYMessages.c:800
+#: LYMessages.c:801
 msgid "Can't proceed without a username and password."
 msgstr "Kan niet verder zonder gebruikersnaam en wachtwoord."
 
-#: LYMessages.c:801
+#: LYMessages.c:802
 msgid "Can't retry with authorization!  Contact the server's WebMaster."
 msgstr "Herhalen gaat niet met autorisatie!  Vraag beheerder van de webserver."
 
-#: LYMessages.c:802
+#: LYMessages.c:803
 msgid "Can't retry with proxy authorization!  Contact the server's WebMaster."
 msgstr "Herhalen gaat niet met proxy-autorisatie!  Vraag beheerder van de webserver."
 
-#: LYMessages.c:803
+#: LYMessages.c:804
 msgid "Retrying with proxy authorization information."
 msgstr "Nieuwe poging met proxy-autorisatie-informatie."
 
-#: LYMessages.c:804
+#: LYMessages.c:805
 #, c-format
 msgid "SSL error:%s-Continue?"
 msgstr "SSL-fout: %s -- Verdergaan?"
 
 #. HTWAIS.c
-#: LYMessages.c:807
+#: LYMessages.c:808
 msgid "HTWAIS: Return message too large."
 msgstr "HTWAIS: Geretourneerd bericht is te groot."
 
-#: LYMessages.c:808
+#: LYMessages.c:809
 msgid "Enter WAIS query: "
 msgstr "Voer een WAIS-verzoek in: "
 
 #. Miscellaneous status
-#: LYMessages.c:811
+#: LYMessages.c:812
 msgid "Retrying as HTTP0 request."
 msgstr "Nieuwe poging als HTTP0-verzoek."
 
-#: LYMessages.c:812
+#: LYMessages.c:813
 #, c-format
 msgid "Transferred %d bytes"
 msgstr "%d bytes overgezet"
 
-#: LYMessages.c:813
+#: LYMessages.c:814
 msgid "Data transfer complete"
 msgstr "Gegevensoverdracht is voltooid"
 
-#: LYMessages.c:814
+#: LYMessages.c:815
 #, c-format
 msgid "Error processing line %d of %s\n"
 msgstr "Fout bij verwerking van regel %d van %s\n"
 
 #. Lynx internal page titles
-#: LYMessages.c:817
+#: LYMessages.c:818
 msgid "Address List Page"
-msgstr "Adreslijst Pagina"
+msgstr "Adreslijstenpagina"
 
-#: LYMessages.c:818
+#: LYMessages.c:819
 msgid "Bookmark file"
 msgstr "Boekenleggerbestand"
 
-#: LYMessages.c:819
+#: LYMessages.c:820
 msgid "Configuration Definitions"
 msgstr "Instellingen"
 
-#: LYMessages.c:820
+#: LYMessages.c:821
 msgid "Cookie Jar"
 msgstr "Koekjestrommel"
 
-#: LYMessages.c:821
+#: LYMessages.c:822
+msgid "Current Edit-Key Map"
+msgstr "Huidige edittoetsenindeling"
+
+#: LYMessages.c:823
 msgid "Current Key Map"
-msgstr "Huidige toetsenbordindeling"
+msgstr "Huidige toetsenindeling"
 
-#: LYMessages.c:822
+#: LYMessages.c:824
 msgid "File Management Options"
 msgstr "Bestandsbeheeropties"
 
-#: LYMessages.c:823
+#: LYMessages.c:825
 msgid "Download Options"
 msgstr "Downloadopties"
 
-#: LYMessages.c:824
+#: LYMessages.c:826
 msgid "History Page"
 msgstr "Historiepagina"
 
-#: LYMessages.c:825
+#: LYMessages.c:827
 msgid "Cache Jar"
 msgstr "Cachetrommel"
 
-#: LYMessages.c:826
+#: LYMessages.c:828
 msgid "List Page"
 msgstr "Lijstenpagina"
 
-#: LYMessages.c:827
+#: LYMessages.c:829
 msgid "Lynx.cfg Information"
 msgstr "Lynx.cfg-informatie"
 
-#: LYMessages.c:828
+#: LYMessages.c:830
 msgid "Converted Mosaic Hotlist"
 msgstr "Geconverteerde Mosaic-hotlist"
 
-#: LYMessages.c:829
+#: LYMessages.c:831
 msgid "Options Menu"
 msgstr "Optiesmenu"
 
-#: LYMessages.c:830
+#: LYMessages.c:832
 msgid "File Permission Options"
 msgstr "Opties voor bestandstoegangsrechten"
 
-#: LYMessages.c:831
+#: LYMessages.c:833
 msgid "Printing Options"
 msgstr "Afdrukopties"
 
-#: LYMessages.c:832
+#: LYMessages.c:834
 msgid "Information about the current document"
 msgstr "Informatie over het huidige document"
 
-#: LYMessages.c:833
+#: LYMessages.c:835
 msgid "Your recent statusline messages"
 msgstr "Recente berichten van de statusregel"
 
-#: LYMessages.c:834
+#: LYMessages.c:836
 msgid "Upload Options"
 msgstr "Uploadopties"
 
-#: LYMessages.c:835
+#: LYMessages.c:837
 msgid "Visited Links Page"
 msgstr "Bezochte links-pagina"
 
 #. CONFIG_DEF_TITLE subtitles
-#: LYMessages.c:838
+#: LYMessages.c:840
 msgid "See also"
 msgstr "Zie ook"
 
-#: LYMessages.c:839
+#: LYMessages.c:841
 msgid "your"
 msgstr "uw"
 
-#: LYMessages.c:840
+#: LYMessages.c:842
 msgid "for runtime options"
 msgstr "voor uitvoeropties"
 
-#: LYMessages.c:841
+#: LYMessages.c:843
 msgid "compile time options"
 msgstr "compilatieopties"
 
-#: LYMessages.c:842
+#: LYMessages.c:844
 msgid "color-style configuration"
 msgstr "instellingen van kleurstijl"
 
-#: LYMessages.c:843
+#: LYMessages.c:845
 msgid "latest release"
 msgstr "laatste versie"
 
-#: LYMessages.c:844
+#: LYMessages.c:846
 msgid "pre-release version"
 msgstr "testversie"
 
-#: LYMessages.c:845
+#: LYMessages.c:847
 msgid "development version"
 msgstr "ontwikkelversie"
 
 #. #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"
@@ -2727,7 +2734,7 @@ msgstr ""
 "een programmafout rapporteert."
 
 #. #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."
@@ -2736,53 +2743,53 @@ msgstr ""
 "definities tijdens het compileren van dit exemplaar van Lynx."
 
 #. #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)reëer D)ownload E)dit F)-volledig menu M)-wijzig R)-wis T)-vink U)pload\n"
 
-#: LYMessages.c:857
+#: LYMessages.c:859
 msgid "Failed to obtain status of current link!"
 msgstr "Kan status van de huidige link niet verkrijgen!"
 
 #. #define INVALID_PERMIT_URL
-#: LYMessages.c:860
+#: LYMessages.c:862
 msgid "Special URL only valid from current File Permission menu!"
 msgstr "Speciale URL is alleen geldig vanuit huidige Bestandstoegangsrechten-menu!"
 
-#: LYMessages.c:864
+#: LYMessages.c:866
 msgid "External support is currently disabled."
 msgstr "Externe ondersteuning is momenteel uitgeschakeld."
 
 #. new with 2.8.4dev.21
-#: LYMessages.c:868
+#: LYMessages.c:870
 msgid "Changing working-directory is currently disabled."
 msgstr "De werkmap wijzigen is momenteel uitgeschakeld."
 
-#: LYMessages.c:869
+#: LYMessages.c:871
 msgid "Linewrap OFF!"
 msgstr "Regelvouwen UIT!"
 
-#: LYMessages.c:870
+#: LYMessages.c:872
 msgid "Linewrap ON!"
 msgstr "Regelvouwen AAN!"
 
-#: LYMessages.c:871
+#: LYMessages.c:873
 msgid "Parsing nested-tables toggled OFF!  Reloading..."
-msgstr "Ontleden van geneste tabellen is UIT gezet!  Herladen..."
+msgstr "Ontleden van geneste tabellen is UITgezet!  Herladen..."
 
-#: LYMessages.c:872
+#: LYMessages.c:874
 msgid "Parsing nested-tables toggled ON!  Reloading..."
-msgstr "Ontleden van geneste tabellen is AAN gezet!  Herladen..."
+msgstr "Ontleden van geneste tabellen is AANgezet!  Herladen..."
 
-#: LYMessages.c:873
+#: LYMessages.c:875
 msgid "Shifting is disabled while line-wrap is in effect"
-msgstr "Gebruik van shift is uitgeschakeld als regelvouwen in gebruik is"
+msgstr "Schuiven is uitgeschakeld als regelvouwen in gebruik is"
 
-#: LYMessages.c:874
+#: LYMessages.c:876
 msgid "Trace not supported"
 msgstr "Traceren wordt niet ondersteund"
 
-#: LYMessages.c:795
+#: LYMessages.c:796
 #, c-format
 msgid "\tIndents: first=%.0f others=%.0f, Height=%.1f Desc=%.1f\n"
 msgstr "        Inspringen: eerste=%.0f overigen=%.0f, hoogte=%.1f omschr=%.1f\n"
@@ -2806,12 +2813,12 @@ msgstr "Dit programma weet niet hoe proxy-autorisatie-informatie te maken voor s
 msgid "This client doesn't know how to compose authorization information for scheme"
 msgstr "Dit programma weet niet hoe autorisatie-informatie te maken voor schema"
 
-#: WWW/Library/Implementation/HTAABrow.c:1093
+#: WWW/Library/Implementation/HTAABrow.c:1094
 #, c-format
 msgid "Invalid header '%s%s%s%s%s'"
 msgstr "Foutieve kop '%s%s%s%s%s'"
 
-#: WWW/Library/Implementation/HTAABrow.c:1198
+#: WWW/Library/Implementation/HTAABrow.c:1200
 msgid "Proxy authorization required -- retrying"
 msgstr "Proxy-autorisatie is vereist -- nieuwe poging"
 
@@ -2827,25 +2834,25 @@ msgstr "Toegang is verboden volgens regel"
 msgid "Document with POST content not found in cache.  Resubmit?"
 msgstr "Document met POST inhoud niet gevonden in cache.  Nog eens verzenden?"
 
-#: WWW/Library/Implementation/HTAccess.c:949
+#: WWW/Library/Implementation/HTAccess.c:947
 msgid "Loading failed, use a previous copy."
-msgstr "Het laden is mislukt, gebruik een vroegere kopie."
+msgstr "Het laden is mislukt; gebruik een vroegere kopie."
 
-#: WWW/Library/Implementation/HTAccess.c:1058 src/GridText.c:8867
+#: WWW/Library/Implementation/HTAccess.c:1056 src/GridText.c:8875
 msgid "Loading incomplete."
-msgstr "Laden niet voltooid."
+msgstr "Laden is niet voltooid."
 
-#: 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: socket of bestandsnummer teruggegeven door verouderde laadroutine!\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: Interne fout.  Meld dit aan <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: Geretourneerde status was: %d\n"
@@ -2854,65 +2861,65 @@ msgstr "**** HTAccess: Geretourneerde status was: %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 geen toegang krijgen"
 
-#: WWW/Library/Implementation/HTAccess.c:1106
+#: WWW/Library/Implementation/HTAccess.c:1104
 msgid "Unable to access document."
 msgstr "Kan geen toegang krijgen tot document."
 
-#: WWW/Library/Implementation/HTFTP.c:849
+#: WWW/Library/Implementation/HTFTP.c:875
 #, c-format
 msgid "Enter password for user %s@%s:"
 msgstr "Voer wachtwoord in voor gebruiker %s@%s:"
 
-#: WWW/Library/Implementation/HTFTP.c:877
+#: WWW/Library/Implementation/HTFTP.c:903
 msgid "Unable to connect to FTP host."
 msgstr "Kan geen verbinding maken met FTP-host."
 
-#: WWW/Library/Implementation/HTFTP.c:1158
+#: WWW/Library/Implementation/HTFTP.c:1142
 msgid "close master socket"
 msgstr "hoofdsocket sluiten"
 
-#: WWW/Library/Implementation/HTFTP.c:1220
+#: WWW/Library/Implementation/HTFTP.c:1204
 msgid "socket for master socket"
 msgstr "socket voor hoofdsocket"
 
-#: WWW/Library/Implementation/HTFTP.c:2986
+#: WWW/Library/Implementation/HTFTP.c:2952
 msgid "Receiving FTP directory."
 msgstr "Ophalen van FTP-bestandenoverzicht."
 
-#: WWW/Library/Implementation/HTFTP.c:3122
+#: WWW/Library/Implementation/HTFTP.c:3090
 #, c-format
 msgid "Transferred %d bytes (%5d)"
 msgstr "%d bytes overgezet (%5d)"
 
-#: WWW/Library/Implementation/HTFTP.c:3480
+#: WWW/Library/Implementation/HTFTP.c:3448
 msgid "connect for data"
 msgstr "verbinden voor datastroom"
 
-#: WWW/Library/Implementation/HTFTP.c:4141
+#: WWW/Library/Implementation/HTFTP.c:4120
 msgid "Receiving FTP file."
 msgstr "Ophalen van FTP-bestand."
 
-#: WWW/Library/Implementation/HTFinger.c:278
+#: WWW/Library/Implementation/HTFinger.c:274
 msgid "Could not set up finger connection."
 msgstr "Kan finger-verbinding niet maken."
 
-#: WWW/Library/Implementation/HTFinger.c:325
+#: WWW/Library/Implementation/HTFinger.c:321
 msgid "Could not load data (no sitename in finger URL)"
 msgstr "Kan gegevens niet laden (geen site-naam in finger-URL)"
 
-#: WWW/Library/Implementation/HTFinger.c:329
+#: WWW/Library/Implementation/HTFinger.c:325
 msgid "Invalid port number - will only use port 79!"
 msgstr "Ongeldig poortnummer -- zal alleen poort 79 gebruiken!"
 
-#: WWW/Library/Implementation/HTFinger.c:395
+#: WWW/Library/Implementation/HTFinger.c:391
 msgid "Could not access finger host."
 msgstr "Kan finger-host niet bereiken."
 
-#: WWW/Library/Implementation/HTFinger.c:403
+#: WWW/Library/Implementation/HTFinger.c:399
 msgid "No response from finger server."
 msgstr "Geen antwoord van finger-server."
 
@@ -3042,16 +3049,16 @@ msgstr "Lezen van nieuwsartikel."
 msgid "Sorry, could not load requested news."
 msgstr "Sorry, kan het opgevraagde nieuws niet laden."
 
-#: WWW/Library/Implementation/HTTCP.c:1286
+#: WWW/Library/Implementation/HTTCP.c:1323
 msgid "Address has invalid port"
 msgstr "Adres bevat ongeldige poort"
 
-#: WWW/Library/Implementation/HTTCP.c:1362
+#: WWW/Library/Implementation/HTTCP.c:1397
 msgid "Address length looks invalid"
 msgstr "Adreslengte ziet er ongeldig uit"
 
-#: 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 gindse computer %s niet vinden."
@@ -3060,39 +3067,39 @@ msgstr "Kan gindse computer %s niet vinden."
 #. * 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 "Ongeldige hostnaam %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1651
+#: WWW/Library/Implementation/HTTCP.c:1874
 #, c-format
 msgid "Making %s connection to %s"
 msgstr "Maken van %s-verbinding met %s"
 
-#: WWW/Library/Implementation/HTTCP.c:1662
+#: WWW/Library/Implementation/HTTCP.c:1885
 msgid "socket failed."
 msgstr "socket is mislukt."
 
-#: WWW/Library/Implementation/HTTCP.c:1676
+#: WWW/Library/Implementation/HTTCP.c:1899
 #, c-format
 msgid "socket failed: family %d addr %s port %s."
-msgstr "socket is mislukt: familie %d adres %s poort %s."
+msgstr "socket is mislukt: familie %d, adres %s, poort %s."
 
-#: WWW/Library/Implementation/HTTCP.c:1700
+#: WWW/Library/Implementation/HTTCP.c:1923
 msgid "Could not make connection non-blocking."
 msgstr "Kan verbinding niet niet-blokkerend maken."
 
-#: WWW/Library/Implementation/HTTCP.c:1768
+#: WWW/Library/Implementation/HTTCP.c:1991
 msgid "Connection failed (too many retries)."
 msgstr "Verbinden is mislukt (te vaak opnieuw geprobeerd)."
 
-#: WWW/Library/Implementation/HTTCP.c:1955
+#: WWW/Library/Implementation/HTTCP.c:2180
 msgid "Could not restore socket to blocking."
 msgstr "Kan socket niet naar blokkerende modus herstellen."
 
-#: WWW/Library/Implementation/HTTCP.c:2021
+#: WWW/Library/Implementation/HTTCP.c:2248
 msgid "Socket read failed (too many tries)."
 msgstr "Socket uitlezen is mislukt (te vaak opnieuw geprobeerd)."
 
@@ -3101,91 +3108,95 @@ msgstr "Socket uitlezen is mislukt (te vaak opnieuw geprobeerd)."
 msgid "SSL callback:%s, preverify_ok=%d, ssl_okay=%d"
 msgstr "SSL callback:%s, preverify_ok=%d, ssl_okay=%d"
 
-#: WWW/Library/Implementation/HTTP.c:432
+#: WWW/Library/Implementation/HTTP.c:438
 #, c-format
 msgid "Address contains a username: %s"
 msgstr "Adres bevat een gebruikersnaam: %s"
 
-#: WWW/Library/Implementation/HTTP.c:486
+#: WWW/Library/Implementation/HTTP.c:492
 #, c-format
 msgid "Certificate issued by: %s"
 msgstr "Certificaat is uitgeven door: %s"
 
-#: WWW/Library/Implementation/HTTP.c:673
+#: WWW/Library/Implementation/HTTP.c:679
 msgid "This client does not contain support for HTTPS URLs."
 msgstr "Dit programma ondersteunt geen HTTPS-URL's."
 
-#: WWW/Library/Implementation/HTTP.c:698
+#: WWW/Library/Implementation/HTTP.c:704
 msgid "Unable to connect to remote host."
 msgstr "Kan geen verbinding maken met gindse computer."
 
-#: WWW/Library/Implementation/HTTP.c:730
+#: WWW/Library/Implementation/HTTP.c:744
 msgid "Retrying connection without TLS."
 msgstr "Verbinding wordt opnieuw geprobeerd zonder TLS."
 
-#: WWW/Library/Implementation/HTTP.c:773
+#: WWW/Library/Implementation/HTTP.c:794
+msgid "GnuTLS error when trying to verify certificate."
+msgstr "GnuTLS-fout tijdens verificatie van certificaat."
+
+#: WWW/Library/Implementation/HTTP.c:806
+msgid "the certificate has no known issuer"
+msgstr "het certificaat heeft geen bekende uitgever"
+
+#: WWW/Library/Implementation/HTTP.c:808
 msgid "no issuer was found"
 msgstr "geen uitgever gevonden"
 
-#: WWW/Library/Implementation/HTTP.c:775
+#: WWW/Library/Implementation/HTTP.c:810
 msgid "issuer is not a CA"
 msgstr "uitgever is geen CA"
 
-#: WWW/Library/Implementation/HTTP.c:777
-msgid "the certificate has no known issuer"
-msgstr "het certificaat heeft geen bekende uitgever"
-
-#: WWW/Library/Implementation/HTTP.c:779
+#: WWW/Library/Implementation/HTTP.c:812
 msgid "the certificate has been revoked"
 msgstr "het certificaat is herroepen"
 
-#: WWW/Library/Implementation/HTTP.c:781
+#: WWW/Library/Implementation/HTTP.c:814
 msgid "the certificate is not trusted"
 msgstr "het certificaat wordt niet vertrouwd"
 
-#: WWW/Library/Implementation/HTTP.c:855
+#: WWW/Library/Implementation/HTTP.c:889
 #, c-format
 msgid "Verified connection to %s (cert=%s)"
 msgstr "Geverifieerde verbinding met %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 "Geverifieerde verbinding met %s (subj=%s)"
 
-#: WWW/Library/Implementation/HTTP.c:975
+#: WWW/Library/Implementation/HTTP.c:1009
 msgid "Can't find common name in certificate"
 msgstr "Kan in certificaat geen gewone naam vinden"
 
-#: WWW/Library/Implementation/HTTP.c:978
+#: WWW/Library/Implementation/HTTP.c:1012
 #, c-format
 msgid "SSL error:host(%s)!=cert(%s)-Continue?"
 msgstr "SSL-fout: computer(%s)!=certificaat(%s).  Verdergaan?"
 
-#: WWW/Library/Implementation/HTTP.c:991
+#: WWW/Library/Implementation/HTTP.c:1025
 #, c-format
 msgid "UNVERIFIED connection to %s (cert=%s)"
 msgstr "ONGEVERIFIEERDE verbinding met %s (cert=%s)"
 
-#: WWW/Library/Implementation/HTTP.c:1000
+#: WWW/Library/Implementation/HTTP.c:1034
 #, c-format
 msgid "Secure %d-bit %s (%s) HTTP connection"
 msgstr "Veilige %d-bits %s (%s) HTTP-verbinding"
 
-#: WWW/Library/Implementation/HTTP.c:1467
+#: WWW/Library/Implementation/HTTP.c:1497
 msgid "Sending HTTP request."
 msgstr "Zenden van HTTP-verzoek."
 
-#: WWW/Library/Implementation/HTTP.c:1509
+#: WWW/Library/Implementation/HTTP.c:1539
 msgid "Unexpected network write error; connection aborted."
 msgstr "Onverwachte fout bij schrijven naar netwerk; verbinding is verbroken."
 
-#: WWW/Library/Implementation/HTTP.c:1515
+#: WWW/Library/Implementation/HTTP.c:1545
 msgid "HTTP request sent; waiting for response."
 msgstr "HTTP-verzoek is verzonden; wacht op antwoord."
 
-#: 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 "Onverwachte fout bij lezen uit netwerk; verbinding is verbroken."
 
@@ -3198,7 +3209,7 @@ msgstr "Onverwachte fout bij lezen uit netwerk; verbinding is verbroken."
 #. * 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 "Onverwachte informatieve status ontvangen."
 
@@ -3208,7 +3219,7 @@ msgstr "Onverwachte informatieve status ontvangen."
 #. * 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 "Verzoek is volbracht.  Herstellen van inhoud."
 
@@ -3218,27 +3229,27 @@ msgstr "Verzoek is volbracht.  Herstellen van inhoud."
 #. * 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 "Kreeg een onverwachte '304 Niet gewijzigd'-statusmelding."
 
-#: WWW/Library/Implementation/HTTP.c:2012
+#: WWW/Library/Implementation/HTTP.c:2042
 msgid "Redirection of POST content requires user approval."
 msgstr "Doorverwijzing van POST-inhoud vereist toestemming van de gebruiker."
 
-#: WWW/Library/Implementation/HTTP.c:2027
+#: WWW/Library/Implementation/HTTP.c:2057
 msgid "Have POST content.  Treating Permanent Redirection as Temporary.\n"
 msgstr "Heb POST-inhoud.  Permanente doorverwijzing wordt behandeld als een tijdelijke.\n"
 
-#: WWW/Library/Implementation/HTTP.c:2071
+#: WWW/Library/Implementation/HTTP.c:2101
 msgid "Retrying with access authorization information."
 msgstr "Bezig opnieuw te proberen met toegangsautorisatie-informatie."
 
-#: WWW/Library/Implementation/HTTP.c:2083
+#: WWW/Library/Implementation/HTTP.c:2113
 msgid "Show the 401 message body?"
 msgstr "Inhoud van het 401-bericht laten zien?"
 
-#: WWW/Library/Implementation/HTTP.c:2127
+#: WWW/Library/Implementation/HTTP.c:2157
 msgid "Show the 407 message body?"
 msgstr "Inhoud van het 407-bericht laten zien?"
 
@@ -3246,7 +3257,7 @@ msgstr "Inhoud van het 407-bericht laten zien?"
 #. * 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 "Onbekende statusmelding van server!"
 
@@ -3267,36 +3278,36 @@ msgstr "Kan WAIS-verbinding voor lezen niet tot stand brengen."
 msgid "Diagnostic code is "
 msgstr "Diagnostische code is "
 
-#: WWW/Library/Implementation/HTWAIS.c:464
+#: WWW/Library/Implementation/HTWAIS.c:460
 msgid "Index "
 msgstr "Inhoud "
 
-#: WWW/Library/Implementation/HTWAIS.c:468
+#: WWW/Library/Implementation/HTWAIS.c:464
 #, c-format
 msgid " contains the following %d item%s relevant to \""
 msgstr " bevat de volgende %d item%s relevant voor \""
 
-#: WWW/Library/Implementation/HTWAIS.c:476
+#: WWW/Library/Implementation/HTWAIS.c:472
 msgid "The first figure after each entry is its relative score, "
 msgstr "Het eerste cijfer achter elk item is zijn relatieve score, "
 
-#: WWW/Library/Implementation/HTWAIS.c:477
+#: WWW/Library/Implementation/HTWAIS.c:473
 msgid "the second is the number of lines in the item."
 msgstr "het tweede is het aantal regels in het item."
 
-#: WWW/Library/Implementation/HTWAIS.c:519
+#: WWW/Library/Implementation/HTWAIS.c:515
 msgid " (bad file name)"
 msgstr " (foutieve bestandsnaam)"
 
-#: WWW/Library/Implementation/HTWAIS.c:545
+#: WWW/Library/Implementation/HTWAIS.c:541
 msgid "(bad doc id)"
 msgstr "(foutief document-ID.)"
 
-#: WWW/Library/Implementation/HTWAIS.c:561
+#: WWW/Library/Implementation/HTWAIS.c:557
 msgid "(Short Header record, can't display)"
 msgstr "(Verkorte Kop structuur, niet toonbaar)"
 
-#: WWW/Library/Implementation/HTWAIS.c:568
+#: WWW/Library/Implementation/HTWAIS.c:564
 msgid ""
 "\n"
 "Long Header record, can't display\n"
@@ -3304,7 +3315,7 @@ msgstr ""
 "\n"
 "Lange Kop structuur, niet toonbaar\n"
 
-#: WWW/Library/Implementation/HTWAIS.c:575
+#: WWW/Library/Implementation/HTWAIS.c:571
 msgid ""
 "\n"
 "Text record\n"
@@ -3312,7 +3323,7 @@ msgstr ""
 "\n"
 "Tekst structuur\n"
 
-#: WWW/Library/Implementation/HTWAIS.c:584
+#: WWW/Library/Implementation/HTWAIS.c:580
 msgid ""
 "\n"
 "Headline record, can't display\n"
@@ -3320,7 +3331,7 @@ msgstr ""
 "\n"
 "Kopregel structuur, niet toonbaar\n"
 
-#: WWW/Library/Implementation/HTWAIS.c:592
+#: WWW/Library/Implementation/HTWAIS.c:588
 msgid ""
 "\n"
 "Code record, can't display\n"
@@ -3328,27 +3339,27 @@ msgstr ""
 "\n"
 "Code structuur, niet toonbaar\n"
 
-#: WWW/Library/Implementation/HTWAIS.c:696
+#: WWW/Library/Implementation/HTWAIS.c:692
 msgid "Syntax error in WAIS URL"
 msgstr "Syntactische fout in WAIS-URL"
 
-#: 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 "Deze link is om te zoeken in de "
 
-#: 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"
@@ -3356,188 +3367,188 @@ msgstr ""
 "\n"
 "Typ de zoekopdracht ('s') en specificeer dan zoektermen.\n"
 
-#: WWW/Library/Implementation/HTWAIS.c:836
+#: WWW/Library/Implementation/HTWAIS.c:832
 msgid " (in "
 msgstr " (in "
 
-#: WWW/Library/Implementation/HTWAIS.c:845
+#: WWW/Library/Implementation/HTWAIS.c:841
 msgid "WAIS Search of \""
 msgstr "WAIS doorzoeken naar \""
 
-#: WWW/Library/Implementation/HTWAIS.c:849
+#: WWW/Library/Implementation/HTWAIS.c:845
 msgid "\" in: "
 msgstr "\" in: "
 
-#: WWW/Library/Implementation/HTWAIS.c:864
+#: WWW/Library/Implementation/HTWAIS.c:860
 msgid "HTWAIS: Request too large."
 msgstr "HTWAIS: Verzoek is te groot."
 
-#: WWW/Library/Implementation/HTWAIS.c:873
+#: WWW/Library/Implementation/HTWAIS.c:869
 msgid "Searching WAIS database..."
 msgstr "Doorzoeken van WAIS-databank..."
 
-#: WWW/Library/Implementation/HTWAIS.c:883
+#: WWW/Library/Implementation/HTWAIS.c:879
 msgid "Search interrupted."
 msgstr "Zoeken is onderbroken."
 
-#: WWW/Library/Implementation/HTWAIS.c:934
+#: WWW/Library/Implementation/HTWAIS.c:930
 msgid "Can't convert format of WAIS document"
 msgstr "Kan opmaak van WAIS-document niet converteren"
 
-#: WWW/Library/Implementation/HTWAIS.c:978
+#: WWW/Library/Implementation/HTWAIS.c:974
 msgid "HTWAIS: Request too long."
 msgstr "HTWAIS: Verzoek is te lang."
 
 #.
 #. * 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 "Ophalen van WAIS-document..."
 
 #. 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 "Er is geen tekst geretourneerd!\n"
 
-#: WWW/Library/Implementation/HTWSRC.c:301
+#: WWW/Library/Implementation/HTWSRC.c:302
 msgid " NOT GIVEN in source file; "
 msgstr " NIET OPGEGEVEN in bronbestand; "
 
-#: WWW/Library/Implementation/HTWSRC.c:324
+#: WWW/Library/Implementation/HTWSRC.c:325
 msgid " WAIS source file"
 msgstr " WAIS-bronbestand"
 
-#: WWW/Library/Implementation/HTWSRC.c:331
+#: WWW/Library/Implementation/HTWSRC.c:332
 msgid " description"
 msgstr " omschrijving"
 
-#: WWW/Library/Implementation/HTWSRC.c:341
+#: WWW/Library/Implementation/HTWSRC.c:342
 msgid "Access links"
 msgstr "Toegangs-links"
 
-#: WWW/Library/Implementation/HTWSRC.c:362
+#: WWW/Library/Implementation/HTWSRC.c:363
 msgid "Direct access"
 msgstr "Directe toegang"
 
 #. * 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 " (of via een proxy-server, indien opgegeven)"
 
-#: WWW/Library/Implementation/HTWSRC.c:380
+#: WWW/Library/Implementation/HTWSRC.c:381
 msgid "Maintainer"
 msgstr "Beheerder"
 
-#: WWW/Library/Implementation/HTWSRC.c:388
+#: WWW/Library/Implementation/HTWSRC.c:389
 msgid "Host"
 msgstr "Computer"
 
-#: src/GridText.c:699
+#: src/GridText.c:691
 msgid "Memory exhausted, display interrupted!"
 msgstr "Geen geheugen meer beschikbar, weergave is onderbroken!"
 
-#: src/GridText.c:704
+#: src/GridText.c:696
 msgid "Memory exhausted, will interrupt transfer!"
 msgstr "Geen geheugen meer beschikbaar, overdracht wordt afgebroken!"
 
-#: src/GridText.c:3685
+#: src/GridText.c:3674
 msgid " *** MEMORY EXHAUSTED ***"
 msgstr " *** ONVOLDOENDE GEHEUGEN BESCHIKBAAR ***"
 
-#: src/GridText.c:6146
+#: src/GridText.c:6152
 msgid "text entry field"
 msgstr "tekstinvoerveld"
 
-#: src/GridText.c:6149
+#: src/GridText.c:6155
 msgid "password entry field"
 msgstr "wachtwoordinvoerveld"
 
-#: src/GridText.c:6152
+#: src/GridText.c:6158
 msgid "checkbox"
 msgstr "aanvinkvakje"
 
-#: src/GridText.c:6155
+#: src/GridText.c:6161
 msgid "radio button"
 msgstr "drukknop"
 
-#: src/GridText.c:6158
+#: src/GridText.c:6164
 msgid "submit button"
 msgstr "verzendknop"
 
-#: src/GridText.c:6161
+#: src/GridText.c:6167
 msgid "reset button"
 msgstr "herstelknop"
 
-#: src/GridText.c:6164
+#: src/GridText.c:6170
 msgid "script button"
 msgstr "scriptknop"
 
-#: src/GridText.c:6167
+#: src/GridText.c:6173
 msgid "popup menu"
 msgstr "popup-menu"
 
-#: src/GridText.c:6170
+#: src/GridText.c:6176
 msgid "hidden form field"
 msgstr "verborgen formulierveld"
 
-#: src/GridText.c:6173
+#: src/GridText.c:6179
 msgid "text entry area"
 msgstr "tekstinvoergebied"
 
-#: src/GridText.c:6176
+#: src/GridText.c:6182
 msgid "range entry field"
 msgstr "bereikinvoerveld"
 
-#: src/GridText.c:6179
+#: src/GridText.c:6185
 msgid "file entry field"
 msgstr "bestandsnaaminvoerveld"
 
-#: src/GridText.c:6182
+#: src/GridText.c:6188
 msgid "text-submit field"
 msgstr "tekst-verzendveld"
 
-#: src/GridText.c:6185
+#: src/GridText.c:6191
 msgid "image-submit button"
 msgstr "afbeelding-verzendknop"
 
-#: src/GridText.c:6188
+#: src/GridText.c:6194
 msgid "keygen field"
 msgstr "sleutelaanmaakveld"
 
-#: src/GridText.c:6191
+#: src/GridText.c:6197
 msgid "unknown form field"
 msgstr "onbekend formulierveld"
 
-#: 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 "onbekend veld of link"
 
-#: src/GridText.c:10649
+#: src/GridText.c:10650
 msgid "Can't open file for uploading"
 msgstr "Kan bestand niet openen voor upload"
 
-#: src/GridText.c:11837
+#: src/GridText.c:11843
 #, c-format
 msgid "Submitting %s"
 msgstr "Verzenden van %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 "Ophanging Gedetecteerd: TextAnchor-struct is corrupt - stel voor te onderbreken!"
+msgstr "Ophanging gedetecteerd: TextAnchor-struct is beschadigd -- stel voor te onderbreken!"
 
 #. don't show previous state
-#: src/GridText.c:13056
+#: src/GridText.c:13083
 msgid "Wrap lines to fit displayed area?"
 msgstr "Regels omvouwen zodat alles zichtbaar is?"
 
-#: src/GridText.c:13696
+#: src/GridText.c:13719
 msgid "Very long lines have been truncated!"
 msgstr "Erg lange regels zijn afgekapt!"
 
-#: 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 "bytes"
 
@@ -3545,32 +3556,32 @@ msgstr "bytes"
 #. * 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 "%s aan gegevens gelezen"
 
-#: src/HTAlert.c:326
+#: src/HTAlert.c:351
 #, c-format
 msgid "Read %s of %s of data"
 msgstr "%s van %s aan gegevens gelezen"
 
-#: 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 " (gestopt voor %s)"
 
-#: src/HTAlert.c:351
+#: src/HTAlert.c:378
 #, c-format
 msgid ", ETA %s"
 msgstr ", ETA %s"
 
-#: src/HTAlert.c:373
+#: src/HTAlert.c:400
 msgid " (Press 'z' to abort)"
 msgstr " (Druk op 'z' om te stoppen)"
 
@@ -3599,11 +3610,11 @@ msgstr " (Druk op 'z' om te stoppen)"
 #. * 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 "nee"
 
@@ -3623,7 +3634,7 @@ msgstr "nee"
 #. * (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/O)"
 
@@ -3668,7 +3679,7 @@ msgstr ""
 "     het 'verwijder boekenlegger', welke doorgaans gekoppeld is aan\n"
 "     de 'R' toets, maar uw systeembeheerder heeft dit wellicht gewijzigd."
 
-#: src/LYBookmark.c:376
+#: src/LYBookmark.c:378
 #, c-format
 msgid ""
 "     You can delete links by the 'R' key<br>\n"
@@ -3677,7 +3688,7 @@ msgstr ""
 "     U kunt links verwijderen met de 'R' toets<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 +3698,7 @@ msgstr ""
 "     Dit is doorgaans de 'R' toets, maar uw systeembeheerder kan dit\n"
 "     gewijzigd hebben."
 
-#: 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."
@@ -3695,7 +3706,7 @@ msgstr ""
 "     Dit bestand kan ook met een doorsnee tekst-editor worden gewijzigd om\n"
 "     verlopen of foutieve links te wissen, of om de volgorde aan te passen."
 
-#: 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"
@@ -3712,7 +3723,7 @@ msgstr ""
 msgid "File may be recoverable from %s during this session"
 msgstr "Het bestand is gedurende deze sessie wellicht terug te halen uit %s"
 
-#: src/LYCgi.c:158
+#: src/LYCgi.c:162
 #, c-format
 msgid "Do you want to execute \"%s\"?"
 msgstr "Wilt u \"%s\" uitvoeren?"
@@ -3721,71 +3732,75 @@ msgstr "Wilt u \"%s\" uitvoeren?"
 #. * 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 "Geen toegang tot cgi script"
 
-#: src/LYCgi.c:707 src/LYCgi.c:710
+#: src/LYCgi.c:711 src/LYCgi.c:714
 msgid "Good Advice"
 msgstr "Goede Raad"
 
-#: src/LYCgi.c:714
+#: src/LYCgi.c:718
 msgid "An excellent http server for VMS is available via"
 msgstr "Een uitstekende http server voor VMS is bereikbaar via"
 
-#: src/LYCgi.c:721
+#: src/LYCgi.c:725
 msgid "this link"
 msgstr "deze link"
 
-#: src/LYCgi.c:725
+#: src/LYCgi.c:729
 msgid "It provides state of the art CGI script support.\n"
 msgstr "Het biedt voortreffelijke CGI script ondersteuning.\n"
 
-#: src/LYClean.c:122
+#: src/LYClean.c:115
 msgid "Exiting via interrupt:"
 msgstr "Beëindiging via interrupt:"
 
-#: src/LYCookie.c:2537
+#: src/LYCookie.c:2538
 msgid "(from a previous session)"
 msgstr "(van een eerdere sessie)"
 
-#: src/LYCookie.c:2598
+#: src/LYCookie.c:2599
 msgid "Maximum Gobble Date:"
 msgstr "Uiterste Houdbaarheidsdatum:"
 
-#: 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 fout, programma wordt afgebroken"
 
-#: src/LYCurses.c:1297
+#: src/LYCurses.c:1170
+msgid "Terminal reinitialisation failed - unknown terminal type?"
+msgstr "Herinitialisatie van terminal is mislukt -- onbekend terminaltype?"
+
+#: src/LYCurses.c:1377
 msgid "Terminal initialisation failed - unknown terminal type?"
-msgstr "Terminal initialisatie mislukt - onbekend terminal type?"
+msgstr "Initialisatie van terminal is mislukt -- onbekend terminaltype?"
 
-#: 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 "U mout een vt100, 200, enz. terminal gebruiken met dit programma."
 
-#: src/LYCurses.c:1833
+#: src/LYCurses.c:1916
 msgid "Your Terminal type is unknown!"
-msgstr "Uw terminal type is onbekend!"
+msgstr "Uw terminaltype is onbekend!"
 
-#: src/LYCurses.c:1834
+#: src/LYCurses.c:1917
 msgid "Enter a terminal type:"
-msgstr "Voer een terminal type in:"
+msgstr "Voer een terminaltype in:"
 
-#: src/LYCurses.c:1848
+#: src/LYCurses.c:1931
 msgid "TERMINAL TYPE IS SET TO"
-msgstr "TERMINAL TYPE IS GEZET OP"
+msgstr "TERMINALTYPE IS GEZET OP"
 
-#: src/LYCurses.c:2398
+#: src/LYCurses.c:2483
 #, c-format
 msgid ""
 "\n"
@@ -3794,7 +3809,7 @@ msgstr ""
 "\n"
 "Een fatale fout is opgetreden in %s Ver. %s\n"
 
-#: src/LYCurses.c:2401
+#: src/LYCurses.c:2486
 #, c-format
 msgid ""
 "\n"
@@ -3854,39 +3869,39 @@ msgstr "Tijdelijk bestand bekijken"
 msgid "Save to disk disabled."
 msgstr "Opslaan op schijf is uitgeschakeld."
 
-#: src/LYDownload.c:561 src/LYPrint.c:1322
+#: src/LYDownload.c:561 src/LYPrint.c:1330
 msgid "Local additions:"
 msgstr "Lokale toevoegingen:"
 
-#: src/LYDownload.c:572 src/LYUpload.c:209
+#: src/LYDownload.c:572 src/LYUpload.c:206
 msgid "No Name Given"
 msgstr "Geen naam opgegeven"
 
-#: src/LYHistory.c:679
+#: src/LYHistory.c:680
 msgid "You selected:"
 msgstr "U selecteerde:"
 
-#: src/LYHistory.c:703 src/LYHistory.c:932
+#: src/LYHistory.c:704 src/LYHistory.c:933
 msgid "(no address)"
 msgstr "(geen adres)"
 
-#: src/LYHistory.c:707
+#: src/LYHistory.c:708
 msgid " (internal)"
 msgstr " (intern)"
 
-#: src/LYHistory.c:709
+#: src/LYHistory.c:710
 msgid " (was internal)"
 msgstr " (was intern)"
 
-#: src/LYHistory.c:807
+#: src/LYHistory.c:808
 msgid " (From History)"
 msgstr " (Uit historie)"
 
-#: src/LYHistory.c:852
+#: src/LYHistory.c:853
 msgid "You visited (POSTs, bookmark, menu and list files excluded):"
 msgstr "U bezocht (m.u.v. POST's, boekenlegger, menu en lijstbestanden):"
 
-#: src/LYHistory.c:1154
+#: src/LYHistory.c:1155
 msgid "(No messages yet)"
 msgstr "(Nog geen vermeldingen)"
 
@@ -3946,27 +3961,27 @@ msgstr "Totaal aantal reserveringen"
 msgid "Total frees"
 msgstr "Totaal aantal vrijgevingen"
 
-#: src/LYList.c:88
+#: src/LYList.c:89
 msgid "References in "
 msgstr "Referenties in "
 
-#: src/LYList.c:91
+#: src/LYList.c:92
 msgid "this document:"
 msgstr "dit document:"
 
-#: src/LYList.c:97
+#: src/LYList.c:98
 msgid "Visible links:"
 msgstr "Zichtbare links:"
 
-#: src/LYList.c:201 src/LYList.c:312
+#: src/LYList.c:202 src/LYList.c:321
 msgid "Hidden links:"
 msgstr "Verborgen links:"
 
-#: src/LYList.c:349
+#: src/LYList.c:358
 msgid "References"
 msgstr "Referenties"
 
-#: src/LYList.c:353
+#: src/LYList.c:362
 msgid "Visible links"
 msgstr "Zichtbare links"
 
@@ -3979,305 +3994,305 @@ msgstr "Kan status van '%s' niet opvragen."
 msgid "The selected item is not a file or a directory!  Request ignored."
 msgstr "Het geselecteerde item is geen bestand of map!  Verzoek is genegeerd."
 
-#: src/LYLocal.c:455
+#: src/LYLocal.c:456
 #, c-format
 msgid "Unable to %s due to system error!"
 msgstr "Het %s is mislukt vanwege systeemfout!"
 
-#: src/LYLocal.c:489
+#: src/LYLocal.c:490
 #, c-format
 msgid "Probable failure to %s due to system error!"
 msgstr "Waarschijnlijke fout tijdens het %s vanwege systeemfout!"
 
-#: src/LYLocal.c:554 src/LYLocal.c:577
+#: src/LYLocal.c:555 src/LYLocal.c:578
 #, c-format
 msgid "remove %s"
 msgstr "verwijderen van %s"
 
-#: src/LYLocal.c:597
+#: src/LYLocal.c:598
 #, c-format
 msgid "touch %s"
 msgstr "aanraken van %s"
 
-#: src/LYLocal.c:627
+#: src/LYLocal.c:628
 #, c-format
 msgid "move %s to %s"
 msgstr "verplaatsen van %s naar %s"
 
-#: src/LYLocal.c:675
+#: src/LYLocal.c:676
 msgid "There is already a directory with that name!  Request ignored."
 msgstr "Er is al een map met die naam!  Verzoek is genegeerd."
 
-#: src/LYLocal.c:677
+#: src/LYLocal.c:678
 msgid "There is already a file with that name!  Request ignored."
 msgstr "Er is al een bestand met die naam!  Verzoek is genegeerd."
 
-#: src/LYLocal.c:679
+#: src/LYLocal.c:680
 msgid "The specified name is already in use!  Request ignored."
 msgstr "De opgegeven naam is al in gebruik!  Verzoek is genegeerd."
 
-#: src/LYLocal.c:691
+#: src/LYLocal.c:692
 msgid "Destination has different owner!  Request denied."
 msgstr "Bestemming heeft een andere eigenaar!  Verzoek is genegeerd."
 
-#: src/LYLocal.c:694
+#: src/LYLocal.c:695
 msgid "Destination is not a valid directory!  Request denied."
 msgstr "Bestemming is geen geldige map!  Verzoek is genegeerd."
 
-#: src/LYLocal.c:710
+#: src/LYLocal.c:711
 msgid "Source and destination are the same location!  Request ignored!"
 msgstr "Bron en bestemming zijn dezelfde locatie!  Verzoek is genegeerd!"
 
-#: src/LYLocal.c:734
+#: src/LYLocal.c:735
 msgid "Remove all tagged files and directories?"
 msgstr "Alle aangevinkte bestand en mappen verwijderen?"
 
-#: src/LYLocal.c:807
+#: src/LYLocal.c:808
 msgid "Enter new location for tagged items: "
 msgstr "Voer een nieuwe bestemming in voor aangevinkte items: "
 
-#: src/LYLocal.c:905
+#: src/LYLocal.c:906
 msgid "Enter new name for directory: "
 msgstr "Voer een nieuwe naam in voor map: "
 
-#: src/LYLocal.c:907
+#: src/LYLocal.c:908
 msgid "Enter new name for file: "
 msgstr "Voer een nieuwe naam in voor bestand: "
 
-#: src/LYLocal.c:919
+#: src/LYLocal.c:920
 msgid "Illegal character (path-separator) found! Request ignored."
 msgstr "Ongeldig teken (padscheidingsteken) gevonden!  Verzoek is genegeerd."
 
-#: src/LYLocal.c:969
+#: src/LYLocal.c:970
 msgid "Enter new location for directory: "
 msgstr "Voer een nieuwe locatie in voor map: "
 
-#: src/LYLocal.c:971
+#: src/LYLocal.c:972
 msgid "Enter new location for file: "
 msgstr "Voer een nieuwe locatie voor bestand in: "
 
-#: src/LYLocal.c:998
+#: src/LYLocal.c:999
 msgid "Unexpected failure - unable to find trailing path separator"
 msgstr "Onverwachte mislukking - kan nakomend padscheidingsteken niet vinden"
 
-#: src/LYLocal.c:1060
+#: src/LYLocal.c:1061
 msgid "Modify name, location, or permission (n, l, or p): "
 msgstr "Wijzig N)aam, L)ocatie, of P)ermissies (n,l, of p): "
 
-#: src/LYLocal.c:1062
+#: src/LYLocal.c:1063
 msgid "Modify name or location (n or l): "
 msgstr "Wijzig N)aam of L)ocatie (n of l): "
 
 #.
 #. * Code for changing ownership needed here.
 #.
-#: src/LYLocal.c:1091
+#: src/LYLocal.c:1092
 msgid "This feature not yet implemented!"
 msgstr "Deze optie is nog niet geïmplementeerd!"
 
-#: src/LYLocal.c:1112
+#: src/LYLocal.c:1113
 msgid "Enter name of file to create: "
 msgstr "Voer een bestandsnaam in om aan te maken: "
 
-#: src/LYLocal.c:1115 src/LYLocal.c:1152
+#: src/LYLocal.c:1116 src/LYLocal.c:1153
 msgid "Illegal redirection \"//\" found! Request ignored."
 msgstr "Foutieve verwijzing \"/\"gevonden!  Verzoek is genegeerd."
 
-#: src/LYLocal.c:1149
+#: src/LYLocal.c:1150
 msgid "Enter name for new directory: "
 msgstr "Voer een naam in voor een nieuwe map: "
 
-#: src/LYLocal.c:1190
+#: src/LYLocal.c:1191
 msgid "Create file or directory (f or d): "
 msgstr "Maak F)-bestand of D)-map (f of d): "
 
-#: src/LYLocal.c:1232
+#: src/LYLocal.c:1233
 #, c-format
 msgid "Remove directory '%s'?"
 msgstr "Map '%s' verwijderen?"
 
-#: src/LYLocal.c:1235
+#: src/LYLocal.c:1236
 msgid "Remove directory?"
 msgstr "Map verwijderen?"
 
-#: src/LYLocal.c:1240
+#: src/LYLocal.c:1241
 #, c-format
 msgid "Remove file '%s'?"
 msgstr "Verwijder bestand '%s'?"
 
-#: src/LYLocal.c:1242
+#: src/LYLocal.c:1243
 msgid "Remove file?"
 msgstr "Verwijder bestand?"
 
-#: src/LYLocal.c:1247
+#: src/LYLocal.c:1248
 #, c-format
 msgid "Remove symbolic link '%s'?"
 msgstr "Verwijder symbolische koppeling '%s'?"
 
-#: src/LYLocal.c:1249
+#: src/LYLocal.c:1250
 msgid "Remove symbolic link?"
 msgstr "Verwijder symbolische koppeling?"
 
-#: src/LYLocal.c:1347
+#: src/LYLocal.c:1348
 msgid "Sorry, don't know how to permit non-UNIX files yet."
 msgstr "Sorry, weet nog niet hoe met permissies van niet-UNIX bestanden om te gaan."
 
-#: src/LYLocal.c:1376
+#: src/LYLocal.c:1377
 msgid "Unable to open permit options file"
 msgstr "Kan bestand met permissie-opties niet openen"
 
-#: src/LYLocal.c:1404
+#: src/LYLocal.c:1405
 msgid "Specify permissions below:"
 msgstr "Specificeer permissies hieronder:"
 
-#: src/LYLocal.c:1405 src/LYShowInfo.c:265
+#: src/LYLocal.c:1406 src/LYShowInfo.c:287
 msgid "Owner:"
 msgstr "Eigenaar:"
 
-#: src/LYLocal.c:1421
+#: src/LYLocal.c:1422
 msgid "Group"
 msgstr "Groep"
 
-#: src/LYLocal.c:1437
+#: src/LYLocal.c:1438
 msgid "Others:"
 msgstr "Anderen:"
 
-#: src/LYLocal.c:1455
+#: src/LYLocal.c:1456
 msgid "form to permit"
 msgstr "formulier voor permissies"
 
-#: src/LYLocal.c:1551
+#: src/LYLocal.c:1552
 msgid "Invalid mode format."
 msgstr "Onjuist formaat voor modus."
 
-#: src/LYLocal.c:1555
+#: src/LYLocal.c:1556
 msgid "Invalid syntax format."
 msgstr "Onjuiste syntaxis."
 
-#: src/LYLocal.c:1742
+#: src/LYLocal.c:1743
 msgid "Warning!  UUDecoded file will exist in the directory you started Lynx."
 msgstr "Let op!  UUDecoded bestand blijft bestaan in de map waarin u Lynx startte."
 
-#: src/LYLocal.c:1932
+#: src/LYLocal.c:1933
 msgid "NULL URL pointer"
 msgstr "NULL URL verwijzing"
 
-#: src/LYLocal.c:2014
+#: src/LYLocal.c:2015
 #, c-format
 msgid "Executing %s "
 msgstr "Bezig met uitvoeren van %s "
 
-#: src/LYLocal.c:2017
+#: src/LYLocal.c:2018
 msgid "Executing system command. This might take a while."
 msgstr "Bezig met uitvoeren van systeemcommando.  Dit kan even duren."
 
-#: src/LYLocal.c:2091
+#: src/LYLocal.c:2092
 msgid "Current directory:"
 msgstr "Huidige map:"
 
-#: src/LYLocal.c:2094 src/LYLocal.c:2112
+#: src/LYLocal.c:2095 src/LYLocal.c:2113
 msgid "Current selection:"
 msgstr "Geselecteerd:"
 
-#: src/LYLocal.c:2098
+#: src/LYLocal.c:2099
 msgid "Nothing currently selected."
 msgstr "Er is momenteel niets geselecteerd."
 
-#: src/LYLocal.c:2114
+#: src/LYLocal.c:2115
 msgid "tagged item:"
 msgstr "aangevinkt item:"
 
-#: src/LYLocal.c:2115
+#: src/LYLocal.c:2116
 msgid "tagged items:"
 msgstr "aangevinkte items:"
 
-#: src/LYLocal.c:2215 src/LYLocal.c:2224
+#: src/LYLocal.c:2216 src/LYLocal.c:2225
 msgid "Illegal filename; request ignored."
 msgstr "Onjuiste bestandsnaam; verzoek is genegeerd."
 
 #. 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 "Installatie in de geselecteerde map is niet toegestaan."
 
-#: src/LYLocal.c:2377
+#: src/LYLocal.c:2378
 msgid "The selected item is not a directory!  Request ignored."
 msgstr "Het geselecteerde item is geen map!  Verzoek is genegeerd."
 
-#: src/LYLocal.c:2386
+#: src/LYLocal.c:2387
 msgid "Just a moment, ..."
 msgstr "Een ogenblik geduld..."
 
-#: src/LYLocal.c:2403
+#: src/LYLocal.c:2404
 msgid "Error building install args"
 msgstr "Fout bij opbouwen van installatie-argumenten"
 
-#: 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 "Bron en bestemming zijn gelijk: %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 "Al in bestemmingsmap: %s"
 
-#: src/LYLocal.c:2474
+#: src/LYLocal.c:2475
 msgid "Installation complete"
 msgstr "Installatie is voltooid"
 
-#: src/LYLocal.c:2666
+#: src/LYLocal.c:2680
 msgid "Temporary URL or list would be too long."
 msgstr "Tijdelijke URL of lijst zou te lang zijn."
 
-#: src/LYMail.c:544
+#: src/LYMail.c:566
 msgid "Sending"
 msgstr "Bezig met zenden"
 
-#: src/LYMail.c:1030
+#: src/LYMail.c:1050
 #, c-format
 msgid "The link   %s :?: %s \n"
 msgstr "De link   %s :?: %s\n"
 
-#: src/LYMail.c:1032
+#: src/LYMail.c:1052
 #, c-format
 msgid "called \"%s\"\n"
 msgstr "genaamd \"%s\"\n"
 
-#: src/LYMail.c:1033
+#: src/LYMail.c:1053
 #, c-format
 msgid "in the file \"%s\" called \"%s\"\n"
 msgstr "in het bestand \"%s\" genaamd \"%s\"\n"
 
-#: src/LYMail.c:1034
+#: src/LYMail.c:1054
 msgid "was requested but was not available."
 msgstr "is opgevraagd maar niet beschikbaar."
 
-#: src/LYMail.c:1035
+#: src/LYMail.c:1055
 msgid "Thought you might want to know."
 msgstr "Het leek me dat u dat zou willen weten."
 
-#: src/LYMail.c:1037
+#: src/LYMail.c:1057
 msgid "This message was automatically generated by"
 msgstr "Dit bericht is automatisch gegenereerd door"
 
-#: src/LYMail.c:1751
+#: src/LYMail.c:1770
 msgid "No system mailer configured"
 msgstr "Geen systeemmailer geconfigureerd"
 
-#: src/LYMain.c:1049
+#: src/LYMain.c:1069
 msgid "No Winsock found, sorry."
 msgstr "Geen Winsock gevonden, sorry."
 
-#: src/LYMain.c:1240
+#: src/LYMain.c:1260
 msgid "You MUST define a valid TMP or TEMP area!"
 msgstr "U MOET een geldig TMP- of TEMP-gebied opgeven!"
 
-#: src/LYMain.c:1293 src/LYMainLoop.c:5260
+#: src/LYMain.c:1313 src/LYMainLoop.c:5283
 msgid "No such directory"
 msgstr "Map bestaat niet"
 
-#: src/LYMain.c:1487
+#: src/LYMain.c:1507
 #, c-format
 msgid ""
 "\n"
@@ -4288,7 +4303,7 @@ msgstr ""
 "Configuratiebestand '%s' is niet beschikbaar.\n"
 "\n"
 
-#: src/LYMain.c:1497
+#: src/LYMain.c:1517
 #, c-format
 msgid ""
 "\n"
@@ -4299,199 +4314,177 @@ msgstr ""
 "Lynx-tekensets zijn niet opgegeven.\n"
 "\n"
 
-#: src/LYMain.c:1526
-#, c-format
-msgid ""
-"\n"
-"Lynx edit map not declared.\n"
-"\n"
-msgstr ""
-"\n"
-"Lynx-editkaart is niet opgegeven.\n"
-"\n"
-
-#: src/LYMain.c:1608
-#, c-format
-msgid ""
-"\n"
-"Lynx file \"%s\" is not available.\n"
-"\n"
-msgstr ""
-"\n"
-"Lynx-bestand '%s' is niet beschikbaar.\n"
-"\n"
-
-#: src/LYMain.c:1683
+#: src/LYMain.c:1654
 #, c-format
 msgid "Ignored %d characters from standard input.\n"
 msgstr "Er zijn %d tekens van standaardinvoer genegeerd.\n"
 
-#: src/LYMain.c:1685
+#: src/LYMain.c:1656
 #, c-format
 msgid "Use \"-stdin\" or \"-\" to tell how to handle piped input.\n"
 msgstr "Gebruik \"-stdin\" of \"-\" om aan te geven hoe doorgesluisde invoer behandeld moet worden.\n"
 
-#: src/LYMain.c:1843
+#: src/LYMain.c:1814
 msgid "Warning:"
 msgstr "Waarschuwing:"
 
-#: src/LYMain.c:2408
+#: src/LYMain.c:2384
 msgid "persistent cookies state will be changed in next session only."
 msgstr "Voortbestaande stand van koekjes wordt pas in volgende sessie gewijzigd."
 
-#: 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: onbekende tekenset '%s' wordt genegeerd\n"
 
-#: src/LYMain.c:3208
+#: src/LYMain.c:3185
 #, c-format
 msgid "%s Version %s (%s)"
 msgstr "%s versie %s (%s)"
 
-#: src/LYMain.c:3246
+#: src/LYMain.c:3223
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr "Gecompileerd op %s op %s om %s\n"
 
-#: src/LYMain.c:3268
+#: src/LYMain.c:3245
 msgid "Copyrights held by the Lynx Developers Group,"
 msgstr "De auteursrechten zijn in handen van de Lynx-ontwikkelaarsgroep,"
 
-#: src/LYMain.c:3269
+#: src/LYMain.c:3246
 msgid "the University of Kansas, CERN, and other contributors."
 msgstr "de Universiteit van Kansas, CERN, en andere medewerkers."
 
-#: src/LYMain.c:3270
+#: src/LYMain.c:3247
 msgid "Distributed under the GNU General Public License (Version 2)."
 msgstr "Gedistribueerd onder de GPL (GNU General Public License), versie 2."
 
-#: src/LYMain.c:3271
+#: src/LYMain.c:3248
 msgid "See http://lynx.isc.org/ and the online help for more information."
 msgstr "Zie http://lynx.isc.org/ en de online hulp voor meer informatie."
 
-#: src/LYMain.c:4104
+#: src/LYMain.c:4091
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "Gebruik:  %s [opties] [bestand]\n"
 
-#: src/LYMain.c:4105
+#: src/LYMain.c:4092
 #, c-format
 msgid "Options are:\n"
 msgstr "Mogelijke opties zijn:\n"
 
-#: src/LYMain.c:4406
+#: src/LYMain.c:4395
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr "%s: Ongeldige optie: %s\n"
 
-#: src/LYMainLoop.c:575
+#: src/LYMainLoop.c:572
 #, c-format
 msgid "Internal error: Invalid mouse link %d!"
 msgstr "**Interne fout**: Ongeldige muiskoppeling %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 "Een door de gebruiker opgegeven URL"
 
-#: src/LYMainLoop.c:1148
+#: src/LYMainLoop.c:1142
 msgid "Enctype multipart/form-data not yet supported!  Cannot submit."
 msgstr "Het Enctype 'multipart/form-data' wordt nog niet ondersteund!  Kan niet verzenden."
 
 #.
 #. * Make a name for this help file.
 #.
-#: src/LYMainLoop.c:3177
+#: src/LYMainLoop.c:3196
 msgid "Help Screen"
 msgstr "Hulpscherm"
 
-#: src/LYMainLoop.c:3308
+#: src/LYMainLoop.c:3327
 msgid "System Index"
 msgstr "Systeemindex"
 
-#: src/LYMainLoop.c:3556
+#: src/LYMainLoop.c:3575
 #, c-format
 msgid "Query parameter %d: "
 msgstr "Bevraagparameter %d: "
 
-#: src/LYMainLoop.c:3781 src/LYMainLoop.c:5558
+#: src/LYMainLoop.c:3804 src/LYMainLoop.c:5581
 msgid "Entry into main screen"
 msgstr "Ingang naar beginscherm"
 
-#: src/LYMainLoop.c:4039
+#: src/LYMainLoop.c:4062
 msgid "No next document present"
 msgstr "Geen volgend document aanwezig"
 
-#: src/LYMainLoop.c:4334
+#: src/LYMainLoop.c:4357
 msgid "charset for this document specified explicitly, sorry..."
 msgstr "de tekenset voor dit document is expliciet opgegeven, sorry..."
 
-#: src/LYMainLoop.c:5240
+#: src/LYMainLoop.c:5263
 msgid "cd to:"
 msgstr "cd naar:"
 
-#: src/LYMainLoop.c:5263
+#: src/LYMainLoop.c:5286
 msgid "A component of path is not a directory"
 msgstr "Een component van het pad is geen map"
 
-#: src/LYMainLoop.c:5266
+#: src/LYMainLoop.c:5289
 msgid "failed to change directory"
 msgstr "Map wijzigen is mislukt"
 
-#: src/LYMainLoop.c:6496
+#: src/LYMainLoop.c:6515
 msgid "Reparsing document under current settings..."
 msgstr "Document wordt opnieuw ontleed met huidige instellingen..."
 
-#: src/LYMainLoop.c:6790
+#: src/LYMainLoop.c:6809
 #, c-format
 msgid "Fatal error - could not open output file %s\n"
 msgstr "Fatale fout: kan uitvoerbestand %s niet openen\n"
 
-#: src/LYMainLoop.c:7128
+#: src/LYMainLoop.c:7151
 msgid "TABLE center enable."
 msgstr "TABLE centreren ingeschakeld."
 
-#: src/LYMainLoop.c:7131
+#: src/LYMainLoop.c:7154
 msgid "TABLE center disable."
 msgstr "TABLE centreren uitgeschakeld."
 
-#: src/LYMainLoop.c:7211
+#: src/LYMainLoop.c:7234
 msgid "Current URL is empty."
 msgstr "Huidige URL is leeg."
 
-#: src/LYMainLoop.c:7213 src/LYUtils.c:1881
+#: src/LYMainLoop.c:7236 src/LYUtils.c:1917
 msgid "Copy to clipboard failed."
 msgstr "Kopiëren naar klembord is mislukt."
 
-#: src/LYMainLoop.c:7215
+#: src/LYMainLoop.c:7238
 msgid "Document URL put to clipboard."
 msgstr "Document-URL is op klembord geplaatst."
 
-#: src/LYMainLoop.c:7217
+#: src/LYMainLoop.c:7240
 msgid "Link URL put to clipboard."
 msgstr "Link-URL is op klembord geplaatst."
 
-#: src/LYMainLoop.c:7244
+#: src/LYMainLoop.c:7267
 msgid "No URL in the clipboard."
 msgstr "Geen URL op het klembord."
 
-#: 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: geen toegang tot startbestand"
 
-#: 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: startbestand kan niet gevonden worden of is geen tekst/html of tekst/plain"
 
-#: src/LYMainLoop.c:8058
+#: src/LYMainLoop.c:8082
 msgid "      Exiting..."
 msgstr "      Afsluiten..."
 
-#: src/LYMainLoop.c:8099
+#: src/LYMainLoop.c:8125
 msgid "-more-"
 msgstr "-meer-"
 
@@ -4555,369 +4548,374 @@ msgstr ""
 msgid "Message has no original text!"
 msgstr "Bericht bevat geen oorspronkelijke tekst!"
 
-#: src/LYOptions.c:770
+#: src/LYOptions.c:774
 msgid "review/edit B)ookmarks files"
 msgstr "B)ladwijzerbestanden bekijken/wijzigen"
 
-#: src/LYOptions.c:772
+#: src/LYOptions.c:776
 msgid "B)ookmark file: "
 msgstr "B)ladwijzerbestand: "
 
-#: src/LYOptions.c:2120 src/LYOptions.c:2127
+#: src/LYOptions.c:2123 src/LYOptions.c:2130
 msgid "ON"
 msgstr "AAN"
 
 #. 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 "UIT"
 
-#: src/LYOptions.c:2122
+#: src/LYOptions.c:2125
 msgid "NEVER"
 msgstr "NOOIT"
 
-#: src/LYOptions.c:2123
+#: src/LYOptions.c:2126
 msgid "ALWAYS"
 msgstr "ALTIJD"
 
-#: src/LYOptions.c:2139 src/LYOptions.c:2281
+#: src/LYOptions.c:2142 src/LYOptions.c:2294
 msgid "ignore"
 msgstr "negeren"
 
-#: src/LYOptions.c:2140
+#: src/LYOptions.c:2143
 msgid "ask user"
 msgstr "gebruiker vragen"
 
-#: src/LYOptions.c:2141
+#: src/LYOptions.c:2144
 msgid "accept all"
 msgstr "alles aanvaarden"
 
-#: src/LYOptions.c:2153
+#: src/LYOptions.c:2156
 msgid "ALWAYS OFF"
 msgstr "ALTIJD UIT"
 
-#: src/LYOptions.c:2154
+#: src/LYOptions.c:2157
 msgid "FOR LOCAL FILES ONLY"
 msgstr "ALLEEN VOOR LOKALE BESTANDEN"
 
-#: src/LYOptions.c:2156
+#: src/LYOptions.c:2159
 msgid "ALWAYS ON"
 msgstr "ALTIJD AAN"
 
-#: src/LYOptions.c:2168
+#: src/LYOptions.c:2171
 msgid "Numbers act as arrows"
 msgstr "cijfers werken als pijltjes"
 
-#: src/LYOptions.c:2170
+#: src/LYOptions.c:2173
 msgid "Links are numbered"
 msgstr "cijfers kiezen koppelingen"
 
-#: src/LYOptions.c:2173
+#: src/LYOptions.c:2176
 msgid "Links and form fields are numbered"
 msgstr "cijfers kiezen koppelingen/formuliervelden"
 
-#: src/LYOptions.c:2176
+#: src/LYOptions.c:2179
 msgid "Form fields are numbered"
 msgstr "cijfers kiezen formuliervelden"
 
-#: src/LYOptions.c:2191
+#: src/LYOptions.c:2194
 msgid "Case insensitive"
 msgstr "hoofdletterongevoelig"
 
-#: src/LYOptions.c:2192
+#: src/LYOptions.c:2195
 msgid "Case sensitive"
 msgstr "hoofdlettergevoelig"
 
-#: src/LYOptions.c:2216
+#: src/LYOptions.c:2229
 msgid "prompt normally"
 msgstr "normaal prompten"
 
-#: src/LYOptions.c:2217
+#: src/LYOptions.c:2230
 msgid "force yes-response"
 msgstr "ja-antwoord afdwingen"
 
-#: src/LYOptions.c:2218
+#: src/LYOptions.c:2231
 msgid "force no-response"
 msgstr "nee-antwoord afdwingen"
 
-#: src/LYOptions.c:2236
+#: src/LYOptions.c:2249
 msgid "Novice"
 msgstr "beginner"
 
-#: src/LYOptions.c:2237
+#: src/LYOptions.c:2250
 msgid "Intermediate"
 msgstr "gevorderd"
 
-#: src/LYOptions.c:2238
+#: src/LYOptions.c:2251
 msgid "Advanced"
 msgstr "expert"
 
-#: src/LYOptions.c:2247
+#: src/LYOptions.c:2260
 msgid "By First Visit"
 msgstr "op eerstbezocht"
 
-#: src/LYOptions.c:2249
+#: src/LYOptions.c:2262
 msgid "By First Visit Reversed"
 msgstr "omgekeerd eerstbezocht"
 
-#: src/LYOptions.c:2250
+#: src/LYOptions.c:2263
 msgid "As Visit Tree"
 msgstr "als bezoekboom"
 
-#: src/LYOptions.c:2251
+#: src/LYOptions.c:2264
 msgid "By Last Visit"
 msgstr "op laatstbezocht"
 
-#: src/LYOptions.c:2253
+#: src/LYOptions.c:2266
 msgid "By Last Visit Reversed"
 msgstr "omgekeerd laatstbezocht"
 
 #. Old_DTD variable
-#: src/LYOptions.c:2264
+#: src/LYOptions.c:2277
 msgid "relaxed (TagSoup mode)"
 msgstr "versoepeld (TagSoup-modus)"
 
-#: src/LYOptions.c:2265
+#: src/LYOptions.c:2278
 msgid "strict (SortaSGML mode)"
 msgstr "strikt (SortaSGML-modus)"
 
-#: src/LYOptions.c:2272
+#: src/LYOptions.c:2285
 msgid "Ignore"
 msgstr "Negeren"
 
-#: src/LYOptions.c:2273
+#: src/LYOptions.c:2286
 msgid "Add to trace-file"
 msgstr "Aan volgbestand toevoegen"
 
-#: src/LYOptions.c:2274
+#: src/LYOptions.c:2287
 msgid "Add to LYNXMESSAGES"
 msgstr "Aan LYNXBERICHT toevoegen"
 
-#: src/LYOptions.c:2275
+#: src/LYOptions.c:2288
 msgid "Warn, point to trace-file"
 msgstr "Waarschuwing, verwijst naar volgbestand:"
 
-#: src/LYOptions.c:2282
+#: src/LYOptions.c:2295
 msgid "as labels"
 msgstr "tonen als labels"
 
-#: src/LYOptions.c:2283
+#: src/LYOptions.c:2296
 msgid "as links"
 msgstr "tonen als koppelingen"
 
-#: src/LYOptions.c:2290
+#: src/LYOptions.c:2303
 msgid "show filename"
 msgstr "bestandsnaam tonen"
 
-#: src/LYOptions.c:2301
+#: src/LYOptions.c:2314
 msgid "STANDARD"
 msgstr "STANDAARD"
 
-#: src/LYOptions.c:2302
+#: src/LYOptions.c:2315
 msgid "ADVANCED"
 msgstr "GEAVANCEERD"
 
-#: src/LYOptions.c:2336
+#: src/LYOptions.c:2349
 msgid "Directories first"
 msgstr "mappen eerst"
 
-#: src/LYOptions.c:2337
+#: src/LYOptions.c:2350
 msgid "Files first"
 msgstr "bestanden eerst"
 
-#: src/LYOptions.c:2338
+#: src/LYOptions.c:2351
 msgid "Mixed style"
 msgstr "gemengd"
 
-#: src/LYOptions.c:2346 src/LYOptions.c:2366
+#: src/LYOptions.c:2359 src/LYOptions.c:2379
 msgid "By Name"
 msgstr "op naam"
 
-#: src/LYOptions.c:2347 src/LYOptions.c:2367
+#: src/LYOptions.c:2360 src/LYOptions.c:2380
 msgid "By Type"
 msgstr "op type"
 
-#: src/LYOptions.c:2348 src/LYOptions.c:2368
+#: src/LYOptions.c:2361 src/LYOptions.c:2381
 msgid "By Size"
 msgstr "op grootte"
 
-#: src/LYOptions.c:2349 src/LYOptions.c:2369
+#: src/LYOptions.c:2362 src/LYOptions.c:2382
 msgid "By Date"
 msgstr "op datum"
 
-#: src/LYOptions.c:2350
+#: src/LYOptions.c:2363
 msgid "By Mode"
 msgstr "op modus"
 
-#: src/LYOptions.c:2352
+#: src/LYOptions.c:2365
 msgid "By User"
 msgstr "op gebruiker"
 
-#: src/LYOptions.c:2353
+#: src/LYOptions.c:2366
 msgid "By Group"
 msgstr "op groep"
 
-#: src/LYOptions.c:2378
+#: src/LYOptions.c:2391
 msgid "Do not show rate"
 msgstr "niet tonen"
 
-#: src/LYOptions.c:2379 src/LYOptions.c:2380
+#: src/LYOptions.c:2392 src/LYOptions.c:2393
 #, c-format
 msgid "Show %s/sec rate"
 msgstr "als %s/s tonen"
 
-#: src/LYOptions.c:2382 src/LYOptions.c:2383
+#: src/LYOptions.c:2395 src/LYOptions.c:2396
 #, c-format
 msgid "Show %s/sec, ETA"
 msgstr "als %s/s plus ETA tonen"
 
-#: src/LYOptions.c:2386
+#: src/LYOptions.c:2397 src/LYOptions.c:2398
+#, c-format
+msgid "Show %s/sec (2-digits), ETA"
+msgstr "als tweecijferig %s/s plus ETA tonen"
+
+#: src/LYOptions.c:2401
 msgid "Show progressbar"
 msgstr "als voortgangsbalk"
 
-#: src/LYOptions.c:2398
+#: src/LYOptions.c:2413
 msgid "Accept lynx's internal types"
 msgstr "interne types van Lynx accepteren"
 
-#: src/LYOptions.c:2399
+#: src/LYOptions.c:2414
 msgid "Also accept lynx.cfg's types"
 msgstr "ook types uit lynx.cfg accepteren"
 
-#: src/LYOptions.c:2400
+#: src/LYOptions.c:2415
 msgid "Also accept user's types"
 msgstr "ook gebruikertypes accepteren"
 
-#: src/LYOptions.c:2401
+#: src/LYOptions.c:2416
 msgid "Also accept system's types"
 msgstr "ook systeemtypes accepteren"
 
-#: src/LYOptions.c:2402
+#: src/LYOptions.c:2417
 msgid "Accept all types"
 msgstr "alle types accepteren"
 
-#: 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 "allemaal"
 
-#: 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 "Gebruik %s om naar het Optiesmenu te gaan!"
 
-#: src/LYOptions.c:3541
+#: src/LYOptions.c:3675
 msgid "(options marked with (!) will not be saved)"
 msgstr "(opties gemarkeerd met (!) worden niet opgeslagen)"
 
-#: src/LYOptions.c:3549
+#: src/LYOptions.c:3683
 msgid "General Preferences"
 msgstr "Algemene voorkeuren"
 
 #. ***************************************************************
 #. User Mode: SELECT
-#: src/LYOptions.c:3553
+#: src/LYOptions.c:3687
 msgid "User mode"
 msgstr "Gebruikersmodus"
 
 #. Editor: INPUT
-#: src/LYOptions.c:3559
+#: src/LYOptions.c:3693
 msgid "Editor"
 msgstr "Editor"
 
 #. Search Type: SELECT
-#: src/LYOptions.c:3564
+#: src/LYOptions.c:3698
 msgid "Type of Search"
 msgstr "Zoekmethode"
 
-#: src/LYOptions.c:3569
+#: src/LYOptions.c:3703
 msgid "Security and Privacy"
 msgstr "Veiligheid en privacy"
 
 #. ***************************************************************
 #. Cookies: SELECT
-#: src/LYOptions.c:3573
+#: src/LYOptions.c:3707
 msgid "Cookies"
 msgstr "Koekjes"
 
 #. Cookie Prompting: SELECT
-#: src/LYOptions.c:3587
+#: src/LYOptions.c:3721
 msgid "Invalid-Cookie Prompting"
 msgstr "Prompt bij ongeldige koekjes"
 
 #. SSL Prompting: SELECT
-#: src/LYOptions.c:3594
+#: src/LYOptions.c:3728
 msgid "SSL Prompting"
 msgstr "SSL-prompt"
 
-#: src/LYOptions.c:3600
+#: src/LYOptions.c:3734
 msgid "Keyboard Input"
 msgstr "Toetsenbordinvoer"
 
 #. ***************************************************************
 #. Keypad Mode: SELECT
-#: src/LYOptions.c:3604
+#: src/LYOptions.c:3738
 msgid "Keypad mode"
 msgstr "Gedrag van cijfertoetsen"
 
 #. Emacs keys: ON/OFF
-#: src/LYOptions.c:3610
+#: src/LYOptions.c:3744
 msgid "Emacs keys"
 msgstr "Emacs-toetsen"
 
 #. VI Keys: ON/OFF
-#: src/LYOptions.c:3616
+#: src/LYOptions.c:3750
 msgid "VI keys"
 msgstr "VI-toetsen"
 
 #. 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 "Regelbewerkingsstijl"
 
 #. Keyboard layout: SELECT
-#: src/LYOptions.c:3635
+#: src/LYOptions.c:3769
 msgid "Keyboard layout"
 msgstr "Toetsenbordindeling"
 
 #.
 #. * Display and Character Set
 #.
-#: src/LYOptions.c:3649
+#: src/LYOptions.c:3783
 msgid "Display and Character Set"
 msgstr "Weergave en tekenset"
 
 #. Use locale-based character set: ON/OFF
-#: src/LYOptions.c:3654
+#: src/LYOptions.c:3788
 msgid "Use locale-based character set"
 msgstr "Tekenset van taalregio nemen"
 
-#: src/LYOptions.c:3661
+#: src/LYOptions.c:3795
 msgid "Use HTML5 charset replacements"
 msgstr "Vervangende HTML5-tekenset"
 
 #. Display Character Set: SELECT
-#: src/LYOptions.c:3667
+#: src/LYOptions.c:3801
 msgid "Display character set"
 msgstr "Gebruikte tekenset op scherm"
 
-#: src/LYOptions.c:3698
+#: src/LYOptions.c:3832
 msgid "Assumed document character set"
 msgstr "Tekenset van huidig document"
 
@@ -4926,264 +4924,273 @@ msgstr "Tekenset van huidig document"
 #. * 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-modus"
 
-#: src/LYOptions.c:3720
+#: src/LYOptions.c:3854
 msgid "Raw 8-bit"
 msgstr "Kale 8-bit"
 
 #. 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 "Uiterlijk van document"
 
-#: src/LYOptions.c:3740
+#: src/LYOptions.c:3874
 msgid "Show color"
 msgstr "Kleur tonen"
 
+#. Color style: ON/OFF
+#: src/LYOptions.c:3899
+msgid "Color style"
+msgstr "Kleurstijl"
+
+#: src/LYOptions.c:3908
+msgid "Default colors"
+msgstr "Standaardkleuren"
+
 #. Show cursor: ON/OFF
-#: src/LYOptions.c:3764
+#: src/LYOptions.c:3916
 msgid "Show cursor"
 msgstr "Cursor tonen"
 
 #. Underline links: ON/OFF
-#: src/LYOptions.c:3770
+#: src/LYOptions.c:3922
 msgid "Underline links"
 msgstr "Koppelingen onderstrepen"
 
 #. Show scrollbar: ON/OFF
-#: src/LYOptions.c:3777
+#: src/LYOptions.c:3929
 msgid "Show scrollbar"
 msgstr "Schuifbalk tonen"
 
 #. Select Popups: ON/OFF
-#: src/LYOptions.c:3784
+#: src/LYOptions.c:3936
 msgid "Popups for select fields"
 msgstr "Menuutjes voor keuzevelden"
 
 #. HTML error recovery: SELECT
-#: src/LYOptions.c:3790
+#: src/LYOptions.c:3942
 msgid "HTML error recovery"
 msgstr "HTML-foutcorrectie"
 
 #. Bad HTML messages: SELECT
-#: src/LYOptions.c:3796
+#: src/LYOptions.c:3948
 msgid "Bad HTML messages"
-msgstr "HTML-berichten ongeldig"
+msgstr "Ongeldige HTML-berichten"
 
 #. Show Images: SELECT
-#: src/LYOptions.c:3802
+#: src/LYOptions.c:3954
 msgid "Show images"
 msgstr "Afbeeldingen"
 
 #. Verbose Images: ON/OFF
-#: src/LYOptions.c:3816
+#: src/LYOptions.c:3968
 msgid "Verbose images"
 msgstr "Details van afbeeldingen"
 
 #.
 #. * Headers Transferred to Remote Servers
 #.
-#: src/LYOptions.c:3824
+#: src/LYOptions.c:3976
 msgid "Headers Transferred to Remote Servers"
 msgstr "Naar servers verzonden kopregels"
 
 #. ***************************************************************
 #. Mail Address: INPUT
-#: src/LYOptions.c:3828
+#: src/LYOptions.c:3980
 msgid "Personal mail address"
 msgstr "Persoonlijk e-mailadres"
 
-#: src/LYOptions.c:3833
+#: src/LYOptions.c:3985
 msgid "Personal name for mail"
 msgstr "Persoonlijke naam voor e-mail"
 
-#: src/LYOptions.c:3840
+#: src/LYOptions.c:3992
 msgid "Password for anonymous ftp"
 msgstr "Wachtwoord voor anonieme FTP"
 
 #. Preferred media type: SELECT
-#: src/LYOptions.c:3846
+#: src/LYOptions.c:3998
 msgid "Preferred media type"
 msgstr "Voorkeursmediatype"
 
 # Het gaat over compressiemethodes, niet over codering.
 #. Preferred encoding: SELECT
-#: src/LYOptions.c:3852
+#: src/LYOptions.c:4004
 msgid "Preferred encoding"
 msgstr "Voorkeurscompressie"
 
 #. Preferred Document Character Set: INPUT
-#: src/LYOptions.c:3858
+#: src/LYOptions.c:4010
 msgid "Preferred document character set"
 msgstr "Voorkeurstekenset van document"
 
 #. Preferred Document Language: INPUT
-#: src/LYOptions.c:3863
+#: src/LYOptions.c:4015
 msgid "Preferred document language"
 msgstr "Voorkeurstaal van document"
 
-#: src/LYOptions.c:3869
+#: src/LYOptions.c:4021
 msgid "Send User-Agent header"
 msgstr "User-Agent-kopregel versturen"
 
-#: src/LYOptions.c:3871
+#: src/LYOptions.c:4023
 msgid "User-Agent header"
 msgstr "User-Agent-kopregel"
 
 #.
 #. * Listing and Accessing Files
 #.
-#: src/LYOptions.c:3879
+#: src/LYOptions.c:4031
 msgid "Listing and Accessing Files"
 msgstr "Bestandslijsten en snelheid"
 
 #. FTP sort: SELECT
-#: src/LYOptions.c:3884
+#: src/LYOptions.c:4036
 msgid "Use Passive FTP"
 msgstr "Passieve FTP gebruiken"
 
 #. FTP sort: SELECT
-#: src/LYOptions.c:3890
+#: src/LYOptions.c:4042
 msgid "FTP sort criteria"
 msgstr "Sortering voor FTP"
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:3898
+#: src/LYOptions.c:4050
 msgid "Local directory sort criteria"
 msgstr "Groepering in lokale mappen"
 
 #. Local Directory Order: SELECT
-#: src/LYOptions.c:3904
+#: src/LYOptions.c:4056
 msgid "Local directory sort order"
 msgstr "Sortering van lokale bestanden"
 
-#: src/LYOptions.c:3913
+#: src/LYOptions.c:4065
 msgid "Show dot files"
-msgstr "puntbestanden tonen"
+msgstr "Puntbestanden tonen"
 
-#: src/LYOptions.c:3921
+#: src/LYOptions.c:4073
 msgid "Execution links"
-msgstr "verwijzingen die programma's starten"
+msgstr "Programma-startende links"
 
-#: src/LYOptions.c:3939
+#: src/LYOptions.c:4091
 msgid "Pause when showing message"
-msgstr "Onderbreek bij tonen bericht"
+msgstr "Pauzeren bij tonen van bericht"
 
 #. Show transfer rate: SELECT
-#: src/LYOptions.c:3946
+#: src/LYOptions.c:4098
 msgid "Show transfer rate"
 msgstr "Overdrachtssnelheid tonen"
 
 #.
 #. * Special Files and Screens
 #.
-#: src/LYOptions.c:3966
+#: src/LYOptions.c:4118
 msgid "Special Files and Screens"
 msgstr "Speciale bestanden en schermen"
 
-#: src/LYOptions.c:3971
+#: src/LYOptions.c:4123
 msgid "Multi-bookmarks"
 msgstr "Meervoudige boekenleggers"
 
-#: src/LYOptions.c:3979
+#: src/LYOptions.c:4131
 msgid "Review/edit Bookmarks files"
 msgstr "Boekenleggerbestanden bekijken/wijzigen"
 
-#: src/LYOptions.c:3982
+#: src/LYOptions.c:4134
 msgid "Goto multi-bookmark menu"
 msgstr "Naar multiboekenleggermenu"
 
-#: src/LYOptions.c:3984
+#: src/LYOptions.c:4136
 msgid "Bookmarks file"
 msgstr "Boekenleggerbestand"
 
 #. Auto Session: ON/OFF
-#: src/LYOptions.c:3991
+#: src/LYOptions.c:4143
 msgid "Auto Session"
 msgstr "Automatische sessie"
 
 #. Session File Menu: INPUT
-#: src/LYOptions.c:3997
+#: src/LYOptions.c:4149
 msgid "Session file"
 msgstr "Sessiebestand"
 
 #. Visited Pages: SELECT
-#: src/LYOptions.c:4003
+#: src/LYOptions.c:4155
 msgid "Visited Pages"
 msgstr "Bezochte pagina's"
 
-#: src/LYOptions.c:4008
+#: src/LYOptions.c:4160
 msgid "View the file "
 msgstr "Instellingenbestand bekijken: "
 
-#: src/LYPrint.c:947
+#: src/LYPrint.c:955
 #, c-format
 msgid " Print job complete.\n"
 msgstr " Printopdracht is voltooid.\n"
 
-#: src/LYPrint.c:1274
+#: src/LYPrint.c:1282
 msgid "Document:"
 msgstr "Document:"
 
-#: src/LYPrint.c:1275
+#: src/LYPrint.c:1283
 msgid "Number of lines:"
 msgstr "Aantal regels:"
 
-#: src/LYPrint.c:1276
+#: src/LYPrint.c:1284
 msgid "Number of pages:"
 msgstr "Aantal pagina's:"
 
-#: src/LYPrint.c:1277
+#: src/LYPrint.c:1285
 msgid "pages"
 msgstr "pagina's"
 
-#: src/LYPrint.c:1277
+#: src/LYPrint.c:1285
 msgid "page"
 msgstr "pagina"
 
-#: src/LYPrint.c:1278
+#: src/LYPrint.c:1286
 msgid "(approximately)"
 msgstr "(bij benadering)"
 
-#: src/LYPrint.c:1285
+#: src/LYPrint.c:1293
 msgid "Some print functions have been disabled!"
 msgstr "Enkele afdrukinstellingen zijn uitgeschakeld."
 
-#: src/LYPrint.c:1289
+#: src/LYPrint.c:1297
 msgid "Standard print options:"
 msgstr "Standaard afdrukinstellingen:"
 
-#: src/LYPrint.c:1290
+#: src/LYPrint.c:1298
 msgid "Print options:"
 msgstr "Afdrukinstellingen:"
 
-#: src/LYPrint.c:1297
+#: src/LYPrint.c:1305
 msgid "Save to a local file"
 msgstr "Opslaan naar een lokaal bestand"
 
-#: src/LYPrint.c:1299
+#: src/LYPrint.c:1307
 msgid "Save to disk disabled"
 msgstr "Opslaan naar schijf is uitgeschakeld"
 
-#: src/LYPrint.c:1306
+#: src/LYPrint.c:1314
 msgid "Mail the file"
 msgstr "Het bestand mailen"
 
-#: src/LYPrint.c:1313
+#: src/LYPrint.c:1321
 msgid "Print to the screen"
 msgstr "Afdrukken naar het scherm"
 
-#: src/LYPrint.c:1318
+#: src/LYPrint.c:1326
 msgid "Print out on a printer attached to your vt100 terminal"
 msgstr "Afdrukken naar een printer die verbonden is aan uw vt100-terminal"
 
@@ -5206,293 +5213,293 @@ msgstr ""
 
 #: src/LYReadCFG.c:454
 msgid "Offending line:"
-msgstr "Regel waar het mis ging:"
+msgstr "Regel waar het misging:"
 
-#: src/LYReadCFG.c:757
+#: src/LYReadCFG.c:769
 #, c-format
 msgid "key remapping of %s to %s for %s failed\n"
 msgstr "toetsherdefinitie van %s naar %s voor %s is mislukt\n"
 
-#: src/LYReadCFG.c:764
+#: src/LYReadCFG.c:776
 #, c-format
 msgid "key remapping of %s to %s failed\n"
 msgstr "toetsherdefinitie van %s naar %s is mislukt\n"
 
-#: src/LYReadCFG.c:785
+#: src/LYReadCFG.c:797
 #, c-format
 msgid "invalid line-editor selection %s for key %s, selecting all\n"
 msgstr "ongeldige selectie %s voor toets %s; alles wordt geselecteerd\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 "maken van koppeling voor toets %s (0x%x) naar 0x%x voor %s mislukt\n"
+msgstr "maken van koppeling voor toets %s (0x%x) naar 0x%x voor %s is mislukt\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 "maken van koppeling voor toets %s (0x%x) voor %s mislukt\n"
+msgstr "maken van koppeling voor toets %s (0x%x) voor %s is mislukt\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 niet starten, CERN reglement bestand %s is niet beschikbaar\n"
 
-#: src/LYReadCFG.c:923
+#: src/LYReadCFG.c:935
 msgid "(no name)"
 msgstr "(naamloos)"
 
-#: 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 "Meer dan %d geneste insluitingen in lynx.cfg -- misschien een lus?!?\n"
 
-#: src/LYReadCFG.c:2046
+#: src/LYReadCFG.c:2075
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr "De laatst geprobeerde insluiting was '%s',\n"
 
-#: src/LYReadCFG.c:2047
+#: src/LYReadCFG.c:2076
 #, c-format
 msgid "included from '%s'.\n"
 msgstr "ingevoegd vanuit '%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 "Onderstaande gegevens werden gelezen uit uw lynx.cfg-bestand."
 
-#: src/LYReadCFG.c:2451 src/LYReadCFG.c:2464
+#: src/LYReadCFG.c:2480 src/LYReadCFG.c:2493
 msgid "Please read the distribution"
 msgstr "Lees de meegeleverde versie van"
 
-#: src/LYReadCFG.c:2457 src/LYReadCFG.c:2467
+#: src/LYReadCFG.c:2486 src/LYReadCFG.c:2496
 msgid "for more comments."
 msgstr "voor meer opmerkingen."
 
-#: src/LYReadCFG.c:2503
+#: src/LYReadCFG.c:2532
 msgid "RELOAD THE CHANGES"
 msgstr "DE VERANDERINGEN HERLADEN"
 
-#: src/LYReadCFG.c:2511
+#: src/LYReadCFG.c:2540
 msgid "Your primary configuration"
 msgstr "Uw primaire instellingenbestand is:"
 
-#: src/LYShowInfo.c:177
+#: src/LYShowInfo.c:111
+msgid "URL:"
+msgstr "URL:"
+
+#: src/LYShowInfo.c:196
 msgid "Directory that you are currently viewing"
 msgstr "De map die u op dit moment bekijkt"
 
-#: src/LYShowInfo.c:180
+#: src/LYShowInfo.c:199
 msgid "Name:"
 msgstr "Naam:"
 
-#: src/LYShowInfo.c:183
-msgid "URL:"
-msgstr "URL:"
-
-#: src/LYShowInfo.c:197
+#: src/LYShowInfo.c:216
 msgid "Directory that you have currently selected"
 msgstr "Geselecteerde map"
 
-#: src/LYShowInfo.c:199
+#: src/LYShowInfo.c:218
 msgid "File that you have currently selected"
 msgstr "Geselecteerd bestand"
 
-#: src/LYShowInfo.c:202
+#: src/LYShowInfo.c:221
 msgid "Symbolic link that you have currently selected"
 msgstr "Geselecteerde symbolische verwijzing"
 
-#: src/LYShowInfo.c:205
+#: src/LYShowInfo.c:224
 msgid "Item that you have currently selected"
 msgstr "Geselecteerd item"
 
-#: src/LYShowInfo.c:207
+#: src/LYShowInfo.c:226
 msgid "Full name:"
 msgstr "Volledige naam:"
 
-#: src/LYShowInfo.c:217
+#: src/LYShowInfo.c:239
 msgid "Unable to follow link"
 msgstr "De verwijzing kan niet vervolgd worden"
 
-#: src/LYShowInfo.c:219
+#: src/LYShowInfo.c:241
 msgid "Points to file:"
 msgstr "Wijst naar bestand:"
 
-#: src/LYShowInfo.c:224
+#: src/LYShowInfo.c:246
 msgid "Name of owner:"
 msgstr "Naam van eigenaar:"
 
-#: src/LYShowInfo.c:227
+#: src/LYShowInfo.c:249
 msgid "Group name:"
 msgstr "Groepsnaam:"
 
-#: src/LYShowInfo.c:229
+#: src/LYShowInfo.c:251
 msgid "File size:"
 msgstr "Bestandsgrootte:"
 
-#: src/LYShowInfo.c:231
+#: src/LYShowInfo.c:253
 msgid "(bytes)"
 msgstr "(bytes)"
 
 #.
 #. * Include date and time information.
 #.
-#: src/LYShowInfo.c:236
+#: src/LYShowInfo.c:258
 msgid "Creation date:"
 msgstr "Aanmaakdatum:"
 
-#: src/LYShowInfo.c:239
+#: src/LYShowInfo.c:261
 msgid "Last modified:"
 msgstr "Laatst gewijzigd op:"
 
-#: src/LYShowInfo.c:242
+#: src/LYShowInfo.c:264
 msgid "Last accessed:"
 msgstr "Laatst bezocht op:"
 
-#: src/LYShowInfo.c:248
+#: src/LYShowInfo.c:270
 msgid "Access Permissions"
 msgstr "Toegangsrechten"
 
-#: src/LYShowInfo.c:283
+#: src/LYShowInfo.c:305
 msgid "Group:"
 msgstr "Groep:"
 
-#: src/LYShowInfo.c:303
+#: src/LYShowInfo.c:325
 msgid "World:"
 msgstr "Wereld:"
 
-#: src/LYShowInfo.c:310
+#: src/LYShowInfo.c:332
 msgid "File that you are currently viewing"
 msgstr "Het bestand dat u op dit moment bekijkt"
 
-#: src/LYShowInfo.c:318 src/LYShowInfo.c:422
+#: src/LYShowInfo.c:340 src/LYShowInfo.c:444
 msgid "Linkname:"
 msgstr "Linknaam:"
 
-#: src/LYShowInfo.c:324 src/LYShowInfo.c:339
+#: src/LYShowInfo.c:346 src/LYShowInfo.c:361
 msgid "Charset:"
 msgstr "Tekenset:"
 
-#: src/LYShowInfo.c:338
+#: src/LYShowInfo.c:360
 msgid "(assumed)"
 msgstr "(verondersteld)"
 
-#: 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 "Laatst veranderd:"
 
-#: src/LYShowInfo.c:356
+#: src/LYShowInfo.c:378
 msgid "Expires:"
 msgstr "Vervalt:"
 
-#: src/LYShowInfo.c:359
+#: src/LYShowInfo.c:381
 msgid "Cache-Control:"
 msgstr "Cache-besturing:"
 
-#: src/LYShowInfo.c:362
+#: src/LYShowInfo.c:384
 msgid "Content-Length:"
 msgstr "Inhoudslengte:"
 
-#: src/LYShowInfo.c:366
+#: src/LYShowInfo.c:388
 msgid "Length:"
 msgstr "Lengte:"
 
-#: src/LYShowInfo.c:371
+#: src/LYShowInfo.c:393
 msgid "Language:"
 msgstr "Taal:"
 
-#: src/LYShowInfo.c:378
+#: src/LYShowInfo.c:400
 msgid "Post Data:"
 msgstr "POST-informatie:"
 
-#: src/LYShowInfo.c:381
+#: src/LYShowInfo.c:403
 msgid "Post Content Type:"
 msgstr "POST-inhoudstype:"
 
-#: src/LYShowInfo.c:384
+#: src/LYShowInfo.c:406
 msgid "Owner(s):"
 msgstr "Eigenaar:"
 
-#: src/LYShowInfo.c:389
+#: src/LYShowInfo.c:411
 msgid "size:"
 msgstr "grootte:"
 
-#: src/LYShowInfo.c:391
+#: src/LYShowInfo.c:413
 msgid "lines"
 msgstr "regels"
 
-#: src/LYShowInfo.c:395
+#: src/LYShowInfo.c:417
 msgid "forms mode"
 msgstr "formuliermodus"
 
-#: src/LYShowInfo.c:397
+#: src/LYShowInfo.c:419
 msgid "source"
 msgstr "bron"
 
-#: src/LYShowInfo.c:398
+#: src/LYShowInfo.c:420
 msgid "normal"
 msgstr "normaal"
 
-#: src/LYShowInfo.c:400
+#: src/LYShowInfo.c:422
 msgid ", safe"
 msgstr ", veilig"
 
-#: src/LYShowInfo.c:402
+#: src/LYShowInfo.c:424
 msgid ", via internal link"
 msgstr ", via interne link"
 
-#: src/LYShowInfo.c:407
+#: src/LYShowInfo.c:429
 msgid ", no-cache"
 msgstr ", geen cache"
 
-#: src/LYShowInfo.c:409
+#: src/LYShowInfo.c:431
 msgid ", ISMAP script"
 msgstr ", ISMAP-script"
 
-#: src/LYShowInfo.c:411
+#: src/LYShowInfo.c:433
 msgid ", bookmark file"
 msgstr ", boekenleggerbestand"
 
-#: src/LYShowInfo.c:415
+#: src/LYShowInfo.c:437
 msgid "mode:"
 msgstr "modus:"
 
-#: src/LYShowInfo.c:421
+#: src/LYShowInfo.c:443
 msgid "Link that you currently have selected"
 msgstr "Link die nu geselecteerd is"
 
-#: src/LYShowInfo.c:430
+#: src/LYShowInfo.c:452
 msgid "Method:"
 msgstr "Methode:"
 
-#: src/LYShowInfo.c:434
+#: src/LYShowInfo.c:456
 msgid "Enctype:"
 msgstr "Enctype:"
 
-#: src/LYShowInfo.c:440
+#: src/LYShowInfo.c:462
 msgid "Action:"
 msgstr "Actie:"
 
-#: src/LYShowInfo.c:446
+#: src/LYShowInfo.c:468
 msgid "(Form field)"
 msgstr "(formulierveld)"
 
-#: src/LYShowInfo.c:457
+#: src/LYShowInfo.c:478
 msgid "No Links on the current page"
 msgstr "Er zijn geen verwijzingen op de huidige pagina"
 
-#: src/LYShowInfo.c:463
+#: src/LYShowInfo.c:484
 msgid "Server Headers:"
 msgstr "Serverkopregels:"
 
-#: src/LYStyle.c:331
+#: src/LYStyle.c:338
 #, c-format
 msgid ""
 "Syntax Error parsing style in lss file:\n"
@@ -5509,6 +5516,17 @@ msgstr ""
 "waar OBJECT een van de volgende is: EM,STRONG,B,I,U,BLINK enz.\n"
 "\n"
 
+#: src/LYStyle.c:933
+#, c-format
+msgid ""
+"\n"
+"Lynx file \"%s\" is not available.\n"
+"\n"
+msgstr ""
+"\n"
+"Lynx-bestand '%s' is niet beschikbaar.\n"
+"\n"
+
 #: src/LYTraversal.c:111
 msgid "here is a list of the history stack so that you may rebuild"
 msgstr "hier is een lijst van de logs, zodat u opnieuw kunt bouwen"
@@ -5533,41 +5551,41 @@ msgstr "Ongeldige doorverwijzing met \"~\" gevonden!  Verzoek is genegeerd."
 msgid "Unable to upload file."
 msgstr "Kan bestand niet uploaden."
 
-#: src/LYUpload.c:199
+#: src/LYUpload.c:196
 msgid "Upload To:"
 msgstr "Zenden naar:"
 
-#: src/LYUpload.c:200
+#: src/LYUpload.c:197
 msgid "Upload options:"
 msgstr "Zendopties:"
 
-#: src/LYUtils.c:1883
+#: src/LYUtils.c:1919
 msgid "Download document URL put to clipboard."
 msgstr "Document afhalings-URL op klembord geplaatst."
 
-#: src/LYUtils.c:2668
+#: src/LYUtils.c:2666
 msgid "Unexpected access protocol for this URL scheme."
 msgstr "Onverwacht toegangsprotocol voor deze URL-methode."
 
-#: src/LYUtils.c:3492
+#: src/LYUtils.c:3571
 msgid "Too many tempfiles"
 msgstr "Te veel tijdelijke bestanden"
 
-#: src/LYUtils.c:3792
+#: src/LYUtils.c:3871
 msgid "unknown restriction"
 msgstr "Onbekende beperking"
 
-#: src/LYUtils.c:3823
+#: src/LYUtils.c:3902
 #, c-format
 msgid "No restrictions set.\n"
 msgstr "Er zijn geen beperkingen gesteld.\n"
 
-#: src/LYUtils.c:3826
+#: src/LYUtils.c:3905
 #, c-format
 msgid "Restrictions set:\n"
 msgstr "Gestelde beperkingen:\n"
 
-#: src/LYUtils.c:5212
+#: src/LYUtils.c:5279
 msgid "Cannot find HOME directory"
 msgstr "Kan persoonlijke map niet vinden"
 
@@ -5575,7 +5593,7 @@ msgstr "Kan persoonlijke map niet vinden"
 msgid "Normally disabled.  See ENABLE_LYNXRC in lynx.cfg\n"
 msgstr "Normaliter uitgeschakeld.  Zie ENABLE_LYNXRC in 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"
@@ -5587,7 +5605,7 @@ msgstr ""
 "\"FALSE\", zodat voor elk koekje om bevestiging zal worden gevraagd.\n"
 "Zet accept_all_cookies op \"TRUE\" om alle koekjes te accepteren.\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"
@@ -5597,7 +5615,7 @@ msgstr ""
 "anonftp_password geeft de gebruiker de gelegenheid op het e-mailadres\n"
 "op te geven dat gebruikt wordt als wachtwoord bij anonieme FTP-toegang.n Als geen waarde gegeven wordt, gebruikt Lynx het persoonlijke e-mailadres.\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"
@@ -5607,7 +5625,7 @@ msgstr ""
 "boekenleggerbestand waarin de gebruiker links kan plaatsen om deze\n"
 "op een later tijdstip eenvoudig te kunnen bereiken.\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"
@@ -5618,7 +5636,7 @@ msgstr ""
 "en kleine letters, in plaats van ongevoelig voor kast.  De standaard is\n"
 "meestal \"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"
@@ -5631,7 +5649,7 @@ msgstr ""
 "scherm, kunt u een andere 8 bit verzameling proberen of 7 bit benaderingen.\n"
 "Huidig geldige tekenverzamelingen zijn:\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"
@@ -5640,7 +5658,7 @@ msgid ""
 "settings made here.\n"
 msgstr "cookie_accept_domains en cookie_reject_domains zijn door komma's gescheiden lijsten van domeinen voor welke Lynx automatisch alle koekjes respectievelijk toelaat of weigert.  Als een domein opgegeven wordt voor beide opties zal verwerping het winnen van toelaten.  De accept_all_cookies parameter doet deze instellingen teniet.\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 ~/"
@@ -5648,7 +5666,7 @@ msgstr ""
 "'cookie_file' specificeert het bestand waaruit blijvende koekjes worden\n"
 "gelezen.  Standaard is dit ~/"
 
-#: 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"
@@ -5667,7 +5685,7 @@ msgstr ""
 "domein-attribuut te plaatsen.  Alle domeinen zullen standaard de\n"
 "gebruiker vragen (query) in geval van ongeldig pad of domein.\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"
@@ -5675,7 +5693,7 @@ msgstr ""
 "dir_list_order bepaalt de volgorde van de mappenlijst onder DIRED_SUPPORT\n"
 "(als geïmplementeerd).  De standaard is \"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"
@@ -5687,7 +5705,7 @@ msgstr ""
 "bestanden en mappen samen worden gesorteerd.  \"FILES_FIRST\" plaatst\n"
 "bestanden eerst, \"DIRECTORIES_FIRST\" plaatst mappen eerst.\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"
@@ -5699,7 +5717,7 @@ msgstr ""
 "  ^B = links (backward-char)   ^F = rechts (forward-char)\n"
 "in gebruik zijn.\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"
@@ -5712,7 +5730,7 @@ msgstr ""
 "wordt opgegeven.  De ingebouwde editor zal worden gebruikt om e-mail te\n"
 "verzenden.\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"
@@ -5728,7 +5746,7 @@ msgstr ""
 "  BY_SIZE     -- sorteert op de grootte van het bestand\n"
 "  BY_DATE     -- sorteert op de datum van het bestand\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"
@@ -5751,7 +5769,7 @@ msgstr ""
 "\n"
 "Huidige mogelijkheden voor lineedit_mode zijn:\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"
@@ -5764,7 +5782,7 @@ msgstr ""
 "Er kunnen 26 boekenleggerbestanden zijn, voor elke hoofdletter A-Z.\n"
 "We beginnen met \"multi_bookmarkB\" omdat 'A' de gewone is (zie boven).\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"
@@ -5782,7 +5800,7 @@ msgstr ""
 "ook dit veld leeg laten, maar dan wordt het ook niet opgenomen in\n"
 "uw e-mailcommentaren.\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"
@@ -5802,7 +5820,7 @@ msgstr ""
 "bericht niet opslaan. Om de standaardwaarde te veranderen kunt u het\n"
 "optiemenu gebruiken of dit bestand direct bewerken.\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"
@@ -5830,7 +5848,7 @@ msgstr ""
 "moeten sturen, maar het verzenden van een onacceptabel antwoord is ook\n"
 "toegestaan.\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"
@@ -5845,7 +5863,7 @@ msgstr ""
 "server het verzenden.  Als dit niet het geval is, zal de server het\n"
 "bestand in zijn standaard taal verzenden.\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"
@@ -5868,7 +5886,7 @@ msgstr ""
 "         omzeilen.  Deze optie moet alleen op \"on\" gezet worden als u\n"
 "         alleen maar informatie bekijkt uit een vertrouwde bron.\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"
@@ -5897,7 +5915,7 @@ msgstr ""
 "         omzeilen.  Deze optie moet alleen op \"on\" gezet worden als u\n"
 "         alleen maar informatie bekijkt uit een vertrouwde bron.\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"
@@ -5916,7 +5934,7 @@ msgstr ""
 "drukknoppen zorgt.\n"
 "De standaard kan worden tenietgedaan d.m.v. de `-popup' commandoregel optie.\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"
@@ -5934,24 +5952,24 @@ msgid ""
 "the 'o'ptions menu.  If the option settings are saved, the \"on\" and\n"
 "\"off\" \"show color\" settings will be treated as \"default\".\n"
 msgstr ""
-"show_color specificeert hoe de kleuren modus bij het opstarten moet\n"
-"zijn.  Een waarde \"never\" forceert een kleur modus \"off\" (de terminal\n"
+"show_color specificeert wat de kleurenmodus bij het opstarten moet\n"
+"zijn.  Een waarde \"never\" forceert de kleurmodus \"off\" (de terminal\n"
 "wordt als monochroom beschouwd) zelfs als de terminal kleur aan lijkt\n"
-"te kunnen.  Een waarde \"always\" zal kleuren modus \"on\" forceren, zelfs\n"
+"te kunnen.  Een waarde \"always\" forceert de kleurenmodus \"on\", zelfs\n"
 "als de terminal monochroom lijkt te zijn, als dit maar ondersteund\n"
 "wordt door de bibliotheek die gebruikt is om lynx mee te maken.  Een\n"
-"waarde \"default\" zal uitgaan van een monochroom terminal, tenzij bij\n"
-"het opstarten blijkt dat de terminal kleur aan kan, of als de `-color'\n"
+"waarde \"default\" zal uitgaan van een monochrome terminal, tenzij bij\n"
+"het opstarten blijkt dat de terminal kleur aan kan, of als de '-color'\n"
 "optie wordt opgegeven vanaf de commandoregel, of als de COLORTERM\n"
-"omgevingsvariabele gezet is.  Het standaard gedrag wordt gebruikt bij\n"
+"omgevingsvariabele gezet is.  Het standaardgedrag wordt gebruikt bij\n"
 "anonieme accounts of als de \"option_save\" restrictie gezet is.  Het\n"
 "effect van de opgeslagen waarde kan worden tenietgedaan d.m.v. de\n"
-"`-color' en `-nocolor' opties op de commandoregel.  De modus van het\n"
-"opstarten kan gewijzigd worden via de \"Toon kleur\" optie in het\n"
-"'o'pties menu.  Als de optie-instellingen worden opgeslagen, zullen de\n"
-"\"on\" en \"off\" instellingen worden gezien als \"default\".\n"
+"'-color' en '-nocolor' opties op de commandoregel.  De modus van het\n"
+"opstarten kan gewijzigd worden via de optie \"Kleur tonen\" in het\n"
+"'o'pties menu.  Als de optie-instellingen worden opgeslagen, zullen\n"
+"de \"on\" en \"off\" instellingen worden gezien als \"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"
@@ -5972,7 +5990,7 @@ msgstr ""
 "Een waarde \"on\" zal de positionering links van de links of opties\n"
 "zetten, en en waarde \"off\" probeert de cursor te 'verbergen'.\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"
@@ -5986,7 +6004,7 @@ msgstr ""
 "de commandoregel.  Indien uitgeschakeld, wordt het ook onmogelijk gemaakt\n"
 "om verborgen bestanden aan te maken vanuit Lynx.\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"
@@ -5999,18 +6017,18 @@ msgid ""
 "presented regardless of user mode.\n"
 msgstr ""
 "Als sub_bookmarks niet \"off\" is, en meervoudige boekenleggers zijn\n"
-"opgegeven (zie onder), dan zullen alle boekenlegger operaties eerst de\n"
-"gebruiker vragen om een actief sub-boekenlegger bestand te selecteren.\n"
+"opgegeven (zie onder), dan zullen alle boekenleggeroperaties eerst de\n"
+"gebruiker vragen om een actief sub-boekenleggerbestand te selecteren.\n"
 "Als de standaard Lynx bookmark_file gedefinieerd is (zie boven), dan\n"
 "zal dit gebruikt worden als de standaard selectie.  Als deze optie op\n"
-"\"advanced\" gezet is en de gebruikersmodus ook \"advanced\" is, dan zal\n"
-"het 'v'-inzien boekenlegger commando een statusregel-menu tonen in\n"
-"plaats van het menu dat in \"novice\" en \"intermediate\" modus wordt\n"
+"\"geavanceerd\" gezet is en de gebruikersmodus is \"expert\", dan zal\n"
+"het boekenlegger-inzien-commando ('v') een statusregel-menu tonen in\n"
+"plaats van het menu dat in \"beginner\" en \"gevorderd\" modus wordt\n"
 "gebruikt.  Als deze optie op \"standaard\" gezet wordt, zal ongeacht de\n"
 "gebruikersmodus het volledige menu getoond worden.\n"
 "\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"
@@ -6026,7 +6044,7 @@ msgstr ""
 "schakelen.  Gebruik \"ADVANCED\" om onder in het scherm de URL van de\n"
 "geselecteerd link te zien.\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"
@@ -6036,7 +6054,7 @@ msgstr ""
 "afbeelding laten zien in plaats van [INLINE], [LINK] of [IMAGE].\n"
 "Zie ook VERBOSE_IMAGES in 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"
@@ -6051,7 +6069,7 @@ msgstr ""
 "De hoofdletters 'H', 'J' en 'K' zullen nog steeds hulp activeren,\n"
 "springen naar snelkoppelingen of de toetsenindeling laten zien.\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"
@@ -6059,7 +6077,7 @@ msgstr ""
 "De optie 'visited_links' bepaalt hoe Lynx de informatie weergeeft op de\n"
 "pagina met Bezochte links.\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"
@@ -6077,7 +6095,7 @@ msgstr ""
 "De corresponderende nummers op het linkerdeel van het toetsenbord zullen\n"
 "ook als pijltjestoetsen functioneren, ongeacht de Numlock stand.\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"
@@ -6086,7 +6104,7 @@ msgstr ""
 "verschijnen naast elke link en nummers kunnen gebruikt worden om links\n"
 "te selecteren.\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 +6124,7 @@ msgstr ""
 "op het scherm zichtbaar is.  Referentielijsten en uitvoer van het\n"
 "lijst commando nummeren ook formulier-invoervelden.\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 +6134,7 @@ msgstr ""
 "verminkt uitzien als \"LINKS_ARE_NUMBERED\" of\n"
 "\"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\" is aangezet.\n"
 
-#: src/LYrcFile.c:899
+#: src/LYrcFile.c:915
 msgid ""
 "Lynx User Defaults File\n"
 "\n"
@@ -6124,7 +6142,7 @@ msgstr ""
 "Lynxbestand met standaardinstellingen van gebruiker\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 +6152,7 @@ msgstr ""
 "met de 'o'-toets). Om opties met dit venster te bewaren vinkt u het\n"
 "aanvinkveld aan:\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 +6160,7 @@ msgstr ""
 "U bewaart vervolgens de instellingen via de link op de regel boven het\n"
 "aanvinkveld:\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"
@@ -6152,7 +6170,7 @@ msgstr ""
 "een eenvoudiger optiemenu wordt getoond. Bewaar hiermee de opties met de\n"
 "'>'-toets.\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"
@@ -6162,7 +6180,7 @@ msgstr ""
 "via de '>'-toets).\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"
@@ -6182,6 +6200,15 @@ msgstr ""
 "meestal \"lynx.cfg\". Het heeft een andere inhoud en een andere opmaak.\n"
 "Het is niet dit bestand.\n"
 
+#~ msgid ""
+#~ "\n"
+#~ "Lynx edit map not declared.\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Lynx-editkaart is niet opgegeven.\n"
+#~ "\n"
+
 #~ msgid "Very long lines have been wrapped!"
 #~ msgstr "Erg lange regels zijn omgevouwen!"