about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--BUILD/VS2003/lynx/lynx_cfg.h4
-rw-r--r--BUILD/VS2005X/lynx/lynx_cfg.h4
-rw-r--r--BUILD/VS2008X/lynx/lynx_cfg.h4
-rw-r--r--CHANGES7
-rw-r--r--INSTALLATION12
-rw-r--r--WWW/Library/Implementation/HTUtils.h2
-rw-r--r--aclocal.m451
-rw-r--r--config.hin41
-rwxr-xr-xconfigure3171
-rw-r--r--configure.in41
-rw-r--r--makefile.bcb4
-rw-r--r--makefile.msc4
-rw-r--r--makelynx.bat4
-rw-r--r--po/nl.po499
-rw-r--r--src/LYEditmap.c26
-rw-r--r--src/LYGlobalDefs.h10
-rw-r--r--src/LYHistory.c4
-rw-r--r--src/LYKeymap.c4
-rw-r--r--src/LYKeymap.h4
-rw-r--r--src/LYList.c4
-rw-r--r--src/LYMail.c87
-rw-r--r--src/LYMail.h20
-rw-r--r--src/LYMain.c4
-rw-r--r--src/LYMainLoop.c10
-rw-r--r--src/LYStrings.h4
-rw-r--r--src/LYUtils.c8
-rw-r--r--src/LYUtils.h4
-rw-r--r--src/makefile.dos6
28 files changed, 2121 insertions, 1922 deletions
diff --git a/BUILD/VS2003/lynx/lynx_cfg.h b/BUILD/VS2003/lynx/lynx_cfg.h
index 5e5f25a3..2861e1f1 100644
--- a/BUILD/VS2003/lynx/lynx_cfg.h
+++ b/BUILD/VS2003/lynx/lynx_cfg.h
@@ -1,4 +1,4 @@
-// $LynxId: lynx_cfg.h,v 1.5 2010/11/06 13:37:00 tom Exp $
+// $LynxId: lynx_cfg.h,v 1.6 2011/05/28 13:07:55 tom Exp $
 // definitions abstracted from makefile.msc
 
 #ifndef LYNX_CFG_H
@@ -13,7 +13,7 @@
 #define DIRED_SUPPORT 1
 #define DISP_PARTIAL 1
 #define DOSPATH 1
-#define EXP_ALT_BINDINGS 1
+#define USE_ALT_BINDINGS 1
 #define EXP_NESTED_TABLES 1
 #define HAVE_KEYPAD 1
 #define HAVE_PUTENV 1
diff --git a/BUILD/VS2005X/lynx/lynx_cfg.h b/BUILD/VS2005X/lynx/lynx_cfg.h
index 1856824e..7059d496 100644
--- a/BUILD/VS2005X/lynx/lynx_cfg.h
+++ b/BUILD/VS2005X/lynx/lynx_cfg.h
@@ -1,4 +1,4 @@
-// $LynxId: lynx_cfg.h,v 1.4 2010/11/06 13:37:00 tom Exp $
+// $LynxId: lynx_cfg.h,v 1.5 2011/05/28 13:07:55 tom Exp $
 // definitions abstracted from makefile.msc
 
 #ifndef LYNX_CFG_H
@@ -14,7 +14,7 @@
 #define DIRED_SUPPORT 1
 #define DISP_PARTIAL 1
 #define DOSPATH 1
-#define EXP_ALT_BINDINGS 1
+#define USE_ALT_BINDINGS 1
 #define EXP_NESTED_TABLES 1
 #define HAVE_KEYPAD 1
 #define HAVE_PUTENV 1
diff --git a/BUILD/VS2008X/lynx/lynx_cfg.h b/BUILD/VS2008X/lynx/lynx_cfg.h
index 1856824e..7059d496 100644
--- a/BUILD/VS2008X/lynx/lynx_cfg.h
+++ b/BUILD/VS2008X/lynx/lynx_cfg.h
@@ -1,4 +1,4 @@
-// $LynxId: lynx_cfg.h,v 1.4 2010/11/06 13:37:00 tom Exp $
+// $LynxId: lynx_cfg.h,v 1.5 2011/05/28 13:07:55 tom Exp $
 // definitions abstracted from makefile.msc
 
 #ifndef LYNX_CFG_H
@@ -14,7 +14,7 @@
 #define DIRED_SUPPORT 1
 #define DISP_PARTIAL 1
 #define DOSPATH 1
-#define EXP_ALT_BINDINGS 1
+#define USE_ALT_BINDINGS 1
 #define EXP_NESTED_TABLES 1
 #define HAVE_KEYPAD 1
 #define HAVE_PUTENV 1
diff --git a/CHANGES b/CHANGES
index 7102c949..c94833e6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,12 @@
--- $LynxId: CHANGES,v 1.544 2011/05/27 09:50:23 tom Exp $
+-- $LynxId: CHANGES,v 1.546 2011/05/28 13:13:56 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
 
-2011-05-27 (2.8.8dev.9)
+2011-05-28 (2.8.8dev.9)
+* change #define's for addrlist-page and alt-bindings to reflect their
+  non-experimental status -TD
+* change default for --enable-addrlist-page configure option to enabled -TD
 * modify blat/blatj configuration so that support for both is compiled-in
   for DOSPATH configurations.  Add "-altblat" option to select blat vs blatj.
   Define USE_ALT_BLAT_MAILER to specify which is the default (prompted by
diff --git a/INSTALLATION b/INSTALLATION
index fafb96f9..cef6461d 100644
--- a/INSTALLATION
+++ b/INSTALLATION
@@ -180,7 +180,11 @@ II. Compile instructions -- UNIX
 	do not support a configure script, such as MS-DOS, Win32 and VMS, you
 	must edit lynx.cfg).
 
-  --disable-alt-bindings 		(prevent defining EXP_ALT_BINDINGS)
+  --disable-addrlist-page		(prevent defining USE_ADDRLIST_PAGE)
+	Turn off code that displays an alternative list-page, bound to 'A'
+	rather than 'l', which always lists URLs rather than titles.
+
+  --disable-alt-bindings 		(prevent defining USE_ALT_BINDINGS)
 	Compiles-in an alternative set of line-edit bindings, in addition
 	to the default bindings.
 
@@ -386,10 +390,6 @@ II. Compile instructions -- UNIX
 	information to diagnose problems with either Lynx or the sites to which
 	you connect.
 
-  --enable-addrlist-page		(define EXP_ADDRLIST_PAGE)
-	Compiles-in an alternative list-page, bound to 'A' rather than 'l',
-	which always lists URLs rather than titles.
-
   --enable-ascii-ctypes			(define USE_ASCII_CTYPES)
 	Compiles-in alternative case-conversion functions which ensure that
 	configuration names, etc., are compared in POSIX locale.  This is
@@ -1388,4 +1388,4 @@ VIII. Acknowledgment
 
 -- 1999/04/24 - H. Nelson <lynx-admin@irm.nara.kindai.ac.jp>
 -- vile:txtmode
--- $LynxId: INSTALLATION,v 1.114 2010/12/08 01:28:43 Doug.Kaufman Exp $
+-- $LynxId: INSTALLATION,v 1.116 2011/05/28 13:07:55 tom Exp $
diff --git a/WWW/Library/Implementation/HTUtils.h b/WWW/Library/Implementation/HTUtils.h
index 788c9184..01086171 100644
--- a/WWW/Library/Implementation/HTUtils.h
+++ b/WWW/Library/Implementation/HTUtils.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTUtils.h,v 1.105 2011/05/24 08:50:26 tom Exp $
+ * $LynxId: HTUtils.h,v 1.107 2011/05/28 15:13:56 tom Exp $
  *
  * Utility macros for the W3 code library
  * MACROS FOR GENERAL USE
diff --git a/aclocal.m4 b/aclocal.m4
index 41fc127a..11c3ffe4 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,11 +1,11 @@
-dnl $LynxId: aclocal.m4,v 1.182 2011/05/10 09:21:03 tom Exp $
+dnl $LynxId: aclocal.m4,v 1.186 2011/05/28 16:14:57 tom Exp $
 dnl Macros for auto-configure script.
 dnl by T.E.Dickey <dickey@invisible-island.net>
 dnl and Jim Spath <jspath@mail.bcpl.lib.md.us>
 dnl and Philippe De Muyter <phdm@macqel.be>
 dnl
 dnl Created: 1997/01/28
-dnl Updated: 2011/05/08
+dnl Updated: 2011/05/28
 dnl
 dnl The autoconf used in Lynx development is GNU autoconf 2.13 or 2.52, patched
 dnl by Thomas Dickey.  See your local GNU archives, and this URL:
@@ -1663,7 +1663,7 @@ CF_CURSES_HEADER
 CF_TERM_HEADER
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_FUNCS version: 16 updated: 2011/04/09 18:19:55
+dnl CF_CURSES_FUNCS version: 17 updated: 2011/05/14 16:07:29
 dnl ---------------
 dnl Curses-functions are a little complicated, since a lot of them are macros.
 AC_DEFUN([CF_CURSES_FUNCS],
@@ -1684,7 +1684,8 @@ do
 			[
 #ifndef ${cf_func}
 long foo = (long)(&${cf_func});
-${cf_cv_main_return:-return}(foo == 0);
+if (foo + 1234 > 5678)
+	${cf_cv_main_return:-return}(foo);
 #endif
 			],
 			[cf_result=yes],
@@ -5016,7 +5017,7 @@ AC_MSG_RESULT($cf_use_socks5p_h)
 test "$cf_use_socks5p_h" = yes && AC_DEFINE(INCLUDE_PROTOTYPES)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_SRAND version: 8 updated: 2007/04/22 12:01:07
+dnl CF_SRAND version: 9 updated: 2011/05/28 12:10:58
 dnl --------
 dnl Check for functions similar to srand() and rand().  lrand48() and random()
 dnl return a 31-bit value, while rand() returns a value less than RAND_MAX
@@ -5066,12 +5067,40 @@ if test "$cf_cv_srand_func" != unknown ; then
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #endif
-#ifdef HAVE_BSD_RANDOM_H
-#include <bsd/random.h>
-#endif
 		],[long x = $cf_cv_rand_max],,
 		[cf_cv_rand_max="(1L<<$cf_rand_max)-1"])
 	])
+
+	case $cf_cv_srand_func in
+	*/arc4random)
+		AC_MSG_CHECKING(if <bsd/stdlib.h> should be included)
+		AC_TRY_COMPILE([#include <bsd/stdlib.h>],
+					   [void *arc4random(int);
+						void *x = arc4random(1)],
+					   [cf_bsd_stdlib_h=no],
+					   [cf_bsd_stdlib_h=yes])
+	    AC_MSG_RESULT($cf_bsd_stdlib_h)
+		if test "$cf_bsd_stdlib_h" = yes
+		then
+			AC_DEFINE(HAVE_BSD_STDLIB_H)
+		else
+			AC_MSG_CHECKING(if <bsd/random.h> should be included)
+			AC_TRY_COMPILE([#include <bsd/random.h>],
+						   [void *arc4random(int);
+							void *x = arc4random(1)],
+						   [cf_bsd_random_h=no],
+						   [cf_bsd_random_h=yes])
+			AC_MSG_RESULT($cf_bsd_random_h)
+			if test "$cf_bsd_random_h" = yes
+			then
+				AC_DEFINE(HAVE_BSD_RANDOM_H)
+			else
+				AC_MSG_WARN(no header file found for arc4random)
+			fi
+		fi
+		;;
+	esac
+
 	CF_SRAND_PARSE($cf_func,cf_srand_func,cf_rand_func)
 
 	CF_UPPER(cf_rand_max,ifelse($1,,my_,$1)rand_max)
@@ -6150,7 +6179,7 @@ $3="$withval"
 AC_SUBST($3)dnl
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_WITH_ZLIB version: 3 updated: 2007/07/29 13:19:54
+dnl CF_WITH_ZLIB version: 4 updated: 2011/05/28 12:10:58
 dnl ------------
 dnl check for libz aka "zlib"
 AC_DEFUN([CF_WITH_ZLIB],[
@@ -6161,6 +6190,10 @@ AC_DEFUN([CF_WITH_ZLIB],[
 ],[
 	gzopen("name","mode")
 ],z,,,zlib)
+
+AC_CHECK_FUNCS( \
+	zError \
+)
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_XOPEN_CURSES version: 11 updated: 2011/01/18 18:15:30
diff --git a/config.hin b/config.hin
index 019678a9..27e88682 100644
--- a/config.hin
+++ b/config.hin
@@ -1,5 +1,5 @@
 /*
- * $LynxId: config.hin,v 1.124 2011/05/24 08:45:30 tom Exp $
+ * $LynxId: config.hin,v 1.126 2011/05/28 15:12:53 tom Exp $
  * vile:cmode
  *
  * The configure script translates "config.hin" into "lynx_cfg.h"
@@ -38,12 +38,9 @@
 #undef ENABLE_OPTS_CHANGE_EXEC	/* CF_ARG_ENABLE(change-exec) */
 #undef EXEC_LINKS		/* CF_ARG_ENABLE(exec-links) */
 #undef EXEC_SCRIPTS		/* CF_ARG_ENABLE(exec-scripts) */
-#undef EXP_ADDRLIST_PAGE	/* CF_ARG_ENABLE(addrlist-page) */
-#undef EXP_ALT_BINDINGS		/* CF_ARG_ENABLE(alt-bindings) */
 #undef EXP_CHARTRANS_AUTOSWITCH	/* CF_ARG_ENABLE(font-switch) */
 #undef EXP_JAPANESEUTF8_SUPPORT	/* CF_ARG_ENABLE(japanese-utf8) */
 #undef EXP_KEYBOARD_LAYOUT	/* CF_ARG_ENABLE(kbd-layout) */
-#undef EXP_LIBJS		/* CF_ARG_ENABLE(libjs) */
 #undef EXP_NESTED_TABLES	/* CF_ARG_ENABLE(nested-tables) */
 #undef FANCY_CURSES		/* CF_FANCY_CURSES */
 #undef GCC_NORETURN		/* CF_GCC_ATTRIBUTES */
@@ -56,8 +53,8 @@
 #undef HAVE_ARGZ_H		/* AM_GNU_GETTEXT */
 #undef HAVE_ARPA_INET_H
 #undef HAVE_ASSUME_DEFAULT_COLORS /* ncurses extension */
-#undef HAVE_BSD_RANDOM_H	/* have bsd/random.h */
-#undef HAVE_BSD_STDLIB_H	/* have bsd/stdlib.h */
+#undef HAVE_BSD_RANDOM_H	/* CF_SRAND */
+#undef HAVE_BSD_STDLIB_H	/* CF_SRAND */
 #undef HAVE_BSD_TOUCHLINE	/* CF_CURS_TOUCHLINE */
 #undef HAVE_CATGETS		/* defined if you want to use non-GNU catgets */
 #undef HAVE_CBREAK
@@ -251,32 +248,34 @@
 #undef UNDERLINE_LINKS		/* CF_ARG_ENABLE(underlines) */
 #undef UNIX
 #undef UNZIP_PATH		/* CF_PATH_PROG(unzip) */
-#undef USE_ASCII_CTYPES		/* CF_ARG_ENABLE(ascii-ctypes) */
+#undef USE_ADDRLIST_PAGE	/* CF_ARG_DISABLE(addrlist-page) */
+#undef USE_ALT_BINDINGS		/* CF_ARG_DISABLE(alt-bindings) */
+#undef USE_ASCII_CTYPES		/* CF_ARG_DISABLE(ascii-ctypes) */
 #undef USE_BZLIB		/* AC_ARG_WITH(bzlib) */
-#undef USE_CACHEJAR		/* CF_ARG_ENABLE(session-cache) */
-#undef USE_CHARSET_CHOICE	/* CF_ARG_ENABLE(charset-choice) */
-#undef USE_COLOR_STYLE		/* CF_ARG_ENABLE(color-style) */
-#undef USE_DEFAULT_COLORS	/* CF_ARG_ENABLE(default-colors) */
+#undef USE_CACHEJAR		/* CF_ARG_DISABLE(session-cache) */
+#undef USE_CHARSET_CHOICE	/* CF_ARG_DISABLE(charset-choice) */
+#undef USE_COLOR_STYLE		/* CF_ARG_DISABLE(color-style) */
+#undef USE_DEFAULT_COLORS	/* CF_ARG_DISABLE(default-colors) */
 #undef USE_EXECVP		/* CF_ARG_DISABLE(full-paths) */
 #undef USE_EXTERNALS		/* CF_ARG_ENABLE(externs) */
 #undef USE_FCNTL		/* CF_FIONBIO */
-#undef USE_FILE_UPLOAD		/* CF_ARG_ENABLE(file-upload) */
+#undef USE_FILE_UPLOAD		/* CF_ARG_DISABLE(file-upload) */
 #undef USE_GNUTLS_FUNCS		/* CF_GNUTLS */
 #undef USE_GNUTLS_INCL		/* CF_GNUTLS */
 #undef USE_IDNA			/* CF_ARG_DISABLE(idna) */
-#undef USE_JUSTIFY_ELTS		/* CF_ARG_ENABLE(justify-elts) */
-#undef USE_LOCALE_CHARSET	/* CF_ARG_ENABLE(locale-charset) */
+#undef USE_JUSTIFY_ELTS		/* CF_ARG_DISABLE(justify-elts) */
+#undef USE_LOCALE_CHARSET	/* CF_ARG_DISABLE(locale-charset) */
 #undef USE_OPENSSL_INCL		/* CF_SSL */
-#undef USE_PERSISTENT_COOKIES	/* CF_ARG_ENABLE(persistent-cookies) */
-#undef USE_PRETTYSRC		/* CF_ARG_ENABLE(prettysrc) */
-#undef USE_PROGRESSBAR		/* CF_ARG_ENABLE(progressbar) */
-#undef USE_READPROGRESS		/* CF_ARG_ENABLE(read-eta) */
-#undef USE_SCROLLBAR		/* CF_ARG_ENABLE(scrollbar) */
-#undef USE_SESSIONS		/* CF_ARG_ENABLE(sessions) */
+#undef USE_PERSISTENT_COOKIES	/* CF_ARG_DISABLE(persistent-cookies) */
+#undef USE_PRETTYSRC		/* CF_ARG_DISABLE(prettysrc) */
+#undef USE_PROGRESSBAR		/* CF_ARG_DISABLE(progressbar) */
+#undef USE_READPROGRESS		/* CF_ARG_DISABLE(read-eta) */
+#undef USE_SCROLLBAR		/* CF_ARG_DISABLE(scrollbar) */
+#undef USE_SESSIONS		/* CF_ARG_DISABLE(sessions) */
 #undef USE_SLANG		/* AC_ARG_WITH(screen=slang) */
 #undef USE_SOCKS4_PREFIX	/* CF_SOCKS5 */
 #undef USE_SOCKS5		/* CF_SOCKS5 */
-#undef USE_SOURCE_CACHE		/* CF_ARG_ENABLE(source-cache) */
+#undef USE_SOURCE_CACHE		/* CF_ARG_DISABLE(source-cache) */
 #undef USE_SSL			/* CF_SSL */
 #undef USE_SYSV_UTMP		/* CF_UTMP */
 #undef USE_X509_SUPPORT		/* CF_GNUTLS, CF_SSL */
diff --git a/configure b/configure
index b7272f04..050265c5 100755
--- a/configure
+++ b/configure
@@ -738,9 +738,9 @@ Experimental Options:
   --disable-config-info   disable browsable configuration-info
   --disable-forms-options disable forms-based options
   --disable-menu-options  disable old-style option menu
-  --disable-sessions      use experimental sessions code
-  --disable-session-cache use experimental session-caching code
-  --enable-addrlist-page  use experimental address-list page
+  --disable-sessions      use sessions code
+  --disable-session-cache use session-caching code
+  --disable-addrlist-page disable address-list page
   --enable-cjk            use experimental CJK logic
   --enable-japanese-utf8  use experimental Japanese UTF-8 logic
   --enable-default-colors enable use of default-colors (ncurses/slang)
@@ -748,18 +748,18 @@ Experimental Options:
   --enable-nested-tables  use experimental nested-table support
 Miscellaneous Options:
   --disable-alt-bindings  disable alternative line-edit bindings
-  --disable-ascii-ctypes  use ascii case-conversion
+  --disable-ascii-ctypes  disable use of ascii case-conversion
   --disable-extended-dtd  disable extended HTML DTD logic
-  --disable-file-upload   use file-upload support
-  --disable-idna          provide IDNA support
-  --disable-justify-elts  use element-justification logic
-  --disable-partial       use partial-display logic
+  --disable-file-upload   disable file-upload support
+  --disable-idna          disable IDNA support
+  --disable-justify-elts  disable element-justification logic
+  --disable-partial       disable partial-display logic
   --disable-persistent-cookies  disable persistent-cookie support
-  --disable-prettysrc     colorize HTML source
-  --disable-progressbar   use progress-bar
-  --disable-read-eta      read-progress message shows ETA
-  --disable-source-cache  cache HTML source for parse mode changes
-  --disable-scrollbar     use scrollbar, with mouse
+  --disable-prettysrc     disable colorization of HTML source
+  --disable-progressbar   disable progress-bar
+  --disable-read-eta      disable read-progress message shows ETA
+  --disable-source-cache  do not cache HTML source for parse mode changes
+  --disable-scrollbar     disable scrollbar with mouse
   --enable-charset-choice use charset-selection logic
   --enable-externs        use external commands
   --enable-font-switch    use Linux setfont for character-translation
@@ -25068,8 +25068,6 @@ fi
 
 for ac_header in \
 	arpa/inet.h \
-	bsd/random.h \
-	bsd/stdlib.h \
 	fcntl.h \
 	limits.h \
 	stdlib.h \
@@ -25088,23 +25086,23 @@ for ac_header in \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:25091: checking for $ac_header" >&5
+echo "$as_me:25089: 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 25097 "configure"
+#line 25095 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:25101: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:25099: \"$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:25107: \$? = $ac_status" >&5
+  echo "$as_me:25105: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -25123,7 +25121,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:25126: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:25124: 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
@@ -25133,14 +25131,14 @@ EOF
 fi
 done
 
-echo "$as_me:25136: checking termio.h and termios.h" >&5
+echo "$as_me:25134: 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 25143 "configure"
+#line 25141 "configure"
 #include "confdefs.h"
 
 #if HAVE_TERMIO_H
@@ -25158,16 +25156,16 @@ putchar (0x0a)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25161: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25159: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25164: \$? = $ac_status" >&5
+  echo "$as_me:25162: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25167: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25165: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25170: \$? = $ac_status" >&5
+  echo "$as_me:25168: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termio_and_termios=yes
 else
@@ -25178,20 +25176,20 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:25181: result: $cf_cv_termio_and_termios" >&5
+echo "$as_me:25179: 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:25187: checking for sigaction and structs" >&5
+echo "$as_me:25185: 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 25194 "configure"
+#line 25192 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -25211,16 +25209,16 @@ struct sigaction act;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25214: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25212: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25217: \$? = $ac_status" >&5
+  echo "$as_me:25215: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25220: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25218: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25223: \$? = $ac_status" >&5
+  echo "$as_me:25221: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_func_sigaction=yes
 else
@@ -25231,7 +25229,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:25234: result: $cf_cv_func_sigaction" >&5
+echo "$as_me:25232: result: $cf_cv_func_sigaction" >&5
 echo "${ECHO_T}$cf_cv_func_sigaction" >&6
 test "$cf_cv_func_sigaction" = yes && cat >>confdefs.h <<\EOF
 #define HAVE_SIGACTION 1
@@ -25240,23 +25238,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:25243: checking for $ac_header" >&5
+echo "$as_me:25241: 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 25249 "configure"
+#line 25247 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:25253: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:25251: \"$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:25259: \$? = $ac_status" >&5
+  echo "$as_me:25257: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -25275,7 +25273,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:25278: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:25276: 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
@@ -25296,23 +25294,23 @@ else
 for ac_header in wait.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:25299: checking for $ac_header" >&5
+echo "$as_me:25297: 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 25305 "configure"
+#line 25303 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:25309: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:25307: \"$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:25315: \$? = $ac_status" >&5
+  echo "$as_me:25313: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -25331,7 +25329,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:25334: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:25332: 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
@@ -25344,23 +25342,23 @@ done
 for ac_header in waitstatus.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:25347: checking for $ac_header" >&5
+echo "$as_me:25345: 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 25353 "configure"
+#line 25351 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:25357: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:25355: \"$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:25363: \$? = $ac_status" >&5
+  echo "$as_me:25361: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -25379,7 +25377,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:25382: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:25380: 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
@@ -25401,14 +25399,14 @@ cf_wait_headers="$cf_wait_headers
 fi
 fi
 
-echo "$as_me:25404: checking for union wait" >&5
+echo "$as_me:25402: 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 25411 "configure"
+#line 25409 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -25424,16 +25422,16 @@ int x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25427: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25425: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25430: \$? = $ac_status" >&5
+  echo "$as_me:25428: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25433: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25431: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25436: \$? = $ac_status" >&5
+  echo "$as_me:25434: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_unionwait=no
 	 echo compiles ok w/o union wait 1>&5
@@ -25443,7 +25441,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 25446 "configure"
+#line 25444 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -25463,16 +25461,16 @@ union wait x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25466: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25464: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25469: \$? = $ac_status" >&5
+  echo "$as_me:25467: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25472: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25470: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25475: \$? = $ac_status" >&5
+  echo "$as_me:25473: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_unionwait=yes
 	 echo compiles ok with union wait and possibly macros too 1>&5
@@ -25487,7 +25485,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:25490: result: $cf_cv_type_unionwait" >&5
+echo "$as_me:25488: result: $cf_cv_type_unionwait" >&5
 echo "${ECHO_T}$cf_cv_type_unionwait" >&6
 test $cf_cv_type_unionwait = yes && cat >>confdefs.h <<\EOF
 #define HAVE_TYPE_UNIONWAIT 1
@@ -25495,14 +25493,14 @@ EOF
 
 if test $cf_cv_type_unionwait = yes; then
 
-	echo "$as_me:25498: checking if union wait can be used as wait-arg" >&5
+	echo "$as_me:25496: 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 25505 "configure"
+#line 25503 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -25514,16 +25512,16 @@ union wait x; wait(&x)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25517: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25515: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25520: \$? = $ac_status" >&5
+  echo "$as_me:25518: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25523: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25521: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25526: \$? = $ac_status" >&5
+  echo "$as_me:25524: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_arg_union_wait=yes
 else
@@ -25535,20 +25533,20 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-	echo "$as_me:25538: result: $cf_cv_arg_union_wait" >&5
+	echo "$as_me:25536: 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:25544: checking if union wait can be used as waitpid-arg" >&5
+	echo "$as_me:25542: 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 25551 "configure"
+#line 25549 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -25560,16 +25558,16 @@ union wait x; waitpid(0, &x, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25563: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25561: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25566: \$? = $ac_status" >&5
+  echo "$as_me:25564: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25569: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25567: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25572: \$? = $ac_status" >&5
+  echo "$as_me:25570: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_arg_union_waitpid=yes
 else
@@ -25581,7 +25579,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-	echo "$as_me:25584: result: $cf_cv_arg_union_waitpid" >&5
+	echo "$as_me:25582: result: $cf_cv_arg_union_waitpid" >&5
 echo "${ECHO_T}$cf_cv_arg_union_waitpid" >&6
 	test $cf_cv_arg_union_waitpid = yes && cat >>confdefs.h <<\EOF
 #define WAITPID_USES_UNION 1
@@ -25589,13 +25587,13 @@ EOF
 
 fi
 
-echo "$as_me:25592: checking for uid_t in sys/types.h" >&5
+echo "$as_me:25590: 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 25598 "configure"
+#line 25596 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -25609,7 +25607,7 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:25612: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:25610: 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
 
@@ -25623,7 +25621,7 @@ EOF
 
 fi
 
-echo "$as_me:25626: checking type of array argument to getgroups" >&5
+echo "$as_me:25624: 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
@@ -25632,7 +25630,7 @@ else
   ac_cv_type_getgroups=cross
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 25635 "configure"
+#line 25633 "configure"
 #include "confdefs.h"
 /* Thanks to Mike Rendell for this test.  */
 #include <sys/types.h>
@@ -25658,15 +25656,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:25661: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25659: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25664: \$? = $ac_status" >&5
+  echo "$as_me:25662: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:25666: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25664: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25669: \$? = $ac_status" >&5
+  echo "$as_me:25667: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_getgroups=gid_t
 else
@@ -25679,7 +25677,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 25682 "configure"
+#line 25680 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 
@@ -25694,20 +25692,20 @@ rm -rf conftest*
 
 fi
 fi
-echo "$as_me:25697: result: $ac_cv_type_getgroups" >&5
+echo "$as_me:25695: 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:25704: checking for off_t" >&5
+echo "$as_me:25702: 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 25710 "configure"
+#line 25708 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -25722,16 +25720,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25725: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25723: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25728: \$? = $ac_status" >&5
+  echo "$as_me:25726: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25731: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25729: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25734: \$? = $ac_status" >&5
+  echo "$as_me:25732: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -25741,7 +25739,7 @@ ac_cv_type_off_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:25744: result: $ac_cv_type_off_t" >&5
+echo "$as_me:25742: 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
   :
@@ -25753,13 +25751,13 @@ EOF
 
 fi
 
-echo "$as_me:25756: checking for pid_t" >&5
+echo "$as_me:25754: 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 25762 "configure"
+#line 25760 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -25774,16 +25772,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25777: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25775: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25780: \$? = $ac_status" >&5
+  echo "$as_me:25778: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25783: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25781: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25786: \$? = $ac_status" >&5
+  echo "$as_me:25784: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -25793,7 +25791,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:25796: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:25794: 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
   :
@@ -25805,13 +25803,13 @@ EOF
 
 fi
 
-echo "$as_me:25808: checking for uid_t in sys/types.h" >&5
+echo "$as_me:25806: 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 25814 "configure"
+#line 25812 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -25825,7 +25823,7 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:25828: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:25826: 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
 
@@ -25839,13 +25837,13 @@ EOF
 
 fi
 
-echo "$as_me:25842: checking for mode_t" >&5
+echo "$as_me:25840: 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 25848 "configure"
+#line 25846 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -25860,16 +25858,16 @@ if (sizeof (mode_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25863: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25861: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25866: \$? = $ac_status" >&5
+  echo "$as_me:25864: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25869: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25867: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25872: \$? = $ac_status" >&5
+  echo "$as_me:25870: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_mode_t=yes
 else
@@ -25879,7 +25877,7 @@ ac_cv_type_mode_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:25882: result: $ac_cv_type_mode_t" >&5
+echo "$as_me:25880: 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
   :
@@ -25891,13 +25889,13 @@ EOF
 
 fi
 
-	echo "$as_me:25894: checking for ssize_t" >&5
+	echo "$as_me:25892: 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 25900 "configure"
+#line 25898 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -25912,16 +25910,16 @@ if (sizeof (ssize_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25915: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25913: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25918: \$? = $ac_status" >&5
+  echo "$as_me:25916: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25921: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25919: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25924: \$? = $ac_status" >&5
+  echo "$as_me:25922: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_ssize_t=yes
 else
@@ -25931,7 +25929,7 @@ ac_cv_type_ssize_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:25934: result: $ac_cv_type_ssize_t" >&5
+echo "$as_me:25932: 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
@@ -25946,13 +25944,13 @@ EOF
 
 fi
 
-	echo "$as_me:25949: checking for socklen_t" >&5
+	echo "$as_me:25947: 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 25955 "configure"
+#line 25953 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -25970,16 +25968,16 @@ if (sizeof (socklen_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25973: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25971: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25976: \$? = $ac_status" >&5
+  echo "$as_me:25974: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25979: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25977: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25982: \$? = $ac_status" >&5
+  echo "$as_me:25980: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_socklen_t=yes
 else
@@ -25989,7 +25987,7 @@ ac_cv_type_socklen_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:25992: result: $ac_cv_type_socklen_t" >&5
+echo "$as_me:25990: 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
@@ -26004,7 +26002,7 @@ EOF
 
 fi
 
-echo "$as_me:26007: checking for long long type" >&5
+echo "$as_me:26005: 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
@@ -26035,7 +26033,7 @@ _CFEOF
 	rm -f conftest*
 
 fi
-echo "$as_me:26038: result: $cf_cv_type_long_long" >&5
+echo "$as_me:26036: 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
@@ -26045,14 +26043,14 @@ EOF
 
 fi
 
-echo "$as_me:26048: checking for tm.tm_gmtoff" >&5
+echo "$as_me:26046: 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 26055 "configure"
+#line 26053 "configure"
 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME
@@ -26077,16 +26075,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26080: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26078: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26083: \$? = $ac_status" >&5
+  echo "$as_me:26081: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26086: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26084: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26089: \$? = $ac_status" >&5
+  echo "$as_me:26087: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_tm_gmtoff=yes
 else
@@ -26097,19 +26095,19 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:26100: result: $cf_cv_tm_gmtoff" >&5
+echo "$as_me:26098: 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:26106: checking for int" >&5
+echo "$as_me:26104: 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 26112 "configure"
+#line 26110 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26124,16 +26122,16 @@ if (sizeof (int))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26127: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26125: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26130: \$? = $ac_status" >&5
+  echo "$as_me:26128: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26133: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26131: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26136: \$? = $ac_status" >&5
+  echo "$as_me:26134: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_int=yes
 else
@@ -26143,10 +26141,10 @@ ac_cv_type_int=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:26146: result: $ac_cv_type_int" >&5
+echo "$as_me:26144: result: $ac_cv_type_int" >&5
 echo "${ECHO_T}$ac_cv_type_int" >&6
 
-echo "$as_me:26149: checking size of int" >&5
+echo "$as_me:26147: 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
@@ -26155,7 +26153,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 26158 "configure"
+#line 26156 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26167,21 +26165,21 @@ int _array_ [1 - 2 * !((sizeof (int)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26170: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26168: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26173: \$? = $ac_status" >&5
+  echo "$as_me:26171: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26176: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26174: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26179: \$? = $ac_status" >&5
+  echo "$as_me:26177: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 26184 "configure"
+#line 26182 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26193,16 +26191,16 @@ int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26196: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26194: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26199: \$? = $ac_status" >&5
+  echo "$as_me:26197: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26202: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26200: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26205: \$? = $ac_status" >&5
+  echo "$as_me:26203: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -26218,7 +26216,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 26221 "configure"
+#line 26219 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26230,16 +26228,16 @@ int _array_ [1 - 2 * !((sizeof (int)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26233: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26231: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26236: \$? = $ac_status" >&5
+  echo "$as_me:26234: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26239: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26237: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26242: \$? = $ac_status" >&5
+  echo "$as_me:26240: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -26255,7 +26253,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 26258 "configure"
+#line 26256 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26267,16 +26265,16 @@ int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26270: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26268: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26273: \$? = $ac_status" >&5
+  echo "$as_me:26271: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26276: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26274: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26279: \$? = $ac_status" >&5
+  echo "$as_me:26277: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -26289,12 +26287,12 @@ done
 ac_cv_sizeof_int=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:26292: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:26290: 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 26297 "configure"
+#line 26295 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26310,15 +26308,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:26313: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26311: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26316: \$? = $ac_status" >&5
+  echo "$as_me:26314: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:26318: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26316: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26321: \$? = $ac_status" >&5
+  echo "$as_me:26319: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_int=`cat conftest.val`
 else
@@ -26334,19 +26332,19 @@ else
   ac_cv_sizeof_int=0
 fi
 fi
-echo "$as_me:26337: result: $ac_cv_sizeof_int" >&5
+echo "$as_me:26335: 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
 EOF
 
-echo "$as_me:26343: checking for long" >&5
+echo "$as_me:26341: 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 26349 "configure"
+#line 26347 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26361,16 +26359,16 @@ if (sizeof (long))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26364: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26362: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26367: \$? = $ac_status" >&5
+  echo "$as_me:26365: \$? = $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:26368: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26373: \$? = $ac_status" >&5
+  echo "$as_me:26371: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_long=yes
 else
@@ -26380,10 +26378,10 @@ ac_cv_type_long=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:26383: result: $ac_cv_type_long" >&5
+echo "$as_me:26381: result: $ac_cv_type_long" >&5
 echo "${ECHO_T}$ac_cv_type_long" >&6
 
-echo "$as_me:26386: checking size of long" >&5
+echo "$as_me:26384: 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
@@ -26392,7 +26390,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 26395 "configure"
+#line 26393 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26404,21 +26402,21 @@ int _array_ [1 - 2 * !((sizeof (long)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26407: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26405: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26410: \$? = $ac_status" >&5
+  echo "$as_me:26408: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26413: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26411: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26416: \$? = $ac_status" >&5
+  echo "$as_me:26414: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 26421 "configure"
+#line 26419 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26430,16 +26428,16 @@ int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26433: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26431: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26436: \$? = $ac_status" >&5
+  echo "$as_me:26434: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26439: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26437: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26442: \$? = $ac_status" >&5
+  echo "$as_me:26440: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -26455,7 +26453,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 26458 "configure"
+#line 26456 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26467,16 +26465,16 @@ int _array_ [1 - 2 * !((sizeof (long)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26470: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26468: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26473: \$? = $ac_status" >&5
+  echo "$as_me:26471: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26476: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26474: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26479: \$? = $ac_status" >&5
+  echo "$as_me:26477: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -26492,7 +26490,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 26495 "configure"
+#line 26493 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26504,16 +26502,16 @@ int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26507: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26505: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26510: \$? = $ac_status" >&5
+  echo "$as_me:26508: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26513: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26511: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26516: \$? = $ac_status" >&5
+  echo "$as_me:26514: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -26526,12 +26524,12 @@ done
 ac_cv_sizeof_long=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:26529: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:26527: 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 26534 "configure"
+#line 26532 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26547,15 +26545,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:26550: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26548: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26553: \$? = $ac_status" >&5
+  echo "$as_me:26551: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:26555: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26553: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26558: \$? = $ac_status" >&5
+  echo "$as_me:26556: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_long=`cat conftest.val`
 else
@@ -26571,19 +26569,19 @@ else
   ac_cv_sizeof_long=0
 fi
 fi
-echo "$as_me:26574: result: $ac_cv_sizeof_long" >&5
+echo "$as_me:26572: result: $ac_cv_sizeof_long" >&5
 echo "${ECHO_T}$ac_cv_sizeof_long" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_LONG $ac_cv_sizeof_long
 EOF
 
-echo "$as_me:26580: checking for off_t" >&5
+echo "$as_me:26578: 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 26586 "configure"
+#line 26584 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26598,16 +26596,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26601: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26599: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26604: \$? = $ac_status" >&5
+  echo "$as_me:26602: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26607: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26605: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26610: \$? = $ac_status" >&5
+  echo "$as_me:26608: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -26617,10 +26615,10 @@ ac_cv_type_off_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:26620: result: $ac_cv_type_off_t" >&5
+echo "$as_me:26618: result: $ac_cv_type_off_t" >&5
 echo "${ECHO_T}$ac_cv_type_off_t" >&6
 
-echo "$as_me:26623: checking size of off_t" >&5
+echo "$as_me:26621: 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
@@ -26629,7 +26627,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 26632 "configure"
+#line 26630 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26641,21 +26639,21 @@ int _array_ [1 - 2 * !((sizeof (off_t)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26644: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26642: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26647: \$? = $ac_status" >&5
+  echo "$as_me:26645: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26650: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26648: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26653: \$? = $ac_status" >&5
+  echo "$as_me:26651: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 26658 "configure"
+#line 26656 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26667,16 +26665,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26670: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26668: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26673: \$? = $ac_status" >&5
+  echo "$as_me:26671: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26676: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26674: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26679: \$? = $ac_status" >&5
+  echo "$as_me:26677: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -26692,7 +26690,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 26695 "configure"
+#line 26693 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26704,16 +26702,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26707: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26705: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26710: \$? = $ac_status" >&5
+  echo "$as_me:26708: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26713: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26711: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26716: \$? = $ac_status" >&5
+  echo "$as_me:26714: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -26729,7 +26727,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 26732 "configure"
+#line 26730 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26741,16 +26739,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26744: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26742: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26747: \$? = $ac_status" >&5
+  echo "$as_me:26745: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26750: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26748: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26753: \$? = $ac_status" >&5
+  echo "$as_me:26751: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -26763,12 +26761,12 @@ done
 ac_cv_sizeof_off_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:26766: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:26764: 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 26771 "configure"
+#line 26769 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26784,15 +26782,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:26787: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26785: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26790: \$? = $ac_status" >&5
+  echo "$as_me:26788: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:26792: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26790: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26795: \$? = $ac_status" >&5
+  echo "$as_me:26793: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_off_t=`cat conftest.val`
 else
@@ -26808,19 +26806,19 @@ else
   ac_cv_sizeof_off_t=0
 fi
 fi
-echo "$as_me:26811: result: $ac_cv_sizeof_off_t" >&5
+echo "$as_me:26809: result: $ac_cv_sizeof_off_t" >&5
 echo "${ECHO_T}$ac_cv_sizeof_off_t" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_OFF_T $ac_cv_sizeof_off_t
 EOF
 
-echo "$as_me:26817: checking for time_t" >&5
+echo "$as_me:26815: 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 26823 "configure"
+#line 26821 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26835,16 +26833,16 @@ if (sizeof (time_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26838: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26836: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26841: \$? = $ac_status" >&5
+  echo "$as_me:26839: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26844: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26842: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26847: \$? = $ac_status" >&5
+  echo "$as_me:26845: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_time_t=yes
 else
@@ -26854,10 +26852,10 @@ ac_cv_type_time_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:26857: result: $ac_cv_type_time_t" >&5
+echo "$as_me:26855: result: $ac_cv_type_time_t" >&5
 echo "${ECHO_T}$ac_cv_type_time_t" >&6
 
-echo "$as_me:26860: checking size of time_t" >&5
+echo "$as_me:26858: 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
@@ -26866,7 +26864,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 26869 "configure"
+#line 26867 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26878,21 +26876,21 @@ int _array_ [1 - 2 * !((sizeof (time_t)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26881: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26879: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26884: \$? = $ac_status" >&5
+  echo "$as_me:26882: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26887: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26885: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26890: \$? = $ac_status" >&5
+  echo "$as_me:26888: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 26895 "configure"
+#line 26893 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26904,16 +26902,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26907: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26905: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26910: \$? = $ac_status" >&5
+  echo "$as_me:26908: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26913: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26911: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26916: \$? = $ac_status" >&5
+  echo "$as_me:26914: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -26929,7 +26927,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 26932 "configure"
+#line 26930 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26941,16 +26939,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26944: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26942: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26947: \$? = $ac_status" >&5
+  echo "$as_me:26945: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26950: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26948: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26953: \$? = $ac_status" >&5
+  echo "$as_me:26951: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -26966,7 +26964,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 26969 "configure"
+#line 26967 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -26978,16 +26976,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26981: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26979: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26984: \$? = $ac_status" >&5
+  echo "$as_me:26982: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26987: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26985: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26990: \$? = $ac_status" >&5
+  echo "$as_me:26988: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -27000,12 +26998,12 @@ done
 ac_cv_sizeof_time_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:27003: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:27001: 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 27008 "configure"
+#line 27006 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27021,15 +27019,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:27024: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27022: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27027: \$? = $ac_status" >&5
+  echo "$as_me:27025: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:27029: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27027: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27032: \$? = $ac_status" >&5
+  echo "$as_me:27030: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_time_t=`cat conftest.val`
 else
@@ -27045,7 +27043,7 @@ else
   ac_cv_sizeof_time_t=0
 fi
 fi
-echo "$as_me:27048: result: $ac_cv_sizeof_time_t" >&5
+echo "$as_me:27046: 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
@@ -27053,13 +27051,13 @@ EOF
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo "$as_me:27056: checking for working alloca.h" >&5
+echo "$as_me:27054: 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 27062 "configure"
+#line 27060 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int
@@ -27071,16 +27069,16 @@ char *p = (char *) alloca (2 * sizeof (int));
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27074: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27072: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27077: \$? = $ac_status" >&5
+  echo "$as_me:27075: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27080: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27078: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27083: \$? = $ac_status" >&5
+  echo "$as_me:27081: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_working_alloca_h=yes
 else
@@ -27090,7 +27088,7 @@ ac_cv_working_alloca_h=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:27093: result: $ac_cv_working_alloca_h" >&5
+echo "$as_me:27091: 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
 
@@ -27100,13 +27098,13 @@ EOF
 
 fi
 
-echo "$as_me:27103: checking for alloca" >&5
+echo "$as_me:27101: 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 27109 "configure"
+#line 27107 "configure"
 #include "confdefs.h"
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -27138,16 +27136,16 @@ char *p = (char *) alloca (1);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27141: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27139: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27144: \$? = $ac_status" >&5
+  echo "$as_me:27142: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27147: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27145: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27150: \$? = $ac_status" >&5
+  echo "$as_me:27148: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_alloca_works=yes
 else
@@ -27157,7 +27155,7 @@ ac_cv_func_alloca_works=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:27160: result: $ac_cv_func_alloca_works" >&5
+echo "$as_me:27158: 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
@@ -27178,13 +27176,13 @@ cat >>confdefs.h <<\EOF
 #define C_ALLOCA 1
 EOF
 
-echo "$as_me:27181: checking whether \`alloca.c' needs Cray hooks" >&5
+echo "$as_me:27179: 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 27187 "configure"
+#line 27185 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -27202,18 +27200,18 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:27205: result: $ac_cv_os_cray" >&5
+echo "$as_me:27203: 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:27210: checking for $ac_func" >&5
+echo "$as_me:27208: 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 27216 "configure"
+#line 27214 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -27244,16 +27242,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27247: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27245: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27250: \$? = $ac_status" >&5
+  echo "$as_me:27248: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27253: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27251: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27256: \$? = $ac_status" >&5
+  echo "$as_me:27254: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -27263,7 +27261,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:27266: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:27264: 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
 
@@ -27277,7 +27275,7 @@ fi
   done
 fi
 
-echo "$as_me:27280: checking stack direction for C alloca" >&5
+echo "$as_me:27278: 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
@@ -27286,7 +27284,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 27289 "configure"
+#line 27287 "configure"
 #include "confdefs.h"
 int
 find_stack_direction ()
@@ -27309,15 +27307,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:27312: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27310: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27315: \$? = $ac_status" >&5
+  echo "$as_me:27313: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:27317: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27315: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27320: \$? = $ac_status" >&5
+  echo "$as_me:27318: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_stack_direction=1
 else
@@ -27329,7 +27327,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:27332: result: $ac_cv_c_stack_direction" >&5
+echo "$as_me:27330: result: $ac_cv_c_stack_direction" >&5
 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
 cat >>confdefs.h <<EOF
@@ -27341,23 +27339,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:27344: checking for $ac_header" >&5
+echo "$as_me:27342: 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 27350 "configure"
+#line 27348 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:27354: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:27352: \"$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:27360: \$? = $ac_status" >&5
+  echo "$as_me:27358: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -27376,7 +27374,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:27379: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:27377: 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
@@ -27389,13 +27387,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:27392: checking for $ac_func" >&5
+echo "$as_me:27390: 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 27398 "configure"
+#line 27396 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -27426,16 +27424,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27429: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27427: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27432: \$? = $ac_status" >&5
+  echo "$as_me:27430: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27435: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27433: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27438: \$? = $ac_status" >&5
+  echo "$as_me:27436: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -27445,7 +27443,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:27448: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:27446: 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
@@ -27457,7 +27455,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:27460: checking for working fork" >&5
+  echo "$as_me:27458: 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
@@ -27480,15 +27478,15 @@ else
       }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:27483: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27481: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27486: \$? = $ac_status" >&5
+  echo "$as_me:27484: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:27488: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27486: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27491: \$? = $ac_status" >&5
+  echo "$as_me:27489: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -27500,7 +27498,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:27503: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:27501: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -27514,12 +27512,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:27517: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:27515: 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:27522: checking for working vfork" >&5
+  echo "$as_me:27520: 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
@@ -27528,7 +27526,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 27531 "configure"
+#line 27529 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -27625,15 +27623,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:27628: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27626: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27631: \$? = $ac_status" >&5
+  echo "$as_me:27629: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:27633: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27631: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27636: \$? = $ac_status" >&5
+  echo "$as_me:27634: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -27645,13 +27643,13 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:27648: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:27646: 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:27654: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:27652: 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
 
@@ -27676,14 +27674,14 @@ EOF
 
 fi
 
-echo "$as_me:27679: checking if we should use fcntl or ioctl" >&5
+echo "$as_me:27677: 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 27686 "configure"
+#line 27684 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -27700,16 +27698,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27703: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27701: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27706: \$? = $ac_status" >&5
+  echo "$as_me:27704: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27709: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27707: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27712: \$? = $ac_status" >&5
+  echo "$as_me:27710: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fionbio=ioctl
 else
@@ -27717,7 +27715,7 @@ else
 cat conftest.$ac_ext >&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 27720 "configure"
+#line 27718 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -27739,16 +27737,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27742: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27740: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27745: \$? = $ac_status" >&5
+  echo "$as_me:27743: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27748: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27746: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27751: \$? = $ac_status" >&5
+  echo "$as_me:27749: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fionbio=fcntl
 else
@@ -27761,20 +27759,20 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:27764: result: $cf_cv_fionbio" >&5
+echo "$as_me:27762: 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:27770: checking for broken/missing definition of remove" >&5
+echo "$as_me:27768: 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 27777 "configure"
+#line 27775 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -27786,23 +27784,23 @@ remove("dummy")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27789: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27787: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27792: \$? = $ac_status" >&5
+  echo "$as_me:27790: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27795: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27793: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27798: \$? = $ac_status" >&5
+  echo "$as_me:27796: \$? = $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 27805 "configure"
+#line 27803 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 		int __unlink(name) { return unlink(name); }
@@ -27815,16 +27813,16 @@ remove("dummy")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27818: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27816: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27821: \$? = $ac_status" >&5
+  echo "$as_me:27819: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27824: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27822: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27827: \$? = $ac_status" >&5
+  echo "$as_me:27825: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_baddef_remove=yes
 else
@@ -27839,20 +27837,20 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:27842: result: $cf_cv_baddef_remove" >&5
+echo "$as_me:27840: 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:27848: checking for lstat" >&5
+echo "$as_me:27846: 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 27855 "configure"
+#line 27853 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -27866,16 +27864,16 @@ lstat(".", (struct stat *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27869: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27867: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27872: \$? = $ac_status" >&5
+  echo "$as_me:27870: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27875: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27873: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27878: \$? = $ac_status" >&5
+  echo "$as_me:27876: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_lstat=yes
 else
@@ -27887,7 +27885,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:27890: result: $ac_cv_func_lstat " >&5
+echo "$as_me:27888: result: $ac_cv_func_lstat " >&5
 echo "${ECHO_T}$ac_cv_func_lstat " >&6
 if test $ac_cv_func_lstat = yes; then
 	cat >>confdefs.h <<\EOF
@@ -27917,17 +27915,16 @@ for ac_func in \
 	usleep \
 	vasprintf \
 	waitpid \
-	zError \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:27924: checking for $ac_func" >&5
+echo "$as_me:27921: 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 27930 "configure"
+#line 27927 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -27958,16 +27955,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27961: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27958: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27964: \$? = $ac_status" >&5
+  echo "$as_me:27961: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27967: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27964: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27970: \$? = $ac_status" >&5
+  echo "$as_me:27967: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -27977,7 +27974,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:27980: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:27977: 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
@@ -27993,13 +27990,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:27996: checking for $ac_func" >&5
+echo "$as_me:27993: 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 28002 "configure"
+#line 27999 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -28030,16 +28027,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28033: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28030: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28036: \$? = $ac_status" >&5
+  echo "$as_me:28033: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28039: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28036: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28042: \$? = $ac_status" >&5
+  echo "$as_me:28039: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -28049,7 +28046,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:28052: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:28049: 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
@@ -28061,7 +28058,7 @@ else
 fi
 done
 
-echo "$as_me:28064: checking for random-integer functions" >&5
+echo "$as_me:28061: 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
@@ -28081,7 +28078,7 @@ do
 	esac
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 28084 "configure"
+#line 28081 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -28100,16 +28097,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:28103: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28100: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28106: \$? = $ac_status" >&5
+  echo "$as_me:28103: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28109: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28106: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28112: \$? = $ac_status" >&5
+  echo "$as_me:28109: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_srand_func=$cf_func
  break
@@ -28121,10 +28118,10 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:28124: result: $cf_cv_srand_func" >&5
+echo "$as_me:28121: 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:28127: checking for range of random-integers" >&5
+	echo "$as_me:28124: 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
@@ -28145,7 +28142,7 @@ else
 			;;
 		esac
 		cat >conftest.$ac_ext <<_ACEOF
-#line 28148 "configure"
+#line 28145 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -28154,9 +28151,6 @@ else
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #endif
-#ifdef HAVE_BSD_RANDOM_H
-#include <bsd/random.h>
-#endif
 
 int
 main ()
@@ -28167,16 +28161,16 @@ long x = $cf_cv_rand_max
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28170: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28164: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28173: \$? = $ac_status" >&5
+  echo "$as_me:28167: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28176: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28170: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28179: \$? = $ac_status" >&5
+  echo "$as_me:28173: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -28187,9 +28181,104 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:28190: result: $cf_cv_rand_max" >&5
+echo "$as_me:28184: result: $cf_cv_rand_max" >&5
 echo "${ECHO_T}$cf_cv_rand_max" >&6
 
+	case $cf_cv_srand_func in
+	*/arc4random)
+		echo "$as_me:28189: 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 28192 "configure"
+#include "confdefs.h"
+#include <bsd/stdlib.h>
+int
+main ()
+{
+void *arc4random(int);
+						void *x = arc4random(1)
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:28205: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:28208: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:28211: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:28214: \$? = $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
+cf_bsd_stdlib_h=yes
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+	    echo "$as_me:28223: result: $cf_bsd_stdlib_h" >&5
+echo "${ECHO_T}$cf_bsd_stdlib_h" >&6
+		if test "$cf_bsd_stdlib_h" = yes
+		then
+			cat >>confdefs.h <<\EOF
+#define HAVE_BSD_STDLIB_H 1
+EOF
+
+		else
+			echo "$as_me:28232: 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 28235 "configure"
+#include "confdefs.h"
+#include <bsd/random.h>
+int
+main ()
+{
+void *arc4random(int);
+							void *x = arc4random(1)
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:28248: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:28251: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:28254: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:28257: \$? = $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
+cf_bsd_random_h=yes
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+			echo "$as_me:28266: result: $cf_bsd_random_h" >&5
+echo "${ECHO_T}$cf_bsd_random_h" >&6
+			if test "$cf_bsd_random_h" = yes
+			then
+				cat >>confdefs.h <<\EOF
+#define HAVE_BSD_RANDOM_H 1
+EOF
+
+			else
+				{ echo "$as_me:28275: WARNING: no header file found for arc4random" >&5
+echo "$as_me: WARNING: no header file found for arc4random" >&2;}
+			fi
+		fi
+		;;
+	esac
+
 	cf_srand_func=`echo $cf_func | sed -e 's%/.*%%'`
 	cf_rand_func=`echo $cf_func | sed -e 's%.*/%%'`
 
@@ -28218,13 +28307,13 @@ fi
 for ac_func in strstr
 do
 
-echo "$as_me:28221: checking for $ac_func declaration" >&5
+echo "$as_me:28310: 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 28227 "configure"
+#line 28316 "configure"
 #include "confdefs.h"
 #include <string.h>
 int
@@ -28238,20 +28327,20 @@ extern	int	$ac_func();
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28241: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28330: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28244: \$? = $ac_status" >&5
+  echo "$as_me:28333: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28247: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28336: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28250: \$? = $ac_status" >&5
+  echo "$as_me:28339: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 28254 "configure"
+#line 28343 "configure"
 #include "confdefs.h"
 #include <string.h>
 int
@@ -28265,16 +28354,16 @@ int	(*p)() = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28268: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28357: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28271: \$? = $ac_status" >&5
+  echo "$as_me:28360: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28274: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28363: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28277: \$? = $ac_status" >&5
+  echo "$as_me:28366: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -28295,11 +28384,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:28298: result: yes" >&5
+  echo "$as_me:28387: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:28302: result: no" >&5
+  echo "$as_me:28391: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -28314,13 +28403,13 @@ done
 for ac_func in getgrgid getgrnam
 do
 
-echo "$as_me:28317: checking for $ac_func declaration" >&5
+echo "$as_me:28406: 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 28323 "configure"
+#line 28412 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -28336,20 +28425,20 @@ extern	int	$ac_func();
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28339: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28428: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28342: \$? = $ac_status" >&5
+  echo "$as_me:28431: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28345: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28434: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28348: \$? = $ac_status" >&5
+  echo "$as_me:28437: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 28352 "configure"
+#line 28441 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -28365,16 +28454,16 @@ int	(*p)() = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28368: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28457: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28371: \$? = $ac_status" >&5
+  echo "$as_me:28460: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28374: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28463: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28377: \$? = $ac_status" >&5
+  echo "$as_me:28466: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -28395,11 +28484,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:28398: result: yes" >&5
+  echo "$as_me:28487: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:28402: result: no" >&5
+  echo "$as_me:28491: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -28411,14 +28500,14 @@ EOF
 fi
 done
 
-echo "$as_me:28414: checking if TRUE/FALSE are defined" >&5
+echo "$as_me:28503: 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 28421 "configure"
+#line 28510 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -28432,16 +28521,16 @@ int x = TRUE, y = FALSE
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28435: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28524: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28438: \$? = $ac_status" >&5
+  echo "$as_me:28527: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28441: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28530: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28444: \$? = $ac_status" >&5
+  echo "$as_me:28533: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_bool_defs=yes
 else
@@ -28452,7 +28541,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:28455: result: $cf_cv_bool_defs" >&5
+echo "$as_me:28544: result: $cf_cv_bool_defs" >&5
 echo "${ECHO_T}$cf_cv_bool_defs" >&6
 if test "$cf_cv_bool_defs" = no ; then
 	cat >>confdefs.h <<\EOF
@@ -28465,14 +28554,14 @@ EOF
 
 fi
 
-echo "$as_me:28468: checking if external errno is declared" >&5
+echo "$as_me:28557: 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 28475 "configure"
+#line 28564 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -28490,16 +28579,16 @@ int x = (int) errno
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28493: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28582: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28496: \$? = $ac_status" >&5
+  echo "$as_me:28585: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28499: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28588: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28502: \$? = $ac_status" >&5
+  echo "$as_me:28591: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -28510,7 +28599,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:28513: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:28602: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -28525,14 +28614,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:28528: checking if external errno exists" >&5
+echo "$as_me:28617: 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 28535 "configure"
+#line 28624 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -28547,16 +28636,16 @@ errno = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28550: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28639: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28553: \$? = $ac_status" >&5
+  echo "$as_me:28642: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28556: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28645: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28559: \$? = $ac_status" >&5
+  echo "$as_me:28648: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_errno=yes
 else
@@ -28567,7 +28656,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:28570: result: $cf_cv_have_errno" >&5
+echo "$as_me:28659: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -28580,7 +28669,7 @@ EOF
 
 fi
 
-echo "$as_me:28583: checking if we can set errno" >&5
+echo "$as_me:28672: 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
@@ -28588,7 +28677,7 @@ else
 
 if test "$cross_compiling" = yes; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 28591 "configure"
+#line 28680 "configure"
 #include "confdefs.h"
 #include <errno.h>
 int
@@ -28600,16 +28689,16 @@ errno = 255
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28603: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28692: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28606: \$? = $ac_status" >&5
+  echo "$as_me:28695: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28609: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28698: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28612: \$? = $ac_status" >&5
+  echo "$as_me:28701: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_set_errno=maybe
 else
@@ -28620,7 +28709,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 28623 "configure"
+#line 28712 "configure"
 #include "confdefs.h"
 
 #include <errno.h>
@@ -28631,15 +28720,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:28634: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28723: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28637: \$? = $ac_status" >&5
+  echo "$as_me:28726: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:28639: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28728: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28642: \$? = $ac_status" >&5
+  echo "$as_me:28731: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_set_errno=yes
 else
@@ -28652,20 +28741,20 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:28655: result: $cf_cv_set_errno" >&5
+echo "$as_me:28744: 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:28661: checking for setlocale()" >&5
+echo "$as_me:28750: 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 28668 "configure"
+#line 28757 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int
@@ -28677,16 +28766,16 @@ setlocale(LC_ALL, "")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28680: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28769: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28683: \$? = $ac_status" >&5
+  echo "$as_me:28772: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28686: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28775: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28689: \$? = $ac_status" >&5
+  echo "$as_me:28778: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_locale=yes
 else
@@ -28698,21 +28787,21 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:28701: result: $cf_cv_locale" >&5
+echo "$as_me:28790: result: $cf_cv_locale" >&5
 echo "${ECHO_T}$cf_cv_locale" >&6
 test $cf_cv_locale = yes && { cat >>confdefs.h <<\EOF
 #define LOCALE 1
 EOF
  }
 
-echo "$as_me:28708: checking if NGROUPS is defined" >&5
+echo "$as_me:28797: 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 28715 "configure"
+#line 28804 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -28731,23 +28820,23 @@ int x = NGROUPS
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28734: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28823: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28737: \$? = $ac_status" >&5
+  echo "$as_me:28826: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28740: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28829: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28743: \$? = $ac_status" >&5
+  echo "$as_me:28832: \$? = $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 28750 "configure"
+#line 28839 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -28766,16 +28855,16 @@ int x = NGROUPS_MAX
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28769: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28858: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28772: \$? = $ac_status" >&5
+  echo "$as_me:28861: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28775: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28864: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28778: \$? = $ac_status" >&5
+  echo "$as_me:28867: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ngroups=NGROUPS_MAX
 else
@@ -28787,7 +28876,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:28790: result: $cf_cv_ngroups" >&5
+echo "$as_me:28879: result: $cf_cv_ngroups" >&5
 echo "${ECHO_T}$cf_cv_ngroups" >&6
 
 fi
@@ -28804,14 +28893,14 @@ EOF
 
 fi
 
-echo "$as_me:28807: checking if external sys_nerr is declared" >&5
+echo "$as_me:28896: 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 28814 "configure"
+#line 28903 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -28829,16 +28918,16 @@ int x = (int) sys_nerr
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28832: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28921: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28835: \$? = $ac_status" >&5
+  echo "$as_me:28924: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28838: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28927: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28841: \$? = $ac_status" >&5
+  echo "$as_me:28930: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_sys_nerr=yes
 else
@@ -28849,7 +28938,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:28852: result: $cf_cv_dcl_sys_nerr" >&5
+echo "$as_me:28941: 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
@@ -28864,14 +28953,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:28867: checking if external sys_nerr exists" >&5
+echo "$as_me:28956: 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 28874 "configure"
+#line 28963 "configure"
 #include "confdefs.h"
 
 #undef sys_nerr
@@ -28886,16 +28975,16 @@ sys_nerr = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28889: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28978: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28892: \$? = $ac_status" >&5
+  echo "$as_me:28981: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28895: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28984: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28898: \$? = $ac_status" >&5
+  echo "$as_me:28987: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_sys_nerr=yes
 else
@@ -28906,7 +28995,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:28909: result: $cf_cv_have_sys_nerr" >&5
+echo "$as_me:28998: 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
@@ -28919,14 +29008,14 @@ EOF
 
 fi
 
-echo "$as_me:28922: checking if external sys_errlist is declared" >&5
+echo "$as_me:29011: 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 28929 "configure"
+#line 29018 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -28944,16 +29033,16 @@ int x = (int) sys_errlist
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28947: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29036: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28950: \$? = $ac_status" >&5
+  echo "$as_me:29039: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28953: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29042: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28956: \$? = $ac_status" >&5
+  echo "$as_me:29045: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_sys_errlist=yes
 else
@@ -28964,7 +29053,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:28967: result: $cf_cv_dcl_sys_errlist" >&5
+echo "$as_me:29056: 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
@@ -28979,14 +29068,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:28982: checking if external sys_errlist exists" >&5
+echo "$as_me:29071: 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 28989 "configure"
+#line 29078 "configure"
 #include "confdefs.h"
 
 #undef sys_errlist
@@ -29001,16 +29090,16 @@ sys_errlist = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29004: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29093: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29007: \$? = $ac_status" >&5
+  echo "$as_me:29096: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29010: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29099: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29013: \$? = $ac_status" >&5
+  echo "$as_me:29102: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_sys_errlist=yes
 else
@@ -29021,7 +29110,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:29024: result: $cf_cv_have_sys_errlist" >&5
+echo "$as_me:29113: 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
@@ -29037,23 +29126,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:29040: checking for $ac_header" >&5
+echo "$as_me:29129: 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 29046 "configure"
+#line 29135 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:29050: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:29139: \"$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:29056: \$? = $ac_status" >&5
+  echo "$as_me:29145: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -29072,7 +29161,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:29075: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:29164: 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
@@ -29082,14 +29171,14 @@ EOF
 fi
 done
 
-echo "$as_me:29085: checking for lastlog path" >&5
+echo "$as_me:29174: 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 29092 "configure"
+#line 29181 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -29109,16 +29198,16 @@ char *path = _PATH_LASTLOG
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29112: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29201: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29115: \$? = $ac_status" >&5
+  echo "$as_me:29204: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29118: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29207: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29121: \$? = $ac_status" >&5
+  echo "$as_me:29210: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_path_lastlog="_PATH_LASTLOG"
 else
@@ -29133,13 +29222,13 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:29136: result: $cf_cv_path_lastlog" >&5
+echo "$as_me:29225: 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:29142: checking for utmp implementation" >&5
+echo "$as_me:29231: 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
@@ -29156,7 +29245,7 @@ cf_utmp_includes="
 #endif
 "
 	cat >conftest.$ac_ext <<_ACEOF
-#line 29159 "configure"
+#line 29248 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -29170,16 +29259,16 @@ struct $cf_header x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29173: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29262: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29176: \$? = $ac_status" >&5
+  echo "$as_me:29265: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29179: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29268: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29182: \$? = $ac_status" >&5
+  echo "$as_me:29271: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -29188,7 +29277,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 29191 "configure"
+#line 29280 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -29202,16 +29291,16 @@ struct $cf_header x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29205: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29294: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29208: \$? = $ac_status" >&5
+  echo "$as_me:29297: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29211: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29300: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29214: \$? = $ac_status" >&5
+  echo "$as_me:29303: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -29226,7 +29315,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:29229: result: $cf_cv_have_utmp" >&5
+echo "$as_me:29318: result: $cf_cv_have_utmp" >&5
 echo "${ECHO_T}$cf_cv_have_utmp" >&6
 
 if test $cf_cv_have_utmp != no ; then
@@ -29239,14 +29328,14 @@ EOF
 EOF
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:29242: checking if ${cf_cv_have_utmp}.ut_host is declared" >&5
+echo "$as_me:29331: 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 29249 "configure"
+#line 29338 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -29260,16 +29349,16 @@ struct $cf_cv_have_utmp x; char *y = &x.ut_host[0]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29263: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29352: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29266: \$? = $ac_status" >&5
+  echo "$as_me:29355: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29269: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29358: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29272: \$? = $ac_status" >&5
+  echo "$as_me:29361: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_host=yes
 else
@@ -29281,7 +29370,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:29284: result: $cf_cv_have_utmp_ut_host" >&5
+echo "$as_me:29373: result: $cf_cv_have_utmp_ut_host" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_host" >&6
 test $cf_cv_have_utmp_ut_host != no && cat >>confdefs.h <<\EOF
 #define HAVE_UTMP_UT_HOST 1
@@ -29290,14 +29379,14 @@ EOF
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:29293: checking if ${cf_cv_have_utmp}.ut_syslen is declared" >&5
+echo "$as_me:29382: 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 29300 "configure"
+#line 29389 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -29311,16 +29400,16 @@ struct $cf_cv_have_utmp x; int y = x.ut_syslen
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29314: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29403: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29317: \$? = $ac_status" >&5
+  echo "$as_me:29406: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29320: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29409: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29323: \$? = $ac_status" >&5
+  echo "$as_me:29412: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_syslen=yes
 else
@@ -29332,7 +29421,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:29335: result: $cf_cv_have_utmp_ut_syslen" >&5
+echo "$as_me:29424: result: $cf_cv_have_utmp_ut_syslen" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_syslen" >&6
 test $cf_cv_have_utmp_ut_syslen != no && cat >>confdefs.h <<\EOF
 #define HAVE_UTMP_UT_SYSLEN 1
@@ -29341,7 +29430,7 @@ EOF
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:29344: checking if ${cf_cv_have_utmp}.ut_name is declared" >&5
+echo "$as_me:29433: 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
@@ -29358,7 +29447,7 @@ cf_utmp_includes="
 "
 for cf_header in ut_name ut_user ; do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 29361 "configure"
+#line 29450 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -29372,16 +29461,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29375: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29464: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29378: \$? = $ac_status" >&5
+  echo "$as_me:29467: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29381: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29470: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29384: \$? = $ac_status" >&5
+  echo "$as_me:29473: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_name=$cf_header
 	 break
@@ -29393,12 +29482,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:29396: result: $cf_cv_have_utmp_ut_name" >&5
+echo "$as_me:29485: result: $cf_cv_have_utmp_ut_name" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_name" >&6
 
 case $cf_cv_have_utmp_ut_name in #(vi
 no) #(vi
-	{ { echo "$as_me:29401: error: Cannot find declaration for ut.ut_name" >&5
+	{ { echo "$as_me:29490: 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; }; }
 	;;
@@ -29412,7 +29501,7 @@ esac
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:29415: checking for exit-status in $cf_cv_have_utmp" >&5
+echo "$as_me:29504: 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
@@ -29425,7 +29514,7 @@ for cf_result in \
 	ut_exit.ut_exit
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 29428 "configure"
+#line 29517 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -29439,16 +29528,16 @@ struct $cf_cv_have_utmp x; long y = x.$cf_result = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29442: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29531: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29445: \$? = $ac_status" >&5
+  echo "$as_me:29534: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29448: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29537: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29451: \$? = $ac_status" >&5
+  echo "$as_me:29540: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_xstatus=$cf_result
 	 break
@@ -29461,7 +29550,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:29464: result: $cf_cv_have_utmp_ut_xstatus" >&5
+echo "$as_me:29553: result: $cf_cv_have_utmp_ut_xstatus" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_xstatus" >&6
 if test $cf_cv_have_utmp_ut_xstatus != no ; then
 	cat >>confdefs.h <<\EOF
@@ -29476,14 +29565,14 @@ fi
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:29479: checking if ${cf_cv_have_utmp}.ut_xtime is declared" >&5
+echo "$as_me:29568: 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 29486 "configure"
+#line 29575 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -29497,23 +29586,23 @@ struct $cf_cv_have_utmp x; long y = x.ut_xtime = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29500: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29589: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29503: \$? = $ac_status" >&5
+  echo "$as_me:29592: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29506: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29595: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29509: \$? = $ac_status" >&5
+  echo "$as_me:29598: \$? = $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 29516 "configure"
+#line 29605 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -29527,16 +29616,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:29530: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29619: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29533: \$? = $ac_status" >&5
+  echo "$as_me:29622: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29536: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29625: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29539: \$? = $ac_status" >&5
+  echo "$as_me:29628: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_xtime=define
 else
@@ -29550,7 +29639,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:29553: result: $cf_cv_have_utmp_ut_xtime" >&5
+echo "$as_me:29642: result: $cf_cv_have_utmp_ut_xtime" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_xtime" >&6
 if test $cf_cv_have_utmp_ut_xtime != no ; then
 	cat >>confdefs.h <<\EOF
@@ -29567,14 +29656,14 @@ fi
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:29570: checking if ${cf_cv_have_utmp}.ut_session is declared" >&5
+echo "$as_me:29659: 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 29577 "configure"
+#line 29666 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -29588,16 +29677,16 @@ struct $cf_cv_have_utmp x; long y = x.ut_session
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29591: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29680: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29594: \$? = $ac_status" >&5
+  echo "$as_me:29683: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29597: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29686: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29600: \$? = $ac_status" >&5
+  echo "$as_me:29689: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_session=yes
 else
@@ -29608,7 +29697,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:29611: result: $cf_cv_have_utmp_ut_session" >&5
+echo "$as_me:29700: result: $cf_cv_have_utmp_ut_session" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_session" >&6
 if test $cf_cv_have_utmp_ut_session != no ; then
 	cat >>confdefs.h <<\EOF
@@ -29618,7 +29707,7 @@ EOF
 fi
 fi
 
-echo "$as_me:29621: checking if $cf_cv_have_utmp is SYSV flavor" >&5
+echo "$as_me:29710: 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
@@ -29626,7 +29715,7 @@ else
 
 test "$cf_cv_have_utmp" = "utmp" && cf_prefix="ut" || cf_prefix="utx"
 cat >conftest.$ac_ext <<_ACEOF
-#line 29629 "configure"
+#line 29718 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -29645,16 +29734,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29648: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29737: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29651: \$? = $ac_status" >&5
+  echo "$as_me:29740: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29654: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29743: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29657: \$? = $ac_status" >&5
+  echo "$as_me:29746: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_sysv_utmp=yes
 else
@@ -29665,7 +29754,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:29668: result: $cf_cv_sysv_utmp" >&5
+echo "$as_me:29757: result: $cf_cv_sysv_utmp" >&5
 echo "${ECHO_T}$cf_cv_sysv_utmp" >&6
 test $cf_cv_sysv_utmp = yes && cat >>confdefs.h <<\EOF
 #define USE_SYSV_UTMP 1
@@ -29673,14 +29762,14 @@ EOF
 
 fi
 
-echo "$as_me:29676: checking if external h_errno exists" >&5
+echo "$as_me:29765: 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 29683 "configure"
+#line 29772 "configure"
 #include "confdefs.h"
 
 #undef h_errno
@@ -29695,16 +29784,16 @@ h_errno = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29698: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29787: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29701: \$? = $ac_status" >&5
+  echo "$as_me:29790: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29704: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29793: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29707: \$? = $ac_status" >&5
+  echo "$as_me:29796: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_h_errno=yes
 else
@@ -29715,7 +29804,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:29718: result: $cf_cv_have_h_errno" >&5
+echo "$as_me:29807: 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
@@ -29728,7 +29817,7 @@ EOF
 
 fi
 
-echo "$as_me:29731: checking if bibp: URLs should be supported" >&5
+echo "$as_me:29820: 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.
@@ -29745,13 +29834,13 @@ else
   use_bibp_urls=yes
 
 fi;
-echo "$as_me:29748: result: $use_bibp_urls" >&5
+echo "$as_me:29837: 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:29754: checking if configuration info should be browsable" >&5
+echo "$as_me:29843: 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.
@@ -29768,13 +29857,13 @@ else
   use_config_info=yes
 
 fi;
-echo "$as_me:29771: result: $use_config_info" >&5
+echo "$as_me:29860: 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:29777: checking if new-style forms-based options screen should be used" >&5
+echo "$as_me:29866: 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.
@@ -29791,13 +29880,13 @@ else
   use_forms_options=yes
 
 fi;
-echo "$as_me:29794: result: $use_forms_options" >&5
+echo "$as_me:29883: 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:29800: checking if old-style options menu should be used" >&5
+echo "$as_me:29889: 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.
@@ -29814,13 +29903,13 @@ else
   use_menu_options=yes
 
 fi;
-echo "$as_me:29817: result: $use_menu_options" >&5
+echo "$as_me:29906: 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:29823: checking if sessions code should be used" >&5
+echo "$as_me:29912: 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.
@@ -29837,7 +29926,7 @@ else
   use_sessions=yes
 
 fi;
-echo "$as_me:29840: result: $use_sessions" >&5
+echo "$as_me:29929: result: $use_sessions" >&5
 echo "${ECHO_T}$use_sessions" >&6
 if test $use_sessions != no ; then
 	cat >>confdefs.h <<\EOF
@@ -29847,7 +29936,7 @@ EOF
 	EXTRA_OBJS="$EXTRA_OBJS LYSession\$o"
 fi
 
-echo "$as_me:29850: checking if session-caching code should be used" >&5
+echo "$as_me:29939: 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.
@@ -29864,7 +29953,7 @@ else
   use_session_cache=yes
 
 fi;
-echo "$as_me:29867: result: $use_session_cache" >&5
+echo "$as_me:29956: result: $use_session_cache" >&5
 echo "${ECHO_T}$use_session_cache" >&6
 if test $use_session_cache != no ; then
     cat >>confdefs.h <<\EOF
@@ -29873,30 +29962,30 @@ EOF
 
 fi
 
-echo "$as_me:29876: checking if experimental address-list page should be used" >&5
-echo $ECHO_N "checking if experimental address-list page should be used... $ECHO_C" >&6
+echo "$as_me:29965: 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.
 if test "${enable_addrlist_page+set}" = set; then
   enableval="$enable_addrlist_page"
-  test "$enableval" != yes && enableval=no
-  if test "$enableval" != "no" ; then
+  test "$enableval" != no && enableval=yes
+  if test "$enableval" != "yes" ; then
     use_addrlist_page=$enableval
   else
-    use_addrlist_page=no
+    use_addrlist_page=yes
   fi
 else
-  enableval=no
-  use_addrlist_page=no
+  enableval=yes
+  use_addrlist_page=yes
 
 fi;
-echo "$as_me:29893: result: $use_addrlist_page" >&5
+echo "$as_me:29982: result: $use_addrlist_page" >&5
 echo "${ECHO_T}$use_addrlist_page" >&6
 test $use_addrlist_page != no && cat >>confdefs.h <<\EOF
-#define EXP_ADDRLIST_PAGE 1
+#define USE_ADDRLIST_PAGE 1
 EOF
 
-echo "$as_me:29899: checking if experimental CJK logic should be used" >&5
+echo "$as_me:29988: 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.
@@ -29913,13 +30002,13 @@ else
   use_cjk=no
 
 fi;
-echo "$as_me:29916: result: $use_cjk" >&5
+echo "$as_me:30005: 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:29922: checking if experimental Japanese UTF-8 logic should be used" >&5
+echo "$as_me:30011: 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.
@@ -29936,7 +30025,7 @@ else
   use_ja_utf8=no
 
 fi;
-echo "$as_me:29939: result: $use_ja_utf8" >&5
+echo "$as_me:30028: result: $use_ja_utf8" >&5
 echo "${ECHO_T}$use_ja_utf8" >&6
 if test $use_ja_utf8 != no ; then
 	cat >>confdefs.h <<\EOF
@@ -29981,7 +30070,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 29984 "configure"
+#line 30073 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -29993,16 +30082,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29996: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30085: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29999: \$? = $ac_status" >&5
+  echo "$as_me:30088: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30002: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30091: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30005: \$? = $ac_status" >&5
+  echo "$as_me:30094: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -30019,7 +30108,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}:30022: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:30111: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -30060,7 +30149,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 30063 "configure"
+#line 30152 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -30072,16 +30161,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30075: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30164: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30078: \$? = $ac_status" >&5
+  echo "$as_me:30167: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30081: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30170: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30084: \$? = $ac_status" >&5
+  echo "$as_me:30173: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -30098,7 +30187,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}:30101: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:30190: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -30114,7 +30203,7 @@ echo "${as_me:-configure}:30101: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:30117: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:30206: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -30139,7 +30228,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}:30142: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:30231: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -30168,7 +30257,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}:30171: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:30260: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -30177,7 +30266,7 @@ echo "${as_me:-configure}:30171: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:30180: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:30269: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -30188,7 +30277,7 @@ done
 
 fi;
 
-  echo "$as_me:30191: checking for iconv" >&5
+  echo "$as_me:30280: 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
@@ -30199,12 +30288,12 @@ else
 cf_cv_header_path_iconv=
 cf_cv_library_path_iconv=
 
-echo "${as_me:-configure}:30202: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:30291: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 30207 "configure"
+#line 30296 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -30223,16 +30312,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30226: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30315: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30229: \$? = $ac_status" >&5
+  echo "$as_me:30318: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30232: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30321: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30235: \$? = $ac_status" >&5
+  echo "$as_me:30324: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -30246,7 +30335,7 @@ cat conftest.$ac_ext >&5
 LIBS="-liconv  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 30249 "configure"
+#line 30338 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -30265,16 +30354,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30268: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30357: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30271: \$? = $ac_status" >&5
+  echo "$as_me:30360: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30274: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30363: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30277: \$? = $ac_status" >&5
+  echo "$as_me:30366: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -30291,9 +30380,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for iconv library" 1>&6
 
-echo "${as_me:-configure}:30294: testing find linkage for iconv library ..." 1>&5
+echo "${as_me:-configure}:30383: testing find linkage for iconv library ..." 1>&5
 
-echo "${as_me:-configure}:30296: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:30385: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -30406,11 +30495,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}:30409: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:30498: 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 30413 "configure"
+#line 30502 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -30429,21 +30518,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30432: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30521: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30435: \$? = $ac_status" >&5
+  echo "$as_me:30524: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30438: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30527: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30441: \$? = $ac_status" >&5
+  echo "$as_me:30530: \$? = $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}:30446: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:30535: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
 
             cf_cv_find_linkage_iconv=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -30461,7 +30550,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_iconv" = maybe ; then
 
-echo "${as_me:-configure}:30464: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:30553: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -30558,13 +30647,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}:30561: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:30650: 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 30567 "configure"
+#line 30656 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -30583,21 +30672,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30586: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30675: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30589: \$? = $ac_status" >&5
+  echo "$as_me:30678: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30592: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30681: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30595: \$? = $ac_status" >&5
+  echo "$as_me:30684: \$? = $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}:30600: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:30689: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
 
                 cf_cv_find_linkage_iconv=yes
                 cf_cv_library_file_iconv="-liconv"
@@ -30637,7 +30726,7 @@ am_cv_func_iconv="no, consider installing GNU libiconv"
 fi
 
 fi
-echo "$as_me:30640: result: $am_cv_func_iconv" >&5
+echo "$as_me:30729: result: $am_cv_func_iconv" >&5
 echo "${ECHO_T}$am_cv_func_iconv" >&6
 
   if test "$am_cv_func_iconv" = yes; then
@@ -30646,14 +30735,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_ICONV 1
 EOF
 
-    echo "$as_me:30649: checking if the declaration of iconv() needs const." >&5
+    echo "$as_me:30738: 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 30656 "configure"
+#line 30745 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -30678,16 +30767,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30681: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30770: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30684: \$? = $ac_status" >&5
+  echo "$as_me:30773: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30687: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30776: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30690: \$? = $ac_status" >&5
+  echo "$as_me:30779: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_proto_iconv_const=no
 else
@@ -30697,7 +30786,7 @@ am_cv_proto_iconv_const=yes
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:30700: result: $am_cv_proto_iconv_const" >&5
+echo "$as_me:30789: 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
@@ -30739,7 +30828,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 30742 "configure"
+#line 30831 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -30751,16 +30840,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30754: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30843: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30757: \$? = $ac_status" >&5
+  echo "$as_me:30846: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30760: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30849: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30763: \$? = $ac_status" >&5
+  echo "$as_me:30852: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -30777,7 +30866,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}:30780: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:30869: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -30814,7 +30903,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}:30817: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:30906: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -30838,7 +30927,7 @@ curses|slang|ncurses*)
 esac
 
 if test "$use_dft_colors" != no ; then
-echo "$as_me:30841: checking if you want to use default-colors" >&5
+echo "$as_me:30930: 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.
@@ -30855,7 +30944,7 @@ else
   use_dft_colors=no
 
 fi;
-echo "$as_me:30858: result: $use_dft_colors" >&5
+echo "$as_me:30947: result: $use_dft_colors" >&5
 echo "${ECHO_T}$use_dft_colors" >&6
 test $use_dft_colors = "yes" && cat >>confdefs.h <<\EOF
 #define USE_DEFAULT_COLORS 1
@@ -30863,7 +30952,7 @@ EOF
 
 fi
 
-echo "$as_me:30866: checking if experimental keyboard-layout logic should be used" >&5
+echo "$as_me:30955: 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.
@@ -30880,13 +30969,13 @@ else
   use_kbd_layout=no
 
 fi;
-echo "$as_me:30883: result: $use_kbd_layout" >&5
+echo "$as_me:30972: 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:30889: checking if experimental nested-table logic should be used" >&5
+echo "$as_me:30978: 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.
@@ -30903,13 +30992,13 @@ else
   use_nested_tables=no
 
 fi;
-echo "$as_me:30906: result: $use_nested_tables" >&5
+echo "$as_me:30995: 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:30912: checking if alternative line-edit bindings should be used" >&5
+echo "$as_me:31001: 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.
@@ -30926,13 +31015,13 @@ else
   use_alt_bindings=yes
 
 fi;
-echo "$as_me:30929: result: $use_alt_bindings" >&5
+echo "$as_me:31018: result: $use_alt_bindings" >&5
 echo "${ECHO_T}$use_alt_bindings" >&6
 test $use_alt_bindings != no && cat >>confdefs.h <<\EOF
-#define EXP_ALT_BINDINGS 1
+#define USE_ALT_BINDINGS 1
 EOF
 
-echo "$as_me:30935: checking if ascii case-conversion should be used" >&5
+echo "$as_me:31024: 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.
@@ -30949,13 +31038,13 @@ else
   use_ascii_ctypes=yes
 
 fi;
-echo "$as_me:30952: result: $use_ascii_ctypes" >&5
+echo "$as_me:31041: 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:30958: checking if you want to use extended HTML DTD logic" >&5
+echo "$as_me:31047: 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.
@@ -30972,13 +31061,13 @@ else
   use_ext_htmldtd=yes
 
 fi;
-echo "$as_me:30975: result: $use_ext_htmldtd" >&5
+echo "$as_me:31064: 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:30981: checking if file-upload logic should be used" >&5
+echo "$as_me:31070: 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.
@@ -30995,13 +31084,13 @@ else
   use_file_upload=yes
 
 fi;
-echo "$as_me:30998: result: $use_file_upload" >&5
+echo "$as_me:31087: 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:31004: checking if IDNA support should be used" >&5
+echo "$as_me:31093: 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.
@@ -31018,7 +31107,7 @@ else
   use_idna=yes
 
 fi;
-echo "$as_me:31021: result: $use_idna" >&5
+echo "$as_me:31110: result: $use_idna" >&5
 echo "${ECHO_T}$use_idna" >&6
 
 if test "$use_idna" = yes ; then
@@ -31057,7 +31146,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 31060 "configure"
+#line 31149 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -31069,16 +31158,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31072: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31161: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31075: \$? = $ac_status" >&5
+  echo "$as_me:31164: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31078: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31167: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31081: \$? = $ac_status" >&5
+  echo "$as_me:31170: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -31095,7 +31184,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}:31098: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:31187: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -31136,7 +31225,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 31139 "configure"
+#line 31228 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -31148,16 +31237,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31151: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31240: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31154: \$? = $ac_status" >&5
+  echo "$as_me:31243: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31157: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31246: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31160: \$? = $ac_status" >&5
+  echo "$as_me:31249: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -31174,7 +31263,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}:31177: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:31266: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -31190,7 +31279,7 @@ echo "${as_me:-configure}:31177: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:31193: error: cannot find  under $use_idna" >&5
+{ { echo "$as_me:31282: error: cannot find  under $use_idna" >&5
 echo "$as_me: error: cannot find  under $use_idna" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -31215,7 +31304,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}:31218: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:31307: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -31244,7 +31333,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}:31247: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:31336: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -31253,7 +31342,7 @@ echo "${as_me:-configure}:31247: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:31256: error: cannot find  under $use_idna" >&5
+{ { echo "$as_me:31345: error: cannot find  under $use_idna" >&5
 echo "$as_me: error: cannot find  under $use_idna" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -31267,12 +31356,12 @@ done
 cf_cv_header_path_idn=
 cf_cv_library_path_idn=
 
-echo "${as_me:-configure}:31270: testing Starting FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:31359: testing Starting FIND_LINKAGE(idn,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 31275 "configure"
+#line 31364 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -31290,16 +31379,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31293: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31382: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31296: \$? = $ac_status" >&5
+  echo "$as_me:31385: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31299: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31388: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31302: \$? = $ac_status" >&5
+  echo "$as_me:31391: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_idn=yes
@@ -31313,7 +31402,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lidn $LIBICONV $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 31316 "configure"
+#line 31405 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -31331,16 +31420,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31334: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31423: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31337: \$? = $ac_status" >&5
+  echo "$as_me:31426: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31340: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31429: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31343: \$? = $ac_status" >&5
+  echo "$as_me:31432: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_idn=yes
@@ -31357,9 +31446,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for idn library" 1>&6
 
-echo "${as_me:-configure}:31360: testing find linkage for idn library ..." 1>&5
+echo "${as_me:-configure}:31449: testing find linkage for idn library ..." 1>&5
 
-echo "${as_me:-configure}:31362: testing Searching for headers in FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:31451: testing Searching for headers in FIND_LINKAGE(idn,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -31472,11 +31561,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}:31475: testing ... testing $cf_cv_header_path_idn ..." 1>&5
+echo "${as_me:-configure}:31564: 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 31479 "configure"
+#line 31568 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -31494,21 +31583,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31497: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31586: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31500: \$? = $ac_status" >&5
+  echo "$as_me:31589: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31503: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31592: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31506: \$? = $ac_status" >&5
+  echo "$as_me:31595: \$? = $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}:31511: testing ... found idn headers in $cf_cv_header_path_idn ..." 1>&5
+echo "${as_me:-configure}:31600: testing ... found idn headers in $cf_cv_header_path_idn ..." 1>&5
 
             cf_cv_find_linkage_idn=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -31526,7 +31615,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_idn" = maybe ; then
 
-echo "${as_me:-configure}:31529: testing Searching for idn library in FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:31618: testing Searching for idn library in FIND_LINKAGE(idn,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -31623,13 +31712,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}:31626: testing ... testing $cf_cv_library_path_idn ..." 1>&5
+echo "${as_me:-configure}:31715: 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 31632 "configure"
+#line 31721 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -31647,21 +31736,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31650: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31739: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31653: \$? = $ac_status" >&5
+  echo "$as_me:31742: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31656: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31745: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31659: \$? = $ac_status" >&5
+  echo "$as_me:31748: \$? = $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}:31664: testing ... found idn library in $cf_cv_library_path_idn ..." 1>&5
+echo "${as_me:-configure}:31753: testing ... found idn library in $cf_cv_library_path_idn ..." 1>&5
 
                 cf_cv_find_linkage_idn=yes
                 cf_cv_library_file_idn="-lidn"
@@ -31720,7 +31809,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 31723 "configure"
+#line 31812 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -31732,16 +31821,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31735: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31824: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31738: \$? = $ac_status" >&5
+  echo "$as_me:31827: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31741: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31830: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31744: \$? = $ac_status" >&5
+  echo "$as_me:31833: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -31758,7 +31847,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}:31761: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:31850: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -31792,7 +31881,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}:31795: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:31884: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -31803,7 +31892,7 @@ fi
 	LIBS="-lidn $LIBS"
 
 else
-{ echo "$as_me:31806: WARNING: Cannot find idn library" >&5
+{ echo "$as_me:31895: WARNING: Cannot find idn library" >&5
 echo "$as_me: WARNING: Cannot find idn library" >&2;}
 fi
 
@@ -31816,7 +31905,7 @@ fi
 
 fi
 
-echo "$as_me:31819: checking if element-justification logic should be used" >&5
+echo "$as_me:31908: 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.
@@ -31833,13 +31922,13 @@ else
   use_justify_elts=yes
 
 fi;
-echo "$as_me:31836: result: $use_justify_elts" >&5
+echo "$as_me:31925: 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:31842: checking if partial-display should be used" >&5
+echo "$as_me:31931: 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.
@@ -31856,13 +31945,13 @@ else
   use_partial_display=yes
 
 fi;
-echo "$as_me:31859: result: $use_partial_display" >&5
+echo "$as_me:31948: 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:31865: checking if persistent-cookie logic should be used" >&5
+echo "$as_me:31954: 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.
@@ -31879,13 +31968,13 @@ else
   use_filed_cookies=yes
 
 fi;
-echo "$as_me:31882: result: $use_filed_cookies" >&5
+echo "$as_me:31971: 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:31888: checking if html source should be colorized" >&5
+echo "$as_me:31977: 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.
@@ -31902,13 +31991,13 @@ else
   use_prettysrc=yes
 
 fi;
-echo "$as_me:31905: result: $use_prettysrc" >&5
+echo "$as_me:31994: 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:31911: checking if progress-bar code should be used" >&5
+echo "$as_me:32000: 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.
@@ -31925,13 +32014,13 @@ else
   use_progressbar=yes
 
 fi;
-echo "$as_me:31928: result: $use_progressbar" >&5
+echo "$as_me:32017: 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:31934: checking if read-progress message should show ETA" >&5
+echo "$as_me:32023: 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.
@@ -31948,13 +32037,13 @@ else
   use_read_eta=yes
 
 fi;
-echo "$as_me:31951: result: $use_read_eta" >&5
+echo "$as_me:32040: 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:31957: checking if source caching should be used" >&5
+echo "$as_me:32046: 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.
@@ -31971,13 +32060,13 @@ else
   use_source_cache=yes
 
 fi;
-echo "$as_me:31974: result: $use_source_cache" >&5
+echo "$as_me:32063: 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:31980: checking if scrollbar code should be used" >&5
+echo "$as_me:32069: 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.
@@ -31994,10 +32083,10 @@ else
   use_scrollbar=yes
 
 fi;
-echo "$as_me:31997: result: $use_scrollbar" >&5
+echo "$as_me:32086: result: $use_scrollbar" >&5
 echo "${ECHO_T}$use_scrollbar" >&6
 
-echo "$as_me:32000: checking if charset-selection logic should be used" >&5
+echo "$as_me:32089: 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.
@@ -32014,13 +32103,13 @@ else
   use_charset_choice=no
 
 fi;
-echo "$as_me:32017: result: $use_charset_choice" >&5
+echo "$as_me:32106: 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:32023: checking if you want to use external commands" >&5
+echo "$as_me:32112: 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.
@@ -32037,7 +32126,7 @@ else
   use_externs=no
 
 fi;
-echo "$as_me:32040: result: $use_externs" >&5
+echo "$as_me:32129: result: $use_externs" >&5
 echo "${ECHO_T}$use_externs" >&6
 if test $use_externs != "no" ; then
 	cat >>confdefs.h <<\EOF
@@ -32047,7 +32136,7 @@ EOF
 	EXTRA_OBJS="$EXTRA_OBJS LYExtern\$o"
 fi
 
-echo "$as_me:32050: checking if you want to use setfont support" >&5
+echo "$as_me:32139: 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.
@@ -32064,7 +32153,7 @@ else
   use_setfont=no
 
 fi;
-echo "$as_me:32067: result: $use_setfont" >&5
+echo "$as_me:32156: result: $use_setfont" >&5
 echo "${ECHO_T}$use_setfont" >&6
 if test $use_setfont = yes ; then
 	case $host_os in
@@ -32075,7 +32164,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:32078: checking for $ac_word" >&5
+echo "$as_me:32167: 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
@@ -32092,7 +32181,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:32095: found $ac_dir/$ac_word" >&5
+   echo "$as_me:32184: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -32103,10 +32192,10 @@ fi
 SETFONT=$ac_cv_path_SETFONT
 
 if test -n "$SETFONT"; then
-  echo "$as_me:32106: result: $SETFONT" >&5
+  echo "$as_me:32195: result: $SETFONT" >&5
 echo "${ECHO_T}$SETFONT" >&6
 else
-  echo "$as_me:32109: result: no" >&5
+  echo "$as_me:32198: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -32165,7 +32254,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:32168: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:32257: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define SETFONT_PATH "$cf_path_prog"
@@ -32182,19 +32271,19 @@ fi
 		SETFONT=built-in
 		test -n "$verbose" && echo "	Assume $host_os has font-switching" 1>&6
 
-echo "${as_me:-configure}:32185: testing Assume $host_os has font-switching ..." 1>&5
+echo "${as_me:-configure}:32274: 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}:32192: testing Assume $host_os has no font-switching ..." 1>&5
+echo "${as_me:-configure}:32281: testing Assume $host_os has no font-switching ..." 1>&5
 
 		;;
 	esac
 	if test -z "$SETFONT" ; then
-		{ echo "$as_me:32197: WARNING: Cannot find a font-setting program" >&5
+		{ echo "$as_me:32286: WARNING: Cannot find a font-setting program" >&5
 echo "$as_me: WARNING: Cannot find a font-setting program" >&2;}
 	elif test "$SETFONT" != unknown ; then
 		cat >>confdefs.h <<\EOF
@@ -32204,7 +32293,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:32207: checking if you want cgi-link support" >&5
+echo "$as_me:32296: 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.
@@ -32220,10 +32309,10 @@ EOF
 else
   enableval=no
 fi;
-echo "$as_me:32223: result: $enableval" >&5
+echo "$as_me:32312: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:32226: checking if you want change-exec support" >&5
+echo "$as_me:32315: 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.
@@ -32240,13 +32329,13 @@ else
   use_change_exec=no
 
 fi;
-echo "$as_me:32243: result: $use_change_exec" >&5
+echo "$as_me:32332: 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:32249: checking if you want exec-links support" >&5
+echo "$as_me:32338: 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.
@@ -32263,13 +32352,13 @@ else
   use_exec_links=$enableval
 
 fi;
-echo "$as_me:32266: result: $use_exec_links" >&5
+echo "$as_me:32355: 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:32272: checking if you want exec-scripts support" >&5
+echo "$as_me:32361: 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.
@@ -32286,13 +32375,13 @@ else
   use_exec_scripts=$enableval
 
 fi;
-echo "$as_me:32289: result: $use_exec_scripts" >&5
+echo "$as_me:32378: 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:32295: checking if you want internal-links feature" >&5
+echo "$as_me:32384: 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.
@@ -32309,13 +32398,13 @@ else
   use_internal_links=no
 
 fi;
-echo "$as_me:32312: result: $use_internal_links" >&5
+echo "$as_me:32401: result: $use_internal_links" >&5
 echo "${ECHO_T}$use_internal_links" >&6
 test $use_internal_links = no && cat >>confdefs.h <<\EOF
 #define DONT_TRACK_INTERNAL_LINKS 1
 EOF
 
-echo "$as_me:32318: checking if you want to fork NSL requests" >&5
+echo "$as_me:32407: 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.
@@ -32332,7 +32421,7 @@ else
   use_nsl_fork=no
 
 fi;
-echo "$as_me:32335: result: $use_nsl_fork" >&5
+echo "$as_me:32424: result: $use_nsl_fork" >&5
 echo "${ECHO_T}$use_nsl_fork" >&6
 if test $use_nsl_fork = yes ; then
 	case $host_os in
@@ -32351,7 +32440,7 @@ EOF
 	esac
 fi
 
-echo "$as_me:32354: checking if you want to log URL requests via syslog" >&5
+echo "$as_me:32443: 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.
@@ -32368,13 +32457,13 @@ else
   use_syslog=no
 
 fi;
-echo "$as_me:32371: result: $use_syslog" >&5
+echo "$as_me:32460: 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:32377: checking if you want to underline links" >&5
+echo "$as_me:32466: 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.
@@ -32391,7 +32480,7 @@ else
   use_underline=no
 
 fi;
-echo "$as_me:32394: result: $use_underline" >&5
+echo "$as_me:32483: result: $use_underline" >&5
 echo "${ECHO_T}$use_underline" >&6
 test $use_underline = yes && cat >>confdefs.h <<\EOF
 #define UNDERLINE_LINKS 1
@@ -32401,7 +32490,7 @@ test $use_underline = no  && cat >>confdefs.h <<\EOF
 #define UNDERLINE_LINKS 0
 EOF
 
-echo "$as_me:32404: checking if help files should be gzip'ed" >&5
+echo "$as_me:32493: 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.
@@ -32418,10 +32507,10 @@ else
   use_gzip_help=no
 
 fi;
-echo "$as_me:32421: result: $use_gzip_help" >&5
+echo "$as_me:32510: result: $use_gzip_help" >&5
 echo "${ECHO_T}$use_gzip_help" >&6
 
-echo "$as_me:32424: checking if you want to use libbz2 for decompression of some bzip2 files" >&5
+echo "$as_me:32513: 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.
@@ -32431,7 +32520,7 @@ if test "${with_bzlib+set}" = set; then
 else
   use_bzlib=no
 fi;
-echo "$as_me:32434: result: $use_bzlib" >&5
+echo "$as_me:32523: result: $use_bzlib" >&5
 echo "${ECHO_T}$use_bzlib" >&6
 
 if test ".$use_bzlib" != ".no" ; then
@@ -32470,7 +32559,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 32473 "configure"
+#line 32562 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -32482,16 +32571,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32485: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32574: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32488: \$? = $ac_status" >&5
+  echo "$as_me:32577: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32491: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32580: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32494: \$? = $ac_status" >&5
+  echo "$as_me:32583: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -32508,7 +32597,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}:32511: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:32600: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -32549,7 +32638,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 32552 "configure"
+#line 32641 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -32561,16 +32650,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32564: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32653: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32567: \$? = $ac_status" >&5
+  echo "$as_me:32656: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32570: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32659: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32573: \$? = $ac_status" >&5
+  echo "$as_me:32662: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -32587,7 +32676,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}:32590: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:32679: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -32603,7 +32692,7 @@ echo "${as_me:-configure}:32590: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:32606: error: cannot find  under $use_bzlib" >&5
+{ { echo "$as_me:32695: error: cannot find  under $use_bzlib" >&5
 echo "$as_me: error: cannot find  under $use_bzlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -32628,7 +32717,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}:32631: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:32720: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -32657,7 +32746,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}:32660: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:32749: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -32666,7 +32755,7 @@ echo "${as_me:-configure}:32660: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:32669: error: cannot find  under $use_bzlib" >&5
+{ { echo "$as_me:32758: error: cannot find  under $use_bzlib" >&5
 echo "$as_me: error: cannot find  under $use_bzlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -32680,12 +32769,12 @@ done
 cf_cv_header_path_bz2=
 cf_cv_library_path_bz2=
 
-echo "${as_me:-configure}:32683: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:32772: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 32688 "configure"
+#line 32777 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -32702,16 +32791,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32705: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32794: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32708: \$? = $ac_status" >&5
+  echo "$as_me:32797: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32711: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32800: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32714: \$? = $ac_status" >&5
+  echo "$as_me:32803: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_bz2=yes
@@ -32725,7 +32814,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lbz2  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 32728 "configure"
+#line 32817 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -32742,16 +32831,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32745: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32834: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32748: \$? = $ac_status" >&5
+  echo "$as_me:32837: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32751: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32840: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32754: \$? = $ac_status" >&5
+  echo "$as_me:32843: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_bz2=yes
@@ -32768,9 +32857,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for bz2 library" 1>&6
 
-echo "${as_me:-configure}:32771: testing find linkage for bz2 library ..." 1>&5
+echo "${as_me:-configure}:32860: testing find linkage for bz2 library ..." 1>&5
 
-echo "${as_me:-configure}:32773: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:32862: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -32883,11 +32972,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}:32886: testing ... testing $cf_cv_header_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:32975: 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 32890 "configure"
+#line 32979 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -32904,21 +32993,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32907: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32996: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32910: \$? = $ac_status" >&5
+  echo "$as_me:32999: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32913: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33002: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32916: \$? = $ac_status" >&5
+  echo "$as_me:33005: \$? = $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}:32921: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:33010: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5
 
             cf_cv_find_linkage_bz2=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -32936,7 +33025,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_bz2" = maybe ; then
 
-echo "${as_me:-configure}:32939: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:33028: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -32944,7 +33033,7 @@ echo "${as_me:-configure}:32939: testing Searching for bz2 library in FIND_LINKA
         CPPFLAGS="$cf_test_CPPFLAGS"
         LIBS="-lbz2  $cf_save_LIBS"
         cat >conftest.$ac_ext <<_ACEOF
-#line 32947 "configure"
+#line 33036 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -32961,21 +33050,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32964: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33053: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32967: \$? = $ac_status" >&5
+  echo "$as_me:33056: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32970: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33059: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32973: \$? = $ac_status" >&5
+  echo "$as_me:33062: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found bz2 library in system" 1>&6
 
-echo "${as_me:-configure}:32978: testing ... found bz2 library in system ..." 1>&5
+echo "${as_me:-configure}:33067: testing ... found bz2 library in system ..." 1>&5
 
             cf_cv_find_linkage_bz2=yes
 else
@@ -33078,13 +33167,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}:33081: testing ... testing $cf_cv_library_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:33170: 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 33087 "configure"
+#line 33176 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -33101,21 +33190,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33104: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33193: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33107: \$? = $ac_status" >&5
+  echo "$as_me:33196: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33110: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33199: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33113: \$? = $ac_status" >&5
+  echo "$as_me:33202: \$? = $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}:33118: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:33207: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5
 
                 cf_cv_find_linkage_bz2=yes
                 cf_cv_library_file_bz2="-lbz2"
@@ -33174,7 +33263,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 33177 "configure"
+#line 33266 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -33186,16 +33275,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33189: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33278: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33192: \$? = $ac_status" >&5
+  echo "$as_me:33281: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33195: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33284: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33198: \$? = $ac_status" >&5
+  echo "$as_me:33287: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -33212,7 +33301,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}:33215: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:33304: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -33246,7 +33335,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}:33249: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:33338: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -33257,7 +33346,7 @@ fi
 	LIBS="-lbz2 $LIBS"
 
 else
-{ echo "$as_me:33260: WARNING: Cannot find bz2 library" >&5
+{ echo "$as_me:33349: WARNING: Cannot find bz2 library" >&5
 echo "$as_me: WARNING: Cannot find bz2 library" >&2;}
 fi
 
@@ -33267,7 +33356,7 @@ EOF
 
 fi
 
-echo "$as_me:33270: checking if you want to use zlib for decompression of some gzip files" >&5
+echo "$as_me:33359: 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.
@@ -33277,7 +33366,7 @@ if test "${with_zlib+set}" = set; then
 else
   use_zlib=no
 fi;
-echo "$as_me:33280: result: $use_zlib" >&5
+echo "$as_me:33369: result: $use_zlib" >&5
 echo "${ECHO_T}$use_zlib" >&6
 
 if test ".$use_zlib" != ".no" ; then
@@ -33316,7 +33405,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 33319 "configure"
+#line 33408 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -33328,16 +33417,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33331: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33420: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33334: \$? = $ac_status" >&5
+  echo "$as_me:33423: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33337: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33426: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33340: \$? = $ac_status" >&5
+  echo "$as_me:33429: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -33354,7 +33443,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}:33357: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:33446: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -33395,7 +33484,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 33398 "configure"
+#line 33487 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -33407,16 +33496,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33410: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33499: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33413: \$? = $ac_status" >&5
+  echo "$as_me:33502: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33416: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33505: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33419: \$? = $ac_status" >&5
+  echo "$as_me:33508: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -33433,7 +33522,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}:33436: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:33525: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -33449,7 +33538,7 @@ echo "${as_me:-configure}:33436: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:33452: error: cannot find  under $use_zlib" >&5
+{ { echo "$as_me:33541: error: cannot find  under $use_zlib" >&5
 echo "$as_me: error: cannot find  under $use_zlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -33474,7 +33563,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}:33477: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:33566: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -33503,7 +33592,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}:33506: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:33595: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -33512,7 +33601,7 @@ echo "${as_me:-configure}:33506: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:33515: error: cannot find  under $use_zlib" >&5
+{ { echo "$as_me:33604: error: cannot find  under $use_zlib" >&5
 echo "$as_me: error: cannot find  under $use_zlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -33526,12 +33615,12 @@ done
 cf_cv_header_path_z=
 cf_cv_library_path_z=
 
-echo "${as_me:-configure}:33529: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:33618: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 33534 "configure"
+#line 33623 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -33547,16 +33636,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33550: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33639: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33553: \$? = $ac_status" >&5
+  echo "$as_me:33642: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33556: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33645: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33559: \$? = $ac_status" >&5
+  echo "$as_me:33648: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_z=yes
@@ -33570,7 +33659,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lz  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 33573 "configure"
+#line 33662 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -33586,16 +33675,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33589: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33678: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33592: \$? = $ac_status" >&5
+  echo "$as_me:33681: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33595: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33684: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33598: \$? = $ac_status" >&5
+  echo "$as_me:33687: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_z=yes
@@ -33612,9 +33701,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for z library" 1>&6
 
-echo "${as_me:-configure}:33615: testing find linkage for z library ..." 1>&5
+echo "${as_me:-configure}:33704: testing find linkage for z library ..." 1>&5
 
-echo "${as_me:-configure}:33617: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:33706: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -33727,11 +33816,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}:33730: testing ... testing $cf_cv_header_path_z ..." 1>&5
+echo "${as_me:-configure}:33819: 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 33734 "configure"
+#line 33823 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -33747,21 +33836,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33750: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33839: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33753: \$? = $ac_status" >&5
+  echo "$as_me:33842: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33756: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33845: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33759: \$? = $ac_status" >&5
+  echo "$as_me:33848: \$? = $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}:33764: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5
+echo "${as_me:-configure}:33853: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5
 
             cf_cv_find_linkage_z=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -33779,7 +33868,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_z" = maybe ; then
 
-echo "${as_me:-configure}:33782: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:33871: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -33787,7 +33876,7 @@ echo "${as_me:-configure}:33782: testing Searching for z library in FIND_LINKAGE
         CPPFLAGS="$cf_test_CPPFLAGS"
         LIBS="-lz  $cf_save_LIBS"
         cat >conftest.$ac_ext <<_ACEOF
-#line 33790 "configure"
+#line 33879 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -33803,21 +33892,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33806: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33895: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33809: \$? = $ac_status" >&5
+  echo "$as_me:33898: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33812: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33901: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33815: \$? = $ac_status" >&5
+  echo "$as_me:33904: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found z library in system" 1>&6
 
-echo "${as_me:-configure}:33820: testing ... found z library in system ..." 1>&5
+echo "${as_me:-configure}:33909: testing ... found z library in system ..." 1>&5
 
             cf_cv_find_linkage_z=yes
 else
@@ -33920,13 +34009,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}:33923: testing ... testing $cf_cv_library_path_z ..." 1>&5
+echo "${as_me:-configure}:34012: 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 33929 "configure"
+#line 34018 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -33942,21 +34031,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33945: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34034: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33948: \$? = $ac_status" >&5
+  echo "$as_me:34037: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33951: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34040: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33954: \$? = $ac_status" >&5
+  echo "$as_me:34043: \$? = $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}:33959: testing ... found z library in $cf_cv_library_path_z ..." 1>&5
+echo "${as_me:-configure}:34048: testing ... found z library in $cf_cv_library_path_z ..." 1>&5
 
                 cf_cv_find_linkage_z=yes
                 cf_cv_library_file_z="-lz"
@@ -34015,7 +34104,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 34018 "configure"
+#line 34107 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -34027,16 +34116,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34030: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34119: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34033: \$? = $ac_status" >&5
+  echo "$as_me:34122: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:34036: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34125: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34039: \$? = $ac_status" >&5
+  echo "$as_me:34128: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -34053,7 +34142,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}:34056: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:34145: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -34087,7 +34176,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}:34090: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:34179: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -34098,17 +34187,88 @@ fi
 	LIBS="-lz $LIBS"
 
 else
-{ echo "$as_me:34101: WARNING: Cannot find z library" >&5
+{ echo "$as_me:34190: WARNING: Cannot find z library" >&5
 echo "$as_me: WARNING: Cannot find z library" >&2;}
 fi
 
+for ac_func in \
+	zError \
+
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:34199: 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 34205 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func (); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char $ac_func ();
+char (*f) ();
+
+int
+main ()
+{
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+f = $ac_func;
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:34236: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:34239: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:34242: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:34245: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  eval "$as_ac_var=yes"
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:34255: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+  cat >>confdefs.h <<EOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+EOF
+
+fi
+done
+
 	test "x$cf_cv_find_linkage_z" = "xyes" && cat >>confdefs.h <<\EOF
 #define USE_ZLIB 1
 EOF
 
 fi
 
-echo "$as_me:34111: checking if you want to exclude FINGER code" >&5
+echo "$as_me:34271: 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.
@@ -34125,13 +34285,13 @@ else
   use_finger=no
 
 fi;
-echo "$as_me:34128: result: $use_finger" >&5
+echo "$as_me:34288: 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:34134: checking if you want to exclude GOPHER code" >&5
+echo "$as_me:34294: 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.
@@ -34148,13 +34308,13 @@ else
   use_gopher=no
 
 fi;
-echo "$as_me:34151: result: $use_gopher" >&5
+echo "$as_me:34311: 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:34157: checking if you want to exclude NEWS code" >&5
+echo "$as_me:34317: 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.
@@ -34171,13 +34331,13 @@ else
   use_news=no
 
 fi;
-echo "$as_me:34174: result: $use_news" >&5
+echo "$as_me:34334: 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:34180: checking if you want to exclude FTP code" >&5
+echo "$as_me:34340: 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.
@@ -34194,13 +34354,13 @@ else
   use_ftp=no
 
 fi;
-echo "$as_me:34197: result: $use_ftp" >&5
+echo "$as_me:34357: 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:34203: checking if you want to include WAIS code" >&5
+echo "$as_me:34363: 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.
@@ -34217,13 +34377,13 @@ else
   use_wais=no
 
 fi;
-echo "$as_me:34220: result: $use_wais" >&5
+echo "$as_me:34380: result: $use_wais" >&5
 echo "${ECHO_T}$use_wais" >&6
 
 MAKE_WAIS="#"
 if test $use_wais != "no"
 then
-	echo "$as_me:34226: checking for fs_free in -lwais" >&5
+	echo "$as_me:34386: 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
@@ -34231,7 +34391,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lwais  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 34234 "configure"
+#line 34394 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -34250,16 +34410,16 @@ fs_free ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34253: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34413: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34256: \$? = $ac_status" >&5
+  echo "$as_me:34416: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:34259: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34419: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34262: \$? = $ac_status" >&5
+  echo "$as_me:34422: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_wais_fs_free=yes
 else
@@ -34270,18 +34430,18 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:34273: result: $ac_cv_lib_wais_fs_free" >&5
+echo "$as_me:34433: 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:34277: checking if -lm needed for math functions" >&5
+echo "$as_me:34437: 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 34284 "configure"
+#line 34444 "configure"
 #include "confdefs.h"
 
 	#include <stdio.h>
@@ -34296,16 +34456,16 @@ double x = rand(); printf("result = %g\n", sin(x))
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34299: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34459: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34302: \$? = $ac_status" >&5
+  echo "$as_me:34462: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:34305: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34465: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34308: \$? = $ac_status" >&5
+  echo "$as_me:34468: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_libm=no
 else
@@ -34315,7 +34475,7 @@ cf_cv_need_libm=yes
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:34318: result: $cf_cv_need_libm" >&5
+echo "$as_me:34478: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
 if test "$cf_cv_need_libm" = yes
 then
@@ -34329,23 +34489,23 @@ fi
 for ac_header in wais.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:34332: checking for $ac_header" >&5
+echo "$as_me:34492: 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 34338 "configure"
+#line 34498 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:34342: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:34502: \"$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:34348: \$? = $ac_status" >&5
+  echo "$as_me:34508: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -34364,7 +34524,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:34367: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:34527: 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
@@ -34377,7 +34537,7 @@ done
 		MAKE_WAIS=
 
 else
-  { echo "$as_me:34380: WARNING: could not find WAIS library" >&5
+  { echo "$as_me:34540: WARNING: could not find WAIS library" >&5
 echo "$as_me: WARNING: could not find WAIS library" >&2;}
 fi
 
@@ -34385,7 +34545,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:34388: checking if directory-editor code should be used" >&5
+echo "$as_me:34548: 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.
@@ -34402,7 +34562,7 @@ else
   use_dired=yes
 
 fi;
-echo "$as_me:34405: result: $use_dired" >&5
+echo "$as_me:34565: result: $use_dired" >&5
 echo "${ECHO_T}$use_dired" >&6
 
 if test ".$use_dired" != ".no" ; then
@@ -34411,7 +34571,7 @@ if test ".$use_dired" != ".no" ; then
 #define DIRED_SUPPORT 1
 EOF
 
-	echo "$as_me:34414: checking if you wish to allow extracting from archives via DirEd" >&5
+	echo "$as_me:34574: 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.
@@ -34427,10 +34587,10 @@ EOF
 else
   enableval=yes
 fi;
-	echo "$as_me:34430: result: $enableval" >&5
+	echo "$as_me:34590: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:34433: checking if DirEd mode should override keys" >&5
+	echo "$as_me:34593: 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.
@@ -34452,10 +34612,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:34455: result: $enableval" >&5
+	echo "$as_me:34615: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:34458: checking if you wish to allow permissions commands via DirEd" >&5
+	echo "$as_me:34618: 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.
@@ -34477,10 +34637,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:34480: result: $enableval" >&5
+	echo "$as_me:34640: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:34483: checking if you wish to allow executable-permission commands via DirEd" >&5
+	echo "$as_me:34643: 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.
@@ -34496,10 +34656,10 @@ EOF
 else
   enableval=yes
 fi;
-	echo "$as_me:34499: result: $enableval" >&5
+	echo "$as_me:34659: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:34502: checking if you wish to allow \"tar\" commands from DirEd" >&5
+	echo "$as_me:34662: 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.
@@ -34521,10 +34681,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:34524: result: $enableval" >&5
+	echo "$as_me:34684: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:34527: checking if you wish to allow \"uudecode\" commands from DirEd" >&5
+	echo "$as_me:34687: 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.
@@ -34546,10 +34706,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:34549: result: $enableval" >&5
+	echo "$as_me:34709: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:34552: checking if you wish to allow \"zip\" and \"unzip\" commands from DirEd" >&5
+	echo "$as_me:34712: 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.
@@ -34571,10 +34731,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:34574: result: $enableval" >&5
+	echo "$as_me:34734: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:34577: checking if you wish to allow \"gzip\" and \"gunzip\" commands from DirEd" >&5
+	echo "$as_me:34737: 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.
@@ -34596,11 +34756,11 @@ else
 EOF
 
 fi;
-	echo "$as_me:34599: result: $enableval" >&5
+	echo "$as_me:34759: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 fi
 
-echo "$as_me:34603: checking if you want long-directory listings" >&5
+echo "$as_me:34763: 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.
@@ -34622,10 +34782,10 @@ else
 EOF
 
 fi;
-echo "$as_me:34625: result: $enableval" >&5
+echo "$as_me:34785: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:34628: checking if parent-directory references are permitted" >&5
+echo "$as_me:34788: 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.
@@ -34641,7 +34801,7 @@ EOF
 else
   enableval=yes
 fi;
-echo "$as_me:34644: result: $enableval" >&5
+echo "$as_me:34804: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 test -z "$TELNET" && TELNET=telnet
@@ -34649,7 +34809,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:34652: checking for $ac_word" >&5
+echo "$as_me:34812: 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
@@ -34666,7 +34826,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:34669: found $ac_dir/$ac_word" >&5
+   echo "$as_me:34829: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -34677,10 +34837,10 @@ fi
 TELNET=$ac_cv_path_TELNET
 
 if test -n "$TELNET"; then
-  echo "$as_me:34680: result: $TELNET" >&5
+  echo "$as_me:34840: result: $TELNET" >&5
 echo "${ECHO_T}$TELNET" >&6
 else
-  echo "$as_me:34683: result: no" >&5
+  echo "$as_me:34843: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -34739,7 +34899,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:34742: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:34902: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define TELNET_PATH "$cf_path_prog"
@@ -34756,7 +34916,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:34759: checking for $ac_word" >&5
+echo "$as_me:34919: 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
@@ -34773,7 +34933,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:34776: found $ac_dir/$ac_word" >&5
+   echo "$as_me:34936: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -34784,10 +34944,10 @@ fi
 TN3270=$ac_cv_path_TN3270
 
 if test -n "$TN3270"; then
-  echo "$as_me:34787: result: $TN3270" >&5
+  echo "$as_me:34947: result: $TN3270" >&5
 echo "${ECHO_T}$TN3270" >&6
 else
-  echo "$as_me:34790: result: no" >&5
+  echo "$as_me:34950: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -34846,7 +35006,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:34849: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:35009: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define TN3270_PATH "$cf_path_prog"
@@ -34863,7 +35023,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:34866: checking for $ac_word" >&5
+echo "$as_me:35026: 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
@@ -34880,7 +35040,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:34883: found $ac_dir/$ac_word" >&5
+   echo "$as_me:35043: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -34891,10 +35051,10 @@ fi
 RLOGIN=$ac_cv_path_RLOGIN
 
 if test -n "$RLOGIN"; then
-  echo "$as_me:34894: result: $RLOGIN" >&5
+  echo "$as_me:35054: result: $RLOGIN" >&5
 echo "${ECHO_T}$RLOGIN" >&6
 else
-  echo "$as_me:34897: result: no" >&5
+  echo "$as_me:35057: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -34953,7 +35113,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:34956: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:35116: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define RLOGIN_PATH "$cf_path_prog"
@@ -34970,7 +35130,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:34973: checking for $ac_word" >&5
+echo "$as_me:35133: 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
@@ -34987,7 +35147,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:34990: found $ac_dir/$ac_word" >&5
+   echo "$as_me:35150: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -34998,10 +35158,10 @@ fi
 MV=$ac_cv_path_MV
 
 if test -n "$MV"; then
-  echo "$as_me:35001: result: $MV" >&5
+  echo "$as_me:35161: result: $MV" >&5
 echo "${ECHO_T}$MV" >&6
 else
-  echo "$as_me:35004: result: no" >&5
+  echo "$as_me:35164: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -35060,7 +35220,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:35063: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:35223: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define MV_PATH "$cf_path_prog"
@@ -35077,7 +35237,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:35080: checking for $ac_word" >&5
+echo "$as_me:35240: 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
@@ -35094,7 +35254,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:35097: found $ac_dir/$ac_word" >&5
+   echo "$as_me:35257: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -35105,10 +35265,10 @@ fi
 GZIP=$ac_cv_path_GZIP
 
 if test -n "$GZIP"; then
-  echo "$as_me:35108: result: $GZIP" >&5
+  echo "$as_me:35268: result: $GZIP" >&5
 echo "${ECHO_T}$GZIP" >&6
 else
-  echo "$as_me:35111: result: no" >&5
+  echo "$as_me:35271: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -35167,7 +35327,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:35170: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:35330: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define GZIP_PATH "$cf_path_prog"
@@ -35184,7 +35344,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:35187: checking for $ac_word" >&5
+echo "$as_me:35347: 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
@@ -35201,7 +35361,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:35204: found $ac_dir/$ac_word" >&5
+   echo "$as_me:35364: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -35212,10 +35372,10 @@ fi
 UNCOMPRESS=$ac_cv_path_UNCOMPRESS
 
 if test -n "$UNCOMPRESS"; then
-  echo "$as_me:35215: result: $UNCOMPRESS" >&5
+  echo "$as_me:35375: result: $UNCOMPRESS" >&5
 echo "${ECHO_T}$UNCOMPRESS" >&6
 else
-  echo "$as_me:35218: result: no" >&5
+  echo "$as_me:35378: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -35274,7 +35434,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:35277: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:35437: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define UNCOMPRESS_PATH "$cf_path_prog"
@@ -35291,7 +35451,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:35294: checking for $ac_word" >&5
+echo "$as_me:35454: 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
@@ -35308,7 +35468,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:35311: found $ac_dir/$ac_word" >&5
+   echo "$as_me:35471: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -35319,10 +35479,10 @@ fi
 UNZIP=$ac_cv_path_UNZIP
 
 if test -n "$UNZIP"; then
-  echo "$as_me:35322: result: $UNZIP" >&5
+  echo "$as_me:35482: result: $UNZIP" >&5
 echo "${ECHO_T}$UNZIP" >&6
 else
-  echo "$as_me:35325: result: no" >&5
+  echo "$as_me:35485: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -35381,7 +35541,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:35384: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:35544: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define UNZIP_PATH "$cf_path_prog"
@@ -35398,7 +35558,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:35401: checking for $ac_word" >&5
+echo "$as_me:35561: 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
@@ -35415,7 +35575,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:35418: found $ac_dir/$ac_word" >&5
+   echo "$as_me:35578: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -35426,10 +35586,10 @@ fi
 BZIP2=$ac_cv_path_BZIP2
 
 if test -n "$BZIP2"; then
-  echo "$as_me:35429: result: $BZIP2" >&5
+  echo "$as_me:35589: result: $BZIP2" >&5
 echo "${ECHO_T}$BZIP2" >&6
 else
-  echo "$as_me:35432: result: no" >&5
+  echo "$as_me:35592: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -35488,7 +35648,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:35491: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:35651: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define BZIP2_PATH "$cf_path_prog"
@@ -35505,7 +35665,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:35508: checking for $ac_word" >&5
+echo "$as_me:35668: 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
@@ -35522,7 +35682,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:35525: found $ac_dir/$ac_word" >&5
+   echo "$as_me:35685: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -35533,10 +35693,10 @@ fi
 TAR=$ac_cv_path_TAR
 
 if test -n "$TAR"; then
-  echo "$as_me:35536: result: $TAR" >&5
+  echo "$as_me:35696: result: $TAR" >&5
 echo "${ECHO_T}$TAR" >&6
 else
-  echo "$as_me:35539: result: no" >&5
+  echo "$as_me:35699: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -35595,7 +35755,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:35598: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:35758: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define TAR_PATH "$cf_path_prog"
@@ -35652,7 +35812,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:35655: checking for $ac_word" >&5
+echo "$as_me:35815: 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
@@ -35669,7 +35829,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:35672: found $ac_dir/$ac_word" >&5
+   echo "$as_me:35832: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -35680,10 +35840,10 @@ fi
 COMPRESS=$ac_cv_path_COMPRESS
 
 if test -n "$COMPRESS"; then
-  echo "$as_me:35683: result: $COMPRESS" >&5
+  echo "$as_me:35843: result: $COMPRESS" >&5
 echo "${ECHO_T}$COMPRESS" >&6
 else
-  echo "$as_me:35686: result: no" >&5
+  echo "$as_me:35846: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -35742,7 +35902,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:35745: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:35905: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define COMPRESS_PATH "$cf_path_prog"
@@ -35759,7 +35919,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:35762: checking for $ac_word" >&5
+echo "$as_me:35922: 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
@@ -35776,7 +35936,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:35779: found $ac_dir/$ac_word" >&5
+   echo "$as_me:35939: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -35787,10 +35947,10 @@ fi
 RM=$ac_cv_path_RM
 
 if test -n "$RM"; then
-  echo "$as_me:35790: result: $RM" >&5
+  echo "$as_me:35950: result: $RM" >&5
 echo "${ECHO_T}$RM" >&6
 else
-  echo "$as_me:35793: result: no" >&5
+  echo "$as_me:35953: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -35849,7 +36009,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:35852: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:36012: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define RM_PATH "$cf_path_prog"
@@ -35866,7 +36026,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:35869: checking for $ac_word" >&5
+echo "$as_me:36029: 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
@@ -35883,7 +36043,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:35886: found $ac_dir/$ac_word" >&5
+   echo "$as_me:36046: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -35894,10 +36054,10 @@ fi
 UUDECODE=$ac_cv_path_UUDECODE
 
 if test -n "$UUDECODE"; then
-  echo "$as_me:35897: result: $UUDECODE" >&5
+  echo "$as_me:36057: result: $UUDECODE" >&5
 echo "${ECHO_T}$UUDECODE" >&6
 else
-  echo "$as_me:35900: result: no" >&5
+  echo "$as_me:36060: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -35956,7 +36116,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:35959: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:36119: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define UUDECODE_PATH "$cf_path_prog"
@@ -35973,7 +36133,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:35976: checking for $ac_word" >&5
+echo "$as_me:36136: 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
@@ -35990,7 +36150,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:35993: found $ac_dir/$ac_word" >&5
+   echo "$as_me:36153: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -36001,10 +36161,10 @@ fi
 ZCAT=$ac_cv_path_ZCAT
 
 if test -n "$ZCAT"; then
-  echo "$as_me:36004: result: $ZCAT" >&5
+  echo "$as_me:36164: result: $ZCAT" >&5
 echo "${ECHO_T}$ZCAT" >&6
 else
-  echo "$as_me:36007: result: no" >&5
+  echo "$as_me:36167: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -36063,7 +36223,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:36066: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:36226: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define ZCAT_PATH "$cf_path_prog"
@@ -36080,7 +36240,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:36083: checking for $ac_word" >&5
+echo "$as_me:36243: 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
@@ -36097,7 +36257,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:36100: found $ac_dir/$ac_word" >&5
+   echo "$as_me:36260: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -36108,10 +36268,10 @@ fi
 ZIP=$ac_cv_path_ZIP
 
 if test -n "$ZIP"; then
-  echo "$as_me:36111: result: $ZIP" >&5
+  echo "$as_me:36271: result: $ZIP" >&5
 echo "${ECHO_T}$ZIP" >&6
 else
-  echo "$as_me:36114: result: no" >&5
+  echo "$as_me:36274: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -36170,7 +36330,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:36173: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:36333: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define ZIP_PATH "$cf_path_prog"
@@ -36197,7 +36357,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:36200: checking for $ac_word" >&5
+echo "$as_me:36360: 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
@@ -36214,7 +36374,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:36217: found $ac_dir/$ac_word" >&5
+   echo "$as_me:36377: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -36225,10 +36385,10 @@ fi
 INSTALL=$ac_cv_path_INSTALL
 
 if test -n "$INSTALL"; then
-  echo "$as_me:36228: result: $INSTALL" >&5
+  echo "$as_me:36388: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 else
-  echo "$as_me:36231: result: no" >&5
+  echo "$as_me:36391: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -36287,7 +36447,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:36290: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:36450: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define INSTALL_PATH "$cf_path_prog"
@@ -36313,7 +36473,7 @@ fi
 
 if test $cf_cv_screen = pdcurses ; then
 
-	echo "$as_me:36316: checking for X" >&5
+	echo "$as_me:36476: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -36410,17 +36570,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 36413 "configure"
+#line 36573 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:36417: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:36577: \"$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:36423: \$? = $ac_status" >&5
+  echo "$as_me:36583: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -36453,7 +36613,7 @@ if test "$ac_x_libraries" = no; then
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >conftest.$ac_ext <<_ACEOF
-#line 36456 "configure"
+#line 36616 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -36465,16 +36625,16 @@ XtMalloc (0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36468: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36628: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36471: \$? = $ac_status" >&5
+  echo "$as_me:36631: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36474: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36634: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36477: \$? = $ac_status" >&5
+  echo "$as_me:36637: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -36512,7 +36672,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:36515: result: $have_x" >&5
+  echo "$as_me:36675: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -36522,7 +36682,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:36525: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:36685: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -36546,11 +36706,11 @@ else
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:36549: checking whether -R must be followed by a space" >&5
+      echo "$as_me:36709: 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 36553 "configure"
+#line 36713 "configure"
 #include "confdefs.h"
 
 int
@@ -36562,16 +36722,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36565: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36725: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36568: \$? = $ac_status" >&5
+  echo "$as_me:36728: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36571: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36731: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36574: \$? = $ac_status" >&5
+  echo "$as_me:36734: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_nospace=yes
 else
@@ -36581,13 +36741,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:36584: result: no" >&5
+	echo "$as_me:36744: 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 36590 "configure"
+#line 36750 "configure"
 #include "confdefs.h"
 
 int
@@ -36599,16 +36759,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36602: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36762: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36605: \$? = $ac_status" >&5
+  echo "$as_me:36765: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36608: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36768: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36611: \$? = $ac_status" >&5
+  echo "$as_me:36771: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_space=yes
 else
@@ -36618,11 +36778,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:36621: result: yes" >&5
+	  echo "$as_me:36781: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:36625: result: neither works" >&5
+	  echo "$as_me:36785: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -36642,7 +36802,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 36645 "configure"
+#line 36805 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -36661,22 +36821,22 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36664: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36824: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36667: \$? = $ac_status" >&5
+  echo "$as_me:36827: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36670: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36830: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36673: \$? = $ac_status" >&5
+  echo "$as_me:36833: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:36679: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:36839: 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
@@ -36684,7 +36844,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 36687 "configure"
+#line 36847 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -36703,16 +36863,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36706: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36866: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36709: \$? = $ac_status" >&5
+  echo "$as_me:36869: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36712: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36872: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36715: \$? = $ac_status" >&5
+  echo "$as_me:36875: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -36723,14 +36883,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:36726: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:36886: 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:36733: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:36893: 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
@@ -36738,7 +36898,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 36741 "configure"
+#line 36901 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -36757,16 +36917,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36760: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36920: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36763: \$? = $ac_status" >&5
+  echo "$as_me:36923: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36766: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36926: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36769: \$? = $ac_status" >&5
+  echo "$as_me:36929: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -36777,7 +36937,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:36780: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:36940: 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"
@@ -36796,13 +36956,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:36799: checking for gethostbyname" >&5
+    echo "$as_me:36959: 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 36805 "configure"
+#line 36965 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname (); below.  */
@@ -36833,16 +36993,16 @@ f = gethostbyname;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36836: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36996: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36839: \$? = $ac_status" >&5
+  echo "$as_me:36999: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36842: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37002: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36845: \$? = $ac_status" >&5
+  echo "$as_me:37005: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -36852,11 +37012,11 @@ ac_cv_func_gethostbyname=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:36855: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:37015: 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:36859: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:37019: 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
@@ -36864,7 +37024,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 36867 "configure"
+#line 37027 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -36883,16 +37043,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36886: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37046: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36889: \$? = $ac_status" >&5
+  echo "$as_me:37049: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36892: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37052: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36895: \$? = $ac_status" >&5
+  echo "$as_me:37055: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -36903,14 +37063,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:36906: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:37066: 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:36913: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:37073: 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
@@ -36918,7 +37078,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 36921 "configure"
+#line 37081 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -36937,16 +37097,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36940: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37100: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36943: \$? = $ac_status" >&5
+  echo "$as_me:37103: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36946: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37106: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36949: \$? = $ac_status" >&5
+  echo "$as_me:37109: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -36957,7 +37117,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:36960: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:37120: 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"
@@ -36973,13 +37133,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:36976: checking for connect" >&5
+    echo "$as_me:37136: 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 36982 "configure"
+#line 37142 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect (); below.  */
@@ -37010,16 +37170,16 @@ f = connect;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:37013: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37173: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37016: \$? = $ac_status" >&5
+  echo "$as_me:37176: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:37019: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37179: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37022: \$? = $ac_status" >&5
+  echo "$as_me:37182: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_connect=yes
 else
@@ -37029,11 +37189,11 @@ ac_cv_func_connect=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:37032: result: $ac_cv_func_connect" >&5
+echo "$as_me:37192: 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:37036: checking for connect in -lsocket" >&5
+      echo "$as_me:37196: 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
@@ -37041,7 +37201,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 37044 "configure"
+#line 37204 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -37060,16 +37220,16 @@ connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:37063: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37223: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37066: \$? = $ac_status" >&5
+  echo "$as_me:37226: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:37069: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37229: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37072: \$? = $ac_status" >&5
+  echo "$as_me:37232: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -37080,7 +37240,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:37083: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:37243: 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"
@@ -37089,13 +37249,13 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:37092: checking for remove" >&5
+    echo "$as_me:37252: 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 37098 "configure"
+#line 37258 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove (); below.  */
@@ -37126,16 +37286,16 @@ f = remove;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:37129: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37289: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37132: \$? = $ac_status" >&5
+  echo "$as_me:37292: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:37135: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37295: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37138: \$? = $ac_status" >&5
+  echo "$as_me:37298: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_remove=yes
 else
@@ -37145,11 +37305,11 @@ ac_cv_func_remove=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:37148: result: $ac_cv_func_remove" >&5
+echo "$as_me:37308: 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:37152: checking for remove in -lposix" >&5
+      echo "$as_me:37312: 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
@@ -37157,7 +37317,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 37160 "configure"
+#line 37320 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -37176,16 +37336,16 @@ remove ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:37179: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37339: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37182: \$? = $ac_status" >&5
+  echo "$as_me:37342: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:37185: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37345: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37188: \$? = $ac_status" >&5
+  echo "$as_me:37348: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -37196,7 +37356,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:37199: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:37359: 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"
@@ -37205,13 +37365,13 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:37208: checking for shmat" >&5
+    echo "$as_me:37368: 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 37214 "configure"
+#line 37374 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat (); below.  */
@@ -37242,16 +37402,16 @@ f = shmat;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:37245: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37405: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37248: \$? = $ac_status" >&5
+  echo "$as_me:37408: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:37251: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37411: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37254: \$? = $ac_status" >&5
+  echo "$as_me:37414: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -37261,11 +37421,11 @@ ac_cv_func_shmat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:37264: result: $ac_cv_func_shmat" >&5
+echo "$as_me:37424: 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:37268: checking for shmat in -lipc" >&5
+      echo "$as_me:37428: 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
@@ -37273,7 +37433,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 37276 "configure"
+#line 37436 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -37292,16 +37452,16 @@ shmat ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:37295: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37455: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37298: \$? = $ac_status" >&5
+  echo "$as_me:37458: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:37301: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37461: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37304: \$? = $ac_status" >&5
+  echo "$as_me:37464: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -37312,7 +37472,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:37315: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:37475: 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"
@@ -37330,7 +37490,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:37333: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:37493: 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
@@ -37338,7 +37498,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 37341 "configure"
+#line 37501 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -37357,16 +37517,16 @@ IceConnectionNumber ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:37360: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37520: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37363: \$? = $ac_status" >&5
+  echo "$as_me:37523: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:37366: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37526: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37369: \$? = $ac_status" >&5
+  echo "$as_me:37529: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -37377,7 +37537,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:37380: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:37540: 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"
@@ -37389,7 +37549,7 @@ fi
 
 cf_x_athena=${cf_x_athena:-Xaw}
 
-echo "$as_me:37392: checking if you want to link with Xaw 3d library" >&5
+echo "$as_me:37552: 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=
 
@@ -37400,14 +37560,14 @@ if test "${with_Xaw3d+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3d
-	echo "$as_me:37403: result: yes" >&5
+	echo "$as_me:37563: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:37406: result: no" >&5
+	echo "$as_me:37566: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:37410: checking if you want to link with neXT Athena library" >&5
+echo "$as_me:37570: 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=
 
@@ -37418,14 +37578,14 @@ if test "${with_neXtaw+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=neXtaw
-	echo "$as_me:37421: result: yes" >&5
+	echo "$as_me:37581: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:37424: result: no" >&5
+	echo "$as_me:37584: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:37428: checking if you want to link with Athena-Plus library" >&5
+echo "$as_me:37588: 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=
 
@@ -37436,10 +37596,10 @@ if test "${with_XawPlus+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=XawPlus
-	echo "$as_me:37439: result: yes" >&5
+	echo "$as_me:37599: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:37442: result: no" >&5
+	echo "$as_me:37602: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37459,17 +37619,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}:37462: testing found package $cf_athena_pkg ..." 1>&5
+echo "${as_me:-configure}:37622: 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}:37468: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:37628: 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}:37472: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:37632: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -37559,14 +37719,14 @@ cf_x_athena_LIBS=`echo "HAVE_LIB_$cf_x_athena" | sed y%abcdefghijklmnopqrstuvwxy
 #define $cf_x_athena_LIBS 1
 EOF
 
-echo "$as_me:37562: checking for usable $cf_x_athena/Xmu package" >&5
+echo "$as_me:37722: 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 37569 "configure"
+#line 37729 "configure"
 #include "confdefs.h"
 
 #include <X11/Xmu/CharSet.h>
@@ -37582,16 +37742,16 @@ int check = XmuCompareISOLatin1("big", "small")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:37585: \"$ac_link\"") >&5
+if { (eval echo "$as_me:37745: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37588: \$? = $ac_status" >&5
+  echo "$as_me:37748: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:37591: \"$ac_try\"") >&5
+  { (eval echo "$as_me:37751: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37594: \$? = $ac_status" >&5
+  echo "$as_me:37754: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xaw_compat=yes
 else
@@ -37601,7 +37761,7 @@ cf_cv_xaw_compat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:37604: result: $cf_cv_xaw_compat" >&5
+echo "$as_me:37764: result: $cf_cv_xaw_compat" >&5
 echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 
 			if test "$cf_cv_xaw_compat" = no
@@ -37613,22 +37773,22 @@ echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 				*)
 					test -n "$verbose" && echo "	work around broken package" 1>&6
 
-echo "${as_me:-configure}:37616: testing work around broken package ..." 1>&5
+echo "${as_me:-configure}:37776: 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}:37621: testing found package xmu ..." 1>&5
+echo "${as_me:-configure}:37781: 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}:37627: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:37787: 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}:37631: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:37791: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -37714,12 +37874,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:37717: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:37877: testing ...before $LIBS ..." 1>&5
 
 LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s,-lXt ,-lXt -lXmu ," -e 's/  / /g'`
 test -n "$verbose" && echo "	...after  $LIBS" 1>&6
 
-echo "${as_me:-configure}:37722: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:37882: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -37740,17 +37900,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}:37743: testing found package Xext ..." 1>&5
+echo "${as_me:-configure}:37903: 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}:37749: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:37909: 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}:37753: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:37913: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -37834,7 +37994,7 @@ fi
 	:
 else
 
-	echo "$as_me:37837: checking for XextCreateExtension in -lXext" >&5
+	echo "$as_me:37997: 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
@@ -37842,7 +38002,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 37845 "configure"
+#line 38005 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -37861,16 +38021,16 @@ XextCreateExtension ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:37864: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38024: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:37867: \$? = $ac_status" >&5
+  echo "$as_me:38027: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:37870: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38030: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:37873: \$? = $ac_status" >&5
+  echo "$as_me:38033: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
@@ -37881,7 +38041,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:37884: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:38044: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
 echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6
 if test $ac_cv_lib_Xext_XextCreateExtension = yes; then
   LIBS="-lXext $LIBS"
@@ -37894,17 +38054,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}:37897: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:38057: 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}:37903: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:38063: 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}:37907: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:38067: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -37991,14 +38151,14 @@ fi
 		;;
 	*)
 # we have an "xt" package, but it may omit Xt's dependency on X11
-echo "$as_me:37994: checking for usable X dependency" >&5
+echo "$as_me:38154: 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 38001 "configure"
+#line 38161 "configure"
 #include "confdefs.h"
 
 #include <X11/Xlib.h>
@@ -38017,16 +38177,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38020: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38180: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38023: \$? = $ac_status" >&5
+  echo "$as_me:38183: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38026: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38186: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38029: \$? = $ac_status" >&5
+  echo "$as_me:38189: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xt_x11_compat=yes
 else
@@ -38036,30 +38196,30 @@ cf_cv_xt_x11_compat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:38039: result: $cf_cv_xt_x11_compat" >&5
+echo "$as_me:38199: 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}:38045: testing work around broken X11 dependency ..." 1>&5
+echo "${as_me:-configure}:38205: 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}:38052: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:38212: 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}:38058: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:38218: 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}:38062: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:38222: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -38145,12 +38305,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:38148: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:38308: 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}:38153: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:38313: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -38158,14 +38318,14 @@ fi
 		;;
 	esac
 
-echo "$as_me:38161: checking for usable X Toolkit package" >&5
+echo "$as_me:38321: 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 38168 "configure"
+#line 38328 "configure"
 #include "confdefs.h"
 
 #include <X11/Shell.h>
@@ -38180,16 +38340,16 @@ int num = IceConnectionNumber(0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38183: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38343: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38186: \$? = $ac_status" >&5
+  echo "$as_me:38346: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38189: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38349: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38192: \$? = $ac_status" >&5
+  echo "$as_me:38352: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xt_ice_compat=yes
 else
@@ -38199,7 +38359,7 @@ cf_cv_xt_ice_compat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:38202: result: $cf_cv_xt_ice_compat" >&5
+echo "$as_me:38362: result: $cf_cv_xt_ice_compat" >&5
 echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
 
 	if test "$cf_cv_xt_ice_compat" = no
@@ -38213,22 +38373,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}:38216: testing work around broken ICE dependency ..." 1>&5
+echo "${as_me:-configure}:38376: 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}:38221: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:38381: 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}:38227: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:38387: 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}:38231: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:38391: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -38313,17 +38473,17 @@ fi
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then
 	test -n "$verbose" && echo "	found package sm" 1>&6
 
-echo "${as_me:-configure}:38316: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:38476: 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}:38322: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:38482: 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}:38326: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:38486: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -38413,12 +38573,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:38416: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:38576: 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}:38421: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:38581: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -38436,7 +38596,7 @@ else
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:38439: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:38599: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -38507,7 +38667,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}:38510: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:38670: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	CFLAGS="$CFLAGS $cf_new_cflags"
 fi
@@ -38515,7 +38675,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}:38518: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:38678: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
 fi
@@ -38523,14 +38683,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}:38526: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:38686: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
 
 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
 fi
 
 if test "$cf_check_cflags" != "$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 38533 "configure"
+#line 38693 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -38542,16 +38702,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38545: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38705: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38548: \$? = $ac_status" >&5
+  echo "$as_me:38708: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38551: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38711: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38554: \$? = $ac_status" >&5
+  echo "$as_me:38714: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -38559,12 +38719,12 @@ else
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:38562: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:38722: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
 
 	 if test "$cf_check_cppflags" != "$CPPFLAGS" ; then
 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:38567: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:38727: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_flags"
@@ -38572,13 +38732,13 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-	echo "$as_me:38575: checking for XOpenDisplay" >&5
+	echo "$as_me:38735: 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 38581 "configure"
+#line 38741 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char XOpenDisplay (); below.  */
@@ -38609,16 +38769,16 @@ f = XOpenDisplay;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38612: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38772: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38615: \$? = $ac_status" >&5
+  echo "$as_me:38775: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38618: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38778: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38621: \$? = $ac_status" >&5
+  echo "$as_me:38781: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_XOpenDisplay=yes
 else
@@ -38628,13 +38788,13 @@ ac_cv_func_XOpenDisplay=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:38631: result: $ac_cv_func_XOpenDisplay" >&5
+echo "$as_me:38791: 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:38637: checking for XOpenDisplay in -lX11" >&5
+	echo "$as_me:38797: 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
@@ -38642,7 +38802,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 38645 "configure"
+#line 38805 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -38661,16 +38821,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38664: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38824: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38667: \$? = $ac_status" >&5
+  echo "$as_me:38827: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38670: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38830: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38673: \$? = $ac_status" >&5
+  echo "$as_me:38833: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -38681,7 +38841,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:38684: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:38844: result: $ac_cv_lib_X11_XOpenDisplay" >&5
 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
 if test $ac_cv_lib_X11_XOpenDisplay = yes; then
   LIBS="-lX11 $LIBS"
@@ -38689,13 +38849,13 @@ fi
 
 fi
 
-	echo "$as_me:38692: checking for XtAppInitialize" >&5
+	echo "$as_me:38852: 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 38698 "configure"
+#line 38858 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char XtAppInitialize (); below.  */
@@ -38726,16 +38886,16 @@ f = XtAppInitialize;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38729: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38889: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38732: \$? = $ac_status" >&5
+  echo "$as_me:38892: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38735: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38895: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38738: \$? = $ac_status" >&5
+  echo "$as_me:38898: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_XtAppInitialize=yes
 else
@@ -38745,13 +38905,13 @@ ac_cv_func_XtAppInitialize=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:38748: result: $ac_cv_func_XtAppInitialize" >&5
+echo "$as_me:38908: 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:38754: checking for XtAppInitialize in -lXt" >&5
+	echo "$as_me:38914: 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
@@ -38759,7 +38919,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 38762 "configure"
+#line 38922 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -38778,16 +38938,16 @@ XtAppInitialize ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38781: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38941: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38784: \$? = $ac_status" >&5
+  echo "$as_me:38944: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38787: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38947: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38790: \$? = $ac_status" >&5
+  echo "$as_me:38950: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xt_XtAppInitialize=yes
 else
@@ -38798,7 +38958,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:38801: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "$as_me:38961: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
 echo "${ECHO_T}$ac_cv_lib_Xt_XtAppInitialize" >&6
 if test $ac_cv_lib_Xt_XtAppInitialize = yes; then
   cat >>confdefs.h <<\EOF
@@ -38814,7 +38974,7 @@ fi
 fi
 
 if test $cf_have_X_LIBS = no ; then
-	{ echo "$as_me:38817: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+	{ echo "$as_me:38977: 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
@@ -38836,14 +38996,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:38839: checking for $cf_test in $cf_path" >&5
+			echo "$as_me:38999: 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:38842: checking for $cf_test" >&5
+			echo "$as_me:39002: checking for $cf_test" >&5
 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
 		fi
 		cat >conftest.$ac_ext <<_ACEOF
-#line 38846 "configure"
+#line 39006 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -38857,16 +39017,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:38860: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:39020: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:38863: \$? = $ac_status" >&5
+  echo "$as_me:39023: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:38866: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39026: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38869: \$? = $ac_status" >&5
+  echo "$as_me:39029: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -38875,7 +39035,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-		echo "$as_me:38878: result: $cf_result" >&5
+		echo "$as_me:39038: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 		if test "$cf_result" = yes ; then
 			cf_x_athena_inc=$cf_path
@@ -38887,7 +39047,7 @@ echo "${ECHO_T}$cf_result" >&6
 done
 
 if test -z "$cf_x_athena_inc" ; then
-	{ echo "$as_me:38890: WARNING: Unable to successfully find Athena header files with test program" >&5
+	{ echo "$as_me:39050: 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"
@@ -38912,15 +39072,15 @@ do
 			cf_test=XawSimpleMenuAddGlobalActions
 			if test $cf_path != default ; then
 				LIBS="-L$cf_path/lib $cf_lib $LIBS"
-				echo "$as_me:38915: checking for $cf_lib in $cf_path" >&5
+				echo "$as_me:39075: checking for $cf_lib in $cf_path" >&5
 echo $ECHO_N "checking for $cf_lib in $cf_path... $ECHO_C" >&6
 			else
 				LIBS="$cf_lib $LIBS"
-				echo "$as_me:38919: checking for $cf_test in $cf_lib" >&5
+				echo "$as_me:39079: checking for $cf_test in $cf_lib" >&5
 echo $ECHO_N "checking for $cf_test in $cf_lib... $ECHO_C" >&6
 			fi
 			cat >conftest.$ac_ext <<_ACEOF
-#line 38923 "configure"
+#line 39083 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -38936,16 +39096,16 @@ $cf_test((XtAppContext) 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38939: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39099: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38942: \$? = $ac_status" >&5
+  echo "$as_me:39102: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38945: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39105: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38948: \$? = $ac_status" >&5
+  echo "$as_me:39108: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -38954,7 +39114,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-			echo "$as_me:38957: result: $cf_result" >&5
+			echo "$as_me:39117: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				cf_x_athena_lib="$cf_lib"
@@ -38966,7 +39126,7 @@ echo "${ECHO_T}$cf_result" >&6
 done
 
 if test -z "$cf_x_athena_lib" ; then
-	{ { echo "$as_me:38969: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+	{ { echo "$as_me:39129: 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
@@ -38983,7 +39143,7 @@ for ac_prog in xcurses-config
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:38986: checking for $ac_word" >&5
+echo "$as_me:39146: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_XCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -39000,7 +39160,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_XCURSES_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:39003: found $ac_dir/$ac_word" >&5
+   echo "$as_me:39163: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -39011,10 +39171,10 @@ fi
 XCURSES_CONFIG=$ac_cv_path_XCURSES_CONFIG
 
 if test -n "$XCURSES_CONFIG"; then
-  echo "$as_me:39014: result: $XCURSES_CONFIG" >&5
+  echo "$as_me:39174: result: $XCURSES_CONFIG" >&5
 echo "${ECHO_T}$XCURSES_CONFIG" >&6
 else
-  echo "$as_me:39017: result: no" >&5
+  echo "$as_me:39177: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -39035,7 +39195,7 @@ LDFLAGS="$LDFLAGS $X_LIBS"
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:39038: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:39198: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -39106,7 +39266,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}:39109: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:39269: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	CFLAGS="$CFLAGS $cf_new_cflags"
 fi
@@ -39114,7 +39274,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}:39117: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:39277: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
 fi
@@ -39122,14 +39282,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}:39125: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:39285: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
 
 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
 fi
 
 if test "$cf_check_cflags" != "$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 39132 "configure"
+#line 39292 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -39141,16 +39301,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39144: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39304: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39147: \$? = $ac_status" >&5
+  echo "$as_me:39307: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39150: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39310: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39153: \$? = $ac_status" >&5
+  echo "$as_me:39313: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -39158,12 +39318,12 @@ else
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:39161: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:39321: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
 
 	 if test "$cf_check_cppflags" != "$CPPFLAGS" ; then
 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:39166: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:39326: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_flags"
@@ -39171,7 +39331,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:39174: checking for XOpenDisplay in -lX11" >&5
+echo "$as_me:39334: 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
@@ -39179,7 +39339,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 39182 "configure"
+#line 39342 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -39198,16 +39358,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39201: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39361: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39204: \$? = $ac_status" >&5
+  echo "$as_me:39364: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39207: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39367: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39210: \$? = $ac_status" >&5
+  echo "$as_me:39370: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -39218,13 +39378,13 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:39221: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:39381: result: $ac_cv_lib_X11_XOpenDisplay" >&5
 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6
 if test $ac_cv_lib_X11_XOpenDisplay = yes; then
   LIBS="-lX11 $LIBS"
 fi
 
-echo "$as_me:39227: checking for XCurses library" >&5
+echo "$as_me:39387: 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
@@ -39232,7 +39392,7 @@ else
 
 LIBS="-lXCurses $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 39235 "configure"
+#line 39395 "configure"
 #include "confdefs.h"
 
 #include <xcurses.h>
@@ -39247,16 +39407,16 @@ XCursesExit();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39250: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39410: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39253: \$? = $ac_status" >&5
+  echo "$as_me:39413: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39256: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39416: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39259: \$? = $ac_status" >&5
+  echo "$as_me:39419: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_lib_XCurses=yes
 else
@@ -39267,7 +39427,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:39270: result: $cf_cv_lib_XCurses" >&5
+echo "$as_me:39430: result: $cf_cv_lib_XCurses" >&5
 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
 
 fi
@@ -39281,23 +39441,23 @@ EOF
 #define XCURSES 1
 EOF
 
-	echo "$as_me:39284: checking for xcurses.h" >&5
+	echo "$as_me:39444: 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 39290 "configure"
+#line 39450 "configure"
 #include "confdefs.h"
 #include <xcurses.h>
 _ACEOF
-if { (eval echo "$as_me:39294: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:39454: \"$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:39300: \$? = $ac_status" >&5
+  echo "$as_me:39460: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -39316,7 +39476,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:39319: result: $ac_cv_header_xcurses_h" >&5
+echo "$as_me:39479: 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
   cat >>confdefs.h <<\EOF
@@ -39326,14 +39486,14 @@ EOF
 fi
 
 else
-	{ { echo "$as_me:39329: error: Cannot link with XCurses" >&5
+	{ { echo "$as_me:39489: error: Cannot link with XCurses" >&5
 echo "$as_me: error: Cannot link with XCurses" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 else
 
-echo "$as_me:39336: checking if we can include termio.h with curses" >&5
+echo "$as_me:39496: 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
@@ -39343,7 +39503,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 39346 "configure"
+#line 39506 "configure"
 #include "confdefs.h"
 
 #include <LYCurses.h>
@@ -39357,16 +39517,16 @@ putchar(0x0a)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:39360: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:39520: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:39363: \$? = $ac_status" >&5
+  echo "$as_me:39523: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:39366: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39526: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39369: \$? = $ac_status" >&5
+  echo "$as_me:39529: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termio_and_curses=yes
 else
@@ -39379,7 +39539,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
     rm -f lynx_cfg.h
 
 fi
-echo "$as_me:39382: result: $cf_cv_termio_and_curses" >&5
+echo "$as_me:39542: result: $cf_cv_termio_and_curses" >&5
 echo "${ECHO_T}$cf_cv_termio_and_curses" >&6
 
 test $cf_cv_termio_and_curses = yes && cat >>confdefs.h <<\EOF
@@ -39394,23 +39554,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:39397: checking for $ac_header" >&5
+echo "$as_me:39557: 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 39403 "configure"
+#line 39563 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:39407: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:39567: \"$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:39413: \$? = $ac_status" >&5
+  echo "$as_me:39573: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -39429,7 +39589,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:39432: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:39592: 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
@@ -39439,7 +39599,7 @@ EOF
 fi
 done
 
-echo "$as_me:39442: checking if curses supports alternate-character set" >&5
+echo "$as_me:39602: 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
@@ -39448,7 +39608,7 @@ else
 for mapname in acs_map _acs_map
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 39451 "configure"
+#line 39611 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -39462,16 +39622,16 @@ chtype x = $mapname['l']; $mapname['m'] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39465: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39625: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39468: \$? = $ac_status" >&5
+  echo "$as_me:39628: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39471: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39631: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39474: \$? = $ac_status" >&5
+  echo "$as_me:39634: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_alt_char_set=$mapname
 	 break
@@ -39485,20 +39645,20 @@ done
 
 fi
 
-echo "$as_me:39488: result: $cf_cv_alt_char_set" >&5
+echo "$as_me:39648: 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:39494: checking if curses supports fancy attributes" >&5
+echo "$as_me:39654: 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 39501 "configure"
+#line 39661 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -39516,16 +39676,16 @@ attrset(A_UNDERLINE|A_BOLD|A_REVERSE);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39519: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39679: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39522: \$? = $ac_status" >&5
+  echo "$as_me:39682: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39525: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39685: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39528: \$? = $ac_status" >&5
+  echo "$as_me:39688: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fancy_curses=yes
 else
@@ -39537,13 +39697,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:39540: result: $cf_cv_fancy_curses" >&5
+echo "$as_me:39700: 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:39546: checking for function curses_version" >&5
+echo "$as_me:39706: 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
@@ -39553,7 +39713,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_curses_version=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 39556 "configure"
+#line 39716 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -39566,15 +39726,15 @@ int main()
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:39569: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39729: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39572: \$? = $ac_status" >&5
+  echo "$as_me:39732: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:39574: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39734: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39577: \$? = $ac_status" >&5
+  echo "$as_me:39737: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_func_curses_version=yes
 
@@ -39589,21 +39749,21 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core
 fi
-echo "$as_me:39592: result: $cf_cv_func_curses_version" >&5
+echo "$as_me:39752: result: $cf_cv_func_curses_version" >&5
 echo "${ECHO_T}$cf_cv_func_curses_version" >&6
 test "$cf_cv_func_curses_version" = yes && cat >>confdefs.h <<\EOF
 #define HAVE_CURSES_VERSION 1
 EOF
 
 if test "$cf_cv_ncurses_version" != no ; then
-echo "$as_me:39599: checking for obsolete/broken version of ncurses" >&5
+echo "$as_me:39759: 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 39606 "configure"
+#line 39766 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -39622,16 +39782,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:39625: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:39785: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:39628: \$? = $ac_status" >&5
+  echo "$as_me:39788: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:39631: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39791: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39634: \$? = $ac_status" >&5
+  echo "$as_me:39794: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_broken=no
 else
@@ -39643,10 +39803,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:39646: result: $cf_cv_ncurses_broken" >&5
+echo "$as_me:39806: 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:39649: WARNING: hmm... you should get an up-to-date version of ncurses" >&5
+	{ echo "$as_me:39809: WARNING: hmm... you should get an up-to-date version of ncurses" >&5
 echo "$as_me: WARNING: hmm... you should get an up-to-date version of ncurses" >&2;}
 	cat >>confdefs.h <<\EOF
 #define NCURSES_BROKEN 1
@@ -39655,14 +39815,14 @@ EOF
 fi
 fi
 
-echo "$as_me:39658: checking if curses supports color attributes" >&5
+echo "$as_me:39818: 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 39665 "configure"
+#line 39825 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -39682,16 +39842,16 @@ chtype x = COLOR_BLUE;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39685: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39845: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39688: \$? = $ac_status" >&5
+  echo "$as_me:39848: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39691: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39851: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39694: \$? = $ac_status" >&5
+  echo "$as_me:39854: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_color_curses=yes
 else
@@ -39703,7 +39863,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:39706: result: $cf_cv_color_curses" >&5
+echo "$as_me:39866: result: $cf_cv_color_curses" >&5
 echo "${ECHO_T}$cf_cv_color_curses" >&6
 if test $cf_cv_color_curses = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -39723,23 +39883,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:39726: checking for $ac_header" >&5
+echo "$as_me:39886: 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 39732 "configure"
+#line 39892 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:39736: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:39896: \"$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:39742: \$? = $ac_status" >&5
+  echo "$as_me:39902: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -39758,7 +39918,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:39761: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:39921: 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
@@ -39773,23 +39933,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:39776: checking for $ac_header" >&5
+echo "$as_me:39936: 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 39782 "configure"
+#line 39942 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:39786: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:39946: \"$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:39792: \$? = $ac_status" >&5
+  echo "$as_me:39952: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -39808,7 +39968,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:39811: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:39971: 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
@@ -39826,10 +39986,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:39829: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:39989: 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 39832 "configure"
+#line 39992 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -39841,16 +40001,16 @@ struct termios foo; int x = foo.c_iflag
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:39844: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:40004: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:39847: \$? = $ac_status" >&5
+  echo "$as_me:40007: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:39850: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40010: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39853: \$? = $ac_status" >&5
+  echo "$as_me:40013: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   termios_bad=no
 else
@@ -39858,7 +40018,7 @@ else
 cat conftest.$ac_ext >&5
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 39861 "configure"
+#line 40021 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -39872,16 +40032,16 @@ struct termios foo; int x = foo.c_iflag
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:39875: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:40035: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:39878: \$? = $ac_status" >&5
+  echo "$as_me:40038: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:39881: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40041: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39884: \$? = $ac_status" >&5
+  echo "$as_me:40044: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   termios_bad=unknown
 else
@@ -39896,12 +40056,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-	echo "$as_me:39899: result: $termios_bad" >&5
+	echo "$as_me:40059: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:39904: checking declaration of size-change" >&5
+echo "$as_me:40064: 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
@@ -39916,7 +40076,7 @@ do
     CPPFLAGS="$cf_save_CPPFLAGS"
     test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
     cat >conftest.$ac_ext <<_ACEOF
-#line 39919 "configure"
+#line 40079 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -39960,16 +40120,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:39963: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:40123: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:39966: \$? = $ac_status" >&5
+  echo "$as_me:40126: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:39969: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40129: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39972: \$? = $ac_status" >&5
+  echo "$as_me:40132: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_sizechange=yes
 else
@@ -39988,7 +40148,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:39991: result: $cf_cv_sizechange" >&5
+echo "$as_me:40151: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 	cat >>confdefs.h <<\EOF
@@ -40005,14 +40165,14 @@ EOF
 	esac
 fi
 
-echo "$as_me:40008: checking if ttytype is declared in curses library" >&5
+echo "$as_me:40168: 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 40015 "configure"
+#line 40175 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -40024,16 +40184,16 @@ char *x = &ttytype[1]; *x = 1
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40027: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40187: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40030: \$? = $ac_status" >&5
+  echo "$as_me:40190: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40033: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40193: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40036: \$? = $ac_status" >&5
+  echo "$as_me:40196: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_ttytype=yes
 else
@@ -40045,7 +40205,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:40048: result: $cf_cv_have_ttytype" >&5
+echo "$as_me:40208: result: $cf_cv_have_ttytype" >&5
 echo "${ECHO_T}$cf_cv_have_ttytype" >&6
 test $cf_cv_have_ttytype = yes && cat >>confdefs.h <<\EOF
 #define HAVE_TTYTYPE 1
@@ -40053,14 +40213,14 @@ EOF
 
 	if test "$use_wide_curses" = yes ; then
 
-echo "$as_me:40056: checking if curses supports wide characters" >&5
+echo "$as_me:40216: 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 40063 "configure"
+#line 40223 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -40079,16 +40239,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40082: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40242: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40085: \$? = $ac_status" >&5
+  echo "$as_me:40245: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40088: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40248: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40091: \$? = $ac_status" >&5
+  echo "$as_me:40251: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_widec_curses=yes
 else
@@ -40099,7 +40259,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:40102: result: $cf_cv_widec_curses" >&5
+echo "$as_me:40262: result: $cf_cv_widec_curses" >&5
 echo "${ECHO_T}$cf_cv_widec_curses" >&6
 
 if test "$cf_cv_widec_curses" = yes ; then
@@ -40108,14 +40268,14 @@ if test "$cf_cv_widec_curses" = yes ; then
 EOF
 
 	# This is needed on Tru64 5.0 to declare mbstate_t
-	echo "$as_me:40111: checking if we must include wchar.h to declare mbstate_t" >&5
+	echo "$as_me:40271: 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 40118 "configure"
+#line 40278 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -40129,23 +40289,23 @@ mbstate_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:40132: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:40292: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:40135: \$? = $ac_status" >&5
+  echo "$as_me:40295: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:40138: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40298: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40141: \$? = $ac_status" >&5
+  echo "$as_me:40301: \$? = $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 40148 "configure"
+#line 40308 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -40160,16 +40320,16 @@ mbstate_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:40163: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:40323: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:40166: \$? = $ac_status" >&5
+  echo "$as_me:40326: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:40169: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40329: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40172: \$? = $ac_status" >&5
+  echo "$as_me:40332: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_widec_mbstate=yes
 else
@@ -40181,7 +40341,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:40184: result: $cf_cv_widec_mbstate" >&5
+echo "$as_me:40344: result: $cf_cv_widec_mbstate" >&5
 echo "${ECHO_T}$cf_cv_widec_mbstate" >&6
 
 if test "$cf_cv_widec_mbstate" = yes ; then
@@ -40202,14 +40362,14 @@ fi
 
 	fi
 
-echo "$as_me:40205: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+echo "$as_me:40365: 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 40212 "configure"
+#line 40372 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -40231,23 +40391,23 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40234: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40394: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40237: \$? = $ac_status" >&5
+  echo "$as_me:40397: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40240: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40400: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40243: \$? = $ac_status" >&5
+  echo "$as_me:40403: \$? = $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 40250 "configure"
+#line 40410 "configure"
 #include "confdefs.h"
 
 #define _XOPEN_SOURCE_EXTENDED
@@ -40269,16 +40429,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40272: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40432: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40275: \$? = $ac_status" >&5
+  echo "$as_me:40435: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40278: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40438: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40281: \$? = $ac_status" >&5
+  echo "$as_me:40441: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_xopen_extension=yes
 else
@@ -40290,11 +40450,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:40293: result: $cf_cv_need_xopen_extension" >&5
+echo "$as_me:40453: 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:40297: checking for term.h" >&5
+echo "$as_me:40457: 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
@@ -40315,7 +40475,7 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 40318 "configure"
+#line 40478 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -40329,16 +40489,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:40332: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:40492: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:40335: \$? = $ac_status" >&5
+  echo "$as_me:40495: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:40338: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40498: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40341: \$? = $ac_status" >&5
+  echo "$as_me:40501: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_term_header=$cf_header
 	 break
@@ -40357,7 +40517,7 @@ no)
 	for cf_header in ncurses/term.h ncursesw/term.h
 	do
 		cat >conftest.$ac_ext <<_ACEOF
-#line 40360 "configure"
+#line 40520 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -40375,16 +40535,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:40378: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:40538: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:40381: \$? = $ac_status" >&5
+  echo "$as_me:40541: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:40384: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40544: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40387: \$? = $ac_status" >&5
+  echo "$as_me:40547: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_term_header=$cf_header
 			 break
@@ -40399,7 +40559,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 esac
 
 fi
-echo "$as_me:40402: result: $cf_cv_term_header" >&5
+echo "$as_me:40562: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 case $cf_cv_term_header in #(vi
@@ -40423,7 +40583,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:40426: checking for unctrl.h" >&5
+echo "$as_me:40586: 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
@@ -40444,7 +40604,7 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 40447 "configure"
+#line 40607 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -40458,16 +40618,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:40461: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:40621: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:40464: \$? = $ac_status" >&5
+  echo "$as_me:40624: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:40467: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40627: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40470: \$? = $ac_status" >&5
+  echo "$as_me:40630: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_unctrl_header=$cf_header
 	 break
@@ -40481,13 +40641,13 @@ done
 
 case $cf_cv_unctrl_header in #(vi
 no)
-	{ echo "$as_me:40484: WARNING: unctrl.h header not found" >&5
+	{ echo "$as_me:40644: WARNING: unctrl.h header not found" >&5
 echo "$as_me: WARNING: unctrl.h header not found" >&2;}
 	;;
 esac
 
 fi
-echo "$as_me:40490: result: $cf_cv_unctrl_header" >&5
+echo "$as_me:40650: result: $cf_cv_unctrl_header" >&5
 echo "${ECHO_T}$cf_cv_unctrl_header" >&6
 
 case $cf_cv_unctrl_header in #(vi
@@ -40538,10 +40698,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:40541: checking for ${cf_func}" >&5
+	echo "$as_me:40701: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me:-configure}:40544: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:40704: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -40550,7 +40710,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >conftest.$ac_ext <<_ACEOF
-#line 40553 "configure"
+#line 40713 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -40573,7 +40733,8 @@ main ()
 
 #ifndef ${cf_func}
 long foo = (long)(&${cf_func});
-${cf_cv_main_return:-return}(foo == 0);
+if (foo + 1234 > 5678)
+	${cf_cv_main_return:-return}(foo);
 #endif
 
   ;
@@ -40581,16 +40742,16 @@ ${cf_cv_main_return:-return}(foo == 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40584: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40745: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40587: \$? = $ac_status" >&5
+  echo "$as_me:40748: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40590: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40751: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40593: \$? = $ac_status" >&5
+  echo "$as_me:40754: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -40606,7 +40767,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:40609: result: $cf_result" >&5
+	echo "$as_me:40770: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test $cf_result != no; then
 		cat >>confdefs.h <<EOF
@@ -40622,13 +40783,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:40625: checking for $ac_func" >&5
+echo "$as_me:40786: 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 40631 "configure"
+#line 40792 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -40659,16 +40820,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40662: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40823: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40665: \$? = $ac_status" >&5
+  echo "$as_me:40826: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40668: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40829: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40671: \$? = $ac_status" >&5
+  echo "$as_me:40832: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -40678,7 +40839,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:40681: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:40842: 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
@@ -40692,12 +40853,12 @@ fi
 
 if test $use_color_style != no ; then
 	if test .$cf_cv_color_curses != .yes ; then
-		{ { echo "$as_me:40695: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:40856: 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:40700: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:40861: error: Configuration does not support color-styles" >&5
 echo "$as_me: error: Configuration does not support color-styles" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -40705,7 +40866,7 @@ fi
 
 if test $use_scrollbar != no ; then
 	if test .$cf_cv_fancy_curses != .yes ; then
-		{ echo "$as_me:40708: WARNING: Configuration does not support ACS_xxx definitions" >&5
+		{ echo "$as_me:40869: WARNING: Configuration does not support ACS_xxx definitions" >&5
 echo "$as_me: WARNING: Configuration does not support ACS_xxx definitions" >&2;}
 	else
 		cat >>confdefs.h <<\EOF
@@ -40718,7 +40879,7 @@ fi
 # use rpath for libraries in unusual places
 
 LD_RPATH_OPT=
-echo "$as_me:40721: checking for an rpath option" >&5
+echo "$as_me:40882: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 case $cf_cv_system_name in #(vi
 irix*) #(vi
@@ -40749,17 +40910,17 @@ solaris2*) #(vi
 *)
 	;;
 esac
-echo "$as_me:40752: result: $LD_RPATH_OPT" >&5
+echo "$as_me:40913: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 case "x$LD_RPATH_OPT" in #(vi
 x-R*)
-	echo "$as_me:40757: checking if we need a space after rpath option" >&5
+	echo "$as_me:40918: 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"
 	LIBS="${LD_RPATH_OPT}$libdir $LIBS"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 40762 "configure"
+#line 40923 "configure"
 #include "confdefs.h"
 
 int
@@ -40771,16 +40932,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40774: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40935: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40777: \$? = $ac_status" >&5
+  echo "$as_me:40938: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40780: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40941: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40783: \$? = $ac_status" >&5
+  echo "$as_me:40944: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_rpath_space=no
 else
@@ -40790,13 +40951,13 @@ cf_rpath_space=yes
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	LIBS="$cf_save_LIBS"
-	echo "$as_me:40793: result: $cf_rpath_space" >&5
+	echo "$as_me:40954: 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:40799: checking if rpath-hack should be disabled" >&5
+echo "$as_me:40960: 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.
@@ -40813,21 +40974,21 @@ else
   cf_disable_rpath_hack=no
 
 fi;
-echo "$as_me:40816: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:40977: 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:40820: checking for updated LDFLAGS" >&5
+echo "$as_me:40981: 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:40823: result: maybe" >&5
+	echo "$as_me:40984: 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:40830: checking for $ac_word" >&5
+echo "$as_me:40991: 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
@@ -40842,7 +41003,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:40845: found $ac_dir/$ac_word" >&5
+echo "$as_me:41006: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -40850,10 +41011,10 @@ fi
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:40853: result: $cf_ldd_prog" >&5
+  echo "$as_me:41014: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:40856: result: no" >&5
+  echo "$as_me:41017: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -40867,7 +41028,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
 		cf_rpath_oops=
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 40870 "configure"
+#line 41031 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -40879,16 +41040,16 @@ printf("Hello");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40882: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41043: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40885: \$? = $ac_status" >&5
+  echo "$as_me:41046: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40888: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41049: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40891: \$? = $ac_status" >&5
+  echo "$as_me:41052: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort -u`
 		 cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort -u`
@@ -40916,7 +41077,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}:40919: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:41080: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
 
 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
 						break
@@ -40928,11 +41089,11 @@ echo "${as_me:-configure}:40919: testing ...adding -L$cf_rpath_dir/lib to LDFLAG
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:40931: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:41092: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:40935: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:41096: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -40969,7 +41130,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:40972: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:41133: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -40982,11 +41143,11 @@ LDFLAGS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:40985: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:41146: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:40989: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:41150: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -41023,7 +41184,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:41026: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:41187: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -41036,11 +41197,11 @@ LIBS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:41039: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:41200: testing ...checked LIBS $LIBS ..." 1>&5
 
 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:41043: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:41204: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 fi
 
@@ -41141,7 +41302,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:41144: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:41305: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -41317,7 +41478,7 @@ cat >>$CONFIG_STATUS <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:41320: error: ambiguous option: $1
+    { { echo "$as_me:41481: 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;}
@@ -41336,7 +41497,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:41339: error: unrecognized option: $1
+  -*) { { echo "$as_me:41500: 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;}
@@ -41389,7 +41550,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:41392: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:41553: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -41717,7 +41878,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:41720: creating $ac_file" >&5
+    { echo "$as_me:41881: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -41735,7 +41896,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:41738: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:41899: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -41748,7 +41909,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:41751: error: cannot find input file: $f" >&5
+           { { echo "$as_me:41912: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -41814,7 +41975,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:41817: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:41978: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -41825,7 +41986,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:41828: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:41989: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -41838,7 +41999,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:41841: error: cannot find input file: $f" >&5
+           { { echo "$as_me:42002: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -41956,7 +42117,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:41959: $ac_file is unchanged" >&5
+      { echo "$as_me:42120: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
diff --git a/configure.in b/configure.in
index 72d3c670..9898efce 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $LynxId: configure.in,v 1.227 2011/05/24 08:43:15 tom Exp $
+dnl $LynxId: configure.in,v 1.230 2011/05/28 14:35:26 tom Exp $
 dnl
 dnl Process this file with autoconf to produce a configure script.
 dnl
@@ -732,8 +732,6 @@ AC_HEADER_DIRENT
 dnl Don't check for sys/wait.h here since it is covered by another test.
 AC_CHECK_HEADERS( \
 	arpa/inet.h \
-	bsd/random.h \
-	bsd/stdlib.h \
 	fcntl.h \
 	limits.h \
 	stdlib.h \
@@ -801,7 +799,6 @@ AC_CHECK_FUNCS( \
 	usleep \
 	vasprintf \
 	waitpid \
-	zError \
 )
 AC_REPLACE_FUNCS( \
 	mktime \
@@ -875,7 +872,7 @@ test $use_menu_options = no && AC_DEFINE(NO_OPTION_MENU)
 dnl --------------------------------------------------------------------------
 AC_MSG_CHECKING(if sessions code should be used)
 CF_ARG_DISABLE(sessions,
-[  --disable-sessions      use experimental sessions code],
+[  --disable-sessions      use sessions code],
 	[use_sessions=$enableval],
 	[use_sessions=yes])
 AC_MSG_RESULT($use_sessions)
@@ -887,7 +884,7 @@ fi
 dnl --------------------------------------------------------------------------
 AC_MSG_CHECKING(if session-caching code should be used)
 CF_ARG_DISABLE(session-cache,
-[  --disable-session-cache use experimental session-caching code],
+[  --disable-session-cache use session-caching code],
 	[use_session_cache=$enableval],
 	[use_session_cache=yes])
 AC_MSG_RESULT($use_session_cache)
@@ -896,13 +893,13 @@ if test $use_session_cache != no ; then
 fi
 
 dnl --------------------------------------------------------------------------
-AC_MSG_CHECKING(if experimental address-list page should be used)
-CF_ARG_ENABLE(addrlist-page,
-[  --enable-addrlist-page  use experimental address-list page],
+AC_MSG_CHECKING(if address-list page should be used)
+CF_ARG_DISABLE(addrlist-page,
+[  --disable-addrlist-page disable address-list page],
 	[use_addrlist_page=$enableval],
-	[use_addrlist_page=no])
+	[use_addrlist_page=yes])
 AC_MSG_RESULT($use_addrlist_page)
-test $use_addrlist_page != no && AC_DEFINE(EXP_ADDRLIST_PAGE)
+test $use_addrlist_page != no && AC_DEFINE(USE_ADDRLIST_PAGE)
 
 dnl --------------------------------------------------------------------------
 AC_MSG_CHECKING(if experimental CJK logic should be used)
@@ -978,12 +975,12 @@ CF_ARG_ENABLE(alt-bindings,
 	[use_alt_bindings=$enableval],
 	[use_alt_bindings=yes])
 AC_MSG_RESULT($use_alt_bindings)
-test $use_alt_bindings != no && AC_DEFINE(EXP_ALT_BINDINGS)
+test $use_alt_bindings != no && AC_DEFINE(USE_ALT_BINDINGS)
 
 dnl --------------------------------------------------------------------------
 AC_MSG_CHECKING(if ascii case-conversion should be used)
 CF_ARG_DISABLE(ascii-ctypes,
-[  --disable-ascii-ctypes  use ascii case-conversion],
+[  --disable-ascii-ctypes  disable use of ascii case-conversion],
 	[use_ascii_ctypes=$enableval],
 	[use_ascii_ctypes=yes])
 AC_MSG_RESULT($use_ascii_ctypes)
@@ -1001,7 +998,7 @@ test $use_ext_htmldtd = "no" && AC_DEFINE(NO_EXTENDED_HTMLDTD)
 dnl --------------------------------------------------------------------------
 AC_MSG_CHECKING(if file-upload logic should be used)
 CF_ARG_DISABLE(file-upload,
-[  --disable-file-upload   use file-upload support],
+[  --disable-file-upload   disable file-upload support],
 	[use_file_upload=$enableval],
 	[use_file_upload=yes])
 AC_MSG_RESULT($use_file_upload)
@@ -1010,7 +1007,7 @@ test $use_file_upload != no && AC_DEFINE(USE_FILE_UPLOAD)
 dnl --------------------------------------------------------------------------
 AC_MSG_CHECKING(if IDNA support should be used)
 CF_ARG_DISABLE(idna,
-[  --disable-idna          provide IDNA support],
+[  --disable-idna          disable IDNA support],
 	[use_idna=$enableval],
 	[use_idna=yes])
 AC_MSG_RESULT($use_idna)
@@ -1022,7 +1019,7 @@ fi
 dnl --------------------------------------------------------------------------
 AC_MSG_CHECKING(if element-justification logic should be used)
 CF_ARG_DISABLE(justify-elts,
-[  --disable-justify-elts  use element-justification logic],
+[  --disable-justify-elts  disable element-justification logic],
 	[use_justify_elts=$enableval],
 	[use_justify_elts=yes])
 AC_MSG_RESULT($use_justify_elts)
@@ -1031,7 +1028,7 @@ test $use_justify_elts != no && AC_DEFINE(USE_JUSTIFY_ELTS)
 dnl --------------------------------------------------------------------------
 AC_MSG_CHECKING(if partial-display should be used)
 CF_ARG_DISABLE(partial,
-[  --disable-partial       use partial-display logic],
+[  --disable-partial       disable partial-display logic],
 	[use_partial_display=$enableval],
 	[use_partial_display=yes])
 AC_MSG_RESULT($use_partial_display)
@@ -1049,7 +1046,7 @@ test $use_filed_cookies != no && AC_DEFINE(USE_PERSISTENT_COOKIES)
 dnl --------------------------------------------------------------------------
 AC_MSG_CHECKING(if html source should be colorized)
 CF_ARG_DISABLE(prettysrc,
-[  --disable-prettysrc     colorize HTML source],
+[  --disable-prettysrc     disable colorization of HTML source],
 	[use_prettysrc=$enableval],
 	[use_prettysrc=yes])
 AC_MSG_RESULT($use_prettysrc)
@@ -1058,7 +1055,7 @@ test $use_prettysrc != no && AC_DEFINE(USE_PRETTYSRC)
 dnl --------------------------------------------------------------------------
 AC_MSG_CHECKING(if progress-bar code should be used)
 CF_ARG_DISABLE(progressbar,
-[  --disable-progressbar   use progress-bar],
+[  --disable-progressbar   disable progress-bar],
 	[use_progressbar=$enableval],
 	[use_progressbar=yes])
 AC_MSG_RESULT($use_progressbar)
@@ -1067,7 +1064,7 @@ test $use_progressbar != no && AC_DEFINE(USE_PROGRESSBAR)
 dnl --------------------------------------------------------------------------
 AC_MSG_CHECKING(if read-progress message should show ETA)
 CF_ARG_DISABLE(read-eta,
-[  --disable-read-eta      read-progress message shows ETA],
+[  --disable-read-eta      disable read-progress message shows ETA],
 	[use_read_eta=$enableval],
 	[use_read_eta=yes])
 AC_MSG_RESULT($use_read_eta)
@@ -1076,7 +1073,7 @@ test $use_read_eta != no && AC_DEFINE(USE_READPROGRESS)
 dnl --------------------------------------------------------------------------
 AC_MSG_CHECKING(if source caching should be used)
 CF_ARG_DISABLE(source-cache,
-[  --disable-source-cache  cache HTML source for parse mode changes],
+[  --disable-source-cache  do not cache HTML source for parse mode changes],
 	[use_source_cache=$enableval],
 	[use_source_cache=yes])
 AC_MSG_RESULT($use_source_cache)
@@ -1085,7 +1082,7 @@ test $use_source_cache != no && AC_DEFINE(USE_SOURCE_CACHE)
 dnl --------------------------------------------------------------------------
 AC_MSG_CHECKING(if scrollbar code should be used)
 CF_ARG_DISABLE(scrollbar,
-[  --disable-scrollbar     use scrollbar, with mouse],
+[  --disable-scrollbar     disable scrollbar with mouse],
 	[use_scrollbar=$enableval],
 	[use_scrollbar=yes])
 AC_MSG_RESULT($use_scrollbar)
diff --git a/makefile.bcb b/makefile.bcb
index 6eaba88d..c197a240 100644
--- a/makefile.bcb
+++ b/makefile.bcb
@@ -1,4 +1,4 @@
-# $LynxId: makefile.bcb,v 1.14 2009/11/21 16:33:41 tom Exp $
+# $LynxId: makefile.bcb,v 1.15 2011/05/28 13:07:55 tom Exp $
 #
 # Borland C++ / C++ builder
 # 1997/11/08 (Sat) 10:45:37
@@ -50,7 +50,7 @@ CC_FLAGS = $(DEBUG) $(CS_DEFS) $(SOCK_DEFS) \
 -DDISP_PARTIAL \
 -DDONT_HAVE_TM_GMTOFF \
 -DDOSPATH \
--DEXP_ALT_BINDINGS \
+-DUSE_ALT_BINDINGS \
 -DEXP_NESTED_TABLES \
 -DFANCY_CURSES \
 -DHAVE_DIRENT_H=1 \
diff --git a/makefile.msc b/makefile.msc
index 69f1df3d..298ed421 100644
--- a/makefile.msc
+++ b/makefile.msc
@@ -1,4 +1,4 @@
-# $LynxId: makefile.msc,v 1.23 2009/11/21 16:33:41 tom Exp $
+# $LynxId: makefile.msc,v 1.24 2011/05/28 13:07:55 tom Exp $
 #
 # Makefile for `Lynx' browser for Microsoft Visual C++ 4.2 or later
 #
@@ -73,7 +73,7 @@ DEFS = $(CS_DEFS) $(SOCK_DEFS) $(SSL_DEFS) $(SCREEN_DEFS) \
  /D "DISP_PARTIAL" \
  /D "DONT_HAVE_TM_GMTOFF" \
  /D "DOSPATH" \
- /D "EXP_ALT_BINDINGS" \
+ /D "USE_ALT_BINDINGS" \
  /D "EXP_NESTED_TABLES" \
  /D "HAVE_KEYPAD" \
  /D "LONG_LIST" \
diff --git a/makelynx.bat b/makelynx.bat
index 7af02beb..b71a05a3 100644
--- a/makelynx.bat
+++ b/makelynx.bat
@@ -1,5 +1,5 @@
 @echo off

-@rem $LynxId: makelynx.bat,v 1.14 2009/11/21 15:33:24 tom Exp $

+@rem $LynxId: makelynx.bat,v 1.15 2011/05/28 13:07:55 tom Exp $

 @echo Windows/Dos batch makefile for MingW32 and lynx.exe

 @echo Remember to precede this by "command /E:8192" for Windows prior to

 @echo W2000 and "cmd.exe /E:8192" for subsequent Window versions and to

@@ -67,7 +67,7 @@ echo #define _WIN_CC		 1 >> lynx_cfg.h
 rem echo #define USE_SCROLLBAR	 1 >> lynx_cfg.h

 

 SET DEFINES=-DCJK_EX

-SET DEFINES=%DEFINES% -DEXP_ALT_BINDINGS

+SET DEFINES=%DEFINES% -DUSE_ALT_BINDINGS

 SET DEFINES=%DEFINES% -DEXP_NESTED_TABLES

 SET DEFINES=%DEFINES% -DUSE_JUSTIFY_ELTS

 SET DEFINES=%DEFINES% -DUSE_PERSISTENT_COOKIES

diff --git a/po/nl.po b/po/nl.po
index 02c5d600..be694c04 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lynx-2.8.7-dev12\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-01 20:55-0500\n"
-"PO-Revision-Date: 2009-01-01 11:49+0100\n"
+"POT-Creation-Date: 2008-12-26 20:04-0500\n"
+"PO-Revision-Date: 2011-05-28 18:16+0200\n"
 "Last-Translator: Erwin Poeze <erwin.poeze@gmail.com>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -2182,7 +2183,7 @@ msgstr ""
 #: LYMessages.c:697
 #, c-format
 msgid "%s cookie: %.*s=%.*s  Allow? (Y/N/Always/neVer)"
-msgstr "%s koekje: %.*s=%.*s  Toestaan? (Ja, Nee, Altijd, V-nooit)"
+msgstr "%s koekje: %.*s=%.*s  Toestaan? (Ja, Nee, Altijd, nOoit)"
 
 #. #define INVALID_COOKIE_DOMAIN_CONFIRMATION
 #: LYMessages.c:699
@@ -2249,7 +2250,7 @@ msgstr "(Geen naam.)"
 msgid "(No value.)"
 msgstr "(Geen waarde.)"
 
-#: LYMessages.c:716 src/LYOptions.c:2406
+#: LYMessages.c:716 src/LYOptions.c:2402
 msgid "None"
 msgstr "geen"
 
@@ -2809,7 +2810,7 @@ msgstr "Document met POST inhoud niet gevonden in cache.  Nog eens verzenden?"
 msgid "Loading failed, use a previous copy."
 msgstr "Het laden is mislukt, gebruik een vroegere kopie."
 
-#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8513
+#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8542
 msgid "Loading incomplete."
 msgstr "Laden niet voltooid."
 
@@ -2832,7 +2833,7 @@ msgstr "**** HTAccess: Geretourneerde status was: %d\n"
 #. * hack: if we fail in HTAccess.c
 #. * avoid duplicating URL, oh.
 #.
-#: WWW/Library/Implementation/HTAccess.c:1087 src/LYMainLoop.c:7757
+#: WWW/Library/Implementation/HTAccess.c:1087 src/LYMainLoop.c:7756
 msgid "Can't Access"
 msgstr "Kan geen toegang krijgen"
 
@@ -2857,20 +2858,20 @@ msgstr "hoofdsocket sluiten"
 msgid "socket for master socket"
 msgstr "socket voor hoofdsocket"
 
-#: WWW/Library/Implementation/HTFTP.c:2976
+#: WWW/Library/Implementation/HTFTP.c:2977
 msgid "Receiving FTP directory."
 msgstr "Ophalen van FTP-bestandenoverzicht."
 
-#: WWW/Library/Implementation/HTFTP.c:3112
+#: WWW/Library/Implementation/HTFTP.c:3113
 #, c-format
 msgid "Transferred %d bytes (%5d)"
 msgstr "%d bytes overgezet (%5d)"
 
-#: WWW/Library/Implementation/HTFTP.c:3466
+#: WWW/Library/Implementation/HTFTP.c:3467
 msgid "connect for data"
 msgstr "verbinden voor datastroom"
 
-#: WWW/Library/Implementation/HTFTP.c:4127
+#: WWW/Library/Implementation/HTFTP.c:4128
 msgid "Receiving FTP file."
 msgstr "Ophalen van FTP-bestand."
 
@@ -2894,34 +2895,34 @@ msgstr "Kan finger-host niet bereiken."
 msgid "No response from finger server."
 msgstr "Geen antwoord van finger-server."
 
-#: WWW/Library/Implementation/HTNews.c:425
+#: WWW/Library/Implementation/HTNews.c:426
 #, c-format
 msgid "Username for news host '%s':"
 msgstr "Gebruikersnaam voor nieuws-host '%s':"
 
-#: WWW/Library/Implementation/HTNews.c:478
+#: WWW/Library/Implementation/HTNews.c:479
 msgid "Change username?"
 msgstr "Gebruikersnaam wijzigen?"
 
-#: WWW/Library/Implementation/HTNews.c:482
+#: WWW/Library/Implementation/HTNews.c:483
 msgid "Username:"
 msgstr "Gebruikersnaam:"
 
-#: WWW/Library/Implementation/HTNews.c:507
+#: WWW/Library/Implementation/HTNews.c:508
 #, c-format
 msgid "Password for news host '%s':"
 msgstr "Wachtwoord voor nieuws-host '%s':"
 
-#: WWW/Library/Implementation/HTNews.c:590
+#: WWW/Library/Implementation/HTNews.c:591
 msgid "Change password?"
 msgstr "Wachtwoord wijzigen?"
 
-#: WWW/Library/Implementation/HTNews.c:1710
+#: WWW/Library/Implementation/HTNews.c:1711
 #, c-format
 msgid "No matches for: %s"
 msgstr "Geen overeenkomsten voor: %s"
 
-#: WWW/Library/Implementation/HTNews.c:1760
+#: WWW/Library/Implementation/HTNews.c:1761
 msgid ""
 "\n"
 "No articles in this group.\n"
@@ -2929,7 +2930,7 @@ msgstr ""
 "\n"
 "Geen artikelen gevonden in deze groep.\n"
 
-#: WWW/Library/Implementation/HTNews.c:1772
+#: WWW/Library/Implementation/HTNews.c:1773
 msgid ""
 "\n"
 "No articles in this range.\n"
@@ -2940,16 +2941,16 @@ msgstr ""
 #.
 #. * Set window title.
 #.
-#: WWW/Library/Implementation/HTNews.c:1785
+#: WWW/Library/Implementation/HTNews.c:1786
 #, c-format
 msgid "%s,  Articles %d-%d"
 msgstr "%s,  Artikelen %d-%d"
 
-#: WWW/Library/Implementation/HTNews.c:1808
+#: WWW/Library/Implementation/HTNews.c:1809
 msgid "Earlier articles"
 msgstr "Eerdere artikelen"
 
-#: WWW/Library/Implementation/HTNews.c:1821
+#: WWW/Library/Implementation/HTNews.c:1822
 #, c-format
 msgid ""
 "\n"
@@ -2959,41 +2960,41 @@ msgstr ""
 "\n"
 "Er zijn momenteel ongeveer %d artikelen beschikbaar in %s, met volgende ID's:\n"
 
-#: WWW/Library/Implementation/HTNews.c:1883
+#: WWW/Library/Implementation/HTNews.c:1884
 msgid "All available articles in "
 msgstr "Alle beschikbare artikelen in "
 
-#: WWW/Library/Implementation/HTNews.c:2097
+#: WWW/Library/Implementation/HTNews.c:2098
 msgid "Later articles"
 msgstr "Latere artikelen"
 
-#: WWW/Library/Implementation/HTNews.c:2120
+#: WWW/Library/Implementation/HTNews.c:2121
 msgid "Post to "
 msgstr "Posten naar "
 
-#: WWW/Library/Implementation/HTNews.c:2341
+#: WWW/Library/Implementation/HTNews.c:2342
 msgid "This client does not contain support for SNEWS URLs."
 msgstr "Dit programma ondersteunt geen SNEWS-URL's."
 
-#: WWW/Library/Implementation/HTNews.c:2548
+#: WWW/Library/Implementation/HTNews.c:2550
 msgid "No target for raw text!"
 msgstr "Geen bestemming voor ruwe tekst!"
 
-#: WWW/Library/Implementation/HTNews.c:2578
+#: WWW/Library/Implementation/HTNews.c:2581
 msgid "Connecting to NewsHost ..."
 msgstr "Verbinden met nieuws-host ..."
 
-#: WWW/Library/Implementation/HTNews.c:2630
+#: WWW/Library/Implementation/HTNews.c:2633
 #, c-format
 msgid "Could not access %s."
 msgstr "Geen toegang tot %s."
 
-#: WWW/Library/Implementation/HTNews.c:2736
+#: WWW/Library/Implementation/HTNews.c:2739
 #, c-format
 msgid "Can't read news info.  News host %.20s responded: %.200s"
 msgstr "Kan nieuwsinformatie niet lezen.  Nieuws-host %.20s antwoordde: %.200s"
 
-#: WWW/Library/Implementation/HTNews.c:2740
+#: WWW/Library/Implementation/HTNews.c:2743
 #, c-format
 msgid "Can't read news info, empty response from host %s"
 msgstr "Kan nieuwsinformatie niet lezen; loos antwoord van host %s"
@@ -3001,22 +3002,22 @@ msgstr "Kan nieuwsinformatie niet lezen; loos antwoord van host %s"
 #.
 #. * List available newsgroups.  - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:2944
+#: WWW/Library/Implementation/HTNews.c:2947
 msgid "Reading list of available newsgroups."
 msgstr "Lezen van lijst met beschikbare nieuwsgroepen."
 
-#: WWW/Library/Implementation/HTNews.c:2965
+#: WWW/Library/Implementation/HTNews.c:2968
 msgid "Reading list of articles in newsgroup."
 msgstr "Lezen van lijst met artikelen in nieuwsgroep."
 
 #.
 #. * Get an article from a news group.  - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:2971
+#: WWW/Library/Implementation/HTNews.c:2974
 msgid "Reading news article."
 msgstr "Lezen van nieuwsartikel."
 
-#: WWW/Library/Implementation/HTNews.c:3001
+#: WWW/Library/Implementation/HTNews.c:3004
 msgid "Sorry, could not load requested news."
 msgstr "Sorry, kan het opgevraagde nieuws niet laden."
 
@@ -3028,7 +3029,8 @@ msgstr "Adres bevat ongeldige poort"
 msgid "Address length looks invalid"
 msgstr "Adreslengte ziet er ongeldig uit"
 
-#: WWW/Library/Implementation/HTTCP.c:1618 WWW/Library/Implementation/HTTCP.c:1636
+#: WWW/Library/Implementation/HTTCP.c:1618
+#: WWW/Library/Implementation/HTTCP.c:1636
 #, c-format
 msgid "Unable to locate remote host %s."
 msgstr "Kan gindse computer %s niet vinden."
@@ -3037,7 +3039,8 @@ 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:1633 WWW/Library/Implementation/HTTelnet.c:115
+#: WWW/Library/Implementation/HTTCP.c:1633
+#: WWW/Library/Implementation/HTTelnet.c:115
 #, c-format
 msgid "Invalid hostname %s"
 msgstr "Ongeldige hostnaam %s"
@@ -3193,27 +3196,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:1890
+#: WWW/Library/Implementation/HTTP.c:1891
 msgid "Got unexpected 304 Not Modified status."
 msgstr "Kreeg een onverwachte '304 Niet gewijzigd'-statusmelding."
 
-#: WWW/Library/Implementation/HTTP.c:1953
+#: WWW/Library/Implementation/HTTP.c:1954
 msgid "Redirection of POST content requires user approval."
 msgstr "Doorverwijzing van POST-inhoud vereist toestemming van de gebruiker."
 
-#: WWW/Library/Implementation/HTTP.c:1968
+#: WWW/Library/Implementation/HTTP.c:1969
 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:2010
+#: WWW/Library/Implementation/HTTP.c:2011
 msgid "Retrying with access authorization information."
 msgstr "Bezig opnieuw te proberen met toegangsautorisatie-informatie."
 
-#: WWW/Library/Implementation/HTTP.c:2022
+#: WWW/Library/Implementation/HTTP.c:2023
 msgid "Show the 401 message body?"
 msgstr "Inhoud van het 401-bericht laten zien?"
 
-#: WWW/Library/Implementation/HTTP.c:2065
+#: WWW/Library/Implementation/HTTP.c:2066
 msgid "Show the 407 message body?"
 msgstr "Inhoud van het 407-bericht laten zien?"
 
@@ -3221,7 +3224,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:2165
+#: WWW/Library/Implementation/HTTP.c:2166
 msgid "Unknown status reply from server!"
 msgstr "Onbekende statusmelding van server!"
 
@@ -3409,106 +3412,106 @@ msgstr "Beheerder"
 msgid "Host"
 msgstr "Computer"
 
-#: src/GridText.c:704
+#: src/GridText.c:705
 msgid "Memory exhausted, display interrupted!"
 msgstr "Geen geheugen meer beschikbar, weergave is onderbroken!"
 
-#: src/GridText.c:709
+#: src/GridText.c:710
 msgid "Memory exhausted, will interrupt transfer!"
 msgstr "Geen geheugen meer beschikbaar, overdracht wordt afgebroken!"
 
-#: src/GridText.c:3663
+#: src/GridText.c:3654
 msgid " *** MEMORY EXHAUSTED ***"
 msgstr " *** ONVOLDOENDE GEHEUGEN BESCHIKBAAR ***"
 
-#: src/GridText.c:6057 src/GridText.c:6064 src/LYList.c:239
+#: src/GridText.c:6089 src/GridText.c:6096 src/LYList.c:239
 msgid "unknown field or link"
 msgstr "onbekend veld of link"
 
-#: src/GridText.c:6073
+#: src/GridText.c:6105
 msgid "text entry field"
 msgstr "tekstinvoerveld"
 
-#: src/GridText.c:6076
+#: src/GridText.c:6108
 msgid "password entry field"
 msgstr "wachtwoordinvoerveld"
 
-#: src/GridText.c:6079
+#: src/GridText.c:6111
 msgid "checkbox"
 msgstr "aanvinkvakje"
 
-#: src/GridText.c:6082
+#: src/GridText.c:6114
 msgid "radio button"
 msgstr "drukknop"
 
-#: src/GridText.c:6085
+#: src/GridText.c:6117
 msgid "submit button"
 msgstr "verzendknop"
 
-#: src/GridText.c:6088
+#: src/GridText.c:6120
 msgid "reset button"
 msgstr "herstelknop"
 
-#: src/GridText.c:6091
+#: src/GridText.c:6123
 msgid "popup menu"
 msgstr "popup-menu"
 
-#: src/GridText.c:6094
+#: src/GridText.c:6126
 msgid "hidden form field"
 msgstr "verborgen formulierveld"
 
-#: src/GridText.c:6097
+#: src/GridText.c:6129
 msgid "text entry area"
 msgstr "tekstinvoergebied"
 
-#: src/GridText.c:6100
+#: src/GridText.c:6132
 msgid "range entry field"
 msgstr "bereikinvoerveld"
 
-#: src/GridText.c:6103
+#: src/GridText.c:6135
 msgid "file entry field"
 msgstr "bestandsnaaminvoerveld"
 
-#: src/GridText.c:6106
+#: src/GridText.c:6138
 msgid "text-submit field"
 msgstr "tekst-verzendveld"
 
-#: src/GridText.c:6109
+#: src/GridText.c:6141
 msgid "image-submit button"
 msgstr "afbeelding-verzendknop"
 
-#: src/GridText.c:6112
+#: src/GridText.c:6144
 msgid "keygen field"
 msgstr "sleutelaanmaakveld"
 
-#: src/GridText.c:6115
+#: src/GridText.c:6147
 msgid "unknown form field"
 msgstr "onbekend formulierveld"
 
-#: src/GridText.c:10245
+#: src/GridText.c:10275
 msgid "Can't open file for uploading"
 msgstr "Kan bestand niet openen voor upload"
 
-#: src/GridText.c:11404
+#: src/GridText.c:11434
 #, c-format
 msgid "Submitting %s"
 msgstr "Verzenden van %s"
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12457
+#: src/GridText.c:12487
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr "Ophanging Gedetecteerd: TextAnchor-struct is corrupt - stel voor te onderbreken!"
 
 #. don't show previous state
-#: src/GridText.c:12594
+#: src/GridText.c:12624
 msgid "Wrap lines to fit displayed area?"
 msgstr "Regels omvouwen zodat alles zichtbaar is?"
 
-#: src/GridText.c:12646
+#: src/GridText.c:12676
 msgid "Very long lines have been wrapped!"
 msgstr "Erg lange regels zijn omgevouwen!"
 
-#: src/GridText.c:13151
+#: src/GridText.c:13181
 msgid "Very long lines have been truncated!"
 msgstr "Erg lange regels zijn afgekapt!"
 
@@ -3600,38 +3603,38 @@ msgstr "nee"
 #.
 #: src/HTAlert.c:911
 msgid "Y/N/A/V"
-msgstr "J/N/A/V"
+msgstr "(J/N/A/V)"
 
-#: src/HTML.c:5912
+#: src/HTML.c:5913
 msgid "Description:"
 msgstr "Omschrijving:"
 
-#: src/HTML.c:5917
+#: src/HTML.c:5918
 msgid "(none)"
 msgstr "(geen)"
 
-#: src/HTML.c:5921
+#: src/HTML.c:5922
 msgid "Filepath:"
 msgstr "Bestandspad:"
 
-#: src/HTML.c:5927
+#: src/HTML.c:5928
 msgid "(unknown)"
 msgstr "(onbekend)"
 
-#: src/HTML.c:7352
+#: src/HTML.c:7355
 msgid "Document has only hidden links.  Use the 'l'ist command."
 msgstr "Document heeft slechts verborgen links.  Gebruik het 'l'ijst commando."
 
 # Source?
-#: src/HTML.c:7851
+#: src/HTML.c:7854
 msgid "Source cache error - disk full?"
 msgstr "Cache fout - schijf vol?"
 
-#: src/HTML.c:7864
+#: src/HTML.c:7867
 msgid "Source cache error - not enough memory!"
 msgstr "Cache fout - niet genoeg geheugen!"
 
-#: src/LYBookmark.c:167
+#: src/LYBookmark.c:164
 msgid ""
 "     This file is an HTML representation of the X Mosaic hotlist file.\n"
 "     Outdated or invalid links may be removed by using the\n"
@@ -3643,7 +3646,7 @@ msgstr ""
 "     het 'verwijder boekenlegger', welke doorgaans gekoppeld is aan\n"
 "     de 'R' toets, maar uw systeembeheerder heeft dit wellicht gewijzigd."
 
-#: src/LYBookmark.c:374
+#: src/LYBookmark.c:371
 #, c-format
 msgid ""
 "     You can delete links by the 'R' key<br>\n"
@@ -3652,7 +3655,7 @@ msgstr ""
 "     U kunt links verwijderen met de 'R' toets<br>\n"
 "<ol>\n"
 
-#: src/LYBookmark.c:377
+#: src/LYBookmark.c:374
 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"
@@ -3662,7 +3665,7 @@ msgstr ""
 "     Dit is doorgaans de 'R' toets, maar uw systeembeheerder kan dit\n"
 "     gewijzigd hebben."
 
-#: src/LYBookmark.c:381
+#: src/LYBookmark.c:378
 msgid ""
 "     This file also may be edited with a standard text editor to delete\n"
 "     outdated or invalid links, or to change their order."
@@ -3670,7 +3673,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:384
+#: src/LYBookmark.c:381
 msgid ""
 "Note: if you edit this file manually\n"
 "      you should not change the format within the lines\n"
@@ -3682,7 +3685,7 @@ msgstr ""
 "      of andere HTML opmaak toevoegen.\n"
 "      Boekenlegger-links dienen als één regel te worden opgeslagen."
 
-#: src/LYBookmark.c:680
+#: src/LYBookmark.c:677
 #, c-format
 msgid "File may be recoverable from %s during this session"
 msgstr "Het bestand is gedurende deze sessie wellicht terug te halen uit %s"
@@ -4248,19 +4251,19 @@ msgstr "Dit bericht is automatisch gegenereerd door"
 msgid "No system mailer configured"
 msgstr "Geen systeemmailer geconfigureerd"
 
-#: src/LYMain.c:1001
+#: src/LYMain.c:1025
 msgid "No Winsock found, sorry."
 msgstr "Geen Winsock gevonden, sorry."
 
-#: src/LYMain.c:1198
+#: src/LYMain.c:1222
 msgid "You MUST define a valid TMP or TEMP area!"
 msgstr "U MOET een geldig TMP- of TEMP-gebied opgeven!"
 
-#: src/LYMain.c:1251 src/LYMainLoop.c:5051
+#: src/LYMain.c:1275 src/LYMainLoop.c:5051
 msgid "No such directory"
 msgstr "Map bestaat niet"
 
-#: src/LYMain.c:1436
+#: src/LYMain.c:1460
 #, c-format
 msgid ""
 "\n"
@@ -4271,7 +4274,7 @@ msgstr ""
 "Configuratiebestand '%s' is niet beschikbaar.\n"
 "\n"
 
-#: src/LYMain.c:1446
+#: src/LYMain.c:1470
 #, c-format
 msgid ""
 "\n"
@@ -4282,7 +4285,7 @@ msgstr ""
 "Lynx-tekensets zijn niet opgegeven.\n"
 "\n"
 
-#: src/LYMain.c:1475
+#: src/LYMain.c:1499
 #, c-format
 msgid ""
 "\n"
@@ -4293,7 +4296,7 @@ msgstr ""
 "Lynx-editkaart is niet opgegeven.\n"
 "\n"
 
-#: src/LYMain.c:1551
+#: src/LYMain.c:1575
 #, c-format
 msgid ""
 "\n"
@@ -4304,66 +4307,66 @@ msgstr ""
 "Lynx-bestand '%s' is niet beschikbaar.\n"
 "\n"
 
-#: src/LYMain.c:1626
+#: src/LYMain.c:1650
 #, c-format
 msgid "Ignored %d characters from standard input.\n"
 msgstr "Er zijn %d tekens van standaardinvoer genegeerd.\n"
 
-#: src/LYMain.c:1628
+#: src/LYMain.c:1652
 #, 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:1776
+#: src/LYMain.c:1800
 msgid "Warning:"
 msgstr "Waarschuwing:"
 
-#: src/LYMain.c:2341
+#: src/LYMain.c:2365
 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:2586 src/LYMain.c:2631
+#: src/LYMain.c:2610 src/LYMain.c:2655
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr "Lynx: onbekende tekenset '%s' wordt genegeerd\n"
 
-#: src/LYMain.c:3150
+#: src/LYMain.c:3174
 #, c-format
 msgid "%s Version %s (%s)"
 msgstr "%s versie %s (%s)"
 
-#: src/LYMain.c:3188
+#: src/LYMain.c:3212
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr "Gecompileerd op %s op %s om %s\n"
 
-#: src/LYMain.c:3210
+#: src/LYMain.c:3234
 msgid "Copyrights held by the Lynx Developers Group,"
 msgstr "De auteursrechten zijn in handen van de Lynx-ontwikkelaarsgroep,"
 
-#: src/LYMain.c:3211
+#: src/LYMain.c:3235
 msgid "the University of Kansas, CERN, and other contributors."
 msgstr "de Universiteit van Kansas, CERN, en andere medewerkers."
 
-#: src/LYMain.c:3212
+#: src/LYMain.c:3236
 msgid "Distributed under the GNU General Public License (Version 2)."
 msgstr "Gedistribueerd onder de GPL (GNU General Public License), versie 2."
 
-#: src/LYMain.c:3213
+#: src/LYMain.c:3237
 msgid "See http://lynx.isc.org/ and the online help for more information."
 msgstr "Zie http://lynx.isc.org/ en de online help voor meer informatie."
 
-#: src/LYMain.c:4032
+#: src/LYMain.c:4056
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "Gebruik:  %s [opties] [bestand]\n"
 
-#: src/LYMain.c:4033
+#: src/LYMain.c:4057
 #, c-format
 msgid "Options are:\n"
 msgstr "Mogelijke opties zijn:\n"
 
-#: src/LYMain.c:4332
+#: src/LYMain.c:4356
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr "%s: Ongeldige optie: %s\n"
@@ -4420,56 +4423,56 @@ msgstr "Map wijzigen is mislukt"
 msgid "Reparsing document under current settings..."
 msgstr "Document wordt opnieuw ontleed met huidige instellingen..."
 
-#: src/LYMainLoop.c:6521
+#: src/LYMainLoop.c:6520
 #, c-format
 msgid "Fatal error - could not open output file %s\n"
 msgstr "Fatale fout: kan uitvoerbestand %s niet openen\n"
 
-#: src/LYMainLoop.c:6858
+#: src/LYMainLoop.c:6857
 msgid "TABLE center enable."
 msgstr "TABLE centreren ingeschakeld."
 
-#: src/LYMainLoop.c:6861
+#: src/LYMainLoop.c:6860
 msgid "TABLE center disable."
 msgstr "TABLE centreren uitgeschakeld."
 
-#: src/LYMainLoop.c:6938
+#: src/LYMainLoop.c:6937
 msgid "Current URL is empty."
 msgstr "Huidige URL is leeg."
 
-#: src/LYMainLoop.c:6940 src/LYUtils.c:1828
+#: src/LYMainLoop.c:6939 src/LYUtils.c:1828
 msgid "Copy to clipboard failed."
 msgstr "Kopiëren naar klembord is mislukt."
 
-#: src/LYMainLoop.c:6942
+#: src/LYMainLoop.c:6941
 msgid "Document URL put to clipboard."
 msgstr "Document-URL is op klembord geplaatst."
 
-#: src/LYMainLoop.c:6944
+#: src/LYMainLoop.c:6943
 msgid "Link URL put to clipboard."
 msgstr "Link-URL is op klembord geplaatst."
 
-#: src/LYMainLoop.c:6971
+#: src/LYMainLoop.c:6970
 msgid "No URL in the clipboard."
 msgstr "Geen URL op het klembord."
 
-#: src/LYMainLoop.c:7642 src/LYMainLoop.c:7812
+#: src/LYMainLoop.c:7641 src/LYMainLoop.c:7811
 msgid "-index-"
 msgstr "-index-"
 
-#: src/LYMainLoop.c:7752
+#: src/LYMainLoop.c:7751
 msgid "lynx: Can't access startfile"
 msgstr "lynx: Geen toegang tot startbestand"
 
-#: src/LYMainLoop.c:7764
+#: src/LYMainLoop.c:7763
 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:7765
+#: src/LYMainLoop.c:7764
 msgid "      Exiting..."
 msgstr "      Afsluiten..."
 
-#: src/LYMainLoop.c:7806
+#: src/LYMainLoop.c:7805
 msgid "-more-"
 msgstr "-meer-"
 
@@ -4533,348 +4536,349 @@ msgstr ""
 msgid "Message has no original text!"
 msgstr "Bericht bevat geen oorspronkelijke tekst!"
 
-#: src/LYOptions.c:768
+#: src/LYOptions.c:765
 msgid "review/edit B)ookmarks files"
 msgstr "B)ladwijzerbestanden bekijken/wijzigen"
 
-#: src/LYOptions.c:770
+#: src/LYOptions.c:767
 msgid "B)ookmark file: "
 msgstr "B)ladwijzerbestand: "
 
-#: src/LYOptions.c:2131 src/LYOptions.c:2138
+#: src/LYOptions.c:2127 src/LYOptions.c:2134
 msgid "ON"
 msgstr "AAN"
 
 #. verbose_img variable
-#: src/LYOptions.c:2132 src/LYOptions.c:2137 src/LYOptions.c:2289 src/LYOptions.c:2300
+#: src/LYOptions.c:2128 src/LYOptions.c:2133 src/LYOptions.c:2285
+#: src/LYOptions.c:2296
 msgid "OFF"
 msgstr "UIT"
 
-#: src/LYOptions.c:2133
+#: src/LYOptions.c:2129
 msgid "NEVER"
 msgstr "NOOIT"
 
-#: src/LYOptions.c:2134
+#: src/LYOptions.c:2130
 msgid "ALWAYS"
 msgstr "ALTIJD"
 
-#: src/LYOptions.c:2150 src/LYOptions.c:2281
+#: src/LYOptions.c:2146 src/LYOptions.c:2277
 msgid "ignore"
 msgstr "negeren"
 
-#: src/LYOptions.c:2151
+#: src/LYOptions.c:2147
 msgid "ask user"
 msgstr "gebruiker vragen"
 
-#: src/LYOptions.c:2152
+#: src/LYOptions.c:2148
 msgid "accept all"
 msgstr "alles aanvaarden"
 
-#: src/LYOptions.c:2164
+#: src/LYOptions.c:2160
 msgid "ALWAYS OFF"
 msgstr "ALTIJD UIT"
 
-#: src/LYOptions.c:2165
+#: src/LYOptions.c:2161
 msgid "FOR LOCAL FILES ONLY"
 msgstr "ALLEEN VOOR LOKALE BESTANDEN"
 
-#: src/LYOptions.c:2167
+#: src/LYOptions.c:2163
 msgid "ALWAYS ON"
 msgstr "ALTIJD AAN"
 
-#: src/LYOptions.c:2179
+#: src/LYOptions.c:2175
 msgid "Numbers act as arrows"
 msgstr "cijfers doen als pijltjes"
 
-#: src/LYOptions.c:2181
+#: src/LYOptions.c:2177
 msgid "Links are numbered"
 msgstr "cijfers kiezen koppelingen"
 
-#: src/LYOptions.c:2184
+#: src/LYOptions.c:2180
 msgid "Links and form fields are numbered"
 msgstr "cijfers kiezen koppelingen/formuliervelden"
 
-#: src/LYOptions.c:2187
+#: src/LYOptions.c:2183
 msgid "Form fields are numbered"
 msgstr "cijfers kiezen formuliervelden"
 
-#: src/LYOptions.c:2201
+#: src/LYOptions.c:2197
 msgid "Case insensitive"
 msgstr "hoofdletterongevoelig"
 
-#: src/LYOptions.c:2202
+#: src/LYOptions.c:2198
 msgid "Case sensitive"
 msgstr "hoofdlettergevoelig"
 
-#: src/LYOptions.c:2226
+#: src/LYOptions.c:2222
 msgid "prompt normally"
 msgstr "normaal prompten"
 
-#: src/LYOptions.c:2227
+#: src/LYOptions.c:2223
 msgid "force yes-response"
 msgstr "ja-antwoord afdwingen"
 
-#: src/LYOptions.c:2228
+#: src/LYOptions.c:2224
 msgid "force no-response"
 msgstr "nee-antwoord afdwingen"
 
-#: src/LYOptions.c:2246
+#: src/LYOptions.c:2242
 msgid "Novice"
 msgstr "beginner"
 
-#: src/LYOptions.c:2247
+#: src/LYOptions.c:2243
 msgid "Intermediate"
 msgstr "gevorderd"
 
-#: src/LYOptions.c:2248
+#: src/LYOptions.c:2244
 msgid "Advanced"
 msgstr "expert"
 
-#: src/LYOptions.c:2257
+#: src/LYOptions.c:2253
 msgid "By First Visit"
 msgstr "op eerstbezocht"
 
-#: src/LYOptions.c:2259
+#: src/LYOptions.c:2255
 msgid "By First Visit Reversed"
 msgstr "omgekeerd eerstbezocht"
 
-#: src/LYOptions.c:2260
+#: src/LYOptions.c:2256
 msgid "As Visit Tree"
 msgstr "als bezoekboom"
 
-#: src/LYOptions.c:2261
+#: src/LYOptions.c:2257
 msgid "By Last Visit"
 msgstr "op laatstbezocht"
 
-#: src/LYOptions.c:2263
+#: src/LYOptions.c:2259
 msgid "By Last Visit Reversed"
 msgstr "omgekeerd laatstbezocht"
 
 #. Old_DTD variable
-#: src/LYOptions.c:2274
+#: src/LYOptions.c:2270
 msgid "relaxed (TagSoup mode)"
 msgstr "versoepeld (TagSoup-modus)"
 
-#: src/LYOptions.c:2275
+#: src/LYOptions.c:2271
 msgid "strict (SortaSGML mode)"
 msgstr "strikt (SortaSGML-modus)"
 
-#: src/LYOptions.c:2282
+#: src/LYOptions.c:2278
 msgid "as labels"
 msgstr "tonen als labels"
 
-#: src/LYOptions.c:2283
+#: src/LYOptions.c:2279
 msgid "as links"
 msgstr "tonen als koppelingen"
 
-#: src/LYOptions.c:2290
+#: src/LYOptions.c:2286
 msgid "show filename"
 msgstr "bestandsnaam tonen"
 
-#: src/LYOptions.c:2301
+#: src/LYOptions.c:2297
 msgid "STANDARD"
 msgstr "STANDAARD"
 
-#: src/LYOptions.c:2302
+#: src/LYOptions.c:2298
 msgid "ADVANCED"
 msgstr "GEAVANCEERD"
 
-#: src/LYOptions.c:2333
+#: src/LYOptions.c:2329
 msgid "Directories first"
 msgstr "mappen eerst"
 
-#: src/LYOptions.c:2334
+#: src/LYOptions.c:2330
 msgid "Files first"
 msgstr "bestanden eerst"
 
-#: src/LYOptions.c:2335
+#: src/LYOptions.c:2331
 msgid "Mixed style"
 msgstr "gemengd"
 
-#: src/LYOptions.c:2343 src/LYOptions.c:2363
+#: src/LYOptions.c:2339 src/LYOptions.c:2359
 msgid "By Name"
 msgstr "op naam"
 
-#: src/LYOptions.c:2344 src/LYOptions.c:2364
+#: src/LYOptions.c:2340 src/LYOptions.c:2360
 msgid "By Type"
 msgstr "op type"
 
-#: src/LYOptions.c:2345 src/LYOptions.c:2365
+#: src/LYOptions.c:2341 src/LYOptions.c:2361
 msgid "By Size"
 msgstr "op grootte"
 
-#: src/LYOptions.c:2346 src/LYOptions.c:2366
+#: src/LYOptions.c:2342 src/LYOptions.c:2362
 msgid "By Date"
 msgstr "op datum"
 
-#: src/LYOptions.c:2347
+#: src/LYOptions.c:2343
 msgid "By Mode"
 msgstr "op modus"
 
-#: src/LYOptions.c:2349
+#: src/LYOptions.c:2345
 msgid "By User"
 msgstr "op gebruiker"
 
-#: src/LYOptions.c:2350
+#: src/LYOptions.c:2346
 msgid "By Group"
 msgstr "op groep"
 
-#: src/LYOptions.c:2375
+#: src/LYOptions.c:2371
 msgid "Do not show rate"
 msgstr "niet tonen"
 
-#: src/LYOptions.c:2376 src/LYOptions.c:2377
+#: src/LYOptions.c:2372 src/LYOptions.c:2373
 #, c-format
 msgid "Show %s/sec rate"
 msgstr "als %s/s tonen"
 
-#: src/LYOptions.c:2379 src/LYOptions.c:2380
+#: src/LYOptions.c:2375 src/LYOptions.c:2376
 #, c-format
 msgid "Show %s/sec, ETA"
 msgstr "als %s/s plus ETA tonen"
 
-#: src/LYOptions.c:2383
+#: src/LYOptions.c:2379
 msgid "Show progressbar"
 msgstr "als voortgangsbalk"
 
-#: src/LYOptions.c:2395
+#: src/LYOptions.c:2391
 msgid "Accept lynx's internal types"
 msgstr "interne types van Lynx accepteren"
 
-#: src/LYOptions.c:2396
+#: src/LYOptions.c:2392
 msgid "Also accept lynx.cfg's types"
 msgstr "ook types uit lynx.cfg accepteren"
 
-#: src/LYOptions.c:2397
+#: src/LYOptions.c:2393
 msgid "Also accept user's types"
 msgstr "ook gebruikertypes accepteren"
 
-#: src/LYOptions.c:2398
+#: src/LYOptions.c:2394
 msgid "Also accept system's types"
 msgstr "ook systeemtypes accepteren"
 
-#: src/LYOptions.c:2399
+#: src/LYOptions.c:2395
 msgid "Accept all types"
 msgstr "alle types accepteren"
 
-#: src/LYOptions.c:2408
+#: src/LYOptions.c:2404
 msgid "gzip"
 msgstr "gzip"
 
-#: src/LYOptions.c:2409
+#: src/LYOptions.c:2405
 msgid "deflate"
 msgstr "deflate"
 
-#: src/LYOptions.c:2412
+#: src/LYOptions.c:2408
 msgid "compress"
 msgstr "compress"
 
-#: src/LYOptions.c:2415
+#: src/LYOptions.c:2411
 msgid "bzip2"
 msgstr "bzip2"
 
-#: src/LYOptions.c:2417
+#: src/LYOptions.c:2413
 msgid "All"
 msgstr "allemaal"
 
-#: src/LYOptions.c:2685 src/LYOptions.c:2709
+#: src/LYOptions.c:2681 src/LYOptions.c:2705
 #, c-format
 msgid "Use %s to invoke the Options menu!"
 msgstr "Gebruik %s om naar het Optiesmenu te gaan!"
 
-#: src/LYOptions.c:3481
+#: src/LYOptions.c:3477
 msgid "(options marked with (!) will not be saved)"
 msgstr "(opties gemarkeerd met (!) worden niet opgeslagen)"
 
-#: src/LYOptions.c:3489
+#: src/LYOptions.c:3485
 msgid "General Preferences"
 msgstr "Algemene voorkeuren"
 
 #. ***************************************************************
 #. User Mode: SELECT
-#: src/LYOptions.c:3493
+#: src/LYOptions.c:3489
 msgid "User mode"
 msgstr "Gebruikersmodus"
 
 #. Editor: INPUT
-#: src/LYOptions.c:3499
+#: src/LYOptions.c:3495
 msgid "Editor"
 msgstr "Editor"
 
 #. Search Type: SELECT
-#: src/LYOptions.c:3504
+#: src/LYOptions.c:3500
 msgid "Type of Search"
 msgstr "Zoekmethode"
 
-#: src/LYOptions.c:3509
+#: src/LYOptions.c:3505
 msgid "Security and Privacy"
 msgstr "Veiligheid en privacy"
 
 #. ***************************************************************
 #. Cookies: SELECT
-#: src/LYOptions.c:3513
+#: src/LYOptions.c:3509
 msgid "Cookies"
 msgstr "Koekjes"
 
 #. Cookie Prompting: SELECT
-#: src/LYOptions.c:3527
+#: src/LYOptions.c:3523
 msgid "Invalid-Cookie Prompting"
 msgstr "Prompt bij ongeldige koekjes"
 
 #. SSL Prompting: SELECT
-#: src/LYOptions.c:3534
+#: src/LYOptions.c:3530
 msgid "SSL Prompting"
 msgstr "SSL-prompt"
 
-#: src/LYOptions.c:3540
+#: src/LYOptions.c:3536
 msgid "Keyboard Input"
 msgstr "Toetsenbordinvoer"
 
 #. ***************************************************************
 #. Keypad Mode: SELECT
-#: src/LYOptions.c:3544
+#: src/LYOptions.c:3540
 msgid "Keypad mode"
 msgstr "Gedrag van cijfertoetsen"
 
 #. Emacs keys: ON/OFF
-#: src/LYOptions.c:3550
+#: src/LYOptions.c:3546
 msgid "Emacs keys"
 msgstr "Emacs-toetsen"
 
 #. VI Keys: ON/OFF
-#: src/LYOptions.c:3556
+#: src/LYOptions.c:3552
 msgid "VI keys"
 msgstr "VI-toetsen"
 
 #. Line edit style: SELECT
 #. well, at least 2 line edit styles available
-#: src/LYOptions.c:3563
+#: src/LYOptions.c:3559
 msgid "Line edit style"
 msgstr "Regelbewerkingsstijl"
 
 #. Keyboard layout: SELECT
-#: src/LYOptions.c:3575
+#: src/LYOptions.c:3571
 msgid "Keyboard layout"
 msgstr "Toetsenbordindeling"
 
 #.
 #. * Display and Character Set
 #.
-#: src/LYOptions.c:3589
+#: src/LYOptions.c:3585
 msgid "Display and Character Set"
 msgstr "Weergave en tekenset"
 
 #. Use locale-based character set: ON/OFF
-#: src/LYOptions.c:3594
+#: src/LYOptions.c:3590
 msgid "Use locale-based character set"
 msgstr "Tekenset van taalregio nemen"
 
 #. Display Character Set: SELECT
-#: src/LYOptions.c:3603
+#: src/LYOptions.c:3599
 msgid "Display character set"
 msgstr "Gebruikte tekenset op scherm"
 
-#: src/LYOptions.c:3634
+#: src/LYOptions.c:3630
 msgid "Assumed document character set"
 msgstr "Tekenset van huidig document"
 
@@ -4883,186 +4887,186 @@ 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:3654
+#: src/LYOptions.c:3650
 msgid "CJK mode"
 msgstr "CJK-modus"
 
-#: src/LYOptions.c:3656
+#: src/LYOptions.c:3652
 msgid "Raw 8-bit"
 msgstr "Kale 8-bit"
 
 #. X Display: INPUT
-#: src/LYOptions.c:3664
+#: src/LYOptions.c:3660
 msgid "X Display"
 msgstr "X-display"
 
 #.
 #. * Document Appearance
 #.
-#: src/LYOptions.c:3670
+#: src/LYOptions.c:3666
 msgid "Document Appearance"
 msgstr "Uiterlijk van document"
 
-#: src/LYOptions.c:3676
+#: src/LYOptions.c:3672
 msgid "Show color"
 msgstr "Kleur tonen"
 
 #. Show cursor: ON/OFF
-#: src/LYOptions.c:3700
+#: src/LYOptions.c:3696
 msgid "Show cursor"
 msgstr "Cursor tonen"
 
 #. Underline links: ON/OFF
-#: src/LYOptions.c:3706
+#: src/LYOptions.c:3702
 msgid "Underline links"
 msgstr "Koppelingen onderstrepen"
 
 #. Show scrollbar: ON/OFF
-#: src/LYOptions.c:3713
+#: src/LYOptions.c:3709
 msgid "Show scrollbar"
 msgstr "Schuifbalk tonen"
 
 #. Select Popups: ON/OFF
-#: src/LYOptions.c:3720
+#: src/LYOptions.c:3716
 msgid "Popups for select fields"
 msgstr "Menuutjes voor keuzevelden"
 
 #. HTML error recovery: SELECT
-#: src/LYOptions.c:3726
+#: src/LYOptions.c:3722
 msgid "HTML error recovery"
 msgstr "HTML-foutcorrectie"
 
 #. Show Images: SELECT
-#: src/LYOptions.c:3732
+#: src/LYOptions.c:3728
 msgid "Show images"
 msgstr "Afbeeldingen"
 
 #. Verbose Images: ON/OFF
-#: src/LYOptions.c:3746
+#: src/LYOptions.c:3742
 msgid "Verbose images"
 msgstr "Details van afbeeldingen"
 
 #.
 #. * Headers Transferred to Remote Servers
 #.
-#: src/LYOptions.c:3754
+#: src/LYOptions.c:3750
 msgid "Headers Transferred to Remote Servers"
 msgstr "Naar servers verzonden kopregels"
 
 #. ***************************************************************
 #. Mail Address: INPUT
-#: src/LYOptions.c:3758
+#: src/LYOptions.c:3754
 msgid "Personal mail address"
 msgstr "Persoonlijk e-mailadres"
 
-#: src/LYOptions.c:3764
+#: src/LYOptions.c:3760
 msgid "Password for anonymous ftp"
 msgstr "Wachtwoord voor anonieme FTP"
 
 #. Preferred media type: SELECT
-#: src/LYOptions.c:3770
+#: src/LYOptions.c:3766
 msgid "Preferred media type"
 msgstr "Voorkeursmediatype"
 
 # Het gaat over compressiemethodes, niet over codering.
 #. Preferred encoding: SELECT
-#: src/LYOptions.c:3776
+#: src/LYOptions.c:3772
 msgid "Preferred encoding"
 msgstr "Voorkeurscompressie"
 
 #. Preferred Document Character Set: INPUT
-#: src/LYOptions.c:3782
+#: src/LYOptions.c:3778
 msgid "Preferred document character set"
 msgstr "Voorkeurstekenset van document"
 
 #. Preferred Document Language: INPUT
-#: src/LYOptions.c:3787
+#: src/LYOptions.c:3783
 msgid "Preferred document language"
 msgstr "Voorkeurstaal van document"
 
-#: src/LYOptions.c:3793
+#: src/LYOptions.c:3789
 msgid "User-Agent header"
 msgstr "User-Agent-kopregel"
 
 #.
 #. * Listing and Accessing Files
 #.
-#: src/LYOptions.c:3801
+#: src/LYOptions.c:3797
 msgid "Listing and Accessing Files"
 msgstr "Bestandslijsten en snelheid"
 
 #. FTP sort: SELECT
-#: src/LYOptions.c:3806
+#: src/LYOptions.c:3802
 msgid "Use Passive FTP"
 msgstr "passieve FTP gebruiken"
 
 #. FTP sort: SELECT
-#: src/LYOptions.c:3812
+#: src/LYOptions.c:3808
 msgid "FTP sort criteria"
 msgstr "Sortering voor FTP"
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:3820
+#: src/LYOptions.c:3816
 msgid "Local directory sort criteria"
 msgstr "Groepering in lokale mappen"
 
 #. Local Directory Order: SELECT
-#: src/LYOptions.c:3826
+#: src/LYOptions.c:3822
 msgid "Local directory sort order"
 msgstr "Sortering van lokale bestanden"
 
-#: src/LYOptions.c:3835
+#: src/LYOptions.c:3831
 msgid "Show dot files"
 msgstr "puntbestanden tonen"
 
-#: src/LYOptions.c:3843
+#: src/LYOptions.c:3839
 msgid "Execution links"
 msgstr "verwijzingen die programma's starten"
 
 #. Show transfer rate: SELECT
-#: src/LYOptions.c:3863
+#: src/LYOptions.c:3859
 msgid "Show transfer rate"
 msgstr "Overdrachtssnelheid tonen"
 
 #.
 #. * Special Files and Screens
 #.
-#: src/LYOptions.c:3883
+#: src/LYOptions.c:3879
 msgid "Special Files and Screens"
 msgstr "Speciale bestanden en schermen"
 
-#: src/LYOptions.c:3888
+#: src/LYOptions.c:3884
 msgid "Multi-bookmarks"
 msgstr "Meervoudige boekenleggers"
 
-#: src/LYOptions.c:3896
+#: src/LYOptions.c:3892
 msgid "Review/edit Bookmarks files"
 msgstr "Boekenleggerbestanden bekijken/wijzigen"
 
-#: src/LYOptions.c:3898
+#: src/LYOptions.c:3894
 msgid "Goto multi-bookmark menu"
 msgstr "Naar multiboekenleggermenu"
 
-#: src/LYOptions.c:3900
+#: src/LYOptions.c:3896
 msgid "Bookmarks file"
 msgstr "Boekenleggerbestand"
 
 #. Auto Session: ON/OFF
-#: src/LYOptions.c:3907
+#: src/LYOptions.c:3903
 msgid "Auto Session"
 msgstr "Automatische sessie"
 
 #. Session File Menu: INPUT
-#: src/LYOptions.c:3913
+#: src/LYOptions.c:3909
 msgid "Session file"
 msgstr "Sessiebestand"
 
 #. Visited Pages: SELECT
-#: src/LYOptions.c:3919
+#: src/LYOptions.c:3915
 msgid "Visited Pages"
 msgstr "Bezochte pagina's"
 
-#: src/LYOptions.c:3924
+#: src/LYOptions.c:3920
 msgid "View the file "
 msgstr "Instellingenbestand bekijken: "
 
@@ -5449,7 +5453,7 @@ msgstr ""
 "waar OBJECT een van de volgende is: EM,STRONG,B,I,U,BLINK enz.\n"
 "\n"
 
-#: src/LYTraversal.c:111
+#: src/LYTraversal.c:108
 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"
 
@@ -5485,29 +5489,29 @@ msgstr "Zendopties:"
 msgid "Download document URL put to clipboard."
 msgstr "Document afhalings-URL op klembord geplaatst."
 
-#: src/LYUtils.c:2614
+#: src/LYUtils.c:2615
 msgid "Unexpected access protocol for this URL scheme."
 msgstr "Onverwacht toegangsprotocol voor deze URL-methode."
 
-#: src/LYUtils.c:3422
+#: src/LYUtils.c:3423
 msgid "Too many tempfiles"
 msgstr "Te veel tijdelijke bestanden"
 
-#: src/LYUtils.c:3722
+#: src/LYUtils.c:3723
 msgid "unknown restriction"
 msgstr "Onbekende beperking"
 
-#: src/LYUtils.c:3753
+#: src/LYUtils.c:3754
 #, c-format
 msgid "No restrictions set.\n"
 msgstr "Er zijn geen beperkingen gesteld.\n"
 
-#: src/LYUtils.c:3756
+#: src/LYUtils.c:3757
 #, c-format
 msgid "Restrictions set:\n"
 msgstr "Gestelde beperkingen:\n"
 
-#: src/LYUtils.c:5134
+#: src/LYUtils.c:5135
 msgid "Cannot find HOME directory"
 msgstr "Kan persoonlijke map niet vinden"
 
@@ -5535,8 +5539,7 @@ msgid ""
 "to a different value if you choose.\n"
 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"
+"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:332
 msgid ""
@@ -5579,10 +5582,7 @@ msgid ""
 "all cookies.  If a domain is specified in both options, rejection will\n"
 "take precedence.  The accept_all_cookies parameter will override any\n"
 "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"
+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:357
 msgid ""
@@ -5686,8 +5686,7 @@ msgid ""
 "\n"
 "Current lineedit modes are:\n"
 msgstr ""
-"lineedit_mode specificeert de toetsaanslagen die gebruikt worden voor het invoeren van tekenreeksen in prompten en formulieren.  "
-"Als lineedit_mode gezet wordt op \"Default Binding\" dan worden de volgende tekens gebruikt voor verplaatsen en verwijderen:\n"
+"lineedit_mode specificeert de toetsaanslagen die gebruikt worden voor het invoeren van tekenreeksen in prompten en formulieren.  Als lineedit_mode gezet wordt op \"Default Binding\" dan worden de volgende tekens gebruikt voor verplaatsen en verwijderen:\n"
 "                  Vorig Volgend     return = Accepteer invoer\n"
 "  Verplaats teken: <-     ->        ^G     = annuleer invoer\n"
 "  Verplaats woord: ^P     ^N        ^U     = wis regel\n"
@@ -5807,9 +5806,7 @@ msgid ""
 "          or compromise security.  This should only be set to \"on\" if\n"
 "          you are viewing trusted source information.\n"
 msgstr ""
-"Als run_execution_links_on_local_files op \"on\" wordt gezet zullen alle lokale uitvoer-links gevonden in LOKALE bestanden worden "
-"uitgevoerd als ze geselecteerd worden.  Dit verschilt van run_all_execution_links, daar slechts bestanden die zich op het lokale "
-"systeem bevinden deze uitvoer rechten krijgen.\n"
+"Als run_execution_links_on_local_files op \"on\" wordt gezet zullen alle lokale uitvoer-links gevonden in LOKALE bestanden worden uitgevoerd als ze geselecteerd worden.  Dit verschilt van run_all_execution_links, daar slechts bestanden die zich op het lokale systeem bevinden deze uitvoer rechten krijgen.\n"
 "\n"
 "LET OP - Hier dreigt potentieel gevaar.  Omdat u informatie kunt\n"
 "         bekijken die geschreven is door onbekende en niet vertrouwde\n"
diff --git a/src/LYEditmap.c b/src/LYEditmap.c
index 04fdee7f..7e748748 100644
--- a/src/LYEditmap.c
+++ b/src/LYEditmap.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYEditmap.c,v 1.27 2008/09/07 23:00:47 tom Exp $
+ * $LynxId: LYEditmap.c,v 1.28 2011/05/28 13:07:55 tom Exp $
  *
  * LYEditMap.c
  * Keybindings for line and form editting.
@@ -11,7 +11,7 @@
 #include <LYKeymap.h>		/* KEYMAP_SIZE, LKC_*, LYK_* - kw */
 
 /* * * * * LynxEditactionCodes * * * * */
-#ifdef EXP_ALT_BINDINGS
+#ifdef USE_ALT_BINDINGS
 
 /* Last valid index for the (lynxkeycode+modifier -> lynxeditactioncode)
  * tables.  Currently all three tables are the same.  - kw
@@ -26,7 +26,7 @@
 #define LKC_TO_LEC_M2(c) ((c)>LAST_MOD2_LKC? (int)LYE_UNMOD: Mod2Binding[c])
 #define LKC_TO_LEC_M3(c) ((c)>LAST_MOD3_LKC? (int)LYE_UNMOD: Mod3Binding[c])
 
-#endif /* EXP_ALT_BINDINGS */
+#endif /* USE_ALT_BINDINGS */
 
 int current_lineedit = 0;	/* Index into LYLineEditors[]   */
 
@@ -281,7 +281,7 @@ LYE_NOP,        LYE_NOP,        LYE_NOP,        LYE_NOP,
              /*                 ^^=upper-case-line,  ^_=lower-case-line   */
 /* Why the difference for tab? - kw */
 
-#ifdef EXP_ALT_BINDINGS
+#ifdef USE_ALT_BINDINGS
 static LYEditCode BetterEditBinding[KEYMAP_SIZE-1]={
 
 LYE_NOP,        LYE_BOL,        LYE_BACK,       LYE_ABORT,
@@ -923,7 +923,7 @@ LYE_UNMOD,      LYE_UNMOD,
 static short *Mod2Binding = Mod1Binding;
 static short *Mod3Binding = Mod1Binding;
 
-#endif /* EXP_ALT_BINDINGS */
+#endif /* USE_ALT_BINDINGS */
 /* *INDENT-ON* */
 
 /*
@@ -933,7 +933,7 @@ static short *Mod3Binding = Mod1Binding;
 LYEditCode *LYLineEditors[] =
 {
     DefaultEditBinding,		/* You can't please everyone, so you ... DW */
-#ifdef EXP_ALT_BINDINGS
+#ifdef USE_ALT_BINDINGS
     BetterEditBinding,		/* No, you certainly can't ... /ked 10/27/98 */
     BashlikeEditBinding,	/* and one more... - kw 1999-02-15 */
 #endif
@@ -946,7 +946,7 @@ LYEditCode *LYLineEditors[] =
 const char *LYLineeditNames[] =
 {
     "Default Binding",
-#ifdef EXP_ALT_BINDINGS
+#ifdef USE_ALT_BINDINGS
     "Alternate Bindings",
     "Bash-like Bindings",
 #endif
@@ -962,7 +962,7 @@ const char *LYLineeditNames[] =
 const char *LYLineeditHelpURLs[] =
 {
     EDIT_HELP,
-#ifdef EXP_ALT_BINDINGS
+#ifdef USE_ALT_BINDINGS
     ALT_EDIT_HELP,
     BASHLIKE_EDIT_HELP,
 #endif
@@ -981,7 +981,7 @@ int EditBinding(int xlkc)
 	c = TOASCII(c);
     }
 #endif
-#ifdef EXP_ALT_BINDINGS
+#ifdef USE_ALT_BINDINGS
     /*
      * Get intermediate code from one of the lynxkeycode+modifier tables if
      * applicable, otherwise get the lynxeditactioncode directly.  If we have
@@ -1033,7 +1033,7 @@ BOOL LYRemapEditBinding(int xlkc,
 
     if (xlkc < 0 || (xlkc & LKC_ISLAC) || c >= KEYMAP_SIZE + 1)
 	return FALSE;
-#ifdef EXP_ALT_BINDINGS
+#ifdef USE_ALT_BINDINGS
     if (xlkc & LKC_MOD1) {
 	if (c > LAST_MOD1_LKC)
 	    return FALSE;
@@ -1053,7 +1053,7 @@ BOOL LYRemapEditBinding(int xlkc,
 	    Mod3Binding[c] = (short) lec;
 	return TRUE;
     } else
-#endif /* EXP_ALT_BINDINGS */
+#endif /* USE_ALT_BINDINGS */
     {
 #ifndef UCHAR_MAX
 #define UCHAR_MAX 255
@@ -1165,7 +1165,7 @@ int LYEditKeyForAction(int lac,
 	if ((editaction & LYE_DF) && mod3found < 0)
 	    mod3found = i;
     }
-#ifdef EXP_ALT_BINDINGS
+#ifdef USE_ALT_BINDINGS
     if (mod3found >= 0) {
 	for (i = mod3found; i >= 0; i = NEXT_I(i, LAST_MOD3_LKC)) {
 	    editaction = CurrentLineEditor()[i];
@@ -1280,7 +1280,7 @@ int LYEditKeyForAction(int lac,
 	    }
 	}
     }
-#endif /* EXP_ALT_BINDINGS */
+#endif /* USE_ALT_BINDINGS */
     if (pmodkey)
 	*pmodkey = -1;
     return (-1);
diff --git a/src/LYGlobalDefs.h b/src/LYGlobalDefs.h
index c72dbb38..ea3e7e04 100644
--- a/src/LYGlobalDefs.h
+++ b/src/LYGlobalDefs.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYGlobalDefs.h,v 1.129 2011/05/27 08:39:07 tom Exp $
+ * $LynxId: LYGlobalDefs.h,v 1.130 2011/05/27 21:26:14 tom Exp $
  *
  * global variable definitions
  */
@@ -672,6 +672,14 @@ extern "C" {
 	cygwin32_conv_to_full_posix_path(p, q)
 #endif
 
+#ifdef __CYGWIN__
+#define ConvertToWin32Path(p, q) \
+	cygwin_conv_to_full_win32_path(p, q);
+#else
+#define ConvertToWin32Path(p, q) \
+	q = p
+#endif
+
 #ifdef USE_SCROLLBAR
 /* GridText.c */
     extern BOOLEAN LYShowScrollbar;
diff --git a/src/LYHistory.c b/src/LYHistory.c
index b970dec1..5ac35038 100644
--- a/src/LYHistory.c
+++ b/src/LYHistory.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYHistory.c,v 1.80 2010/09/25 11:22:51 tom Exp $
+ * $LynxId: LYHistory.c,v 1.81 2011/05/28 13:05:14 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTTP.h>
@@ -130,7 +130,7 @@ void LYAddVisitedLink(DocInfo *doc)
 	    LYIsUIPage(doc->address, UIP_OPTIONS_MENU) ||
 	    isLYNXKEYMAP(doc->address) ||
 	    LYIsUIPage(doc->address, UIP_LIST_PAGE) ||
-#ifdef EXP_ADDRLIST_PAGE
+#ifdef USE_ADDRLIST_PAGE
 	    LYIsUIPage(doc->address, UIP_ADDRLIST_PAGE) ||
 #endif
 	    LYIsUIPage(doc->address, UIP_CONFIG_DEF) ||
diff --git a/src/LYKeymap.c b/src/LYKeymap.c
index 90cd3c44..d6d764a1 100644
--- a/src/LYKeymap.c
+++ b/src/LYKeymap.c
@@ -1,4 +1,4 @@
-/* $LynxId: LYKeymap.c,v 1.74 2011/05/26 23:24:42 tom Exp $ */
+/* $LynxId: LYKeymap.c,v 1.75 2011/05/28 13:05:14 tom Exp $ */
 #include <HTUtils.h>
 #include <LYUtils.h>
 #include <LYGlobalDefs.h>
@@ -898,7 +898,7 @@ static Kcmd revmap[] = {
     DATA(
 	LYK_INSERT_FILE, "INSERTFILE",
 	"insert file into a textarea (just above cursorline)" ),
-#ifdef EXP_ADDRLIST_PAGE
+#ifdef USE_ADDRLIST_PAGE
     DATA(
 	LYK_ADDRLIST, "ADDRLIST",
 	"like LIST command, but always shows the links' URLs" ),
diff --git a/src/LYKeymap.h b/src/LYKeymap.h
index ae263074..a0cb53dd 100644
--- a/src/LYKeymap.h
+++ b/src/LYKeymap.h
@@ -1,4 +1,4 @@
-/* $LynxId: LYKeymap.h,v 1.42 2010/09/25 11:35:30 tom Exp $ */
+/* $LynxId: LYKeymap.h,v 1.43 2011/05/28 13:05:14 tom Exp $ */
 #ifndef LYKEYMAP_H
 #define LYKEYMAP_H
 
@@ -200,7 +200,7 @@ extern "C" {
 	,LYK_GROW_TEXTAREA
 	,LYK_INSERT_FILE
 
-#ifdef EXP_ADDRLIST_PAGE
+#ifdef USE_ADDRLIST_PAGE
 	,LYK_ADDRLIST
 #else
 #define LYK_ADDRLIST      LYK_ADD_BOOKMARK
diff --git a/src/LYList.c b/src/LYList.c
index 1f316b97..5cd12a45 100644
--- a/src/LYList.c
+++ b/src/LYList.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYList.c,v 1.49 2010/10/03 17:09:22 tom Exp $
+ * $LynxId: LYList.c,v 1.50 2011/05/28 13:05:14 tom Exp $
  *
  *			Lynx Document Reference List Support	      LYList.c
  *			====================================
@@ -76,7 +76,7 @@ int showlist(DocInfo *newdoc, int titles)
     LYforce_HTML_mode = TRUE;	/* force this file to be HTML */
     LYforce_no_cache = TRUE;	/* force this file to be new */
 
-#ifdef EXP_ADDRLIST_PAGE
+#ifdef USE_ADDRLIST_PAGE
     if (titles != TRUE)
 	BeginInternalPage(fp0, ADDRLIST_PAGE_TITLE, LIST_PAGE_HELP);
     else
diff --git a/src/LYMail.c b/src/LYMail.c
index 188bf144..42666cef 100644
--- a/src/LYMail.c
+++ b/src/LYMail.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYMail.c,v 1.83 2011/05/27 08:51:44 tom Exp $
+ * $LynxId: LYMail.c,v 1.87 2011/05/27 23:14:46 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTParse.h>
@@ -320,8 +320,7 @@ Blat <filename> -t <recipient> [optional switches (see below)]
 
 */
 
-static char *blat_cmd(char *mail_cmd,
-		      char *filename,
+static char *blat_cmd(char *filename,
 		      char *address,
 		      char *subject,
 		      char *ccaddr,
@@ -330,24 +329,30 @@ static char *blat_cmd(char *mail_cmd,
     char *b_cmd = NULL;
 
     if (mail_is_altblat) {
+	const char *format = "%s %s -t %s -s %s %s%s%s";
 
-	HTSprintf0(&b_cmd, "%s %s -t \"%s\" -s \"%s\" %s%s%s%s",
-		   mail_cmd,
-		   filename,
-		   address,
-		   subject,
-		   system_mail_flags,
-		   ccaddr ? " -c \"" : "",
-		   NonNull(ccaddr),
-		   ccaddr ? "\"" : "");
+	HTAddParam(&b_cmd, format, 1, ALTBLAT_MAIL);
+	HTAddParam(&b_cmd, format, 2, filename);
+	HTAddParam(&b_cmd, format, 3, address);
+	HTAddParam(&b_cmd, format, 4, subject);
+	HTAddToCmd(&b_cmd, format, 5, ALTBLAT_MAIL_FLAGS);
+	if (non_empty(ccaddr)) {
+	    HTAddToCmd(&b_cmd, format, 6, " -c ");
+	    HTAddParam(&b_cmd, format, 7, NonNull(ccaddr));
+	}
+	HTEndParam(&b_cmd, format, 8);
 
     } else {
 
+	const char *format = "%s @%s";
 	char bl_cmd_file[LY_MAXPATH];
 	FILE *fp;
 
 #ifdef __CYGWIN__
 	char dosname[LY_MAXPATH];
+
+#else
+	char *dosname;
 #endif
 
 	bl_cmd_file[0] = '\0';
@@ -355,12 +360,12 @@ static char *blat_cmd(char *mail_cmd,
 	    HTAlert(FORM_MAILTO_FAILED);
 	    return NULL;
 	}
-#ifdef __CYGWIN__
-	cygwin_conv_to_full_win32_path(filename, dosname);
+
+	HTAddParam(&b_cmd, format, 1, BLAT_MAIL);
+
+	ConvertToWin32Path(filename, dosname);
 	fprintf(fp, "%s\n", dosname);
-#else
-	fprintf(fp, "%s\n", filename);
-#endif
+
 	fprintf(fp, "-t\n%s\n", address);
 	if (subject)
 	    fprintf(fp, "-s\n%s\n", subject);
@@ -372,12 +377,10 @@ static char *blat_cmd(char *mail_cmd,
 	}
 	LYCloseOutput(fp);
 
-#ifdef __CYGWIN__
-	cygwin_conv_to_full_win32_path(bl_cmd_file, dosname);
-	HTSprintf0(&b_cmd, "%s \"@%s\"", mail_cmd, dosname);
-#else
-	HTSprintf0(&b_cmd, "%s @%s", mail_cmd, bl_cmd_file);
-#endif
+	ConvertToWin32Path(bl_cmd_file, dosname);
+
+	HTAddParam(&b_cmd, format, 2, dosname);
+	HTEndParam(&b_cmd, format, 3);
 
     }
 
@@ -474,8 +477,7 @@ int LYSendMailFile(char *the_address,
 
 #if USE_BLAT_MAILER
     if (mail_is_blat) {
-	cmd = blat_cmd(system_mail,
-		       the_filename,
+	cmd = blat_cmd(the_filename,
 		       the_address,
 		       the_subject,
 		       the_ccaddr,
@@ -484,25 +486,32 @@ int LYSendMailFile(char *the_address,
 #endif
 #ifdef __DJGPP__
     if (LYGetEnv("SHELL")) {
+	extern int dj_is_bash;
+	extern char *shell;
+	const char *c_option;
+	const char *format = "%s %s %s -t %s -F %s";
+
 	if (dj_is_bash) {
-	    HTSprintf0(&cmd, "%s -c %s -t \"%s\" -F %s",
-		       shell,
-		       system_mail,
-		       the_address,
-		       the_filename);
+	    c_option = "-c";
 	} else {
-	    HTSprintf0(&cmd, "%s /c %s -t \"%s\" -F %s",
-		       shell,
-		       system_mail,
-		       the_address,
-		       the_filename);
+	    c_option = "/c";
 	}
+	HTAddParam(&cmd, format, 1, shell);
+	HTAddParam(&cmd, format, 2, c_option);
+	HTAddParam(&cmd, format, 3, system_mail);
+	HTAddParam(&cmd, format, 4, the_address);
+	HTAddParam(&cmd, format, 5, the_filename);
+	HTEndParam(&cmd, format, 6);
     } else
 #endif /* __DJGPP__ */
-	HTSprintf0(&cmd, "%s -t \"%s\" -F %s",
-		   system_mail,
-		   the_address,
-		   the_filename);
+    {
+	const char *format = "%s -t %s -F %s";
+
+	HTAddParam(&cmd, format, 1, system_mail);
+	HTAddParam(&cmd, format, 2, the_address);
+	HTAddParam(&cmd, format, 3, the_filename);
+	HTEndParam(&cmd, format, 4);
+    }
 
     stop_curses();
     SetOutputMode(O_TEXT);
diff --git a/src/LYMail.h b/src/LYMail.h
index 96d0fc9f..fb1df6a1 100644
--- a/src/LYMail.h
+++ b/src/LYMail.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYMail.h,v 1.15 2011/05/27 09:54:07 tom Exp $
+ * $LynxId: LYMail.h,v 1.16 2011/05/27 23:18:26 tom Exp $
  */
 #ifndef LYMAIL_H
 #define LYMAIL_H
@@ -25,21 +25,13 @@ extern "C" {
 #define USE_BLAT_MAILER 0
 #endif
 
-#ifdef USE_BLAT_MAILER
-
-#undef SYSTEM_MAIL
-#undef SYSTEM_MAIL_FLAGS
-
-#ifdef USE_ALT_BLAT_MAILER
-#define SYSTEM_MAIL		ALTBLAT_MAIL
-#define SYSTEM_MAIL_FLAGS	""
-#else
-#define SYSTEM_MAIL		BLAT_MAIL
-#define SYSTEM_MAIL_FLAGS	""
-#define USE_ALT_BLAT_MAILER     0
+#ifndef ALTBLAT_MAIL_FLAGS
+#define ALTBLAT_MAIL_FLAGS ""
 #endif
 
-#endif				/* USE_BLAT_MAILER */
+#ifndef BLAT_MAIL_FLAGS
+#define BLAT_MAIL_FLAGS ""
+#endif
 
 #ifdef VMS
 #define USE_VMS_MAILER 1
diff --git a/src/LYMain.c b/src/LYMain.c
index 01b21c5d..19c93109 100644
--- a/src/LYMain.c
+++ b/src/LYMain.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYMain.c,v 1.228 2011/05/27 09:51:51 tom Exp $
+ * $LynxId: LYMain.c,v 1.229 2011/05/27 22:55:56 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTTP.h>
@@ -3599,7 +3599,7 @@ soon as they are seen)"
 #if USE_BLAT_MAILER
    PARSE_SET(
       "noblat",		4|TOGGLE_ARG,		mail_is_blat,
-      "select mail tool (`"THIS_BLAT_MAIL"' ==> `sendmail')"
+      "select mail tool (`"THIS_BLAT_MAIL"' ==> `"SYSTEM_MAIL"')"
    ),
 #endif
    PARSE_FUN(
diff --git a/src/LYMainLoop.c b/src/LYMainLoop.c
index 86511bd1..e45df3a9 100644
--- a/src/LYMainLoop.c
+++ b/src/LYMainLoop.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYMainLoop.c,v 1.173 2011/05/19 10:56:00 tom Exp $
+ * $LynxId: LYMainLoop.c,v 1.174 2011/05/28 13:05:14 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTAccess.h>
@@ -1492,7 +1492,7 @@ static int handle_LYK_ACTIVATE(int *c,
     return 0;
 }
 
-#ifdef EXP_ADDRLIST_PAGE
+#ifdef USE_ADDRLIST_PAGE
 static BOOLEAN handle_LYK_ADDRLIST(int *cmd)
 {
     /*
@@ -1524,7 +1524,7 @@ static BOOLEAN handle_LYK_ADDRLIST(int *cmd)
     }
     return FALSE;
 }
-#endif /* EXP_ADDRLIST_PAGE */
+#endif /* USE_ADDRLIST_PAGE */
 
 static void handle_LYK_ADD_BOOKMARK(BOOLEAN *refresh_screen,
 				    int *old_c,
@@ -7292,12 +7292,12 @@ int mainloop(void)
 		goto new_cmd;
 	    break;
 
-#ifdef EXP_ADDRLIST_PAGE
+#ifdef USE_ADDRLIST_PAGE
 	case LYK_ADDRLIST:	/* always list URL's (only) */
 	    if (handle_LYK_ADDRLIST(&cmd))
 		goto new_cmd;
 	    break;
-#endif /* EXP_ADDRLIST_PAGE */
+#endif /* USE_ADDRLIST_PAGE */
 
 	case LYK_VLINKS:	/* list links visited during the current session */
 	    if (handle_LYK_VLINKS(&cmd, &newdoc_link_is_absolute))
diff --git a/src/LYStrings.h b/src/LYStrings.h
index c31360f1..b3b27af3 100644
--- a/src/LYStrings.h
+++ b/src/LYStrings.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYStrings.h,v 1.78 2010/09/25 11:18:47 tom Exp $
+ * $LynxId: LYStrings.h,v 1.79 2011/05/28 13:07:55 tom Exp $
  */
 #ifndef LYSTRINGS_H
 #define LYSTRINGS_H
@@ -189,7 +189,7 @@ extern "C" {
 #define VISIBLE  0
 #define HIDDEN   1
 
-#ifdef EXP_ALT_BINDINGS
+#ifdef USE_ALT_BINDINGS
 /*  Enable code implementing additional, mostly emacs-like, line-editing
     functions. - kw */
 #define ENHANCED_LINEEDIT
diff --git a/src/LYUtils.c b/src/LYUtils.c
index 1a0aa7f1..a384edfe 100644
--- a/src/LYUtils.c
+++ b/src/LYUtils.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYUtils.c,v 1.208 2011/05/27 00:40:54 tom Exp $
+ * $LynxId: LYUtils.c,v 1.210 2011/05/28 13:05:14 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTTCP.h>
@@ -2768,7 +2768,7 @@ BOOLEAN LYCloseInput(FILE *fp)
 	    result = TRUE;
 	}
     }
-    return result;
+    return (BOOLEAN) result;
 }
 
 /*
@@ -2793,7 +2793,7 @@ BOOLEAN LYCloseOutput(FILE *fp)
     if (!result) {
 	HTAlert(CANNOT_WRITE_TO_FILE);
     }
-    return result;
+    return (BOOLEAN) result;
 }
 
 /*
@@ -6492,7 +6492,7 @@ static uip_entry ly_uip[] =
   , { UIP_PERMIT_OPTIONS	, 0	      , NULL, NULL, NULL }
   , { UIP_UPLOAD_OPTIONS	, UIP_F_LMULTI, NULL, NULL, NULL }
 #endif
-#ifdef EXP_ADDRLIST_PAGE
+#ifdef USE_ADDRLIST_PAGE
   , { UIP_ADDRLIST_PAGE		, UIP_F_LMULTI, NULL, NULL, NULL }
 #endif
   , { UIP_LYNXCFG		, UIP_F_LMULTI, NULL, NULL, NULL }
diff --git a/src/LYUtils.h b/src/LYUtils.h
index 780a70c3..042127c3 100644
--- a/src/LYUtils.h
+++ b/src/LYUtils.h
@@ -1,4 +1,4 @@
-/* $LynxId: LYUtils.h,v 1.85 2010/09/24 09:58:04 tom Exp $ */
+/* $LynxId: LYUtils.h,v 1.86 2011/05/28 13:05:14 tom Exp $ */
 #ifndef LYUTILS_H
 #define LYUTILS_H
 
@@ -89,7 +89,7 @@ extern "C" {
 #define LYIsPathSep(ch) ((ch) == '/')
 #define LYIsDosDrive(s) FALSE	/* really nothing */
 #endif
-#ifdef EXP_ADDRLIST_PAGE
+#ifdef USE_ADDRLIST_PAGE
 #define LYIsListpageTitle(name) \
     (!strcmp((name), LIST_PAGE_TITLE) || \
      !strcmp((name), ADDRLIST_PAGE_TITLE))
diff --git a/src/makefile.dos b/src/makefile.dos
index ed0358db..54096765 100644
--- a/src/makefile.dos
+++ b/src/makefile.dos
@@ -1,4 +1,4 @@
-# $LynxId: makefile.dos,v 1.32 2008/06/30 23:53:42 tom Exp $
+# $LynxId: makefile.dos,v 1.33 2011/05/28 13:07:55 tom Exp $
 
 OBJS= UCdomap.o UCAux.o UCAuto.o \
 LYClean.o LYShowInfo.o LYEdit.o LYStrings.o \
@@ -34,8 +34,8 @@ MCFLAGS = \
  -DCOLOR_CURSES \
  -DDISP_PARTIAL \
  -DDOSPATH \
- -DEXP_ADDRLIST_PAGE \
- -DEXP_ALT_BINDINGS \
+ -DUSE_ADDRLIST_PAGE \
+ -DUSE_ALT_BINDINGS \
  -DEXP_NESTED_TABLES \
  -DUSE_PERSISTENT_COOKIES \
  -DFANCY_CURSES \