snapshot of project "lynx", label v2-8-7dev_12a

61 files changed, 4627 insertions, 4452 deletions

diff --git a/CHANGES b/CHANGES
index 13b5a27a..40b8e0c1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,8 +1,20 @@
--- $LynxId: CHANGES,v 1.352 2008/12/31 23:27:54 tom Exp $
+-- $LynxId: CHANGES,v 1.356 2009/01/02 02:01:19 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
 
+2009-01-?? (2.8.7???.??)
+* update id.po, nl.pl, tr.po from
+    http://translationproject.org/latest/lynx/
+* change configure script to check for "ar" archiver options, from tin bug
+  report for FreeBSD 8.0 which requires a "-" before the options -TD
+* update config.guess (2008-12-19), config.sub (2008-12-11)
+* use putenv() in preference to unsetenv() in LYReadCFG.c, noting that it is
+  a deprecated BSD interface -TD
+* miscellaneous fixes for less-strict compiler warnings -TD
+* remove trailing comma from enumeration UCStatus which causes strict-compiler
+  warning -TD
+
 2008-12-31 (2.8.7dev.12)
 * add configure option --enable-ascii-ctypes to enable EXP_ASCII_CTYPES -TD
 * move EBCDIC tables to separate file LYebcdic.c to simplify building test
diff --git a/WWW/Library/Implementation/HTAnchor.c b/WWW/Library/Implementation/HTAnchor.c
index 4e5e2391..f317d69f 100644
--- a/WWW/Library/Implementation/HTAnchor.c
+++ b/WWW/Library/Implementation/HTAnchor.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTAnchor.c,v 1.61 2008/12/31 22:02:20 tom Exp $
+ * $LynxId: HTAnchor.c,v 1.62 2009/01/01 16:56:15 tom Exp $
  *
  *	Hypertext "Anchor" Object				HTAnchor.c
  *	==========================
@@ -1365,6 +1365,8 @@ LYUCcharset *HTAnchor_resetUCInfoStage(HTParentAnchor *me,
     /* Allow a switch to a more suitable display charset */
     if (LYhndl >= 0 && LYhndl != ohandle && which_stage == UCT_STAGE_PARSER)
 	setup_switch_display_charset(me, LYhndl);
+#else
+    (void) ohandle;
 #endif
     return (&me->UCStages->s[which_stage].C);
 }
diff --git a/WWW/Library/Implementation/HTAnchor.h b/WWW/Library/Implementation/HTAnchor.h
index 9d175c9c..653111b3 100644
--- a/WWW/Library/Implementation/HTAnchor.h
+++ b/WWW/Library/Implementation/HTAnchor.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTAnchor.h,v 1.32 2008/12/31 01:35:49 tom Exp $
+ * $LynxId: HTAnchor.h,v 1.33 2009/01/01 16:47:33 tom Exp $
  *
  *	Hypertext "Anchor" Object				     HTAnchor.h
  *	==========================
@@ -112,7 +112,7 @@ extern "C" {
 	char *content_md5;	/* Content-MD5 */
 	char *message_id;	/* Message-ID */
 	char *subject;		/* Subject */
-	int content_length;	/* Content-Length */
+	long content_length;	/* Content-Length */
 	char *date;		/* Date */
 	char *expires;		/* Expires */
 	char *last_modified;	/* Last-Modified */
diff --git a/WWW/Library/Implementation/HTFTP.c b/WWW/Library/Implementation/HTFTP.c
index bbf5e35a..5f508efc 100644
--- a/WWW/Library/Implementation/HTFTP.c
+++ b/WWW/Library/Implementation/HTFTP.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTFTP.c,v 1.86 2008/12/26 22:19:03 tom Exp $
+ * $LynxId: HTFTP.c,v 1.87 2009/01/01 16:53:31 tom Exp $
  *
  *			File Transfer Protocol (FTP) Client
  *			for a WorldWideWeb browser
@@ -2551,7 +2551,9 @@ static EntryInfo *parse_dir_entry(char *entry,
 
     }				/* switch (server_type) */
 
-#ifndef LONG_LIST
+#ifdef LONG_LIST
+    (void) remove_size;
+#else
     if (remove_size && entry_info->size) {
 	entry_info->size = 0;
     }
@@ -2960,7 +2962,6 @@ static int read_directory(HTParentAnchor *parent,
     int status;
     BOOLEAN WasInterrupted = FALSE;
     HTStructured *target = HTML_new(parent, format_out, sink);
-    HTStructuredClass targetClass;
     char *filename = HTParse(address, "", PARSE_PATH + PARSE_PUNCTUATION);
     EntryInfo *entry_info;
     BOOLEAN first = TRUE;
@@ -2972,8 +2973,6 @@ static int read_directory(HTParentAnchor *parent,
     char string_buffer[64];
 #endif
 
-    targetClass = *(target->isa);
-
     _HTProgress(gettext("Receiving FTP directory."));
 
     /*
diff --git a/WWW/Library/Implementation/HTFile.c b/WWW/Library/Implementation/HTFile.c
index 376795af..e98077c3 100644
--- a/WWW/Library/Implementation/HTFile.c
+++ b/WWW/Library/Implementation/HTFile.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTFile.c,v 1.116 2008/12/31 01:47:53 tom Exp $
+ * $LynxId: HTFile.c,v 1.117 2009/01/01 16:47:58 tom Exp $
  *
  *			File Access				HTFile.c
  *			===========
@@ -1791,9 +1791,6 @@ static void do_readme(HTStructured * target, const char *localname)
     fp = fopen(readme_file_name, "r");
 
     if (fp) {
-	HTStructuredClass targetClass;
-
-	targetClass = *target->isa;	/* (Can't init agregate in K&R) */
 	START(HTML_PRE);
 	while ((ch = fgetc(fp)) != EOF) {
 	    PUTC((char) ch);
@@ -1881,7 +1878,6 @@ static int print_local_dir(DIR *dp, char *localname,
     char *pathname = NULL;
     char *tail = NULL;
     char *p;
-    BOOL present[HTML_A_ATTRIBUTES];
     char *tmpfilename = NULL;
     BOOL need_parent_link = FALSE;
     BOOL preformatted = FALSE;
@@ -1917,9 +1913,6 @@ static int print_local_dir(DIR *dp, char *localname,
     target = HTML_new(anchor, format_out, sink);
     targetClass = *target->isa;	/* Copy routine entry points */
 
-    for (i = 0; i < HTML_A_ATTRIBUTES; i++)
-	present[i] = (BOOL) (i == HTML_A_HREF);
-
     /*
      * The need_parent_link flag will be set if an "Up to <parent>" link was
      * not created for a readable parent in HTDirTitles() because LONG_LIST is
@@ -2918,10 +2911,10 @@ int HTLoadFile(const char *addr,
 	    }
 	    /* end if localname is a directory */
 	    if (S_ISREG(dir_info.st_mode)) {
-#ifdef INT_MAX
-		if (dir_info.st_size <= INT_MAX)
+#ifdef LONG_MAX
+		if (dir_info.st_size <= LONG_MAX)
 #endif
-		    anchor->content_length = dir_info.st_size;
+		    anchor->content_length = (long) dir_info.st_size;
 	    }
 
 	}			/* end if file stat worked */
diff --git a/WWW/Library/Implementation/HTMIME.c b/WWW/Library/Implementation/HTMIME.c
index bda69913..844cf6e0 100644
--- a/WWW/Library/Implementation/HTMIME.c
+++ b/WWW/Library/Implementation/HTMIME.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTMIME.c,v 1.67 2008/12/14 18:46:52 tom Exp $
+ * $LynxId: HTMIME.c,v 1.68 2009/01/01 16:50:17 tom Exp $
  *
  *			MIME Message Parse			HTMIME.c
  *			==================
@@ -2501,7 +2501,6 @@ int HTrjis(char **t,
  */
 /*
  * RJIS ( Recover JIS code from broken file )
- * @Header: rjis.c,v 0.2 92/09/04 takahasi Exp @
  * Copyright (C) 1992 1994
  * Hironobu Takahashi (takahasi@tiny.or.jp)
  *
diff --git a/WWW/Library/Implementation/HTNews.c b/WWW/Library/Implementation/HTNews.c
index bc16318d..1a3fdbc0 100644
--- a/WWW/Library/Implementation/HTNews.c
+++ b/WWW/Library/Implementation/HTNews.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTNews.c,v 1.57 2007/07/03 00:13:21 tom Exp $
+ * $LynxId: HTNews.c,v 1.58 2009/01/01 17:00:01 tom Exp $
  *
  *			NEWS ACCESS				HTNews.c
  *			===========
@@ -99,7 +99,6 @@ static HTStructured *target;	/* The output sink */
 static HTStructuredClass targetClass;	/* Copy of fn addresses */
 static HTStream *rawtarget = NULL;	/* The output sink for rawtext */
 static HTStreamClass rawtargetClass;	/* Copy of fn addresses */
-static HTParentAnchor *node_anchor;	/* Its anchor */
 static int diagnostic;		/* level: 0=none 2=source */
 static BOOL rawtext = NO;	/* Flag: HEAD or -mime_headers */
 static HTList *NNTP_AuthInfo = NULL;	/* AUTHINFO database */
@@ -2537,7 +2536,6 @@ static int HTLoadNews(const char *arg,
 	rawtext = (BOOL) (head_wanted || keep_mime_headers);
     }
     if (rawtext) {
-	node_anchor = anAnchor;
 	rawtarget = HTStreamStack(WWW_PLAINTEXT,
 				  format_out,
 				  stream, anAnchor);
@@ -2556,7 +2554,6 @@ static int HTLoadNews(const char *arg,
 	 * Make a hypertext object with an anchor list.
 	 */
     if (!(post_wanted || reply_wanted || spost_wanted || sreply_wanted)) {
-	node_anchor = anAnchor;
 	target = HTML_new(anAnchor, format_out, stream);
 	targetClass = *target->isa;	/* Copy routine entry points */
     }
diff --git a/WWW/Library/Implementation/HTRules.c b/WWW/Library/Implementation/HTRules.c
index 382805ff..7fcc1e97 100644
--- a/WWW/Library/Implementation/HTRules.c
+++ b/WWW/Library/Implementation/HTRules.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTRules.c,v 1.34 2008/07/06 12:53:43 tom Exp $
+ * $LynxId: HTRules.c,v 1.35 2009/01/01 16:59:24 tom Exp $
  *
  *	Configuration manager for Hypertext Daemon		HTRules.c
  *	==========================================
@@ -508,7 +508,7 @@ int HTSetConfiguration(char *config)
 			  status >= 1 ? quality : 1.0,
 			  status >= 2 ? secs : 0.0,
 			  status >= 3 ? secs_per_byte : 0.0,
-			  status >= 4 ? maxbytes : 0,
+			  status >= 4 ? (long) maxbytes : 0,
 			  mediaCFG);
 
     } else if (0 == strncasecomp(word1, "htbin", 5) ||
diff --git a/WWW/Library/Implementation/HTString.c b/WWW/Library/Implementation/HTString.c
index 1b7ff715..30c2bace 100644
--- a/WWW/Library/Implementation/HTString.c
+++ b/WWW/Library/Implementation/HTString.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTString.c,v 1.55 2008/12/31 22:03:25 tom Exp $
+ * $LynxId: HTString.c,v 1.56 2009/01/01 16:57:48 tom Exp $
  *
  *	Case-independent string comparison		HTString.c
  *
@@ -604,9 +604,9 @@ typedef enum {
     Format
 } PRINTF;
 
-#define VA_INTGR(type) ival = va_arg((*ap), type)
-#define VA_FLOAT(type) fval = va_arg((*ap), type)
-#define VA_POINT(type) pval = (char *)va_arg((*ap), type)
+#define VA_INTGR(type) ival = (int)    va_arg((*ap), type)
+#define VA_FLOAT(type) fval = (double) va_arg((*ap), type)
+#define VA_POINT(type) pval = (char *) va_arg((*ap), type)
 
 #define NUM_WIDTH 10		/* allow for width substituted for "*" in "%*s" */
 		/* also number of chars assumed to be needed in addition
diff --git a/WWW/Library/Implementation/HTTP.c b/WWW/Library/Implementation/HTTP.c
index 4242f5aa..47c8307a 100644
--- a/WWW/Library/Implementation/HTTP.c
+++ b/WWW/Library/Implementation/HTTP.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTTP.c,v 1.101 2008/12/31 02:03:20 tom Exp $
+ * $LynxId: HTTP.c,v 1.103 2009/01/01 16:40:54 tom Exp $
  *
  * HyperText Tranfer Protocol	- Client implementation		HTTP.c
  * ==========================
@@ -469,6 +469,7 @@ static void show_cert_issuer(X509 * peer_cert GCC_UNUSED)
 /*
  * Remove IPv6 brackets (and any port-number) from the given host-string.
  */
+#ifdef USE_SSL
 static char *StripIpv6Brackets(char *host)
 {
     int port_number;
@@ -486,6 +487,7 @@ static char *StripIpv6Brackets(char *host)
     }
     return host;
 }
+#endif
 
 /*		Load Document from HTTP Server			HTLoadHTTP()
  *		==============================
@@ -524,7 +526,6 @@ static int HTLoadHTTP(const char *arg,
     BOOL do_post = FALSE;	/* ARE WE posting ? */
     const char *METHOD;
 
-    BOOL had_header;		/* Have we had at least one header? */
     char *line_buffer;
     char *line_kept_clean;
     int real_length_of_line = 0;
@@ -624,7 +625,6 @@ static int HTLoadHTTP(const char *arg,
      * over here...
      */
     eol = 0;
-    had_header = NO;
     length = 0;
     doing_redirect = FALSE;
     permanent_redirection = FALSE;
@@ -1816,7 +1816,6 @@ static int HTLoadHTTP(const char *arg,
 			already_retrying = TRUE;
 			eol = 0;
 			bytes_already_read = 0;
-			had_header = NO;
 			length = 0;
 			doing_redirect = FALSE;
 			permanent_redirection = FALSE;
diff --git a/WWW/Library/Implementation/HTUtils.h b/WWW/Library/Implementation/HTUtils.h
index 16137deb..e16fc10d 100644
--- a/WWW/Library/Implementation/HTUtils.h
+++ b/WWW/Library/Implementation/HTUtils.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTUtils.h,v 1.92 2008/12/29 18:35:59 tom Exp $
+ * $LynxId: HTUtils.h,v 1.93 2009/01/01 21:49:29 tom Exp $
  *
  * Utility macros for the W3 code library
  * MACROS FOR GENERAL USE
@@ -624,7 +624,7 @@ extern int WWW_TraceMask;
 #define CTRACE(p)         ((void)((TRACE) && ( LY_SHOWWHERE fprintf p )))
 #define CTRACE2(m,p)      ((void)((m)     && ( LY_SHOWWHERE fprintf p )))
 #define tfp TraceFP()
-#define CTRACE_SLEEP(secs) if (TRACE && LYTraceLogFP == 0) sleep(secs)
+#define CTRACE_SLEEP(secs) if (TRACE && LYTraceLogFP == 0) sleep((unsigned)secs)
 #define CTRACE_FLUSH(fp)   if (TRACE) fflush(fp)
 
 #include <www_tcp.h>
diff --git a/WWW/Library/Implementation/SGML.h b/WWW/Library/Implementation/SGML.h
index 04a2fc40..66f77c94 100644
--- a/WWW/Library/Implementation/SGML.h
+++ b/WWW/Library/Implementation/SGML.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: SGML.h,v 1.40 2008/09/18 23:36:15 tom Exp $
+ * $LynxId: SGML.h,v 1.41 2009/01/01 23:05:07 tom Exp $
  *			       SGML parse and stream definition for libwww
  *                             SGML AND STRUCTURED STREAMS
  *
@@ -139,7 +139,7 @@ extern "C" {
     struct _tag {
 	const char *name;	/* The name of the tag */
 #ifdef USE_COLOR_STYLE
-	int name_len;		/* The length of the name */
+	unsigned name_len;	/* The length of the name */
 #endif
 #ifdef EXP_JUSTIFY_ELTS
 	BOOL can_justify;	/* justification allowed? */
diff --git a/WWW/Library/Implementation/UCMap.h b/WWW/Library/Implementation/UCMap.h
index 233361f1..e1a802cc 100644
--- a/WWW/Library/Implementation/UCMap.h
+++ b/WWW/Library/Implementation/UCMap.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: UCMap.h,v 1.22 2009/01/01 00:46:06 tom Exp $
+ * $LynxId: UCMap.h,v 1.23 2009/01/01 02:03:25 tom Exp $
  */
 #ifndef UCMAP_H
 #define UCMAP_H
@@ -20,7 +20,7 @@ extern "C" {
 	ucCannotConvert = -11,
 	ucCannotOutput = -12,
 	ucBufferTooSmall = -13,
-	ucUnknown = -14,
+	ucUnknown = -14
     } UCStatus;
 
     typedef long UCode_t;
diff --git a/WWW/Library/Implementation/makefile.in b/WWW/Library/Implementation/makefile.in
index dc8d55d7..62a5a4f8 100644
--- a/WWW/Library/Implementation/makefile.in
+++ b/WWW/Library/Implementation/makefile.in
@@ -1,4 +1,4 @@
-# $LynxId: makefile.in,v 1.19 2008/09/17 01:14:02 tom Exp $
+# $LynxId: makefile.in,v 1.20 2009/01/02 00:52:08 tom Exp $
 # Make WWW under unix for a.n.other unix system (bsd)
 # Use this as a template
 
@@ -22,6 +22,11 @@ DEFS		= @DEFS@
 EXTRA_CPPFLAGS	= @EXTRA_CPPFLAGS@
 CPPFLAGS	= @CPPFLAGS@
 
+AR		= @AR@
+ARFLAGS		= @ARFLAGS@
+
+RANLIB		= @RANLIB@
+
 o		= .@OBJEXT@
 x		= @EXEEXT@
 
@@ -58,8 +63,6 @@ VC = 2.14
 #  If this env var is set to something else Some makes will use that instead
 SHELL = @CONFIG_SHELL@
 
-RANLIB	= @RANLIB@
-
 #	.h files are distributed but originally are made from the
 #	self-documenting hypertext files.
 
@@ -170,7 +173,7 @@ depend :
 #  On SGI, ranlib is unnecessary and does not exist so we ignore errors
 # for that step
 $(LOB)/libwww.a : $(COMMON)
-	@AR@ @AR_OPTS@ $(LOB)/libwww.a $(COMMON)
+	$(AR) $(ARFLAGS) $(LOB)/libwww.a $(COMMON)
 	-$(RANLIB) $(LOB)/libwww.a
 
 #	Clean up everything generatable except final products
diff --git a/aclocal.m4 b/aclocal.m4
index 4f2ee93f..d8900821 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,11 +1,11 @@
-dnl $LynxId: aclocal.m4,v 1.133 2008/12/29 14:29:10 tom Exp $
+dnl $LynxId: aclocal.m4,v 1.134 2009/01/02 01:46:18 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/1/28
-dnl Updated: 2008/12/24
+dnl Updated: 2009/1/1
 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:
@@ -13,7 +13,7 @@ dnl http://invisible-island.net/autoconf/autoconf.html
 dnl
 dnl ---------------------------------------------------------------------------
 dnl
-dnl Copyright 1997-2007,2008 by Thomas E. Dickey
+dnl Copyright 1997-2008,2009 by Thomas E. Dickey
 dnl
 dnl Permission to use, copy, modify, and distribute this software and its
 dnl documentation for any purpose and without fee is hereby granted,
@@ -989,6 +989,40 @@ ifelse($3,,[    :]dnl
 ])dnl
   ])])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_AR_FLAGS version: 2 updated: 2009/01/01 20:45:18
+dnl -----------
+dnl Check for suitable "ar" (archiver) options for updating an archive.
+AC_DEFUN([CF_AR_FLAGS],[
+AC_REQUIRE([CF_PROG_AR])
+
+AC_CACHE_CHECK(for options to update archives, cf_cv_ar_flags,[
+	cf_cv_ar_flags=unknown
+	for cf_ar_flags in -curv curv -crv crv -cqv cqv -rv rv
+	do
+		rm -f conftest.$ac_cv_objext
+		rm -f conftest.a
+
+		cat >conftest.$ac_ext <<EOF
+#line __oline__ "configure"
+int	testdata[[3]] = { 123, 456, 789 };
+EOF
+		if AC_TRY_EVAL(ac_compile) ; then
+			$AR $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&AC_FD_CC 1>/dev/null
+			if test -f conftest.a ; then
+				cf_cv_ar_flags=$cf_ar_flags
+				break
+			fi
+		else
+			CF_VERBOSE(cannot compile test-program)
+			break
+		fi
+	done
+	rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext
+])
+
+AC_SUBST(ARFLAGS,$cf_cv_ar_flags)
+])
+dnl ---------------------------------------------------------------------------
 dnl CF_BOOL_DEFS version: 3 updated: 1998/04/27 20:32:33
 dnl ------------
 dnl Check if curses.h defines TRUE/FALSE (it does under SVr4).
@@ -3923,6 +3957,13 @@ fi
 
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_PROG_AR version: 1 updated: 2009/01/01 20:15:22
+dnl ----------
+dnl Check for archiver "ar".
+AC_DEFUN([CF_PROG_AR],[
+AC_CHECK_TOOL(AR, ar, ar)
+])
+dnl ---------------------------------------------------------------------------
 dnl CF_PROG_CC_U_D version: 1 updated: 2005/07/14 16:59:30
 dnl --------------
 dnl Check if C (preprocessor) -U and -D options are processed in the order
@@ -3973,6 +4014,16 @@ AC_SUBST(PROG_EXT)
 test -n "$PROG_EXT" && AC_DEFINE_UNQUOTED(PROG_EXT,"$PROG_EXT")
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_PROG_RANLIB version: 1 updated: 2009/01/01 20:15:22
+dnl --------------
+dnl Check for ranlib.
+dnl
+dnl TODO: make this conditionally depend on autoconf version, since the later
+dnl versions of autoconf use check-tool.
+AC_DEFUN([CF_PROG_RANLIB],[
+AC_CHECK_TOOL(RANLIB, ranlib, ':')
+])
+dnl ---------------------------------------------------------------------------
 dnl CF_RECHECK_FUNC version: 3 updated: 2000/10/18 19:29:13
 dnl ---------------
 dnl Re-check on a function to see if we can pick it up by adding a library.
diff --git a/config.guess b/config.guess
index c7607c74..3f51f4ea 100755
--- a/config.guess
+++ b/config.guess
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 #   Free Software Foundation, Inc.
 
-timestamp='2008-04-14'
+timestamp='2008-12-19'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -331,7 +331,20 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	eval $set_cc_for_build
+	SUN_ARCH="i386"
+	# If there is a compiler, see if it is configured for 64-bit objects.
+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+	# This test works for both compilers.
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_64BIT_ARCH >/dev/null
+	    then
+		SUN_ARCH="x86_64"
+	    fi
+	fi
+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
     sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
@@ -796,7 +809,7 @@ EOF
 	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
-	    EM64T | authenticamd)
+	    EM64T | authenticamd | genuineintel)
 		echo x86_64-unknown-interix${UNAME_RELEASE}
 		exit ;;
 	    IA64)
@@ -935,6 +948,9 @@ EOF
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
 	exit ;;
+    padre:Linux:*:*)
+	echo sparc-unknown-linux-gnu
+	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -1138,6 +1154,16 @@ EOF
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
           && { echo i486-ncr-sysv4; exit; } ;;
+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+	OS_REL='.3'
+	test -r /etc/.relid \
+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
diff --git a/config.sub b/config.sub
index a649350a..9489dc78 100755
--- a/config.sub
+++ b/config.sub
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 #   Free Software Foundation, Inc.
 
-timestamp='2008-06-16'
+timestamp='2008-12-11'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -249,6 +249,7 @@ case $basic_machine in
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
+	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
 	| maxq | mb | microblaze | mcore | mep | metag \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
@@ -279,7 +280,7 @@ case $basic_machine in
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
 	| score \
-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
@@ -288,7 +289,7 @@ case $basic_machine in
 	| v850 | v850e \
 	| we32k \
 	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-	| z8k)
+	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
@@ -331,6 +332,7 @@ case $basic_machine in
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
+	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
 	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
@@ -362,7 +364,7 @@ case $basic_machine in
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
@@ -375,7 +377,7 @@ case $basic_machine in
 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
 	| xstormy16-* | xtensa*-* \
 	| ymp-* \
-	| z8k-*)
+	| z8k-* | z80-*)
 		;;
 	# Recognize the basic CPU types without company name, with glob match.
 	xtensa*)
@@ -1140,6 +1142,10 @@ case $basic_machine in
 		basic_machine=z8k-unknown
 		os=-sim
 		;;
+	z80-*-coff)
+		basic_machine=z80-unknown
+		os=-sim
+		;;
 	none)
 		basic_machine=none-none
 		os=-none
@@ -1178,7 +1184,7 @@ case $basic_machine in
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
 	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
diff --git a/configure b/configure
index 43bbe70d..9ea5c9d8 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in 2.8.7dev.11.
+# From configure.in 2.8.7dev.12.
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20081225.
 #
@@ -2736,25 +2736,49 @@ else
   AR="$ac_cv_prog_AR"
 fi
 
-if test "${cf_cv_subst_AR_OPTS+set}" = set; then
+echo "$as_me:2739: checking for options to update archives" >&5
+echo $ECHO_N "checking for options to update archives... $ECHO_C" >&6
+if test "${cf_cv_ar_flags+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-echo "$as_me:2743: checking for archiver options (symbol AR_OPTS)" >&5
-echo $ECHO_N "checking for archiver options (symbol AR_OPTS)... $ECHO_C" >&6
+	cf_cv_ar_flags=unknown
+	for cf_ar_flags in -curv curv -crv crv -cqv cqv -rv rv
+	do
+		rm -f conftest.$ac_cv_objext
+		rm -f conftest.a
 
-if test -z "$AR_OPTS" ; then
-	AR_OPTS=rv
+		cat >conftest.$ac_ext <<EOF
+#line 2752 "configure"
+int	testdata[3] = { 123, 456, 789 };
+EOF
+		if { (eval echo "$as_me:2755: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:2758: \$? = $ac_status" >&5
+  (exit $ac_status); } ; then
+			$AR $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&5 1>/dev/null
+			if test -f conftest.a ; then
+				cf_cv_ar_flags=$cf_ar_flags
+				break
+			fi
+		else
+			test -n "$verbose" && echo "	cannot compile test-program" 1>&6
 
-fi
+echo "${as_me-configure}:2768: testing cannot compile test-program ..." 1>&5
 
-cf_cv_subst_AR_OPTS=$AR_OPTS
-echo "$as_me:2752: result: $AR_OPTS" >&5
-echo "${ECHO_T}$AR_OPTS" >&6
+			break
+		fi
+	done
+	rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext
 
 fi
+echo "$as_me:2776: result: $cf_cv_ar_flags" >&5
+echo "${ECHO_T}$cf_cv_ar_flags" >&6
+
+ARFLAGS=$cf_cv_ar_flags
 
-echo "$as_me:2757: checking if you want to see long compiling messages" >&5
+echo "$as_me:2781: checking if you want to see long compiling messages" >&5
 echo $ECHO_N "checking if you want to see long compiling messages... $ECHO_C" >&6
 
 # Check whether --enable-echo or --disable-echo was given.
@@ -2788,7 +2812,7 @@ else
     ECHO_CC=''
 
 fi;
-echo "$as_me:2791: result: $enableval" >&5
+echo "$as_me:2815: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 # special case for WWW/*
@@ -2798,7 +2822,7 @@ else
 	DONT_ECHO_CC=''
 fi
 
-echo "$as_me:2801: checking if you want to check memory-leaks" >&5
+echo "$as_me:2825: checking if you want to check memory-leaks" >&5
 echo $ECHO_N "checking if you want to check memory-leaks... $ECHO_C" >&6
 
 # Check whether --enable-find-leaks or --disable-find-leaks was given.
@@ -2815,7 +2839,7 @@ else
   with_leak_checks=no
 
 fi;
-echo "$as_me:2818: result: $with_leak_checks" >&5
+echo "$as_me:2842: result: $with_leak_checks" >&5
 echo "${ECHO_T}$with_leak_checks" >&6
 test "$with_leak_checks" = "yes" && cat >>confdefs.h <<\EOF
 #define LY_FIND_LEAKS 1
@@ -2824,7 +2848,7 @@ EOF
 # The comment about adding -g to $CFLAGS is unclear.  Autoconf tries to add
 # a -g flag; we remove it if the user's $CFLAGS was not set and debugging is
 # disabled.
-echo "$as_me:2827: checking if you want to enable debug-code" >&5
+echo "$as_me:2851: checking if you want to enable debug-code" >&5
 echo $ECHO_N "checking if you want to enable debug-code... $ECHO_C" >&6
 
 # Check whether --enable-debug or --disable-debug was given.
@@ -2841,7 +2865,7 @@ else
   with_debug=no
 
 fi;
-echo "$as_me:2844: result: $with_debug" >&5
+echo "$as_me:2868: result: $with_debug" >&5
 echo "${ECHO_T}$with_debug" >&6
 if test "$with_debug" = "yes" ; then
 	case $host_os in
@@ -2866,7 +2890,7 @@ else
 	esac
 fi
 
-echo "$as_me:2869: checking if you want to enable lynx trace code *recommended* " >&5
+echo "$as_me:2893: checking if you want to enable lynx trace code *recommended* " >&5
 echo $ECHO_N "checking if you want to enable lynx trace code *recommended* ... $ECHO_C" >&6
 
 # Check whether --enable-trace or --disable-trace was given.
@@ -2883,13 +2907,13 @@ else
   with_trace=yes
 
 fi;
-echo "$as_me:2886: result: $with_trace" >&5
+echo "$as_me:2910: result: $with_trace" >&5
 echo "${ECHO_T}$with_trace" >&6
 test $with_trace = no && cat >>confdefs.h <<\EOF
 #define NO_LYNX_TRACE 1
 EOF
 
-echo "$as_me:2892: checking if you want verbose trace code" >&5
+echo "$as_me:2916: checking if you want verbose trace code" >&5
 echo $ECHO_N "checking if you want verbose trace code... $ECHO_C" >&6
 
 # Check whether --enable-vertrace or --disable-vertrace was given.
@@ -2906,7 +2930,7 @@ else
   with_vertrace=no
 
 fi;
-echo "$as_me:2909: result: $with_vertrace" >&5
+echo "$as_me:2933: result: $with_vertrace" >&5
 echo "${ECHO_T}$with_vertrace" >&6
 test $with_vertrace = yes && cat >>confdefs.h <<\EOF
 #define LY_TRACELINE __LINE__
@@ -2914,7 +2938,7 @@ EOF
 
 if test -n "$GCC"
 then
-echo "$as_me:2917: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:2941: checking if you want to turn on gcc warnings" >&5
 echo $ECHO_N "checking if you want to turn on gcc warnings... $ECHO_C" >&6
 
 # Check whether --enable-warnings or --disable-warnings was given.
@@ -2931,7 +2955,7 @@ else
   with_warnings=no
 
 fi;
-echo "$as_me:2934: result: $with_warnings" >&5
+echo "$as_me:2958: result: $with_warnings" >&5
 echo "${ECHO_T}$with_warnings" >&6
 if test "$with_warnings" = "yes"
 then
@@ -2954,10 +2978,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:2957: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:2981: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > conftest.$ac_ext <<EOF
-#line 2960 "${as_me-configure}"
+#line 2984 "${as_me-configure}"
 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"
@@ -2995,12 +3019,12 @@ EOF
 EOF
 			;;
 		esac
-		if { (eval echo "$as_me:2998: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:3022: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3001: \$? = $ac_status" >&5
+  echo "$as_me:3025: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-			test -n "$verbose" && echo "$as_me:3003: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:3027: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 		fi
@@ -3013,11 +3037,11 @@ fi
 
 GCC_VERSION=none
 if test "$GCC" = yes ; then
-	echo "$as_me:3016: checking version of $CC" >&5
+	echo "$as_me:3040: checking version of $CC" >&5
 echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
 	GCC_VERSION="`${CC} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
-	echo "$as_me:3020: result: $GCC_VERSION" >&5
+	echo "$as_me:3044: result: $GCC_VERSION" >&5
 echo "${ECHO_T}$GCC_VERSION" >&6
 fi
 
@@ -3026,12 +3050,12 @@ INTEL_COMPILER=no
 if test "$GCC" = yes ; then
 	case $host_os in
 	linux*|gnu*)
-		echo "$as_me:3029: checking if this is really Intel C compiler" >&5
+		echo "$as_me:3053: checking if this is really Intel C compiler" >&5
 echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
 		cf_save_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS -no-gcc"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 3034 "configure"
+#line 3058 "configure"
 #include "confdefs.h"
 
 int
@@ -3048,16 +3072,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3051: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3075: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3054: \$? = $ac_status" >&5
+  echo "$as_me:3078: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3057: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3081: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3060: \$? = $ac_status" >&5
+  echo "$as_me:3084: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   INTEL_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
@@ -3068,14 +3092,14 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 		CFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:3071: result: $INTEL_COMPILER" >&5
+		echo "$as_me:3095: result: $INTEL_COMPILER" >&5
 echo "${ECHO_T}$INTEL_COMPILER" >&6
 		;;
 	esac
 fi
 
 cat > conftest.$ac_ext <<EOF
-#line 3078 "${as_me-configure}"
+#line 3102 "${as_me-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 
@@ -3093,7 +3117,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #269: invalid format string conversion
 
-	{ echo "$as_me:3096: checking for $CC warning options..." >&5
+	{ echo "$as_me:3120: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="-Wall"
@@ -3110,12 +3134,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		wd981
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:3113: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:3137: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3116: \$? = $ac_status" >&5
+  echo "$as_me:3140: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-			test -n "$verbose" && echo "$as_me:3118: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:3142: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -3124,7 +3148,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 
 elif test "$GCC" = yes
 then
-	{ echo "$as_me:3127: checking for $CC warning options..." >&5
+	{ echo "$as_me:3151: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="-W -Wall"
@@ -3144,12 +3168,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef $cf_warn_CONST
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:3147: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:3171: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3150: \$? = $ac_status" >&5
+  echo "$as_me:3174: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-			test -n "$verbose" && echo "$as_me:3152: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:3176: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case $cf_opt in #(vi
 			Wcast-qual) #(vi
@@ -3160,7 +3184,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 				[34].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me-configure}:3163: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me-configure}:3187: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -3176,7 +3200,7 @@ rm -f conftest*
 fi
 fi
 
-echo "$as_me:3179: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:3203: checking if you want to use dbmalloc for testing" >&5
 echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6
 
 # Check whether --with-dbmalloc or --without-dbmalloc was given.
@@ -3192,7 +3216,7 @@ EOF
 else
   with_dbmalloc=
 fi;
-echo "$as_me:3195: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:3219: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case .$with_cflags in #(vi
@@ -3276,23 +3300,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:3279: checking for dbmalloc.h" >&5
+	echo "$as_me:3303: checking for dbmalloc.h" >&5
 echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6
 if test "${ac_cv_header_dbmalloc_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3285 "configure"
+#line 3309 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:3289: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:3313: \"$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:3295: \$? = $ac_status" >&5
+  echo "$as_me:3319: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3311,11 +3335,11 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:3314: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:3338: result: $ac_cv_header_dbmalloc_h" >&5
 echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6
 if test $ac_cv_header_dbmalloc_h = yes; then
 
-echo "$as_me:3318: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:3342: checking for debug_malloc in -ldbmalloc" >&5
 echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6
 if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3323,7 +3347,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3326 "configure"
+#line 3350 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3342,16 +3366,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3345: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3369: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3348: \$? = $ac_status" >&5
+  echo "$as_me:3372: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3351: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3375: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3354: \$? = $ac_status" >&5
+  echo "$as_me:3378: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -3362,7 +3386,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3365: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:3389: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
 echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
 if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then
   cat >>confdefs.h <<EOF
@@ -3377,7 +3401,7 @@ fi
 
 fi
 
-echo "$as_me:3380: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:3404: checking if you want to use dmalloc for testing" >&5
 echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6
 
 # Check whether --with-dmalloc or --without-dmalloc was given.
@@ -3393,7 +3417,7 @@ EOF
 else
   with_dmalloc=
 fi;
-echo "$as_me:3396: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:3420: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case .$with_cflags in #(vi
@@ -3477,23 +3501,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:3480: checking for dmalloc.h" >&5
+	echo "$as_me:3504: checking for dmalloc.h" >&5
 echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6
 if test "${ac_cv_header_dmalloc_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3486 "configure"
+#line 3510 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:3490: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:3514: \"$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:3496: \$? = $ac_status" >&5
+  echo "$as_me:3520: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3512,11 +3536,11 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:3515: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:3539: result: $ac_cv_header_dmalloc_h" >&5
 echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6
 if test $ac_cv_header_dmalloc_h = yes; then
 
-echo "$as_me:3519: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:3543: checking for dmalloc_debug in -ldmalloc" >&5
 echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6
 if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3524,7 +3548,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3527 "configure"
+#line 3551 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3543,16 +3567,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3546: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3570: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3549: \$? = $ac_status" >&5
+  echo "$as_me:3573: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3552: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3576: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3555: \$? = $ac_status" >&5
+  echo "$as_me:3579: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -3563,7 +3587,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3566: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:3590: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
 echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
 if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then
   cat >>confdefs.h <<EOF
@@ -3582,7 +3606,7 @@ cat >>confdefs.h <<\EOF
 #define UNIX 1
 EOF
 
-echo "$as_me:3585: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:3609: checking for $CC option to accept ANSI C" >&5
 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3590,7 +3614,7 @@ else
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >conftest.$ac_ext <<_ACEOF
-#line 3593 "configure"
+#line 3617 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -3639,16 +3663,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO
 do
   CC="$ac_save_CC $ac_arg"
   rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3642: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3666: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3645: \$? = $ac_status" >&5
+  echo "$as_me:3669: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3648: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3672: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3651: \$? = $ac_status" >&5
+  echo "$as_me:3675: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_cc_stdc=$ac_arg
 break
@@ -3665,21 +3689,21 @@ fi
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)
-    echo "$as_me:3668: result: none needed" >&5
+    echo "$as_me:3692: result: none needed" >&5
 echo "${ECHO_T}none needed" >&6 ;;
   *)
-    echo "$as_me:3671: result: $ac_cv_prog_cc_stdc" >&5
+    echo "$as_me:3695: result: $ac_cv_prog_cc_stdc" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
     CC="$CC $ac_cv_prog_cc_stdc" ;;
 esac
 
-echo "$as_me:3676: checking for an ANSI C-conforming const" >&5
+echo "$as_me:3700: checking for an ANSI C-conforming const" >&5
 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
 if test "${ac_cv_c_const+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3682 "configure"
+#line 3706 "configure"
 #include "confdefs.h"
 
 int
@@ -3737,16 +3761,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3740: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3764: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3743: \$? = $ac_status" >&5
+  echo "$as_me:3767: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3746: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3770: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3749: \$? = $ac_status" >&5
+  echo "$as_me:3773: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_const=yes
 else
@@ -3756,7 +3780,7 @@ ac_cv_c_const=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:3759: result: $ac_cv_c_const" >&5
+echo "$as_me:3783: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -3804,7 +3828,7 @@ clix*)
 	# contributed by Alex Matulich (matuli_a@marlin.navsea.navy.mil) also
 	# references -lmalloc and -lbsd.
 
-echo "$as_me:3807: checking for strcmp in -lc_s" >&5
+echo "$as_me:3831: checking for strcmp in -lc_s" >&5
 echo $ECHO_N "checking for strcmp in -lc_s... $ECHO_C" >&6
 if test "${ac_cv_lib_c_s_strcmp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3812,7 +3836,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc_s  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3815 "configure"
+#line 3839 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3831,16 +3855,16 @@ strcmp ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3834: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3858: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3837: \$? = $ac_status" >&5
+  echo "$as_me:3861: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3840: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3864: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3843: \$? = $ac_status" >&5
+  echo "$as_me:3867: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_c_s_strcmp=yes
 else
@@ -3851,7 +3875,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3854: result: $ac_cv_lib_c_s_strcmp" >&5
+echo "$as_me:3878: result: $ac_cv_lib_c_s_strcmp" >&5
 echo "${ECHO_T}$ac_cv_lib_c_s_strcmp" >&6
 if test $ac_cv_lib_c_s_strcmp = yes; then
   cat >>confdefs.h <<EOF
@@ -4006,14 +4030,14 @@ sco*)
 	# SCO's cc (which is reported to have broken const/volatile).
 	case "$CC" in #(vi
 	cc|*/cc)
-		{ echo "$as_me:4009: WARNING: You should consider using gcc or rcc if available" >&5
+		{ echo "$as_me:4033: WARNING: You should consider using gcc or rcc if available" >&5
 echo "$as_me: WARNING: You should consider using gcc or rcc if available" >&2;}
 		unset ac_cv_prog_CC
 		for ac_prog in gcc rcc
 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:4016: checking for $ac_word" >&5
+echo "$as_me:4040: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4028,7 +4052,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_CC="$ac_prog"
-echo "$as_me:4031: found $ac_dir/$ac_word" >&5
+echo "$as_me:4055: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4036,10 +4060,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:4039: result: $CC" >&5
+  echo "$as_me:4063: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:4042: result: no" >&5
+  echo "$as_me:4066: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4062,23 +4086,23 @@ sony-newsos*)
 for ac_header in jcurses.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:4065: checking for $ac_header" >&5
+echo "$as_me:4089: 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 4071 "configure"
+#line 4095 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:4075: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4099: \"$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:4081: \$? = $ac_status" >&5
+  echo "$as_me:4105: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4097,7 +4121,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:4100: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:4124: 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
@@ -4125,23 +4149,23 @@ ultrix*)
 for ac_header in cursesX.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:4128: checking for $ac_header" >&5
+echo "$as_me:4152: 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 4134 "configure"
+#line 4158 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:4138: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4162: \"$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:4144: \$? = $ac_status" >&5
+  echo "$as_me:4168: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4160,7 +4184,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:4163: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:4187: 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
@@ -4177,7 +4201,7 @@ done
 	;;
 esac
 
-echo "$as_me:4180: checking for ${CC-cc} option to accept ANSI C" >&5
+echo "$as_me:4204: checking for ${CC-cc} option to accept ANSI C" >&5
 echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6
 if test "${cf_cv_ansi_cc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4271,7 +4295,7 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 4274 "configure"
+#line 4298 "configure"
 #include "confdefs.h"
 
 #ifndef CC_HAS_PROTOS
@@ -4292,16 +4316,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4295: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4319: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4298: \$? = $ac_status" >&5
+  echo "$as_me:4322: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4301: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4325: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4304: \$? = $ac_status" >&5
+  echo "$as_me:4328: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ansi_cc="$cf_arg"; break
 else
@@ -4314,7 +4338,7 @@ CFLAGS="$cf_save_CFLAGS"
 CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi
-echo "$as_me:4317: result: $cf_cv_ansi_cc" >&5
+echo "$as_me:4341: result: $cf_cv_ansi_cc" >&5
 echo "${ECHO_T}$cf_cv_ansi_cc" >&6
 
 if test "$cf_cv_ansi_cc" != "no"; then
@@ -4397,7 +4421,7 @@ fi
 fi
 
 if test "$cf_cv_ansi_cc" = "no"; then
-	{ { echo "$as_me:4400: error: Your compiler does not appear to recognize prototypes.
+	{ { echo "$as_me:4424: error: Your compiler does not appear to recognize prototypes.
 You have the following choices:
 	a. adjust your compiler options
 	b. get an up-to-date compiler
@@ -4417,7 +4441,7 @@ if test "${enable_largefile+set}" = set; then
 fi;
 if test "$enable_largefile" != no; then
 
-  echo "$as_me:4420: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:4444: checking for special C compiler options needed for large files" >&5
 echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_largefile_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4429,7 +4453,7 @@ else
      	 # IRIX 6.2 and later do not support large files by default,
      	 # so use the C compiler's -n32 option if that helps.
          cat >conftest.$ac_ext <<_ACEOF
-#line 4432 "configure"
+#line 4456 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -4449,16 +4473,16 @@ main ()
 }
 _ACEOF
      	 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4452: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4476: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4455: \$? = $ac_status" >&5
+  echo "$as_me:4479: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4458: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4482: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4461: \$? = $ac_status" >&5
+  echo "$as_me:4485: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -4468,16 +4492,16 @@ fi
 rm -f conftest.$ac_objext
      	 CC="$CC -n32"
      	 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4471: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4495: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4474: \$? = $ac_status" >&5
+  echo "$as_me:4498: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4477: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4501: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4480: \$? = $ac_status" >&5
+  echo "$as_me:4504: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else
@@ -4491,13 +4515,13 @@ rm -f conftest.$ac_objext
        rm -f conftest.$ac_ext
     fi
 fi
-echo "$as_me:4494: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:4518: result: $ac_cv_sys_largefile_CC" >&5
 echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
   if test "$ac_cv_sys_largefile_CC" != no; then
     CC=$CC$ac_cv_sys_largefile_CC
   fi
 
-  echo "$as_me:4500: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:4524: checking for _FILE_OFFSET_BITS value needed for large files" >&5
 echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_file_offset_bits+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4505,7 +4529,7 @@ else
   while :; do
   ac_cv_sys_file_offset_bits=no
   cat >conftest.$ac_ext <<_ACEOF
-#line 4508 "configure"
+#line 4532 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -4525,16 +4549,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4528: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4552: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4531: \$? = $ac_status" >&5
+  echo "$as_me:4555: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4534: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4558: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4537: \$? = $ac_status" >&5
+  echo "$as_me:4561: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -4543,7 +4567,7 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 4546 "configure"
+#line 4570 "configure"
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
@@ -4564,16 +4588,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4567: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4591: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4570: \$? = $ac_status" >&5
+  echo "$as_me:4594: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4573: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4597: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4576: \$? = $ac_status" >&5
+  echo "$as_me:4600: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_file_offset_bits=64; break
 else
@@ -4584,7 +4608,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
   break
 done
 fi
-echo "$as_me:4587: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:4611: result: $ac_cv_sys_file_offset_bits" >&5
 echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
 if test "$ac_cv_sys_file_offset_bits" != no; then
 
@@ -4594,7 +4618,7 @@ EOF
 
 fi
 rm -f conftest*
-  echo "$as_me:4597: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:4621: checking for _LARGE_FILES value needed for large files" >&5
 echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_large_files+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4602,7 +4626,7 @@ else
   while :; do
   ac_cv_sys_large_files=no
   cat >conftest.$ac_ext <<_ACEOF
-#line 4605 "configure"
+#line 4629 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -4622,16 +4646,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4625: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4649: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4628: \$? = $ac_status" >&5
+  echo "$as_me:4652: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4631: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4655: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4634: \$? = $ac_status" >&5
+  echo "$as_me:4658: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -4640,7 +4664,7 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 4643 "configure"
+#line 4667 "configure"
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
@@ -4661,16 +4685,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4664: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4688: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4667: \$? = $ac_status" >&5
+  echo "$as_me:4691: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4670: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4694: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4673: \$? = $ac_status" >&5
+  echo "$as_me:4697: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_large_files=1; break
 else
@@ -4681,7 +4705,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
   break
 done
 fi
-echo "$as_me:4684: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:4708: result: $ac_cv_sys_large_files" >&5
 echo "${ECHO_T}$ac_cv_sys_large_files" >&6
 if test "$ac_cv_sys_large_files" != no; then
 
@@ -4694,7 +4718,7 @@ rm -f conftest*
 fi
 
     if test "$enable_largefile" != no ; then
-	echo "$as_me:4697: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+	echo "$as_me:4721: checking for _LARGEFILE_SOURCE value needed for large files" >&5
 echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
 if test "${ac_cv_sys_largefile_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4702,7 +4726,7 @@ else
   while :; do
   ac_cv_sys_largefile_source=no
   cat >conftest.$ac_ext <<_ACEOF
-#line 4705 "configure"
+#line 4729 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -4714,16 +4738,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4717: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4741: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4720: \$? = $ac_status" >&5
+  echo "$as_me:4744: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4723: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4747: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4726: \$? = $ac_status" >&5
+  echo "$as_me:4750: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -4732,7 +4756,7 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 4735 "configure"
+#line 4759 "configure"
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
@@ -4745,16 +4769,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4748: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4772: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4751: \$? = $ac_status" >&5
+  echo "$as_me:4775: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4754: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4778: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4757: \$? = $ac_status" >&5
+  echo "$as_me:4781: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_largefile_source=1; break
 else
@@ -4765,7 +4789,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
   break
 done
 fi
-echo "$as_me:4768: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:4792: result: $ac_cv_sys_largefile_source" >&5
 echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6
 if test "$ac_cv_sys_largefile_source" != no; then
 
@@ -4779,13 +4803,13 @@ rm -f conftest*
 # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
 # in glibc 2.1.3, but that breaks too many other things.
 # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-echo "$as_me:4782: checking for fseeko" >&5
+echo "$as_me:4806: checking for fseeko" >&5
 echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
 if test "${ac_cv_func_fseeko+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4788 "configure"
+#line 4812 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -4797,16 +4821,16 @@ return fseeko && fseeko (stdin, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4800: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4824: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4803: \$? = $ac_status" >&5
+  echo "$as_me:4827: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4806: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4830: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4809: \$? = $ac_status" >&5
+  echo "$as_me:4833: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_fseeko=yes
 else
@@ -4816,7 +4840,7 @@ ac_cv_func_fseeko=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4819: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:4843: result: $ac_cv_func_fseeko" >&5
 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
 if test $ac_cv_func_fseeko = yes; then
 
@@ -4837,14 +4861,14 @@ fi
 	test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE "
 	test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits "
 
-	echo "$as_me:4840: checking whether to use struct dirent64" >&5
+	echo "$as_me:4864: checking whether to use struct dirent64" >&5
 echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6
 if test "${cf_cv_struct_dirent64+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 4847 "configure"
+#line 4871 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -4865,16 +4889,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4868: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4892: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4871: \$? = $ac_status" >&5
+  echo "$as_me:4895: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4874: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4898: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4877: \$? = $ac_status" >&5
+  echo "$as_me:4901: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_struct_dirent64=yes
 else
@@ -4885,7 +4909,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:4888: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:4912: result: $cf_cv_struct_dirent64" >&5
 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
 	test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF
 #define HAVE_STRUCT_DIRENT64 1
@@ -4901,7 +4925,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:4904: checking for $ac_word" >&5
+echo "$as_me:4928: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4916,7 +4940,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_RANLIB="${ac_tool_prefix}ranlib"
-echo "$as_me:4919: found $ac_dir/$ac_word" >&5
+echo "$as_me:4943: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4924,10 +4948,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:4927: result: $RANLIB" >&5
+  echo "$as_me:4951: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:4930: result: no" >&5
+  echo "$as_me:4954: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4936,7 +4960,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:4939: checking for $ac_word" >&5
+echo "$as_me:4963: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4951,7 +4975,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_RANLIB="ranlib"
-echo "$as_me:4954: found $ac_dir/$ac_word" >&5
+echo "$as_me:4978: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4960,10 +4984,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:4963: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:4987: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:4966: result: no" >&5
+  echo "$as_me:4990: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4972,13 +4996,13 @@ else
   RANLIB="$ac_cv_prog_RANLIB"
 fi
 
-echo "$as_me:4975: checking for ANSI C header files" >&5
+echo "$as_me:4999: checking for ANSI C header files" >&5
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4981 "configure"
+#line 5005 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -4986,13 +5010,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:4989: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5013: \"$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:4995: \$? = $ac_status" >&5
+  echo "$as_me:5019: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5014,7 +5038,7 @@ rm -f conftest.err conftest.$ac_ext
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 5017 "configure"
+#line 5041 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -5032,7 +5056,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 5035 "configure"
+#line 5059 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -5053,7 +5077,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5056 "configure"
+#line 5080 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -5079,15 +5103,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:5082: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5106: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5085: \$? = $ac_status" >&5
+  echo "$as_me:5109: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:5087: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5111: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5090: \$? = $ac_status" >&5
+  echo "$as_me:5114: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -5100,7 +5124,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:5103: result: $ac_cv_header_stdc" >&5
+echo "$as_me:5127: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -5110,7 +5134,7 @@ EOF
 
 fi
 
-echo "$as_me:5113: checking for inline" >&5
+echo "$as_me:5137: checking for inline" >&5
 echo $ECHO_N "checking for inline... $ECHO_C" >&6
 if test "${ac_cv_c_inline+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5118,7 +5142,7 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >conftest.$ac_ext <<_ACEOF
-#line 5121 "configure"
+#line 5145 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo () {return 0; }
@@ -5127,16 +5151,16 @@ $ac_kw int foo () {return 0; }
 
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5130: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5154: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5133: \$? = $ac_status" >&5
+  echo "$as_me:5157: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5136: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5160: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5139: \$? = $ac_status" >&5
+  echo "$as_me:5163: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
@@ -5147,7 +5171,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:5150: result: $ac_cv_c_inline" >&5
+echo "$as_me:5174: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -5168,28 +5192,28 @@ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:5171: checking for $ac_header" >&5
+echo "$as_me:5195: 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 5177 "configure"
+#line 5201 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5183: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5207: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5186: \$? = $ac_status" >&5
+  echo "$as_me:5210: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5189: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5213: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5192: \$? = $ac_status" >&5
+  echo "$as_me:5216: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -5199,7 +5223,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5202: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:5226: 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
@@ -5209,13 +5233,13 @@ EOF
 fi
 done
 
-echo "$as_me:5212: checking for off_t" >&5
+echo "$as_me:5236: 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 5218 "configure"
+#line 5242 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -5230,16 +5254,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5233: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5257: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5236: \$? = $ac_status" >&5
+  echo "$as_me:5260: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5239: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5263: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5242: \$? = $ac_status" >&5
+  echo "$as_me:5266: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -5249,7 +5273,7 @@ ac_cv_type_off_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5252: result: $ac_cv_type_off_t" >&5
+echo "$as_me:5276: 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
   :
@@ -5261,13 +5285,13 @@ EOF
 
 fi
 
-echo "$as_me:5264: checking for size_t" >&5
+echo "$as_me:5288: checking for size_t" >&5
 echo $ECHO_N "checking for size_t... $ECHO_C" >&6
 if test "${ac_cv_type_size_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5270 "configure"
+#line 5294 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -5282,16 +5306,16 @@ if (sizeof (size_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5285: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5309: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5288: \$? = $ac_status" >&5
+  echo "$as_me:5312: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5291: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5315: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5294: \$? = $ac_status" >&5
+  echo "$as_me:5318: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_size_t=yes
 else
@@ -5301,7 +5325,7 @@ ac_cv_type_size_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5304: result: $ac_cv_type_size_t" >&5
+echo "$as_me:5328: result: $ac_cv_type_size_t" >&5
 echo "${ECHO_T}$ac_cv_type_size_t" >&6
 if test $ac_cv_type_size_t = yes; then
   :
@@ -5315,13 +5339,13 @@ fi
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo "$as_me:5318: checking for working alloca.h" >&5
+echo "$as_me:5342: 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 5324 "configure"
+#line 5348 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int
@@ -5333,16 +5357,16 @@ char *p = (char *) alloca (2 * sizeof (int));
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5336: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5360: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5339: \$? = $ac_status" >&5
+  echo "$as_me:5363: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5342: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5366: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5345: \$? = $ac_status" >&5
+  echo "$as_me:5369: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_working_alloca_h=yes
 else
@@ -5352,7 +5376,7 @@ ac_cv_working_alloca_h=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:5355: result: $ac_cv_working_alloca_h" >&5
+echo "$as_me:5379: 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
 
@@ -5362,13 +5386,13 @@ EOF
 
 fi
 
-echo "$as_me:5365: checking for alloca" >&5
+echo "$as_me:5389: 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 5371 "configure"
+#line 5395 "configure"
 #include "confdefs.h"
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -5400,16 +5424,16 @@ char *p = (char *) alloca (1);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5403: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5427: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5406: \$? = $ac_status" >&5
+  echo "$as_me:5430: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5409: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5433: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5412: \$? = $ac_status" >&5
+  echo "$as_me:5436: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_alloca_works=yes
 else
@@ -5419,7 +5443,7 @@ ac_cv_func_alloca_works=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:5422: result: $ac_cv_func_alloca_works" >&5
+echo "$as_me:5446: 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
@@ -5440,13 +5464,13 @@ cat >>confdefs.h <<\EOF
 #define C_ALLOCA 1
 EOF
 
-echo "$as_me:5443: checking whether \`alloca.c' needs Cray hooks" >&5
+echo "$as_me:5467: 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 5449 "configure"
+#line 5473 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -5464,18 +5488,18 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:5467: result: $ac_cv_os_cray" >&5
+echo "$as_me:5491: 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:5472: checking for $ac_func" >&5
+echo "$as_me:5496: 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 5478 "configure"
+#line 5502 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -5506,16 +5530,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5509: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5533: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5512: \$? = $ac_status" >&5
+  echo "$as_me:5536: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5515: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5539: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5518: \$? = $ac_status" >&5
+  echo "$as_me:5542: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -5525,7 +5549,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:5528: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:5552: 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
 
@@ -5539,7 +5563,7 @@ fi
   done
 fi
 
-echo "$as_me:5542: checking stack direction for C alloca" >&5
+echo "$as_me:5566: 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
@@ -5548,7 +5572,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5551 "configure"
+#line 5575 "configure"
 #include "confdefs.h"
 int
 find_stack_direction ()
@@ -5571,15 +5595,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:5574: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5598: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5577: \$? = $ac_status" >&5
+  echo "$as_me:5601: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:5579: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5603: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5582: \$? = $ac_status" >&5
+  echo "$as_me:5606: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_stack_direction=1
 else
@@ -5591,7 +5615,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:5594: result: $ac_cv_c_stack_direction" >&5
+echo "$as_me:5618: result: $ac_cv_c_stack_direction" >&5
 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
 cat >>confdefs.h <<EOF
@@ -5603,23 +5627,23 @@ fi
 for ac_header in stdlib.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:5606: checking for $ac_header" >&5
+echo "$as_me:5630: 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 5612 "configure"
+#line 5636 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:5616: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5640: \"$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:5622: \$? = $ac_status" >&5
+  echo "$as_me:5646: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5638,7 +5662,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:5641: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:5665: 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
@@ -5651,13 +5675,13 @@ done
 for ac_func in getpagesize
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:5654: checking for $ac_func" >&5
+echo "$as_me:5678: 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 5660 "configure"
+#line 5684 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -5688,16 +5712,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5691: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5715: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5694: \$? = $ac_status" >&5
+  echo "$as_me:5718: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5697: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5721: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5700: \$? = $ac_status" >&5
+  echo "$as_me:5724: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -5707,7 +5731,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:5710: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:5734: 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
@@ -5717,7 +5741,7 @@ EOF
 fi
 done
 
-echo "$as_me:5720: checking for working mmap" >&5
+echo "$as_me:5744: checking for working mmap" >&5
 echo $ECHO_N "checking for working mmap... $ECHO_C" >&6
 if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5726,7 +5750,7 @@ else
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5729 "configure"
+#line 5753 "configure"
 #include "confdefs.h"
 $ac_includes_default
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -5853,15 +5877,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:5856: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5880: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5859: \$? = $ac_status" >&5
+  echo "$as_me:5883: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:5861: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5885: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5864: \$? = $ac_status" >&5
+  echo "$as_me:5888: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -5873,7 +5897,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:5876: result: $ac_cv_func_mmap_fixed_mapped" >&5
+echo "$as_me:5900: result: $ac_cv_func_mmap_fixed_mapped" >&5
 echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6
 if test $ac_cv_func_mmap_fixed_mapped = yes; then
 
@@ -5884,13 +5908,13 @@ EOF
 fi
 rm -f conftest.mmap
 
-    echo "$as_me:5887: checking whether we are using the GNU C Library 2.1 or newer" >&5
+    echo "$as_me:5911: checking whether we are using the GNU C Library 2.1 or newer" >&5
 echo $ECHO_N "checking whether we are using the GNU C Library 2.1 or newer... $ECHO_C" >&6
 if test "${ac_cv_gnu_library_2_1+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5893 "configure"
+#line 5917 "configure"
 #include "confdefs.h"
 
 #include <features.h>
@@ -5910,7 +5934,7 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:5913: result: $ac_cv_gnu_library_2_1" >&5
+echo "$as_me:5937: result: $ac_cv_gnu_library_2_1" >&5
 echo "${ECHO_T}$ac_cv_gnu_library_2_1" >&6
 
     GLIBC21="$ac_cv_gnu_library_2_1"
@@ -5939,23 +5963,23 @@ for ac_header in argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
 stdlib.h string.h unistd.h sys/param.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:5942: checking for $ac_header" >&5
+echo "$as_me:5966: 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 5948 "configure"
+#line 5972 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:5952: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5976: \"$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:5958: \$? = $ac_status" >&5
+  echo "$as_me:5982: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5974,7 +5998,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:5977: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:6001: 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
@@ -5989,13 +6013,13 @@ getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \
 strdup strtoul tsearch __argz_count __argz_stringify __argz_next
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:5992: checking for $ac_func" >&5
+echo "$as_me:6016: 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 5998 "configure"
+#line 6022 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -6026,16 +6050,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6029: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6053: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6032: \$? = $ac_status" >&5
+  echo "$as_me:6056: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6035: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6059: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6038: \$? = $ac_status" >&5
+  echo "$as_me:6062: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -6045,7 +6069,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6048: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:6072: 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
@@ -6093,7 +6117,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 6096 "configure"
+#line 6120 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -6105,16 +6129,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6108: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6132: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6111: \$? = $ac_status" >&5
+  echo "$as_me:6135: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6114: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6138: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6117: \$? = $ac_status" >&5
+  echo "$as_me:6141: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -6131,7 +6155,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}:6134: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:6158: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -6172,7 +6196,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 6175 "configure"
+#line 6199 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -6184,16 +6208,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6187: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6211: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6190: \$? = $ac_status" >&5
+  echo "$as_me:6214: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6193: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6217: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6196: \$? = $ac_status" >&5
+  echo "$as_me:6220: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -6210,7 +6234,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}:6213: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:6237: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -6226,7 +6250,7 @@ echo "${as_me-configure}:6213: testing adding $cf_add_incdir to include-path ...
 fi
 
 	else
-{ { echo "$as_me:6229: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:6253: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -6251,7 +6275,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}:6254: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:6278: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -6280,7 +6304,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}:6283: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:6307: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -6289,7 +6313,7 @@ echo "${as_me-configure}:6283: testing adding $cf_add_libdir to library-path ...
 fi
 
 	else
-{ { echo "$as_me:6292: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:6316: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -6300,7 +6324,7 @@ done
 
 fi;
 
-  echo "$as_me:6303: checking for iconv" >&5
+  echo "$as_me:6327: 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
@@ -6311,10 +6335,10 @@ else
 cf_cv_header_path_iconv=
 cf_cv_library_path_iconv=
 
-echo "${as_me-configure}:6314: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me-configure}:6338: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 6317 "configure"
+#line 6341 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -6333,16 +6357,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6336: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6360: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6339: \$? = $ac_status" >&5
+  echo "$as_me:6363: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6342: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6366: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6345: \$? = $ac_status" >&5
+  echo "$as_me:6369: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_find_linkage_iconv=yes
 else
@@ -6353,9 +6377,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for iconv library" 1>&6
 
-echo "${as_me-configure}:6356: testing find linkage for iconv library ..." 1>&5
+echo "${as_me-configure}:6380: testing find linkage for iconv library ..." 1>&5
 
-echo "${as_me-configure}:6358: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me-configure}:6382: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -6463,11 +6487,11 @@ cf_search="$cf_header_path_list $cf_search"
       if test -d $cf_cv_header_path_iconv ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_iconv" 1>&6
 
-echo "${as_me-configure}:6466: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me-configure}:6490: 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 6470 "configure"
+#line 6494 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -6486,21 +6510,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6489: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6513: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6492: \$? = $ac_status" >&5
+  echo "$as_me:6516: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6495: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6519: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6498: \$? = $ac_status" >&5
+  echo "$as_me:6522: \$? = $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}:6503: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me-configure}:6527: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
 
             cf_cv_find_linkage_iconv=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -6518,7 +6542,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_iconv" = maybe ; then
 
-echo "${as_me-configure}:6521: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me-configure}:6545: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -6614,13 +6638,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}:6617: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me-configure}:6641: 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 6623 "configure"
+#line 6647 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -6639,21 +6663,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6642: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6666: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6645: \$? = $ac_status" >&5
+  echo "$as_me:6669: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6648: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6672: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6651: \$? = $ac_status" >&5
+  echo "$as_me:6675: \$? = $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}:6656: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me-configure}:6680: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
 
                 cf_cv_find_linkage_iconv=yes
                 cf_cv_library_file_iconv="-liconv"
@@ -6689,7 +6713,7 @@ am_cv_func_iconv="no, consider installing GNU libiconv"
 fi
 
 fi
-echo "$as_me:6692: result: $am_cv_func_iconv" >&5
+echo "$as_me:6716: result: $am_cv_func_iconv" >&5
 echo "${ECHO_T}$am_cv_func_iconv" >&6
 
   if test "$am_cv_func_iconv" = yes; then
@@ -6698,14 +6722,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_ICONV 1
 EOF
 
-    echo "$as_me:6701: checking if the declaration of iconv() needs const." >&5
+    echo "$as_me:6725: 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 6708 "configure"
+#line 6732 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -6730,16 +6754,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6733: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6757: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6736: \$? = $ac_status" >&5
+  echo "$as_me:6760: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6739: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6763: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6742: \$? = $ac_status" >&5
+  echo "$as_me:6766: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_proto_iconv_const=no
 else
@@ -6749,7 +6773,7 @@ am_cv_proto_iconv_const=yes
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:6752: result: $am_cv_proto_iconv_const" >&5
+echo "$as_me:6776: 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
@@ -6791,7 +6815,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 6794 "configure"
+#line 6818 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -6803,16 +6827,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6806: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6830: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6809: \$? = $ac_status" >&5
+  echo "$as_me:6833: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6812: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6836: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6815: \$? = $ac_status" >&5
+  echo "$as_me:6839: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -6829,7 +6853,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}:6832: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:6856: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -6866,7 +6890,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}:6869: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:6893: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -6877,13 +6901,13 @@ fi
     fi
   fi
 
-  echo "$as_me:6880: checking for nl_langinfo and CODESET" >&5
+  echo "$as_me:6904: checking for nl_langinfo and CODESET" >&5
 echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
 if test "${am_cv_langinfo_codeset+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6886 "configure"
+#line 6910 "configure"
 #include "confdefs.h"
 #include <langinfo.h>
 int
@@ -6895,16 +6919,16 @@ char* cs = nl_langinfo(CODESET);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6898: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6922: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6901: \$? = $ac_status" >&5
+  echo "$as_me:6925: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6904: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6928: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6907: \$? = $ac_status" >&5
+  echo "$as_me:6931: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_langinfo_codeset=yes
 else
@@ -6915,7 +6939,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:6918: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:6942: result: $am_cv_langinfo_codeset" >&5
 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
   if test $am_cv_langinfo_codeset = yes; then
 
@@ -6926,13 +6950,13 @@ EOF
   fi
 
    if test $ac_cv_header_locale_h = yes; then
-    echo "$as_me:6929: checking for LC_MESSAGES" >&5
+    echo "$as_me:6953: checking for LC_MESSAGES" >&5
 echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6
 if test "${am_cv_val_LC_MESSAGES+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6935 "configure"
+#line 6959 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int
@@ -6944,16 +6968,16 @@ return LC_MESSAGES
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6947: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6971: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6950: \$? = $ac_status" >&5
+  echo "$as_me:6974: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6953: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6977: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6956: \$? = $ac_status" >&5
+  echo "$as_me:6980: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_val_LC_MESSAGES=yes
 else
@@ -6963,7 +6987,7 @@ am_cv_val_LC_MESSAGES=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6966: result: $am_cv_val_LC_MESSAGES" >&5
+echo "$as_me:6990: result: $am_cv_val_LC_MESSAGES" >&5
 echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6
     if test $am_cv_val_LC_MESSAGES = yes; then
 
@@ -6973,7 +6997,7 @@ EOF
 
     fi
   fi
-   echo "$as_me:6976: checking whether NLS is requested" >&5
+   echo "$as_me:7000: checking whether NLS is requested" >&5
 echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6
 
 # Check whether --enable-nls or --disable-nls was given.
@@ -6983,7 +7007,7 @@ if test "${enable_nls+set}" = set; then
 else
   USE_NLS=no
 fi;
-  echo "$as_me:6986: result: $USE_NLS" >&5
+  echo "$as_me:7010: result: $USE_NLS" >&5
 echo "${ECHO_T}$USE_NLS" >&6
 
   BUILD_INCLUDED_LIBINTL=no
@@ -6996,7 +7020,7 @@ cat >>confdefs.h <<\EOF
 #define ENABLE_NLS 1
 EOF
 
-    echo "$as_me:6999: checking whether included gettext is requested" >&5
+    echo "$as_me:7023: checking whether included gettext is requested" >&5
 echo $ECHO_N "checking whether included gettext is requested... $ECHO_C" >&6
 
 # Check whether --with-included-gettext or --without-included-gettext was given.
@@ -7006,14 +7030,14 @@ if test "${with_included_gettext+set}" = set; then
 else
   nls_cv_force_use_gnu_gettext=no
 fi;
-    echo "$as_me:7009: result: $nls_cv_force_use_gnu_gettext" >&5
+    echo "$as_me:7033: result: $nls_cv_force_use_gnu_gettext" >&5
 echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6
 
     nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
     if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
                         CATOBJEXT=NONE
 
-      echo "$as_me:7016: checking for libintl.h and gettext()" >&5
+      echo "$as_me:7040: checking for libintl.h and gettext()" >&5
 echo $ECHO_N "checking for libintl.h and gettext()... $ECHO_C" >&6
 if test "${cf_cv_func_gettext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7024,10 +7048,10 @@ else
 cf_cv_header_path_intl=
 cf_cv_library_path_intl=
 
-echo "${as_me-configure}:7027: testing Starting FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me-configure}:7051: testing Starting FIND_LINKAGE(intl,) ..." 1>&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 7030 "configure"
+#line 7054 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -7047,16 +7071,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7050: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7074: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7053: \$? = $ac_status" >&5
+  echo "$as_me:7077: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7056: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7080: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7059: \$? = $ac_status" >&5
+  echo "$as_me:7083: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_find_linkage_intl=yes
 else
@@ -7067,9 +7091,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for intl library" 1>&6
 
-echo "${as_me-configure}:7070: testing find linkage for intl library ..." 1>&5
+echo "${as_me-configure}:7094: testing find linkage for intl library ..." 1>&5
 
-echo "${as_me-configure}:7072: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me-configure}:7096: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -7177,11 +7201,11 @@ cf_search="$cf_header_path_list $cf_search"
       if test -d $cf_cv_header_path_intl ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_intl" 1>&6
 
-echo "${as_me-configure}:7180: testing ... testing $cf_cv_header_path_intl ..." 1>&5
+echo "${as_me-configure}:7204: testing ... testing $cf_cv_header_path_intl ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_intl"
         cat >conftest.$ac_ext <<_ACEOF
-#line 7184 "configure"
+#line 7208 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -7201,21 +7225,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7204: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7228: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7207: \$? = $ac_status" >&5
+  echo "$as_me:7231: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7210: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7234: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7213: \$? = $ac_status" >&5
+  echo "$as_me:7237: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found intl headers in $cf_cv_header_path_intl" 1>&6
 
-echo "${as_me-configure}:7218: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5
+echo "${as_me-configure}:7242: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5
 
             cf_cv_find_linkage_intl=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -7233,7 +7257,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_intl" = maybe ; then
 
-echo "${as_me-configure}:7236: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me-configure}:7260: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -7329,13 +7353,13 @@ cf_search="$cf_library_path_list $cf_search"
           if test -d $cf_cv_library_path_intl ; then
             test -n "$verbose" && echo "	... testing $cf_cv_library_path_intl" 1>&6
 
-echo "${as_me-configure}:7332: testing ... testing $cf_cv_library_path_intl ..." 1>&5
+echo "${as_me-configure}:7356: testing ... testing $cf_cv_library_path_intl ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-lintl  $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_intl"
             cat >conftest.$ac_ext <<_ACEOF
-#line 7338 "configure"
+#line 7362 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -7355,21 +7379,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7358: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7382: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7361: \$? = $ac_status" >&5
+  echo "$as_me:7385: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7364: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7388: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7367: \$? = $ac_status" >&5
+  echo "$as_me:7391: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
                 test -n "$verbose" && echo "	... found intl library in $cf_cv_library_path_intl" 1>&6
 
-echo "${as_me-configure}:7372: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5
+echo "${as_me-configure}:7396: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5
 
                 cf_cv_find_linkage_intl=yes
                 cf_cv_library_file_intl="-lintl"
@@ -7405,7 +7429,7 @@ cf_cv_func_gettext=no
 fi
 
 fi
-echo "$as_me:7408: result: $cf_cv_func_gettext" >&5
+echo "$as_me:7432: result: $cf_cv_func_gettext" >&5
 echo "${ECHO_T}$cf_cv_func_gettext" >&6
 
       if test "$cf_cv_func_gettext" = yes ; then
@@ -7443,7 +7467,7 @@ if test -n "$cf_cv_header_path_intl" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 7446 "configure"
+#line 7470 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7455,16 +7479,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7458: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7482: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7461: \$? = $ac_status" >&5
+  echo "$as_me:7485: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7464: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7488: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7467: \$? = $ac_status" >&5
+  echo "$as_me:7491: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -7481,7 +7505,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}:7484: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:7508: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -7518,7 +7542,7 @@ if test -n "$cf_cv_library_path_intl" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:7521: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:7545: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         INTLLIBS="-L$cf_add_libdir $$INTLLIBS"
       fi
@@ -7534,13 +7558,13 @@ fi
 for ac_func in dcgettext
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:7537: checking for $ac_func" >&5
+echo "$as_me:7561: 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 7543 "configure"
+#line 7567 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -7571,16 +7595,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7574: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7598: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7577: \$? = $ac_status" >&5
+  echo "$as_me:7601: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7580: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7604: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7583: \$? = $ac_status" >&5
+  echo "$as_me:7607: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -7590,7 +7614,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7593: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:7617: 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
@@ -7605,7 +7629,7 @@ done
                     # Extract the first word of "msgfmt", so it can be a program name with args.
 
 set dummy msgfmt; ac_word=$2
-echo "$as_me:7608: checking for $ac_word" >&5
+echo "$as_me:7632: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_MSGFMT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7633,16 +7657,16 @@ esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test "$MSGFMT" != ":"; then
-  echo "$as_me:7636: result: $MSGFMT" >&5
+  echo "$as_me:7660: result: $MSGFMT" >&5
 echo "${ECHO_T}$MSGFMT" >&6
 else
-  echo "$as_me:7639: result: no" >&5
+  echo "$as_me:7663: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
           # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
-echo "$as_me:7645: checking for $ac_word" >&5
+echo "$as_me:7669: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_GMSGFMT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7659,7 +7683,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_GMSGFMT="$ac_dir/$ac_word"
-   echo "$as_me:7662: found $ac_dir/$ac_word" >&5
+   echo "$as_me:7686: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -7671,17 +7695,17 @@ fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 
 if test -n "$GMSGFMT"; then
-  echo "$as_me:7674: result: $GMSGFMT" >&5
+  echo "$as_me:7698: result: $GMSGFMT" >&5
 echo "${ECHO_T}$GMSGFMT" >&6
 else
-  echo "$as_me:7677: result: no" >&5
+  echo "$as_me:7701: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
                     # Extract the first word of "xgettext", so it can be a program name with args.
 
 set dummy xgettext; ac_word=$2
-echo "$as_me:7684: checking for $ac_word" >&5
+echo "$as_me:7708: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_XGETTEXT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7709,10 +7733,10 @@ esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test "$XGETTEXT" != ":"; then
-  echo "$as_me:7712: result: $XGETTEXT" >&5
+  echo "$as_me:7736: result: $XGETTEXT" >&5
 echo "${ECHO_T}$XGETTEXT" >&6
 else
-  echo "$as_me:7715: result: no" >&5
+  echo "$as_me:7739: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -7727,7 +7751,7 @@ fi
 
     if test "$nls_cv_use_gnu_gettext" = "yes"; then
       if test ! -d $srcdir/intl ; then
-        { { echo "$as_me:7730: error: no NLS library is packaged with this application" >&5
+        { { echo "$as_me:7754: error: no NLS library is packaged with this application" >&5
 echo "$as_me: error: no NLS library is packaged with this application" >&2;}
    { (exit 1); exit 1; }; }
       fi
@@ -7735,7 +7759,7 @@ echo "$as_me: error: no NLS library is packaged with this application" >&2;}
       # Extract the first word of "msgfmt", so it can be a program name with args.
 
 set dummy msgfmt; ac_word=$2
-echo "$as_me:7738: checking for $ac_word" >&5
+echo "$as_me:7762: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_MSGFMT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7763,16 +7787,16 @@ esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test "$MSGFMT" != ":"; then
-  echo "$as_me:7766: result: $MSGFMT" >&5
+  echo "$as_me:7790: result: $MSGFMT" >&5
 echo "${ECHO_T}$MSGFMT" >&6
 else
-  echo "$as_me:7769: result: no" >&5
+  echo "$as_me:7793: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
       # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
-echo "$as_me:7775: checking for $ac_word" >&5
+echo "$as_me:7799: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_GMSGFMT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7789,7 +7813,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_GMSGFMT="$ac_dir/$ac_word"
-   echo "$as_me:7792: found $ac_dir/$ac_word" >&5
+   echo "$as_me:7816: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -7801,17 +7825,17 @@ fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 
 if test -n "$GMSGFMT"; then
-  echo "$as_me:7804: result: $GMSGFMT" >&5
+  echo "$as_me:7828: result: $GMSGFMT" >&5
 echo "${ECHO_T}$GMSGFMT" >&6
 else
-  echo "$as_me:7807: result: no" >&5
+  echo "$as_me:7831: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
       # Extract the first word of "xgettext", so it can be a program name with args.
 
 set dummy xgettext; ac_word=$2
-echo "$as_me:7814: checking for $ac_word" >&5
+echo "$as_me:7838: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_XGETTEXT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7839,10 +7863,10 @@ esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test "$XGETTEXT" != ":"; then
-  echo "$as_me:7842: result: $XGETTEXT" >&5
+  echo "$as_me:7866: result: $XGETTEXT" >&5
 echo "${ECHO_T}$XGETTEXT" >&6
 else
-  echo "$as_me:7845: result: no" >&5
+  echo "$as_me:7869: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -7857,7 +7881,7 @@ fi
                   if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then
         : ;
       else
-        echo "$as_me:7860: result: found msgfmt program is not GNU msgfmt; ignore it" >&5
+        echo "$as_me:7884: result: found msgfmt program is not GNU msgfmt; ignore it" >&5
 echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6
         GMSGFMT=":"
       fi
@@ -7867,7 +7891,7 @@ echo "${ECHO_T}found msgfmt program is not GNU msgfmt; ignore it" >&6
                       if $XGETTEXT --omit-header /dev/null >/dev/null 2>&1; then
         : ;
       else
-        echo "$as_me:7870: result: found xgettext program is not GNU xgettext; ignore it" >&5
+        echo "$as_me:7894: result: found xgettext program is not GNU xgettext; ignore it" >&5
 echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6
         XGETTEXT=":"
       fi
@@ -7887,7 +7911,7 @@ echo "${ECHO_T}found xgettext program is not GNU xgettext; ignore it" >&6
 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:7890: checking for $ac_word" >&5
+echo "$as_me:7914: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_INTLBISON+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7902,7 +7926,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_INTLBISON="$ac_prog"
-echo "$as_me:7905: found $ac_dir/$ac_word" >&5
+echo "$as_me:7929: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -7910,10 +7934,10 @@ fi
 fi
 INTLBISON=$ac_cv_prog_INTLBISON
 if test -n "$INTLBISON"; then
-  echo "$as_me:7913: result: $INTLBISON" >&5
+  echo "$as_me:7937: result: $INTLBISON" >&5
 echo "${ECHO_T}$INTLBISON" >&6
 else
-  echo "$as_me:7916: result: no" >&5
+  echo "$as_me:7940: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -7923,7 +7947,7 @@ done
     if test -z "$INTLBISON"; then
       ac_verc_fail=yes
     else
-            echo "$as_me:7926: checking version of bison" >&5
+            echo "$as_me:7950: checking version of bison" >&5
 echo $ECHO_N "checking version of bison... $ECHO_C" >&6
       ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'`
       case $ac_prog_version in
@@ -7932,7 +7956,7 @@ echo $ECHO_N "checking version of bison... $ECHO_C" >&6
            ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
         *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
       esac
-    echo "$as_me:7935: result: $ac_prog_version" >&5
+    echo "$as_me:7959: result: $ac_prog_version" >&5
 echo "${ECHO_T}$ac_prog_version" >&6
     fi
     if test $ac_verc_fail = yes; then
@@ -7958,7 +7982,7 @@ echo "${ECHO_T}$ac_prog_version" >&6
      if test "x$ALL_LINGUAS" = "x"; then
        LINGUAS=
      else
-       echo "$as_me:7961: checking for catalogs to be installed" >&5
+       echo "$as_me:7985: checking for catalogs to be installed" >&5
 echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
        NEW_LINGUAS=
        for presentlang in $ALL_LINGUAS; do
@@ -7978,7 +8002,7 @@ echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
          fi
        done
        LINGUAS=$NEW_LINGUAS
-       echo "$as_me:7981: result: $LINGUAS" >&5
+       echo "$as_me:8005: result: $LINGUAS" >&5
 echo "${ECHO_T}$LINGUAS" >&6
      fi
 
@@ -8011,7 +8035,7 @@ cf_makefile=makefile
 use_our_messages=no
 if test "$USE_NLS" = yes ; then
 if test -d $srcdir/po ; then
-echo "$as_me:8014: checking if we should use included message-library" >&5
+echo "$as_me:8038: checking if we should use included message-library" >&5
 echo $ECHO_N "checking if we should use included message-library... $ECHO_C" >&6
 
 # Check whether --enable-included-msgs or --disable-included-msgs was given.
@@ -8022,7 +8046,7 @@ else
   use_our_messages=yes
 fi;
 fi
-echo "$as_me:8025: result: $use_our_messages" >&5
+echo "$as_me:8049: result: $use_our_messages" >&5
 echo "${ECHO_T}$use_our_messages" >&6
 fi
 
@@ -8063,23 +8087,23 @@ else
 for ac_header in libintl.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:8066: checking for $ac_header" >&5
+echo "$as_me:8090: 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 8072 "configure"
+#line 8096 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8076: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:8100: \"$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:8082: \$? = $ac_status" >&5
+  echo "$as_me:8106: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8098,7 +8122,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:8101: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:8125: 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
@@ -8181,7 +8205,7 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:8184: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:8208: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -8190,7 +8214,7 @@ esac
 fi
 NLS_DATADIR="$withval"
 
-echo "$as_me:8193: checking if you want full utility pathnames" >&5
+echo "$as_me:8217: checking if you want full utility pathnames" >&5
 echo $ECHO_N "checking if you want full utility pathnames... $ECHO_C" >&6
 
 # Check whether --enable-full-paths or --disable-full-paths was given.
@@ -8207,13 +8231,13 @@ else
   with_full_paths=yes
 
 fi;
-echo "$as_me:8210: result: $with_full_paths" >&5
+echo "$as_me:8234: result: $with_full_paths" >&5
 echo "${ECHO_T}$with_full_paths" >&6
 test $with_full_paths = no && cat >>confdefs.h <<\EOF
 #define USE_EXECVP 1
 EOF
 
-echo "$as_me:8216: checking for system mailer" >&5
+echo "$as_me:8240: checking for system mailer" >&5
 echo $ECHO_N "checking for system mailer... $ECHO_C" >&6
 if test "${cf_cv_SYSTEM_MAIL+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8233,13 +8257,13 @@ else
 
 fi
 
-echo "$as_me:8236: result: $cf_cv_SYSTEM_MAIL" >&5
+echo "$as_me:8260: result: $cf_cv_SYSTEM_MAIL" >&5
 echo "${ECHO_T}$cf_cv_SYSTEM_MAIL" >&6
 cat >>confdefs.h <<EOF
 #define SYSTEM_MAIL "$cf_cv_SYSTEM_MAIL"
 EOF
 
-echo "$as_me:8242: checking system mail flags" >&5
+echo "$as_me:8266: checking system mail flags" >&5
 echo $ECHO_N "checking system mail flags... $ECHO_C" >&6
 if test "${cf_cv_system_mail_flags+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8255,7 +8279,7 @@ else
 
 fi
 
-echo "$as_me:8258: result: $cf_cv_system_mail_flags" >&5
+echo "$as_me:8282: result: $cf_cv_system_mail_flags" >&5
 echo "${ECHO_T}$cf_cv_system_mail_flags" >&6
 cat >>confdefs.h <<EOF
 #define SYSTEM_MAIL_FLAGS "$cf_cv_system_mail_flags"
@@ -8267,7 +8291,7 @@ if test $with_full_paths = no ; then
 fi
 fi
 
-echo "$as_me:8270: checking if $CC -U and -D options work together" >&5
+echo "$as_me:8294: checking if $CC -U and -D options work together" >&5
 echo $ECHO_N "checking if $CC -U and -D options work together... $ECHO_C" >&6
 if test "${cf_cv_cc_u_d_options+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8276,7 +8300,7 @@ else
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	CPPFLAGS="-UU_D_OPTIONS -DU_D_OPTIONS -DD_U_OPTIONS -UD_U_OPTIONS"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 8279 "configure"
+#line 8303 "configure"
 #include "confdefs.h"
 
 int
@@ -8295,16 +8319,16 @@ make a defined-error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8298: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8322: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8301: \$? = $ac_status" >&5
+  echo "$as_me:8325: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8304: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8328: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8307: \$? = $ac_status" >&5
+  echo "$as_me:8331: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_cc_u_d_options=yes
@@ -8318,7 +8342,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 	CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi
-echo "$as_me:8321: result: $cf_cv_cc_u_d_options" >&5
+echo "$as_me:8345: result: $cf_cv_cc_u_d_options" >&5
 echo "${ECHO_T}$cf_cv_cc_u_d_options" >&6
 
 cf_XOPEN_SOURCE=600
@@ -8344,14 +8368,14 @@ irix[56].*) #(vi
 	;;
 linux*|gnu*|mint*|k*bsd*-gnu) #(vi
 
-echo "$as_me:8347: checking if we must define _GNU_SOURCE" >&5
+echo "$as_me:8371: checking if we must define _GNU_SOURCE" >&5
 echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_gnu_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 8354 "configure"
+#line 8378 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -8366,16 +8390,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8369: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8393: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8372: \$? = $ac_status" >&5
+  echo "$as_me:8396: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8375: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8399: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8378: \$? = $ac_status" >&5
+  echo "$as_me:8402: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_gnu_source=no
 else
@@ -8384,7 +8408,7 @@ cat conftest.$ac_ext >&5
 cf_save="$CPPFLAGS"
 	 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 8387 "configure"
+#line 8411 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -8399,16 +8423,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8402: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8426: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8405: \$? = $ac_status" >&5
+  echo "$as_me:8429: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8408: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8432: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8411: \$? = $ac_status" >&5
+  echo "$as_me:8435: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_gnu_source=no
 else
@@ -8423,7 +8447,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:8426: result: $cf_cv_gnu_source" >&5
+echo "$as_me:8450: result: $cf_cv_gnu_source" >&5
 echo "${ECHO_T}$cf_cv_gnu_source" >&6
 test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
 
@@ -8450,14 +8474,14 @@ solaris*) #(vi
 	CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__"
 	;;
 *)
-	echo "$as_me:8453: checking if we should define _XOPEN_SOURCE" >&5
+	echo "$as_me:8477: checking if we should define _XOPEN_SOURCE" >&5
 echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_xopen_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 8460 "configure"
+#line 8484 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -8472,16 +8496,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8475: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8499: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8478: \$? = $ac_status" >&5
+  echo "$as_me:8502: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8481: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8505: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8484: \$? = $ac_status" >&5
+  echo "$as_me:8508: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
@@ -8490,7 +8514,7 @@ cat conftest.$ac_ext >&5
 cf_save="$CPPFLAGS"
 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 8493 "configure"
+#line 8517 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -8505,16 +8529,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8508: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8532: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8511: \$? = $ac_status" >&5
+  echo "$as_me:8535: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8514: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8538: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8517: \$? = $ac_status" >&5
+  echo "$as_me:8541: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
@@ -8529,7 +8553,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:8532: result: $cf_cv_xopen_source" >&5
+echo "$as_me:8556: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 	if test "$cf_cv_xopen_source" != no ; then
 
@@ -8563,16 +8587,16 @@ cf_trim_CPPFLAGS=`echo "$cf_save_CPPFLAGS" | \
 	sed	-e 's/-[UD]_POSIX_C_SOURCE\(=[^ 	]*\)\?[ 	]/ /g' \
 		-e 's/-[UD]_POSIX_C_SOURCE\(=[^ 	]*\)\?$//g'`
 
-echo "$as_me:8566: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:8590: checking if we should define _POSIX_C_SOURCE" >&5
 echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
 if test "${cf_cv_posix_c_source+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-echo "${as_me-configure}:8572: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me-configure}:8596: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 8575 "configure"
+#line 8599 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -8587,16 +8611,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8590: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8614: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8593: \$? = $ac_status" >&5
+  echo "$as_me:8617: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8596: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8620: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8599: \$? = $ac_status" >&5
+  echo "$as_me:8623: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -8617,7 +8641,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >conftest.$ac_ext <<_ACEOF
-#line 8620 "configure"
+#line 8644 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -8632,16 +8656,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8635: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8659: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8638: \$? = $ac_status" >&5
+  echo "$as_me:8662: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8641: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8665: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8644: \$? = $ac_status" >&5
+  echo "$as_me:8668: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -8652,15 +8676,15 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 	 fi
 
-echo "${as_me-configure}:8655: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me-configure}:8679: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
 
 	 CFLAGS="$cf_trim_CFLAGS"
 	 CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
 
-echo "${as_me-configure}:8660: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me-configure}:8684: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 8663 "configure"
+#line 8687 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -8675,16 +8699,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8678: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8702: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8681: \$? = $ac_status" >&5
+  echo "$as_me:8705: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8684: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8708: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8687: \$? = $ac_status" >&5
+  echo "$as_me:8711: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -8700,7 +8724,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:8703: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:8727: result: $cf_cv_posix_c_source" >&5
 echo "${ECHO_T}$cf_cv_posix_c_source" >&6
 
 if test "$cf_cv_posix_c_source" != no ; then
@@ -8717,14 +8741,14 @@ fi
 	;;
 esac
 
-echo "$as_me:8720: checking if SIGWINCH is defined" >&5
+echo "$as_me:8744: checking if SIGWINCH is defined" >&5
 echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6
 if test "${cf_cv_define_sigwinch+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 8727 "configure"
+#line 8751 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -8739,23 +8763,23 @@ int x = SIGWINCH
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8742: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8766: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8745: \$? = $ac_status" >&5
+  echo "$as_me:8769: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8748: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8772: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8751: \$? = $ac_status" >&5
+  echo "$as_me:8775: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_define_sigwinch=yes
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 8758 "configure"
+#line 8782 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -8773,16 +8797,16 @@ int x = SIGWINCH
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8776: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8800: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8779: \$? = $ac_status" >&5
+  echo "$as_me:8803: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8782: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8806: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8785: \$? = $ac_status" >&5
+  echo "$as_me:8809: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_define_sigwinch=maybe
 else
@@ -8796,11 +8820,11 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:8799: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:8823: result: $cf_cv_define_sigwinch" >&5
 echo "${ECHO_T}$cf_cv_define_sigwinch" >&6
 
 if test "$cf_cv_define_sigwinch" = maybe ; then
-echo "$as_me:8803: checking for actual SIGWINCH definition" >&5
+echo "$as_me:8827: checking for actual SIGWINCH definition" >&5
 echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6
 if test "${cf_cv_fixup_sigwinch+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8811,7 +8835,7 @@ cf_sigwinch=32
 while test $cf_sigwinch != 1
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 8814 "configure"
+#line 8838 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -8833,16 +8857,16 @@ int x = SIGWINCH
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8836: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8860: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8839: \$? = $ac_status" >&5
+  echo "$as_me:8863: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8842: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8866: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8845: \$? = $ac_status" >&5
+  echo "$as_me:8869: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fixup_sigwinch=$cf_sigwinch
 	 break
@@ -8856,7 +8880,7 @@ cf_sigwinch=`expr $cf_sigwinch - 1`
 done
 
 fi
-echo "$as_me:8859: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:8883: result: $cf_cv_fixup_sigwinch" >&5
 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
 
 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
@@ -8868,7 +8892,7 @@ if test -n "$TRY_CFLAGS" ; then
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me-configure}:8871: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me-configure}:8895: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -8929,7 +8953,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}:8932: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me-configure}:8956: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	CFLAGS="$CFLAGS $cf_new_cflags"
 fi
@@ -8937,7 +8961,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}:8940: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me-configure}:8964: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
 fi
@@ -8945,14 +8969,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}:8948: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me-configure}:8972: 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 8955 "configure"
+#line 8979 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8964,16 +8988,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8967: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8991: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8970: \$? = $ac_status" >&5
+  echo "$as_me:8994: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8973: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8997: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8976: \$? = $ac_status" >&5
+  echo "$as_me:9000: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -8981,12 +9005,12 @@ else
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me-configure}:8984: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me-configure}:9008: 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}:8989: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me-configure}:9013: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_flags"
@@ -8998,7 +9022,7 @@ fi
 
 ### Look for network libraries first, since some functions (such as gethostname)
 ### are used in a lot of places.
-echo "$as_me:9001: checking if you want NSS compatible SSL libraries" >&5
+echo "$as_me:9025: checking if you want NSS compatible SSL libraries" >&5
 echo $ECHO_N "checking if you want NSS compatible SSL libraries... $ECHO_C" >&6
 if test "${cf_cv_use_libnss_compat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9013,10 +9037,10 @@ else
 fi;
 
 fi
-echo "$as_me:9016: result: $cf_cv_use_libnss_compat" >&5
+echo "$as_me:9040: result: $cf_cv_use_libnss_compat" >&5
 echo "${ECHO_T}$cf_cv_use_libnss_compat" >&6
 
-echo "$as_me:9019: checking if you want ssl library" >&5
+echo "$as_me:9043: checking if you want ssl library" >&5
 echo $ECHO_N "checking if you want ssl library... $ECHO_C" >&6
 if test "${cf_cv_use_libssl+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9031,10 +9055,10 @@ else
 fi;
 
 fi
-echo "$as_me:9034: result: $cf_cv_use_libssl" >&5
+echo "$as_me:9058: result: $cf_cv_use_libssl" >&5
 echo "${ECHO_T}$cf_cv_use_libssl" >&6
 
-echo "$as_me:9037: checking if you want gnutls support" >&5
+echo "$as_me:9061: checking if you want gnutls support" >&5
 echo $ECHO_N "checking if you want gnutls support... $ECHO_C" >&6
 if test "${cf_cv_use_libgnutls+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9049,11 +9073,11 @@ else
 fi;
 
 fi
-echo "$as_me:9052: result: $cf_cv_use_libgnutls" >&5
+echo "$as_me:9076: result: $cf_cv_use_libgnutls" >&5
 echo "${ECHO_T}$cf_cv_use_libgnutls" >&6
 
 # this option is mainly for comparing with/without Lynx's wrapper for GNUTLS.
-echo "$as_me:9056: checking if you want gnutls-openssl compat" >&5
+echo "$as_me:9080: checking if you want gnutls-openssl compat" >&5
 echo $ECHO_N "checking if you want gnutls-openssl compat... $ECHO_C" >&6
 if test "${cf_cv_gnutls_compat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9068,10 +9092,10 @@ else
 fi;
 
 fi
-echo "$as_me:9071: result: $cf_cv_gnutls_compat" >&5
+echo "$as_me:9095: result: $cf_cv_gnutls_compat" >&5
 echo "${ECHO_T}$cf_cv_gnutls_compat" >&6
 
-echo "$as_me:9074: checking if you want socks library" >&5
+echo "$as_me:9098: checking if you want socks library" >&5
 echo $ECHO_N "checking if you want socks library... $ECHO_C" >&6
 if test "${cf_cv_use_libsocks+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9086,10 +9110,10 @@ else
 fi;
 
 fi
-echo "$as_me:9089: result: $cf_cv_use_libsocks" >&5
+echo "$as_me:9113: result: $cf_cv_use_libsocks" >&5
 echo "${ECHO_T}$cf_cv_use_libsocks" >&6
 
-echo "$as_me:9092: checking if you want socks5 library" >&5
+echo "$as_me:9116: checking if you want socks5 library" >&5
 echo $ECHO_N "checking if you want socks5 library... $ECHO_C" >&6
 if test "${cf_cv_use_libsocks5+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9104,7 +9128,7 @@ else
 fi;
 
 fi
-echo "$as_me:9107: result: $cf_cv_use_libsocks5" >&5
+echo "$as_me:9131: result: $cf_cv_use_libsocks5" >&5
 echo "${ECHO_T}$cf_cv_use_libsocks5" >&6
 
 if test "x$cf_cv_use_libsocks" != xno ; then
@@ -9143,7 +9167,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 9146 "configure"
+#line 9170 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9155,16 +9179,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9158: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9182: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9161: \$? = $ac_status" >&5
+  echo "$as_me:9185: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9164: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9188: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9167: \$? = $ac_status" >&5
+  echo "$as_me:9191: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9181,7 +9205,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}:9184: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:9208: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -9222,7 +9246,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 9225 "configure"
+#line 9249 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9234,16 +9258,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9237: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9261: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9240: \$? = $ac_status" >&5
+  echo "$as_me:9264: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9243: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9267: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9246: \$? = $ac_status" >&5
+  echo "$as_me:9270: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9260,7 +9284,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}:9263: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:9287: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -9276,7 +9300,7 @@ echo "${as_me-configure}:9263: testing adding $cf_add_incdir to include-path ...
 fi
 
 	else
-{ { echo "$as_me:9279: error: cannot find socks library under $cf_cv_use_libsocks" >&5
+{ { echo "$as_me:9303: error: cannot find socks library under $cf_cv_use_libsocks" >&5
 echo "$as_me: error: cannot find socks library under $cf_cv_use_libsocks" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -9301,7 +9325,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}:9304: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:9328: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -9330,7 +9354,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}:9333: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:9357: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -9339,7 +9363,7 @@ echo "${as_me-configure}:9333: testing adding $cf_add_libdir to library-path ...
 fi
 
 	else
-{ { echo "$as_me:9342: error: cannot find socks library under $cf_cv_use_libsocks" >&5
+{ { echo "$as_me:9366: error: cannot find socks library under $cf_cv_use_libsocks" >&5
 echo "$as_me: error: cannot find socks library under $cf_cv_use_libsocks" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -9353,10 +9377,10 @@ done
 cf_cv_header_path_socks=
 cf_cv_library_path_socks=
 
-echo "${as_me-configure}:9356: testing Starting FIND_LINKAGE(socks,) ..." 1>&5
+echo "${as_me-configure}:9380: testing Starting FIND_LINKAGE(socks,) ..." 1>&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 9359 "configure"
+#line 9383 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -9372,16 +9396,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9375: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9399: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9378: \$? = $ac_status" >&5
+  echo "$as_me:9402: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9381: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9405: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9384: \$? = $ac_status" >&5
+  echo "$as_me:9408: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_find_linkage_socks=yes
 else
@@ -9392,9 +9416,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for socks library" 1>&6
 
-echo "${as_me-configure}:9395: testing find linkage for socks library ..." 1>&5
+echo "${as_me-configure}:9419: testing find linkage for socks library ..." 1>&5
 
-echo "${as_me-configure}:9397: testing Searching for headers in FIND_LINKAGE(socks,) ..." 1>&5
+echo "${as_me-configure}:9421: testing Searching for headers in FIND_LINKAGE(socks,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -9502,11 +9526,11 @@ cf_search="$cf_header_path_list $cf_search"
       if test -d $cf_cv_header_path_socks ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_socks" 1>&6
 
-echo "${as_me-configure}:9505: testing ... testing $cf_cv_header_path_socks ..." 1>&5
+echo "${as_me-configure}:9529: testing ... testing $cf_cv_header_path_socks ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_socks"
         cat >conftest.$ac_ext <<_ACEOF
-#line 9509 "configure"
+#line 9533 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -9522,21 +9546,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9525: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9549: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9528: \$? = $ac_status" >&5
+  echo "$as_me:9552: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9531: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9555: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9534: \$? = $ac_status" >&5
+  echo "$as_me:9558: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found socks headers in $cf_cv_header_path_socks" 1>&6
 
-echo "${as_me-configure}:9539: testing ... found socks headers in $cf_cv_header_path_socks ..." 1>&5
+echo "${as_me-configure}:9563: testing ... found socks headers in $cf_cv_header_path_socks ..." 1>&5
 
             cf_cv_find_linkage_socks=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -9554,7 +9578,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_socks" = maybe ; then
 
-echo "${as_me-configure}:9557: testing Searching for socks library in FIND_LINKAGE(socks,) ..." 1>&5
+echo "${as_me-configure}:9581: testing Searching for socks library in FIND_LINKAGE(socks,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -9650,13 +9674,13 @@ cf_search="$cf_library_path_list $cf_search"
           if test -d $cf_cv_library_path_socks ; then
             test -n "$verbose" && echo "	... testing $cf_cv_library_path_socks" 1>&6
 
-echo "${as_me-configure}:9653: testing ... testing $cf_cv_library_path_socks ..." 1>&5
+echo "${as_me-configure}:9677: testing ... testing $cf_cv_library_path_socks ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-lsocks  $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_socks"
             cat >conftest.$ac_ext <<_ACEOF
-#line 9659 "configure"
+#line 9683 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -9672,21 +9696,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9675: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9699: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9678: \$? = $ac_status" >&5
+  echo "$as_me:9702: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9681: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9705: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9684: \$? = $ac_status" >&5
+  echo "$as_me:9708: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
                 test -n "$verbose" && echo "	... found socks library in $cf_cv_library_path_socks" 1>&6
 
-echo "${as_me-configure}:9689: testing ... found socks library in $cf_cv_library_path_socks ..." 1>&5
+echo "${as_me-configure}:9713: testing ... found socks library in $cf_cv_library_path_socks ..." 1>&5
 
                 cf_cv_find_linkage_socks=yes
                 cf_cv_library_file_socks="-lsocks"
@@ -9782,7 +9806,7 @@ if test -n "$cf_cv_header_path_socks" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 9785 "configure"
+#line 9809 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9794,16 +9818,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9797: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9821: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9800: \$? = $ac_status" >&5
+  echo "$as_me:9824: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9803: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9827: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9806: \$? = $ac_status" >&5
+  echo "$as_me:9830: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9820,7 +9844,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}:9823: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:9847: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -9854,7 +9878,7 @@ if test -n "$cf_cv_library_path_socks" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:9857: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:9881: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -9864,7 +9888,7 @@ fi
 
     LIBS="$LIBS -lsocks"
   else
-    { { echo "$as_me:9867: error: cannot link with socks library" >&5
+    { { echo "$as_me:9891: error: cannot link with socks library" >&5
 echo "$as_me: error: cannot link with socks library" >&2;}
    { (exit 1); exit 1; }; }
   fi
@@ -9905,7 +9929,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 9908 "configure"
+#line 9932 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9917,16 +9941,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9920: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9944: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9923: \$? = $ac_status" >&5
+  echo "$as_me:9947: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9926: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9950: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9929: \$? = $ac_status" >&5
+  echo "$as_me:9953: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9943,7 +9967,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}:9946: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:9970: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -9984,7 +10008,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 9987 "configure"
+#line 10011 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9996,16 +10020,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9999: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10023: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10002: \$? = $ac_status" >&5
+  echo "$as_me:10026: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10005: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10029: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10008: \$? = $ac_status" >&5
+  echo "$as_me:10032: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -10022,7 +10046,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}:10025: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:10049: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -10038,7 +10062,7 @@ echo "${as_me-configure}:10025: testing adding $cf_add_incdir to include-path ..
 fi
 
 	else
-{ { echo "$as_me:10041: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5
+{ { echo "$as_me:10065: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5
 echo "$as_me: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -10063,7 +10087,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}:10066: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:10090: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -10092,7 +10116,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}:10095: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:10119: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -10101,7 +10125,7 @@ echo "${as_me-configure}:10095: testing adding $cf_add_libdir to library-path ..
 fi
 
 	else
-{ { echo "$as_me:10104: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5
+{ { echo "$as_me:10128: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5
 echo "$as_me: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -10120,11 +10144,11 @@ cat >>confdefs.h <<\EOF
 #define SOCKS 1
 EOF
 
-echo "$as_me:10123: checking if the socks library uses socks4 prefix" >&5
+echo "$as_me:10147: checking if the socks library uses socks4 prefix" >&5
 echo $ECHO_N "checking if the socks library uses socks4 prefix... $ECHO_C" >&6
 cf_use_socks4=error
 cat >conftest.$ac_ext <<_ACEOF
-#line 10127 "configure"
+#line 10151 "configure"
 #include "confdefs.h"
 
 #include <socks.h>
@@ -10138,16 +10162,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10141: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10165: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10144: \$? = $ac_status" >&5
+  echo "$as_me:10168: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10147: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10171: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10150: \$? = $ac_status" >&5
+  echo "$as_me:10174: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >>confdefs.h <<\EOF
 #define USE_SOCKS4_PREFIX 1
@@ -10158,7 +10182,7 @@ else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 10161 "configure"
+#line 10185 "configure"
 #include "confdefs.h"
 #include <socks.h>
 int
@@ -10170,29 +10194,29 @@ SOCKSinit((char *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10173: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10197: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10176: \$? = $ac_status" >&5
+  echo "$as_me:10200: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10179: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10203: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10182: \$? = $ac_status" >&5
+  echo "$as_me:10206: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_use_socks4=no
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:10188: error: Cannot link with socks5 library" >&5
+{ { echo "$as_me:10212: error: Cannot link with socks5 library" >&5
 echo "$as_me: error: Cannot link with socks5 library" >&2;}
    { (exit 1); exit 1; }; }
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:10195: result: $cf_use_socks4" >&5
+echo "$as_me:10219: result: $cf_use_socks4" >&5
 echo "${ECHO_T}$cf_use_socks4" >&6
 
 if test "$cf_use_socks4" = "yes" ; then
@@ -10247,10 +10271,10 @@ EOF
 
 fi
 
-echo "$as_me:10250: checking if socks5p.h is available" >&5
+echo "$as_me:10274: checking if socks5p.h is available" >&5
 echo $ECHO_N "checking if socks5p.h is available... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 10253 "configure"
+#line 10277 "configure"
 #include "confdefs.h"
 
 #define INCLUDE_PROTOTYPES
@@ -10265,16 +10289,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10268: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10292: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10271: \$? = $ac_status" >&5
+  echo "$as_me:10295: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10274: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10298: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10277: \$? = $ac_status" >&5
+  echo "$as_me:10301: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_use_socks5p_h=yes
 else
@@ -10283,7 +10307,7 @@ cat conftest.$ac_ext >&5
 cf_use_socks5p_h=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:10286: result: $cf_use_socks5p_h" >&5
+echo "$as_me:10310: result: $cf_use_socks5p_h" >&5
 echo "${ECHO_T}$cf_use_socks5p_h" >&6
 
 test "$cf_use_socks5p_h" = yes && cat >>confdefs.h <<\EOF
@@ -10294,14 +10318,14 @@ else
 
 cf_test_netlibs=no
 
-echo "$as_me:10297: checking for network libraries" >&5
+echo "$as_me:10321: checking for network libraries" >&5
 echo $ECHO_N "checking for network libraries... $ECHO_C" >&6
 
 if test "${cf_cv_netlibs+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-echo "$as_me:10304: result: working..." >&5
+echo "$as_me:10328: result: working..." >&5
 echo "${ECHO_T}working..." >&6
 
 cf_cv_netlibs=""
@@ -10313,23 +10337,23 @@ mingw32) # (vi
 for ac_header in windows.h winsock.h winsock2.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:10316: checking for $ac_header" >&5
+echo "$as_me:10340: 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 10322 "configure"
+#line 10346 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:10326: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:10350: \"$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:10332: \$? = $ac_status" >&5
+  echo "$as_me:10356: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -10348,7 +10372,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:10351: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:10375: 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
@@ -10368,7 +10392,7 @@ done
 	LIBS="$cf_winsock_lib $LIBS"
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 10371 "configure"
+#line 10395 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_WINDOWS_H
@@ -10395,22 +10419,22 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10398: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10422: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10401: \$? = $ac_status" >&5
+  echo "$as_me:10425: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10404: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10428: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10407: \$? = $ac_status" >&5
+  echo "$as_me:10431: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_netlibs="$cf_winsock_lib $cf_cv_netlibs"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:10413: error: Cannot link against winsock library" >&5
+{ { echo "$as_me:10437: error: Cannot link against winsock library" >&5
 echo "$as_me: error: Cannot link against winsock library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -10423,13 +10447,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 for ac_func in gethostname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10426: checking for $ac_func" >&5
+echo "$as_me:10450: 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 10432 "configure"
+#line 10456 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -10460,16 +10484,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10463: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10487: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10466: \$? = $ac_status" >&5
+  echo "$as_me:10490: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10469: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10493: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10472: \$? = $ac_status" >&5
+  echo "$as_me:10496: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10479,7 +10503,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10482: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:10506: 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
@@ -10488,7 +10512,7 @@ EOF
 
 else
 
-echo "$as_me:10491: checking for gethostname in -lnsl" >&5
+echo "$as_me:10515: checking for gethostname in -lnsl" >&5
 echo $ECHO_N "checking for gethostname in -lnsl... $ECHO_C" >&6
 if test "${ac_cv_lib_nsl_gethostname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10496,7 +10520,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10499 "configure"
+#line 10523 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10515,16 +10539,16 @@ gethostname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10518: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10542: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10521: \$? = $ac_status" >&5
+  echo "$as_me:10545: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10524: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10548: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10527: \$? = $ac_status" >&5
+  echo "$as_me:10551: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostname=yes
 else
@@ -10535,7 +10559,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10538: result: $ac_cv_lib_nsl_gethostname" >&5
+echo "$as_me:10562: result: $ac_cv_lib_nsl_gethostname" >&5
 echo "${ECHO_T}$ac_cv_lib_nsl_gethostname" >&6
 if test $ac_cv_lib_nsl_gethostname = yes; then
 
@@ -10552,7 +10576,7 @@ else
 	ac_cv_func_gethostname=unknown
 	unset ac_cv_func_gethostname 2>/dev/null
 
-echo "$as_me:10555: checking for gethostname in -lsocket" >&5
+echo "$as_me:10579: checking for gethostname in -lsocket" >&5
 echo $ECHO_N "checking for gethostname in -lsocket... $ECHO_C" >&6
 if test "${ac_cv_lib_socket_gethostname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10560,7 +10584,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10563 "configure"
+#line 10587 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10579,16 +10603,16 @@ gethostname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10582: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10606: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10585: \$? = $ac_status" >&5
+  echo "$as_me:10609: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10588: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10612: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10591: \$? = $ac_status" >&5
+  echo "$as_me:10615: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_gethostname=yes
 else
@@ -10599,7 +10623,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10602: result: $ac_cv_lib_socket_gethostname" >&5
+echo "$as_me:10626: result: $ac_cv_lib_socket_gethostname" >&5
 echo "${ECHO_T}$ac_cv_lib_socket_gethostname" >&6
 if test $ac_cv_lib_socket_gethostname = yes; then
 
@@ -10623,7 +10647,7 @@ fi
 fi
 done
 
-	echo "$as_me:10626: checking for main in -linet" >&5
+	echo "$as_me:10650: checking for main in -linet" >&5
 echo $ECHO_N "checking for main in -linet... $ECHO_C" >&6
 if test "${ac_cv_lib_inet_main+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10631,7 +10655,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-linet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10634 "configure"
+#line 10658 "configure"
 #include "confdefs.h"
 
 int
@@ -10643,16 +10667,16 @@ main ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10646: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10670: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10649: \$? = $ac_status" >&5
+  echo "$as_me:10673: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10652: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10676: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10655: \$? = $ac_status" >&5
+  echo "$as_me:10679: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_inet_main=yes
 else
@@ -10663,7 +10687,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10666: result: $ac_cv_lib_inet_main" >&5
+echo "$as_me:10690: result: $ac_cv_lib_inet_main" >&5
 echo "${ECHO_T}$ac_cv_lib_inet_main" >&6
 if test $ac_cv_lib_inet_main = yes; then
   cf_cv_netlibs="-linet $cf_cv_netlibs"
@@ -10674,13 +10698,13 @@ fi
 for ac_func in socket
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10677: checking for $ac_func" >&5
+echo "$as_me:10701: 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 10683 "configure"
+#line 10707 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -10711,16 +10735,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10714: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10738: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10717: \$? = $ac_status" >&5
+  echo "$as_me:10741: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10720: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10744: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10723: \$? = $ac_status" >&5
+  echo "$as_me:10747: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10730,7 +10754,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10733: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:10757: 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
@@ -10739,7 +10763,7 @@ EOF
 
 else
 
-echo "$as_me:10742: checking for socket in -lsocket" >&5
+echo "$as_me:10766: checking for socket in -lsocket" >&5
 echo $ECHO_N "checking for socket in -lsocket... $ECHO_C" >&6
 if test "${ac_cv_lib_socket_socket+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10747,7 +10771,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10750 "configure"
+#line 10774 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10766,16 +10790,16 @@ socket ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10769: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10793: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10772: \$? = $ac_status" >&5
+  echo "$as_me:10796: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10775: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10799: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10778: \$? = $ac_status" >&5
+  echo "$as_me:10802: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_socket=yes
 else
@@ -10786,7 +10810,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10789: result: $ac_cv_lib_socket_socket" >&5
+echo "$as_me:10813: result: $ac_cv_lib_socket_socket" >&5
 echo "${ECHO_T}$ac_cv_lib_socket_socket" >&6
 if test $ac_cv_lib_socket_socket = yes; then
 
@@ -10803,7 +10827,7 @@ else
 	ac_cv_func_socket=unknown
 	unset ac_cv_func_socket 2>/dev/null
 
-echo "$as_me:10806: checking for socket in -lbsd" >&5
+echo "$as_me:10830: checking for socket in -lbsd" >&5
 echo $ECHO_N "checking for socket in -lbsd... $ECHO_C" >&6
 if test "${ac_cv_lib_bsd_socket+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10811,7 +10835,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10814 "configure"
+#line 10838 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10830,16 +10854,16 @@ socket ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10833: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10857: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10836: \$? = $ac_status" >&5
+  echo "$as_me:10860: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10839: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10863: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10842: \$? = $ac_status" >&5
+  echo "$as_me:10866: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_bsd_socket=yes
 else
@@ -10850,7 +10874,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10853: result: $ac_cv_lib_bsd_socket" >&5
+echo "$as_me:10877: result: $ac_cv_lib_bsd_socket" >&5
 echo "${ECHO_T}$ac_cv_lib_bsd_socket" >&6
 if test $ac_cv_lib_bsd_socket = yes; then
 
@@ -10879,13 +10903,13 @@ done
 for ac_func in gethostbyname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10882: checking for $ac_func" >&5
+echo "$as_me:10906: 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 10888 "configure"
+#line 10912 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -10916,16 +10940,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10919: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10943: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10922: \$? = $ac_status" >&5
+  echo "$as_me:10946: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10925: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10949: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10928: \$? = $ac_status" >&5
+  echo "$as_me:10952: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10935,7 +10959,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10938: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:10962: 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
@@ -10944,7 +10968,7 @@ EOF
 
 else
 
-echo "$as_me:10947: checking for gethostbyname in -lnsl" >&5
+echo "$as_me:10971: 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
@@ -10952,7 +10976,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 10955 "configure"
+#line 10979 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -10971,16 +10995,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10974: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10998: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10977: \$? = $ac_status" >&5
+  echo "$as_me:11001: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10980: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11004: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10983: \$? = $ac_status" >&5
+  echo "$as_me:11007: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -10991,7 +11015,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:10994: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:11018: 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
 
@@ -11016,13 +11040,13 @@ done
 for ac_func in strcasecmp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:11019: checking for $ac_func" >&5
+echo "$as_me:11043: 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 11025 "configure"
+#line 11049 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -11053,16 +11077,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11056: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11080: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11059: \$? = $ac_status" >&5
+  echo "$as_me:11083: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11062: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11086: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11065: \$? = $ac_status" >&5
+  echo "$as_me:11089: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -11072,7 +11096,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:11075: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:11099: 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
@@ -11081,7 +11105,7 @@ EOF
 
 else
 
-echo "$as_me:11084: checking for strcasecmp in -lresolv" >&5
+echo "$as_me:11108: checking for strcasecmp in -lresolv" >&5
 echo $ECHO_N "checking for strcasecmp in -lresolv... $ECHO_C" >&6
 if test "${ac_cv_lib_resolv_strcasecmp+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11089,7 +11113,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 11092 "configure"
+#line 11116 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11108,16 +11132,16 @@ strcasecmp ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11111: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11135: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11114: \$? = $ac_status" >&5
+  echo "$as_me:11138: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11117: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11141: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11120: \$? = $ac_status" >&5
+  echo "$as_me:11144: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_resolv_strcasecmp=yes
 else
@@ -11128,7 +11152,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11131: result: $ac_cv_lib_resolv_strcasecmp" >&5
+echo "$as_me:11155: result: $ac_cv_lib_resolv_strcasecmp" >&5
 echo "${ECHO_T}$ac_cv_lib_resolv_strcasecmp" >&6
 if test $ac_cv_lib_resolv_strcasecmp = yes; then
 
@@ -11169,14 +11193,14 @@ test $cf_test_netlibs = no && echo "$cf_cv_netlibs" >&6
 
 fi
 
-echo "$as_me:11172: checking for inet_aton function" >&5
+echo "$as_me:11196: checking for inet_aton function" >&5
 echo $ECHO_N "checking for inet_aton function... $ECHO_C" >&6
 if test "${cf_cv_have_inet_aton+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 11179 "configure"
+#line 11203 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -11192,16 +11216,16 @@ inet_aton(0, (struct in_addr *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11195: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11219: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11198: \$? = $ac_status" >&5
+  echo "$as_me:11222: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11201: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11225: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11204: \$? = $ac_status" >&5
+  echo "$as_me:11228: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_inet_aton=yes
 else
@@ -11211,7 +11235,7 @@ cf_cv_have_inet_aton=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:11214: result: $cf_cv_have_inet_aton" >&5
+echo "$as_me:11238: result: $cf_cv_have_inet_aton" >&5
 echo "${ECHO_T}$cf_cv_have_inet_aton" >&6
 if test "$cf_cv_have_inet_aton" = yes ; then
     cat >>confdefs.h <<\EOF
@@ -11219,14 +11243,14 @@ if test "$cf_cv_have_inet_aton" = yes ; then
 EOF
 
 else
-    echo "$as_me:11222: checking for inet_addr function" >&5
+    echo "$as_me:11246: checking for inet_addr function" >&5
 echo $ECHO_N "checking for inet_addr function... $ECHO_C" >&6
 if test "${cf_cv_have_inet_addr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
     cat >conftest.$ac_ext <<_ACEOF
-#line 11229 "configure"
+#line 11253 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -11242,16 +11266,16 @@ inet_addr(0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11245: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11269: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11248: \$? = $ac_status" >&5
+  echo "$as_me:11272: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11251: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11275: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11254: \$? = $ac_status" >&5
+  echo "$as_me:11278: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_inet_addr=yes
 else
@@ -11261,10 +11285,10 @@ cf_cv_have_inet_addr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:11264: result: $cf_cv_have_inet_addr" >&5
+echo "$as_me:11288: result: $cf_cv_have_inet_addr" >&5
 echo "${ECHO_T}$cf_cv_have_inet_addr" >&6
     if test "$cf_cv_have_inet_addr" = no ; then
-	echo "$as_me:11267: checking for library with inet_addr" >&5
+	echo "$as_me:11291: checking for library with inet_addr" >&5
 echo $ECHO_N "checking for library with inet_addr... $ECHO_C" >&6
 if test "${cf_cv_lib_inet_addr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11275,7 +11299,7 @@ else
 	    do
 		LIBS="$cf_save_LIBS $cf_inetlib"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 11278 "configure"
+#line 11302 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -11291,16 +11315,16 @@ inet_addr(0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11294: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11318: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11297: \$? = $ac_status" >&5
+  echo "$as_me:11321: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11300: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11324: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11303: \$? = $ac_status" >&5
+  echo "$as_me:11327: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_lib_inet_addr=$cf_inetlib
 else
@@ -11314,18 +11338,18 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	    done
 
 fi
-echo "$as_me:11317: result: $cf_cv_lib_inet_addr" >&5
+echo "$as_me:11341: result: $cf_cv_lib_inet_addr" >&5
 echo "${ECHO_T}$cf_cv_lib_inet_addr" >&6
 	if test "$cf_cv_lib_inet_addr" != no ; then
 	    LIBS="$LIBS $cf_cv_lib_inet_addr"
 	else
-	    { echo "$as_me:11322: WARNING: Unable to find library for inet_addr function" >&5
+	    { echo "$as_me:11346: WARNING: Unable to find library for inet_addr function" >&5
 echo "$as_me: WARNING: Unable to find library for inet_addr function" >&2;}
 	fi
     fi
 fi
 
-echo "$as_me:11328: checking if you want to use pkg-config" >&5
+echo "$as_me:11352: checking if you want to use pkg-config" >&5
 echo $ECHO_N "checking if you want to use pkg-config... $ECHO_C" >&6
 
 # Check whether --with-pkg-config or --without-pkg-config was given.
@@ -11335,7 +11359,7 @@ if test "${with_pkg_config+set}" = set; then
 else
   cf_pkg_config=yes
 fi;
-echo "$as_me:11338: result: $cf_pkg_config" >&5
+echo "$as_me:11362: result: $cf_pkg_config" >&5
 echo "${ECHO_T}$cf_pkg_config" >&6
 
 case $cf_pkg_config in
@@ -11345,7 +11369,7 @@ no)
 yes)
 	# Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-echo "$as_me:11348: checking for $ac_word" >&5
+echo "$as_me:11372: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11362,7 +11386,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:11365: found $ac_dir/$ac_word" >&5
+   echo "$as_me:11389: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -11374,10 +11398,10 @@ fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:11377: result: $PKG_CONFIG" >&5
+  echo "$as_me:11401: result: $PKG_CONFIG" >&5
 echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  echo "$as_me:11380: result: no" >&5
+  echo "$as_me:11404: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -11415,7 +11439,7 @@ case ".$PKG_CONFIG" in #(vi
   PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:11418: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+  { { echo "$as_me:11442: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
 echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -11463,7 +11487,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 11466 "configure"
+#line 11490 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11475,16 +11499,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11478: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11502: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11481: \$? = $ac_status" >&5
+  echo "$as_me:11505: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11484: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11508: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11487: \$? = $ac_status" >&5
+  echo "$as_me:11511: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -11501,7 +11525,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}:11504: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:11528: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -11542,7 +11566,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 11545 "configure"
+#line 11569 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11554,16 +11578,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11557: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11581: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11560: \$? = $ac_status" >&5
+  echo "$as_me:11584: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11563: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11587: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11566: \$? = $ac_status" >&5
+  echo "$as_me:11590: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -11580,7 +11604,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}:11583: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:11607: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -11596,7 +11620,7 @@ echo "${as_me-configure}:11583: testing adding $cf_add_incdir to include-path ..
 fi
 
 	else
-{ { echo "$as_me:11599: error: cannot find ssl library under $cf_cv_use_libssl" >&5
+{ { echo "$as_me:11623: error: cannot find ssl library under $cf_cv_use_libssl" >&5
 echo "$as_me: error: cannot find ssl library under $cf_cv_use_libssl" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -11621,7 +11645,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}:11624: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:11648: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -11650,7 +11674,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}:11653: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:11677: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -11659,7 +11683,7 @@ echo "${as_me-configure}:11653: testing adding $cf_add_libdir to library-path ..
 fi
 
 	else
-{ { echo "$as_me:11662: error: cannot find ssl library under $cf_cv_use_libssl" >&5
+{ { echo "$as_me:11686: error: cannot find ssl library under $cf_cv_use_libssl" >&5
 echo "$as_me: error: cannot find ssl library under $cf_cv_use_libssl" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -11773,7 +11797,7 @@ fi
 					esac
 					test -n "$verbose" && echo "	adding $cf_libs_ssl to LIBS" 1>&6
 
-echo "${as_me-configure}:11776: testing adding $cf_libs_ssl to LIBS ..." 1>&5
+echo "${as_me-configure}:11800: testing adding $cf_libs_ssl to LIBS ..." 1>&5
 
 					LIBS="$cf_libs_ssl $LIBS"
 				fi
@@ -11791,10 +11815,10 @@ echo "${as_me-configure}:11776: testing adding $cf_libs_ssl to LIBS ..." 1>&5
 cf_cv_header_path_ssl=
 cf_cv_library_path_ssl=
 
-echo "${as_me-configure}:11794: testing Starting FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me-configure}:11818: testing Starting FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 11797 "configure"
+#line 11821 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -11823,16 +11847,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11826: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11850: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11829: \$? = $ac_status" >&5
+  echo "$as_me:11853: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11832: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11856: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11835: \$? = $ac_status" >&5
+  echo "$as_me:11859: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_find_linkage_ssl=yes
 else
@@ -11843,9 +11867,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for ssl library" 1>&6
 
-echo "${as_me-configure}:11846: testing find linkage for ssl library ..." 1>&5
+echo "${as_me-configure}:11870: testing find linkage for ssl library ..." 1>&5
 
-echo "${as_me-configure}:11848: testing Searching for headers in FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me-configure}:11872: testing Searching for headers in FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -11953,11 +11977,11 @@ cf_search="$cf_header_path_list $cf_search"
       if test -d $cf_cv_header_path_ssl ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_ssl" 1>&6
 
-echo "${as_me-configure}:11956: testing ... testing $cf_cv_header_path_ssl ..." 1>&5
+echo "${as_me-configure}:11980: testing ... testing $cf_cv_header_path_ssl ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_ssl"
         cat >conftest.$ac_ext <<_ACEOF
-#line 11960 "configure"
+#line 11984 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -11986,21 +12010,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11989: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12013: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11992: \$? = $ac_status" >&5
+  echo "$as_me:12016: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11995: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12019: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11998: \$? = $ac_status" >&5
+  echo "$as_me:12022: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found ssl headers in $cf_cv_header_path_ssl" 1>&6
 
-echo "${as_me-configure}:12003: testing ... found ssl headers in $cf_cv_header_path_ssl ..." 1>&5
+echo "${as_me-configure}:12027: testing ... found ssl headers in $cf_cv_header_path_ssl ..." 1>&5
 
             cf_cv_find_linkage_ssl=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -12018,7 +12042,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_ssl" = maybe ; then
 
-echo "${as_me-configure}:12021: testing Searching for ssl library in FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me-configure}:12045: testing Searching for ssl library in FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -12026,7 +12050,7 @@ echo "${as_me-configure}:12021: testing Searching for ssl library in FIND_LINKAG
         CPPFLAGS="$cf_test_CPPFLAGS"
         LIBS="-lssl -lcrypto $cf_save_LIBS"
         cat >conftest.$ac_ext <<_ACEOF
-#line 12029 "configure"
+#line 12053 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -12055,21 +12079,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12058: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12082: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12061: \$? = $ac_status" >&5
+  echo "$as_me:12085: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12064: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12088: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12067: \$? = $ac_status" >&5
+  echo "$as_me:12091: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found ssl library in system" 1>&6
 
-echo "${as_me-configure}:12072: testing ... found ssl library in system ..." 1>&5
+echo "${as_me-configure}:12096: testing ... found ssl library in system ..." 1>&5
 
             cf_cv_find_linkage_ssl=yes
 else
@@ -12171,13 +12195,13 @@ cf_search="$cf_library_path_list $cf_search"
           if test -d $cf_cv_library_path_ssl ; then
             test -n "$verbose" && echo "	... testing $cf_cv_library_path_ssl" 1>&6
 
-echo "${as_me-configure}:12174: testing ... testing $cf_cv_library_path_ssl ..." 1>&5
+echo "${as_me-configure}:12198: testing ... testing $cf_cv_library_path_ssl ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-lssl -lcrypto $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_ssl"
             cat >conftest.$ac_ext <<_ACEOF
-#line 12180 "configure"
+#line 12204 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -12206,21 +12230,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12209: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12233: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12212: \$? = $ac_status" >&5
+  echo "$as_me:12236: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12215: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12239: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12218: \$? = $ac_status" >&5
+  echo "$as_me:12242: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
                 test -n "$verbose" && echo "	... found ssl library in $cf_cv_library_path_ssl" 1>&6
 
-echo "${as_me-configure}:12223: testing ... found ssl library in $cf_cv_library_path_ssl ..." 1>&5
+echo "${as_me-configure}:12247: testing ... found ssl library in $cf_cv_library_path_ssl ..." 1>&5
 
                 cf_cv_find_linkage_ssl=yes
                 cf_cv_library_file_ssl="-lssl"
@@ -12303,7 +12327,7 @@ if test -n "$cf_cv_header_path_ssl" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 12306 "configure"
+#line 12330 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -12315,16 +12339,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12318: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12342: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12321: \$? = $ac_status" >&5
+  echo "$as_me:12345: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12324: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12348: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12327: \$? = $ac_status" >&5
+  echo "$as_me:12351: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -12341,7 +12365,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}:12344: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:12368: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -12381,7 +12405,7 @@ if test -n "$cf_cv_library_path_ssl" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:12384: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:12408: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -12392,10 +12416,10 @@ fi
 		fi
 		LIBS="-lssl -lcrypto $LIBS"
 
-echo "$as_me:12395: checking for X509 support" >&5
+echo "$as_me:12419: checking for X509 support" >&5
 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 12398 "configure"
+#line 12422 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -12419,16 +12443,16 @@ X509_verify_cert_error_string(X509_STORE_CTX_get_error(NULL))
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12422: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12446: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12425: \$? = $ac_status" >&5
+  echo "$as_me:12449: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12428: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12452: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12431: \$? = $ac_status" >&5
+  echo "$as_me:12455: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_x509_support=yes
 else
@@ -12437,7 +12461,7 @@ cat conftest.$ac_ext >&5
 cf_x509_support=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:12440: result: $cf_x509_support" >&5
+echo "$as_me:12464: result: $cf_x509_support" >&5
 echo "${ECHO_T}$cf_x509_support" >&6
 
 if test "$cf_x509_support" = yes ; then
@@ -12488,7 +12512,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 12491 "configure"
+#line 12515 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -12500,16 +12524,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12503: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12527: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12506: \$? = $ac_status" >&5
+  echo "$as_me:12530: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12509: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12533: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12512: \$? = $ac_status" >&5
+  echo "$as_me:12536: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -12526,7 +12550,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}:12529: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:12553: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -12567,7 +12591,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 12570 "configure"
+#line 12594 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -12579,16 +12603,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12582: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12606: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12585: \$? = $ac_status" >&5
+  echo "$as_me:12609: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12588: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12612: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12591: \$? = $ac_status" >&5
+  echo "$as_me:12615: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -12605,7 +12629,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}:12608: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:12632: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -12621,7 +12645,7 @@ echo "${as_me-configure}:12608: testing adding $cf_add_incdir to include-path ..
 fi
 
 	else
-{ { echo "$as_me:12624: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:12648: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
 echo "$as_me: error: cannot find ssl library under $cf_cv_use_libgnutls" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -12646,7 +12670,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}:12649: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:12673: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -12675,7 +12699,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}:12678: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:12702: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -12684,7 +12708,7 @@ echo "${as_me-configure}:12678: testing adding $cf_add_libdir to library-path ..
 fi
 
 	else
-{ { echo "$as_me:12687: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:12711: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
 echo "$as_me: error: cannot find ssl library under $cf_cv_use_libgnutls" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -12702,12 +12726,12 @@ done
 		yes) # if no explicit directory given, try pkg-config
 			test -n "$verbose" && echo "	checking pkg-config for $cf_pkg_gnutls" 1>&6
 
-echo "${as_me-configure}:12705: testing checking pkg-config for $cf_pkg_gnutls ..." 1>&5
+echo "${as_me-configure}:12729: testing checking pkg-config for $cf_pkg_gnutls ..." 1>&5
 
 			if "$PKG_CONFIG" --exists $cf_pkg_gnutls ; then
 				test -n "$verbose" && echo "	... found $cf_pkg_gnutls in pkg-config" 1>&6
 
-echo "${as_me-configure}:12710: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me-configure}:12734: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_cv_have_gnutls=yes
 
@@ -12808,14 +12832,14 @@ fi
 					esac
 					test -n "$verbose" && echo "	adding $cf_libs_ssl to LIBS" 1>&6
 
-echo "${as_me-configure}:12811: testing adding $cf_libs_ssl to LIBS ..." 1>&5
+echo "${as_me-configure}:12835: testing adding $cf_libs_ssl to LIBS ..." 1>&5
 
 					LIBS="$cf_libs_ssl $LIBS"
 				fi
 			else
 				test -n "$verbose" && echo "	... did not find $cf_pkg_gnutls in pkg-config" 1>&6
 
-echo "${as_me-configure}:12818: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me-configure}:12842: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_pkg_gnutls=none
 			fi
@@ -12835,10 +12859,10 @@ EOF
 cf_cv_header_path_gnutls=
 cf_cv_library_path_gnutls=
 
-echo "${as_me-configure}:12838: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me-configure}:12862: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 12841 "configure"
+#line 12865 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -12867,16 +12891,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12870: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12894: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12873: \$? = $ac_status" >&5
+  echo "$as_me:12897: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12876: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12900: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12879: \$? = $ac_status" >&5
+  echo "$as_me:12903: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_find_linkage_gnutls=yes
 else
@@ -12887,9 +12911,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for gnutls library" 1>&6
 
-echo "${as_me-configure}:12890: testing find linkage for gnutls library ..." 1>&5
+echo "${as_me-configure}:12914: testing find linkage for gnutls library ..." 1>&5
 
-echo "${as_me-configure}:12892: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me-configure}:12916: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -12997,11 +13021,11 @@ cf_search="$cf_header_path_list $cf_search"
       if test -d $cf_cv_header_path_gnutls ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_gnutls" 1>&6
 
-echo "${as_me-configure}:13000: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me-configure}:13024: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_gnutls"
         cat >conftest.$ac_ext <<_ACEOF
-#line 13004 "configure"
+#line 13028 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -13030,21 +13054,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13033: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13057: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13036: \$? = $ac_status" >&5
+  echo "$as_me:13060: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13039: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13063: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13042: \$? = $ac_status" >&5
+  echo "$as_me:13066: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found gnutls headers in $cf_cv_header_path_gnutls" 1>&6
 
-echo "${as_me-configure}:13047: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me-configure}:13071: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
 
             cf_cv_find_linkage_gnutls=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -13062,7 +13086,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_gnutls" = maybe ; then
 
-echo "${as_me-configure}:13065: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me-configure}:13089: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -13158,13 +13182,13 @@ cf_search="$cf_library_path_list $cf_search"
           if test -d $cf_cv_library_path_gnutls ; then
             test -n "$verbose" && echo "	... testing $cf_cv_library_path_gnutls" 1>&6
 
-echo "${as_me-configure}:13161: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me-configure}:13185: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-lgnutls -lgnutls -lcrypt $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_gnutls"
             cat >conftest.$ac_ext <<_ACEOF
-#line 13167 "configure"
+#line 13191 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -13193,21 +13217,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13196: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13220: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13199: \$? = $ac_status" >&5
+  echo "$as_me:13223: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13202: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13226: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13205: \$? = $ac_status" >&5
+  echo "$as_me:13229: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
                 test -n "$verbose" && echo "	... found gnutls library in $cf_cv_library_path_gnutls" 1>&6
 
-echo "${as_me-configure}:13210: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me-configure}:13234: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
 
                 cf_cv_find_linkage_gnutls=yes
                 cf_cv_library_file_gnutls="-lgnutls"
@@ -13280,7 +13304,7 @@ if test -n "$cf_cv_header_path_gnutls" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 13283 "configure"
+#line 13307 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13292,16 +13316,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13295: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13319: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13298: \$? = $ac_status" >&5
+  echo "$as_me:13322: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13301: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13325: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13304: \$? = $ac_status" >&5
+  echo "$as_me:13328: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -13318,7 +13342,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}:13321: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:13345: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -13357,7 +13381,7 @@ if test -n "$cf_cv_library_path_gnutls" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:13360: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:13384: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -13370,10 +13394,10 @@ fi
 
 		EXTRA_OBJS="$EXTRA_OBJS tidy_tls\$o"
 
-echo "$as_me:13373: checking for X509 support" >&5
+echo "$as_me:13397: checking for X509 support" >&5
 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 13376 "configure"
+#line 13400 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -13397,16 +13421,16 @@ X509_verify_cert_error_string(X509_STORE_CTX_get_error(NULL))
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13400: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13424: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13403: \$? = $ac_status" >&5
+  echo "$as_me:13427: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13406: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13430: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13409: \$? = $ac_status" >&5
+  echo "$as_me:13433: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_x509_support=yes
 else
@@ -13415,7 +13439,7 @@ cat conftest.$ac_ext >&5
 cf_x509_support=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:13418: result: $cf_x509_support" >&5
+echo "$as_me:13442: result: $cf_x509_support" >&5
 echo "${ECHO_T}$cf_x509_support" >&6
 
 if test "$cf_x509_support" = yes ; then
@@ -13465,7 +13489,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 13468 "configure"
+#line 13492 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13477,16 +13501,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13480: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13504: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13483: \$? = $ac_status" >&5
+  echo "$as_me:13507: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13486: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13510: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13489: \$? = $ac_status" >&5
+  echo "$as_me:13513: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -13503,7 +13527,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}:13506: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:13530: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -13544,7 +13568,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 13547 "configure"
+#line 13571 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13556,16 +13580,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13559: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13583: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13562: \$? = $ac_status" >&5
+  echo "$as_me:13586: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13565: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13589: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13568: \$? = $ac_status" >&5
+  echo "$as_me:13592: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -13582,7 +13606,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}:13585: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:13609: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -13598,7 +13622,7 @@ echo "${as_me-configure}:13585: testing adding $cf_add_incdir to include-path ..
 fi
 
 	else
-{ { echo "$as_me:13601: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:13625: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
 echo "$as_me: error: cannot find ssl library under $cf_cv_use_libgnutls" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -13623,7 +13647,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}:13626: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:13650: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -13652,7 +13676,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}:13655: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:13679: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -13661,7 +13685,7 @@ echo "${as_me-configure}:13655: testing adding $cf_add_libdir to library-path ..
 fi
 
 	else
-{ { echo "$as_me:13664: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:13688: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
 echo "$as_me: error: cannot find ssl library under $cf_cv_use_libgnutls" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -13679,12 +13703,12 @@ done
 		yes) # if no explicit directory given, try pkg-config
 			test -n "$verbose" && echo "	checking pkg-config for $cf_pkg_gnutls" 1>&6
 
-echo "${as_me-configure}:13682: testing checking pkg-config for $cf_pkg_gnutls ..." 1>&5
+echo "${as_me-configure}:13706: testing checking pkg-config for $cf_pkg_gnutls ..." 1>&5
 
 			if "$PKG_CONFIG" --exists $cf_pkg_gnutls ; then
 				test -n "$verbose" && echo "	... found $cf_pkg_gnutls in pkg-config" 1>&6
 
-echo "${as_me-configure}:13687: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me-configure}:13711: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_cv_have_gnutls=yes
 
@@ -13785,14 +13809,14 @@ fi
 					esac
 					test -n "$verbose" && echo "	adding $cf_libs_ssl to LIBS" 1>&6
 
-echo "${as_me-configure}:13788: testing adding $cf_libs_ssl to LIBS ..." 1>&5
+echo "${as_me-configure}:13812: testing adding $cf_libs_ssl to LIBS ..." 1>&5
 
 					LIBS="$cf_libs_ssl $LIBS"
 				fi
 			else
 				test -n "$verbose" && echo "	... did not find $cf_pkg_gnutls in pkg-config" 1>&6
 
-echo "${as_me-configure}:13795: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me-configure}:13819: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_pkg_gnutls=none
 			fi
@@ -13812,10 +13836,10 @@ EOF
 cf_cv_header_path_gnutls=
 cf_cv_library_path_gnutls=
 
-echo "${as_me-configure}:13815: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me-configure}:13839: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 13818 "configure"
+#line 13842 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -13844,16 +13868,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13847: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13871: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13850: \$? = $ac_status" >&5
+  echo "$as_me:13874: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13853: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13877: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13856: \$? = $ac_status" >&5
+  echo "$as_me:13880: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_find_linkage_gnutls=yes
 else
@@ -13864,9 +13888,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for gnutls library" 1>&6
 
-echo "${as_me-configure}:13867: testing find linkage for gnutls library ..." 1>&5
+echo "${as_me-configure}:13891: testing find linkage for gnutls library ..." 1>&5
 
-echo "${as_me-configure}:13869: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me-configure}:13893: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -13974,11 +13998,11 @@ cf_search="$cf_header_path_list $cf_search"
       if test -d $cf_cv_header_path_gnutls ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_gnutls" 1>&6
 
-echo "${as_me-configure}:13977: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me-configure}:14001: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_gnutls"
         cat >conftest.$ac_ext <<_ACEOF
-#line 13981 "configure"
+#line 14005 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14007,21 +14031,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14010: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14034: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14013: \$? = $ac_status" >&5
+  echo "$as_me:14037: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14016: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14040: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14019: \$? = $ac_status" >&5
+  echo "$as_me:14043: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found gnutls headers in $cf_cv_header_path_gnutls" 1>&6
 
-echo "${as_me-configure}:14024: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me-configure}:14048: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
 
             cf_cv_find_linkage_gnutls=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -14039,7 +14063,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_gnutls" = maybe ; then
 
-echo "${as_me-configure}:14042: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me-configure}:14066: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -14135,13 +14159,13 @@ cf_search="$cf_library_path_list $cf_search"
           if test -d $cf_cv_library_path_gnutls ; then
             test -n "$verbose" && echo "	... testing $cf_cv_library_path_gnutls" 1>&6
 
-echo "${as_me-configure}:14138: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me-configure}:14162: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-lgnutls -lgnutls-openssl -lgnutls-extra -lgnutls -lcrypt $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_gnutls"
             cat >conftest.$ac_ext <<_ACEOF
-#line 14144 "configure"
+#line 14168 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14170,21 +14194,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14173: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14197: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14176: \$? = $ac_status" >&5
+  echo "$as_me:14200: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14179: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14203: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14182: \$? = $ac_status" >&5
+  echo "$as_me:14206: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
                 test -n "$verbose" && echo "	... found gnutls library in $cf_cv_library_path_gnutls" 1>&6
 
-echo "${as_me-configure}:14187: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me-configure}:14211: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
 
                 cf_cv_find_linkage_gnutls=yes
                 cf_cv_library_file_gnutls="-lgnutls"
@@ -14257,7 +14281,7 @@ if test -n "$cf_cv_header_path_gnutls" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 14260 "configure"
+#line 14284 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14269,16 +14293,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14272: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14296: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14275: \$? = $ac_status" >&5
+  echo "$as_me:14299: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14278: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14302: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14281: \$? = $ac_status" >&5
+  echo "$as_me:14305: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -14295,7 +14319,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}:14298: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:14322: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -14334,7 +14358,7 @@ if test -n "$cf_cv_library_path_gnutls" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:14337: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:14361: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -14346,7 +14370,7 @@ fi
 		LIBS="-lgnutls -lcrypt $LIBS"
 
 		if test "$cf_pkg_gnutls" = none ; then
-				echo "$as_me:14349: checking for SSL_connect in -lgnutls-openssl" >&5
+				echo "$as_me:14373: checking for SSL_connect in -lgnutls-openssl" >&5
 echo $ECHO_N "checking for SSL_connect in -lgnutls-openssl... $ECHO_C" >&6
 if test "${ac_cv_lib_gnutls_openssl_SSL_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14354,7 +14378,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnutls-openssl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 14357 "configure"
+#line 14381 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14373,16 +14397,16 @@ SSL_connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14376: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14400: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14379: \$? = $ac_status" >&5
+  echo "$as_me:14403: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14382: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14406: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14385: \$? = $ac_status" >&5
+  echo "$as_me:14409: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gnutls_openssl_SSL_connect=yes
 else
@@ -14393,12 +14417,12 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:14396: result: $ac_cv_lib_gnutls_openssl_SSL_connect" >&5
+echo "$as_me:14420: result: $ac_cv_lib_gnutls_openssl_SSL_connect" >&5
 echo "${ECHO_T}$ac_cv_lib_gnutls_openssl_SSL_connect" >&6
 if test $ac_cv_lib_gnutls_openssl_SSL_connect = yes; then
   LIBS="-lgnutls-openssl $LIBS"
 else
-  echo "$as_me:14401: checking for SSL_connect in -lgnutls-extra" >&5
+  echo "$as_me:14425: checking for SSL_connect in -lgnutls-extra" >&5
 echo $ECHO_N "checking for SSL_connect in -lgnutls-extra... $ECHO_C" >&6
 if test "${ac_cv_lib_gnutls_extra_SSL_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14406,7 +14430,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnutls-extra  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 14409 "configure"
+#line 14433 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14425,16 +14449,16 @@ SSL_connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14428: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14452: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14431: \$? = $ac_status" >&5
+  echo "$as_me:14455: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14434: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14458: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14437: \$? = $ac_status" >&5
+  echo "$as_me:14461: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gnutls_extra_SSL_connect=yes
 else
@@ -14445,12 +14469,12 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:14448: result: $ac_cv_lib_gnutls_extra_SSL_connect" >&5
+echo "$as_me:14472: result: $ac_cv_lib_gnutls_extra_SSL_connect" >&5
 echo "${ECHO_T}$ac_cv_lib_gnutls_extra_SSL_connect" >&6
 if test $ac_cv_lib_gnutls_extra_SSL_connect = yes; then
   LIBS="-lgnutls-extra $LIBS"
 else
-  { { echo "$as_me:14453: error: cannot find gnutls openssl functions" >&5
+  { { echo "$as_me:14477: error: cannot find gnutls openssl functions" >&5
 echo "$as_me: error: cannot find gnutls openssl functions" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -14459,10 +14483,10 @@ fi
 
 			fi
 
-echo "$as_me:14462: checking for X509 support" >&5
+echo "$as_me:14486: checking for X509 support" >&5
 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 14465 "configure"
+#line 14489 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14486,16 +14510,16 @@ X509_verify_cert_error_string(X509_STORE_CTX_get_error(NULL))
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14489: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14513: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14492: \$? = $ac_status" >&5
+  echo "$as_me:14516: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14495: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14519: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14498: \$? = $ac_status" >&5
+  echo "$as_me:14522: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_x509_support=yes
 else
@@ -14504,7 +14528,7 @@ cat conftest.$ac_ext >&5
 cf_x509_support=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:14507: result: $cf_x509_support" >&5
+echo "$as_me:14531: result: $cf_x509_support" >&5
 echo "${ECHO_T}$cf_x509_support" >&6
 
 if test "$cf_x509_support" = yes ; then
@@ -14536,7 +14560,7 @@ no) #(vi
 	;;
 yes) #(vi
 
-echo "$as_me:14539: checking for SSL_get_version in -lnss_compat_ossl" >&5
+echo "$as_me:14563: checking for SSL_get_version in -lnss_compat_ossl" >&5
 echo $ECHO_N "checking for SSL_get_version in -lnss_compat_ossl... $ECHO_C" >&6
 if test "${ac_cv_lib_nss_compat_ossl_SSL_get_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14544,7 +14568,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnss_compat_ossl -lnss_compat_ossl $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 14547 "configure"
+#line 14571 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -14563,16 +14587,16 @@ SSL_get_version ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14566: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14590: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14569: \$? = $ac_status" >&5
+  echo "$as_me:14593: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14572: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14596: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14575: \$? = $ac_status" >&5
+  echo "$as_me:14599: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nss_compat_ossl_SSL_get_version=yes
 else
@@ -14583,7 +14607,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:14586: result: $ac_cv_lib_nss_compat_ossl_SSL_get_version" >&5
+echo "$as_me:14610: result: $ac_cv_lib_nss_compat_ossl_SSL_get_version" >&5
 echo "${ECHO_T}$ac_cv_lib_nss_compat_ossl_SSL_get_version" >&6
 if test $ac_cv_lib_nss_compat_ossl_SSL_get_version = yes; then
   cat >>confdefs.h <<EOF
@@ -14598,11 +14622,11 @@ else
 		if test -d $cf_ssl_root ; then
 			test -n "$verbose" && echo "	assume it is in $cf_ssl_root" 1>&6
 
-echo "${as_me-configure}:14601: testing assume it is in $cf_ssl_root ..." 1>&5
+echo "${as_me-configure}:14625: testing assume it is in $cf_ssl_root ..." 1>&5
 
 			cf_ssl_library="-L$cf_ssl_root/lib $cf_ssl_library"
 		else
-			{ { echo "$as_me:14605: error: cannot find NSS compilant libraries" >&5
+			{ { echo "$as_me:14629: error: cannot find NSS compilant libraries" >&5
 echo "$as_me: error: cannot find NSS compilant libraries" >&2;}
    { (exit 1); exit 1; }; }
 		fi
@@ -14617,13 +14641,13 @@ fi
 		elif test -d $cf_cv_use_libnss_compat/../include ; then
 			cf_ssl_root=$cf_cv_use_libnss_compat/..
 		else
-			{ { echo "$as_me:14620: error: cannot find NSS compilant library under $cf_cv_use_libnss_compat" >&5
+			{ { echo "$as_me:14644: error: cannot find NSS compilant library under $cf_cv_use_libnss_compat" >&5
 echo "$as_me: error: cannot find NSS compilant library under $cf_cv_use_libnss_compat" >&2;}
    { (exit 1); exit 1; }; }
 		fi
 		cf_ssl_library="-L$cf_ssl_root/lib $cf_ssl_library"
 	else
-		{ echo "$as_me:14626: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&5
+		{ echo "$as_me:14650: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&5
 echo "$as_me: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&2;}
 	fi
 	;;
@@ -14707,10 +14731,10 @@ if test -n "$cf_new_extra_cppflags" ; then
 fi
 
 if test "$cf_ssl_subincs" = yes ; then
-echo "$as_me:14710: checking for NSS compilant include directory" >&5
+echo "$as_me:14734: checking for NSS compilant include directory" >&5
 echo $ECHO_N "checking for NSS compilant include directory... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 14713 "configure"
+#line 14737 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14724,16 +14748,16 @@ SSL_shutdown((SSL *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14727: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14751: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14730: \$? = $ac_status" >&5
+  echo "$as_me:14754: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14733: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14757: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14736: \$? = $ac_status" >&5
+  echo "$as_me:14760: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_ssl_incl=yes
 else
@@ -14742,7 +14766,7 @@ cat conftest.$ac_ext >&5
 cf_ssl_incl=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:14745: result: $cf_ssl_incl" >&5
+echo "$as_me:14769: result: $cf_ssl_incl" >&5
 echo "${ECHO_T}$cf_ssl_incl" >&6
 test "$cf_ssl_incl" = yes && cat >>confdefs.h <<\EOF
 #define USE_NSS_COMPAT_INCL 1
@@ -14750,10 +14774,10 @@ EOF
 
 fi
 
-echo "$as_me:14753: checking if we can link to NSS compilant library" >&5
+echo "$as_me:14777: checking if we can link to NSS compilant library" >&5
 echo $ECHO_N "checking if we can link to NSS compilant library... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 14756 "configure"
+#line 14780 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14772,16 +14796,16 @@ SSL_shutdown((SSL *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14775: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14799: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14778: \$? = $ac_status" >&5
+  echo "$as_me:14802: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14781: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14805: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14784: \$? = $ac_status" >&5
+  echo "$as_me:14808: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_ssl_library=yes
 else
@@ -14790,7 +14814,7 @@ cat conftest.$ac_ext >&5
 cf_ssl_library=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:14793: result: $cf_ssl_library" >&5
+echo "$as_me:14817: result: $cf_ssl_library" >&5
 echo "${ECHO_T}$cf_ssl_library" >&6
 if test "$cf_ssl_library" = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -14802,7 +14826,7 @@ EOF
 EOF
 
 else
-	{ { echo "$as_me:14805: error: Cannot link with NSS compilant libraries" >&5
+	{ { echo "$as_me:14829: error: Cannot link with NSS compilant libraries" >&5
 echo "$as_me: error: Cannot link with NSS compilant libraries" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -14810,7 +14834,7 @@ fi
 fi
 
 ### check for ipv6 support
-echo "$as_me:14813: checking whether to enable ipv6" >&5
+echo "$as_me:14837: checking whether to enable ipv6" >&5
 echo $ECHO_N "checking whether to enable ipv6... $ECHO_C" >&6
 
 # Check whether --enable-ipv6 or --disable-ipv6 was given.
@@ -14826,11 +14850,11 @@ EOF
 else
   enableval=no
 fi;
-echo "$as_me:14829: result: $enableval" >&5
+echo "$as_me:14853: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 if test "$enableval" = "yes"; then
 
-echo "$as_me:14833: checking ipv6 stack type" >&5
+echo "$as_me:14857: checking ipv6 stack type" >&5
 echo $ECHO_N "checking ipv6 stack type... $ECHO_C" >&6
 if test "${cf_cv_ipv6type+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -14851,7 +14875,7 @@ do
 		;;
 	inria) #(vi
 				cat >conftest.$ac_ext <<_ACEOF
-#line 14854 "configure"
+#line 14878 "configure"
 #include "confdefs.h"
 
 #include <netinet/in.h>
@@ -14868,7 +14892,7 @@ rm -f conftest*
 		;;
 	kame) #(vi
 				cat >conftest.$ac_ext <<_ACEOF
-#line 14871 "configure"
+#line 14895 "configure"
 #include "confdefs.h"
 
 #include <netinet/in.h>
@@ -14885,7 +14909,7 @@ rm -f conftest*
 		;;
 	linux-glibc) #(vi
 				cat >conftest.$ac_ext <<_ACEOF
-#line 14888 "configure"
+#line 14912 "configure"
 #include "confdefs.h"
 
 #include <features.h>
@@ -14911,7 +14935,7 @@ rm -f conftest*
 		;;
 	toshiba) #(vi
 		cat >conftest.$ac_ext <<_ACEOF
-#line 14914 "configure"
+#line 14938 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -14928,7 +14952,7 @@ rm -f conftest*
 		;;
 	v6d) #(vi
 		cat >conftest.$ac_ext <<_ACEOF
-#line 14931 "configure"
+#line 14955 "configure"
 #include "confdefs.h"
 
 #include </usr/local/v6/include/sys/v6config.h>
@@ -14945,7 +14969,7 @@ rm -f conftest*
 		;;
 	zeta)
 		cat >conftest.$ac_ext <<_ACEOF
-#line 14948 "configure"
+#line 14972 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -14967,13 +14991,13 @@ rm -f conftest*
 done
 
 fi
-echo "$as_me:14970: result: $cf_cv_ipv6type" >&5
+echo "$as_me:14994: result: $cf_cv_ipv6type" >&5
 echo "${ECHO_T}$cf_cv_ipv6type" >&6
 
 cf_ipv6lib=none
 cf_ipv6dir=none
 
-echo "$as_me:14976: checking for IPv6 library if required" >&5
+echo "$as_me:15000: checking for IPv6 library if required" >&5
 echo $ECHO_N "checking for IPv6 library if required... $ECHO_C" >&6
 case $cf_cv_ipv6type in #(vi
 solaris) #(vi
@@ -15003,13 +15027,13 @@ zeta)
 	cf_ipv6dir=v6
 	;;
 esac
-echo "$as_me:15006: result: $cf_ipv6lib" >&5
+echo "$as_me:15030: result: $cf_ipv6lib" >&5
 echo "${ECHO_T}$cf_ipv6lib" >&6
 
 if test "$cf_ipv6lib" != "none"; then
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 15012 "configure"
+#line 15036 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -15025,16 +15049,16 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15028: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15052: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15031: \$? = $ac_status" >&5
+  echo "$as_me:15055: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15034: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15058: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15037: \$? = $ac_status" >&5
+  echo "$as_me:15061: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -15169,7 +15193,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 15172 "configure"
+#line 15196 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -15181,16 +15205,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15184: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15208: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15187: \$? = $ac_status" >&5
+  echo "$as_me:15211: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15190: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15214: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15193: \$? = $ac_status" >&5
+  echo "$as_me:15217: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -15207,7 +15231,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}:15210: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:15234: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -15233,13 +15257,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 	eval 'cf_cv_have_lib_'$cf_ipv6lib'=no'
 	cf_libdir=""
-	echo "$as_me:15236: checking for getaddrinfo" >&5
+	echo "$as_me:15260: checking for getaddrinfo" >&5
 echo $ECHO_N "checking for getaddrinfo... $ECHO_C" >&6
 if test "${ac_cv_func_getaddrinfo+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15242 "configure"
+#line 15266 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char getaddrinfo (); below.  */
@@ -15270,16 +15294,16 @@ f = getaddrinfo;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15273: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15297: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15276: \$? = $ac_status" >&5
+  echo "$as_me:15300: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15279: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15303: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15282: \$? = $ac_status" >&5
+  echo "$as_me:15306: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_getaddrinfo=yes
 else
@@ -15289,18 +15313,18 @@ ac_cv_func_getaddrinfo=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:15292: result: $ac_cv_func_getaddrinfo" >&5
+echo "$as_me:15316: result: $ac_cv_func_getaddrinfo" >&5
 echo "${ECHO_T}$ac_cv_func_getaddrinfo" >&6
 if test $ac_cv_func_getaddrinfo = yes; then
   eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:15299: checking for getaddrinfo in -l$cf_ipv6lib" >&5
+		echo "$as_me:15323: checking for getaddrinfo in -l$cf_ipv6lib" >&5
 echo $ECHO_N "checking for getaddrinfo in -l$cf_ipv6lib... $ECHO_C" >&6
 		LIBS="-l$cf_ipv6lib $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 15303 "configure"
+#line 15327 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -15316,25 +15340,25 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15319: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15343: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15322: \$? = $ac_status" >&5
+  echo "$as_me:15346: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15325: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15349: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15328: \$? = $ac_status" >&5
+  echo "$as_me:15352: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:15330: result: yes" >&5
+  echo "$as_me:15354: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:15337: result: no" >&5
+echo "$as_me:15361: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_library_path_list=""
@@ -15423,11 +15447,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:15426: checking for -l$cf_ipv6lib in $cf_libdir" >&5
+				echo "$as_me:15450: checking for -l$cf_ipv6lib in $cf_libdir" >&5
 echo $ECHO_N "checking for -l$cf_ipv6lib in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -l$cf_ipv6lib $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 15430 "configure"
+#line 15454 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -15443,25 +15467,25 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15446: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15470: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15449: \$? = $ac_status" >&5
+  echo "$as_me:15473: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15452: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15476: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15455: \$? = $ac_status" >&5
+  echo "$as_me:15479: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:15457: result: yes" >&5
+  echo "$as_me:15481: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'$cf_ipv6lib'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:15464: result: no" >&5
+echo "$as_me:15488: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -15476,7 +15500,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_ipv6lib
 
 	if test $cf_found_library = no ; then
-		{ { echo "$as_me:15479: error: No $cf_ipv6lib library found, cannot continue.  You must fetch lib$cf_ipv6lib.a
+		{ { echo "$as_me:15503: error: No $cf_ipv6lib library found, cannot continue.  You must fetch lib$cf_ipv6lib.a
 from an appropriate IPv6 kit and compile beforehand." >&5
 echo "$as_me: error: No $cf_ipv6lib library found, cannot continue.  You must fetch lib$cf_ipv6lib.a
 from an appropriate IPv6 kit and compile beforehand." >&2;}
@@ -15484,7 +15508,7 @@ from an appropriate IPv6 kit and compile beforehand." >&2;}
 	fi
 fi
 
-echo "$as_me:15487: checking working getaddrinfo" >&5
+echo "$as_me:15511: checking working getaddrinfo" >&5
 echo $ECHO_N "checking working getaddrinfo... $ECHO_C" >&6
 if test "${cf_cv_getaddrinfo+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15494,7 +15518,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_getaddrinfo=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15497 "configure"
+#line 15521 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -15574,15 +15598,15 @@ int main()
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:15577: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15601: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15580: \$? = $ac_status" >&5
+  echo "$as_me:15604: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:15582: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15606: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15585: \$? = $ac_status" >&5
+  echo "$as_me:15609: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_getaddrinfo=yes
 else
@@ -15595,7 +15619,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:15598: result: $cf_cv_getaddrinfo" >&5
+echo "$as_me:15622: result: $cf_cv_getaddrinfo" >&5
 echo "${ECHO_T}$cf_cv_getaddrinfo" >&6
 if test "$cf_cv_getaddrinfo" = yes ; then
 	cat >>confdefs.h <<\EOF
@@ -15610,12 +15634,12 @@ fi
 
 if test "$cf_cv_getaddrinfo" != "yes"; then
 	if test "$cf_cv_ipv6type" != "linux"; then
-		{ echo "$as_me:15613: WARNING: You must get working getaddrinfo() function,
+		{ echo "$as_me:15637: WARNING: You must get working getaddrinfo() function,
 or you can specify \"--disable-ipv6\"" >&5
 echo "$as_me: WARNING: You must get working getaddrinfo() function,
 or you can specify \"--disable-ipv6\"" >&2;}
 	else
-		{ echo "$as_me:15618: WARNING: The getaddrinfo() implementation on your system seems be buggy.
+		{ echo "$as_me:15642: WARNING: The getaddrinfo() implementation on your system seems be buggy.
 You should upgrade your system library to the newest version
 of GNU C library (aka glibc)." >&5
 echo "$as_me: WARNING: The getaddrinfo() implementation on your system seems be buggy.
@@ -15626,7 +15650,7 @@ fi
 
 fi
 
-echo "$as_me:15629: checking for screen type" >&5
+echo "$as_me:15653: checking for screen type" >&5
 echo $ECHO_N "checking for screen type... $ECHO_C" >&6
 if test "${cf_cv_screen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15640,7 +15664,7 @@ case $withval in
 curses|ncurses|ncursesw|pdcurses|slang)
 	cf_cv_screen=$withval
 	;;
-*)	{ { echo "$as_me:15643: error: Unexpected value" >&5
+*)	{ { echo "$as_me:15667: error: Unexpected value" >&5
 echo "$as_me: error: Unexpected value" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -15649,7 +15673,7 @@ else
   cf_cv_screen=curses
 fi;
 fi
-echo "$as_me:15652: result: $cf_cv_screen" >&5
+echo "$as_me:15676: result: $cf_cv_screen" >&5
 echo "${ECHO_T}$cf_cv_screen" >&6
 
 case $cf_cv_screen in
@@ -15684,7 +15708,7 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:15687: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:15711: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -15703,7 +15727,7 @@ dft_color_style=yes
 case $cf_cv_screen in
 curses)
 
-echo "$as_me:15706: checking for extra include directories" >&5
+echo "$as_me:15730: checking for extra include directories" >&5
 echo $ECHO_N "checking for extra include directories... $ECHO_C" >&6
 if test "${cf_cv_curses_incdir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15723,11 +15747,11 @@ sunos3*|sunos4*)
 esac
 
 fi
-echo "$as_me:15726: result: $cf_cv_curses_incdir" >&5
+echo "$as_me:15750: result: $cf_cv_curses_incdir" >&5
 echo "${ECHO_T}$cf_cv_curses_incdir" >&6
 test "$cf_cv_curses_incdir" != no && CPPFLAGS="$cf_cv_curses_incdir $CPPFLAGS"
 
-echo "$as_me:15730: checking if we have identified curses headers" >&5
+echo "$as_me:15754: checking if we have identified curses headers" >&5
 echo $ECHO_N "checking if we have identified curses headers... $ECHO_C" >&6
 if test "${cf_cv_ncurses_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15741,7 +15765,7 @@ for cf_header in \
 	ncurses/ncurses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 15744 "configure"
+#line 15768 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -15753,16 +15777,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15756: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15780: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15759: \$? = $ac_status" >&5
+  echo "$as_me:15783: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15762: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15786: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15765: \$? = $ac_status" >&5
+  echo "$as_me:15789: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -15773,11 +15797,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:15776: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:15800: result: $cf_cv_ncurses_header" >&5
 echo "${ECHO_T}$cf_cv_ncurses_header" >&6
 
 if test "$cf_cv_ncurses_header" = none ; then
-	{ { echo "$as_me:15780: error: No curses header-files found" >&5
+	{ { echo "$as_me:15804: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -15787,23 +15811,23 @@ fi
 for ac_header in $cf_cv_ncurses_header
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:15790: checking for $ac_header" >&5
+echo "$as_me:15814: 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 15796 "configure"
+#line 15820 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:15800: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:15824: \"$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:15806: \$? = $ac_status" >&5
+  echo "$as_me:15830: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -15822,7 +15846,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:15825: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:15849: 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
@@ -15832,7 +15856,7 @@ EOF
 fi
 done
 
-echo "$as_me:15835: checking for terminfo header" >&5
+echo "$as_me:15859: checking for terminfo header" >&5
 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
 if test "${cf_cv_term_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15850,7 +15874,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 15853 "configure"
+#line 15877 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -15865,16 +15889,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15868: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15892: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15871: \$? = $ac_status" >&5
+  echo "$as_me:15895: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15874: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15898: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15877: \$? = $ac_status" >&5
+  echo "$as_me:15901: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -15890,7 +15914,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:15893: result: $cf_cv_term_header" >&5
+echo "$as_me:15917: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -15919,7 +15943,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:15922: checking for ncurses version" >&5
+echo "$as_me:15946: checking for ncurses version" >&5
 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
 if test "${cf_cv_ncurses_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15945,10 +15969,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:15948: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:15972: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:15951: \$? = $ac_status" >&5
+  echo "$as_me:15975: \$? = $ac_status" >&5
   (exit $ac_status); }
 	if test -f conftest.out ; then
 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
@@ -15958,7 +15982,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15961 "configure"
+#line 15985 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -15983,15 +16007,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:15986: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16010: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15989: \$? = $ac_status" >&5
+  echo "$as_me:16013: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:15991: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16015: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15994: \$? = $ac_status" >&5
+  echo "$as_me:16018: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -16005,16 +16029,16 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:16008: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:16032: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:16014: checking if we have identified curses libraries" >&5
+echo "$as_me:16038: checking if we have identified curses libraries" >&5
 echo $ECHO_N "checking if we have identified curses libraries... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 16017 "configure"
+#line 16041 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -16026,16 +16050,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16029: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16053: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16032: \$? = $ac_status" >&5
+  echo "$as_me:16056: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16035: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16059: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16038: \$? = $ac_status" >&5
+  echo "$as_me:16062: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -16044,13 +16068,13 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:16047: result: $cf_result" >&5
+echo "$as_me:16071: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 if test "$cf_result" = no ; then
 case $host_os in #(vi
 freebsd*) #(vi
-    echo "$as_me:16053: checking for tgoto in -lmytinfo" >&5
+    echo "$as_me:16077: checking for tgoto in -lmytinfo" >&5
 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16058,7 +16082,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 16061 "configure"
+#line 16085 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16077,16 +16101,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16080: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16104: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16083: \$? = $ac_status" >&5
+  echo "$as_me:16107: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16086: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16110: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16089: \$? = $ac_status" >&5
+  echo "$as_me:16113: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -16097,7 +16121,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16100: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:16124: result: $ac_cv_lib_mytinfo_tgoto" >&5
 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
 if test $ac_cv_lib_mytinfo_tgoto = yes; then
   LIBS="-lmytinfo $LIBS"
@@ -16105,7 +16129,7 @@ fi
 
     ;;
 hpux10.*) #(vi
-    echo "$as_me:16108: checking for initscr in -lcur_colr" >&5
+    echo "$as_me:16132: checking for initscr in -lcur_colr" >&5
 echo $ECHO_N "checking for initscr in -lcur_colr... $ECHO_C" >&6
 if test "${ac_cv_lib_cur_colr_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16113,7 +16137,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcur_colr  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 16116 "configure"
+#line 16140 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16132,16 +16156,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16135: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16159: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16138: \$? = $ac_status" >&5
+  echo "$as_me:16162: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16141: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16165: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16144: \$? = $ac_status" >&5
+  echo "$as_me:16168: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_cur_colr_initscr=yes
 else
@@ -16152,7 +16176,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16155: result: $ac_cv_lib_cur_colr_initscr" >&5
+echo "$as_me:16179: result: $ac_cv_lib_cur_colr_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_cur_colr_initscr" >&6
 if test $ac_cv_lib_cur_colr_initscr = yes; then
 
@@ -16161,7 +16185,7 @@ if test $ac_cv_lib_cur_colr_initscr = yes; then
 
 else
 
-    echo "$as_me:16164: checking for initscr in -lHcurses" >&5
+    echo "$as_me:16188: checking for initscr in -lHcurses" >&5
 echo $ECHO_N "checking for initscr in -lHcurses... $ECHO_C" >&6
 if test "${ac_cv_lib_Hcurses_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16169,7 +16193,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lHcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 16172 "configure"
+#line 16196 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16188,16 +16212,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16191: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16215: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16194: \$? = $ac_status" >&5
+  echo "$as_me:16218: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16197: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16221: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16200: \$? = $ac_status" >&5
+  echo "$as_me:16224: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Hcurses_initscr=yes
 else
@@ -16208,7 +16232,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16211: result: $ac_cv_lib_Hcurses_initscr" >&5
+echo "$as_me:16235: result: $ac_cv_lib_Hcurses_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_Hcurses_initscr" >&6
 if test $ac_cv_lib_Hcurses_initscr = yes; then
 
@@ -16243,7 +16267,7 @@ if test -n "/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:16246: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:16270: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -16274,7 +16298,7 @@ if test -n "/usr/5lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:16277: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:16301: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -16302,13 +16326,13 @@ if test ".$ac_cv_func_initscr" != .yes ; then
 
     # Check for library containing tgoto.  Do this before curses library
     # because it may be needed to link the test-case for initscr.
-    echo "$as_me:16305: checking for tgoto" >&5
+    echo "$as_me:16329: checking for tgoto" >&5
 echo $ECHO_N "checking for tgoto... $ECHO_C" >&6
 if test "${ac_cv_func_tgoto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 16311 "configure"
+#line 16335 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char tgoto (); below.  */
@@ -16339,16 +16363,16 @@ f = tgoto;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16342: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16366: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16345: \$? = $ac_status" >&5
+  echo "$as_me:16369: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16348: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16372: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16351: \$? = $ac_status" >&5
+  echo "$as_me:16375: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_tgoto=yes
 else
@@ -16358,7 +16382,7 @@ ac_cv_func_tgoto=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:16361: result: $ac_cv_func_tgoto" >&5
+echo "$as_me:16385: result: $ac_cv_func_tgoto" >&5
 echo "${ECHO_T}$ac_cv_func_tgoto" >&6
 if test $ac_cv_func_tgoto = yes; then
   cf_term_lib=predefined
@@ -16367,7 +16391,7 @@ else
         for cf_term_lib in $cf_check_list termcap termlib unknown
         do
             as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh`
-echo "$as_me:16370: checking for tgoto in -l$cf_term_lib" >&5
+echo "$as_me:16394: checking for tgoto in -l$cf_term_lib" >&5
 echo $ECHO_N "checking for tgoto in -l$cf_term_lib... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16375,7 +16399,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_term_lib  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 16378 "configure"
+#line 16402 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16394,16 +16418,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16397: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16421: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16400: \$? = $ac_status" >&5
+  echo "$as_me:16424: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16403: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16427: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16406: \$? = $ac_status" >&5
+  echo "$as_me:16430: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -16414,7 +16438,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16417: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:16441: result: `eval echo '${'$as_ac_Lib'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
 if test `eval echo '${'$as_ac_Lib'}'` = yes; then
   break
@@ -16429,7 +16453,7 @@ fi
  	for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown
     do
         as_ac_Lib=`echo "ac_cv_lib_$cf_curs_lib''_initscr" | $as_tr_sh`
-echo "$as_me:16432: checking for initscr in -l$cf_curs_lib" >&5
+echo "$as_me:16456: checking for initscr in -l$cf_curs_lib" >&5
 echo $ECHO_N "checking for initscr in -l$cf_curs_lib... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Lib+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16437,7 +16461,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_curs_lib  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 16440 "configure"
+#line 16464 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16456,16 +16480,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16459: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16483: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16462: \$? = $ac_status" >&5
+  echo "$as_me:16486: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16465: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16489: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16468: \$? = $ac_status" >&5
+  echo "$as_me:16492: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -16476,23 +16500,23 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16479: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:16503: result: `eval echo '${'$as_ac_Lib'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
 if test `eval echo '${'$as_ac_Lib'}'` = yes; then
   break
 fi
 
     done
-    test $cf_curs_lib = unknown && { { echo "$as_me:16486: error: no curses library found" >&5
+    test $cf_curs_lib = unknown && { { echo "$as_me:16510: error: no curses library found" >&5
 echo "$as_me: error: no curses library found" >&2;}
    { (exit 1); exit 1; }; }
 
     LIBS="-l$cf_curs_lib $cf_save_LIBS"
     if test "$cf_term_lib" = unknown ; then
-        echo "$as_me:16492: checking if we can link with $cf_curs_lib library" >&5
+        echo "$as_me:16516: checking if we can link with $cf_curs_lib library" >&5
 echo $ECHO_N "checking if we can link with $cf_curs_lib library... $ECHO_C" >&6
         cat >conftest.$ac_ext <<_ACEOF
-#line 16495 "configure"
+#line 16519 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -16504,16 +16528,16 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16507: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16531: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16510: \$? = $ac_status" >&5
+  echo "$as_me:16534: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16513: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16537: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16516: \$? = $ac_status" >&5
+  echo "$as_me:16540: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -16522,18 +16546,18 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-        echo "$as_me:16525: result: $cf_result" >&5
+        echo "$as_me:16549: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
-        test $cf_result = no && { { echo "$as_me:16527: error: Cannot link curses library" >&5
+        test $cf_result = no && { { echo "$as_me:16551: error: Cannot link curses library" >&5
 echo "$as_me: error: Cannot link curses library" >&2;}
    { (exit 1); exit 1; }; }
     elif test "$cf_curs_lib" = "$cf_term_lib" ; then
         :
     elif test "$cf_term_lib" != predefined ; then
-        echo "$as_me:16533: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+        echo "$as_me:16557: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
 echo $ECHO_N "checking if we need both $cf_curs_lib and $cf_term_lib libraries... $ECHO_C" >&6
         cat >conftest.$ac_ext <<_ACEOF
-#line 16536 "configure"
+#line 16560 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -16545,16 +16569,16 @@ initscr(); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16548: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16572: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16551: \$? = $ac_status" >&5
+  echo "$as_me:16575: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16554: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16578: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16557: \$? = $ac_status" >&5
+  echo "$as_me:16581: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=no
 else
@@ -16563,7 +16587,7 @@ cat conftest.$ac_ext >&5
 
             LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
             cat >conftest.$ac_ext <<_ACEOF
-#line 16566 "configure"
+#line 16590 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -16575,16 +16599,16 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16578: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16602: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16581: \$? = $ac_status" >&5
+  echo "$as_me:16605: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16584: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16608: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16587: \$? = $ac_status" >&5
+  echo "$as_me:16611: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -16596,13 +16620,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-        echo "$as_me:16599: result: $cf_result" >&5
+        echo "$as_me:16623: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
     fi
 fi
 fi
 
-echo "$as_me:16605: checking for curses performance tradeoff" >&5
+echo "$as_me:16629: checking for curses performance tradeoff" >&5
 echo $ECHO_N "checking for curses performance tradeoff... $ECHO_C" >&6
 if test "${cf_cv_curs_performance+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16610,7 +16634,7 @@ else
 
     cf_cv_curs_performance=no
     cat >conftest.$ac_ext <<_ACEOF
-#line 16613 "configure"
+#line 16637 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -16629,20 +16653,20 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16632: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16656: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16635: \$? = $ac_status" >&5
+  echo "$as_me:16659: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16638: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16662: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16641: \$? = $ac_status" >&5
+  echo "$as_me:16665: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 16645 "configure"
+#line 16669 "configure"
 #include "confdefs.h"
 
 #define CURS_PERFORMANCE
@@ -16662,16 +16686,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16665: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16689: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16668: \$? = $ac_status" >&5
+  echo "$as_me:16692: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16671: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16695: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16674: \$? = $ac_status" >&5
+  echo "$as_me:16698: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_curs_performance=yes
 else
@@ -16686,20 +16710,20 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:16689: result: $cf_cv_curs_performance" >&5
+echo "$as_me:16713: result: $cf_cv_curs_performance" >&5
 echo "${ECHO_T}$cf_cv_curs_performance" >&6
 test $cf_cv_curs_performance = yes && cat >>confdefs.h <<\EOF
 #define CURS_PERFORMANCE 1
 EOF
 
-echo "$as_me:16695: checking for curses touchline function" >&5
+echo "$as_me:16719: checking for curses touchline function" >&5
 echo $ECHO_N "checking for curses touchline function... $ECHO_C" >&6
 if test "${cf_cv_curs_touchline+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 16702 "configure"
+#line 16726 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -16712,23 +16736,23 @@ touchline(stdscr, 1,2,3);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16715: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16739: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16718: \$? = $ac_status" >&5
+  echo "$as_me:16742: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16721: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16745: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16724: \$? = $ac_status" >&5
+  echo "$as_me:16748: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_curs_touchline=bsd
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 16731 "configure"
+#line 16755 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -16741,16 +16765,16 @@ touchline(stdscr, 1,2);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16744: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16768: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16747: \$? = $ac_status" >&5
+  echo "$as_me:16771: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16750: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16774: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16753: \$? = $ac_status" >&5
+  echo "$as_me:16777: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_curs_touchline=sysv
 else
@@ -16762,7 +16786,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:16765: result: $cf_cv_curs_touchline" >&5
+echo "$as_me:16789: result: $cf_cv_curs_touchline" >&5
 echo "${ECHO_T}$cf_cv_curs_touchline" >&6
 case "$cf_cv_curs_touchline" in #(vi
 bsd) #(vi
@@ -16789,7 +16813,7 @@ for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:16792: checking for $ac_word" >&5
+echo "$as_me:16816: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_NCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16806,7 +16830,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_NCURSES_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:16809: found $ac_dir/$ac_word" >&5
+   echo "$as_me:16833: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -16817,10 +16841,10 @@ fi
 NCURSES_CONFIG=$ac_cv_path_NCURSES_CONFIG
 
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:16820: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:16844: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:16823: result: no" >&5
+  echo "$as_me:16847: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -16878,7 +16902,7 @@ if test -n "$cf_cv_curses_dir/include $cf_cv_curses_dir/include/$cf_ncuhdr_root"
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 16881 "configure"
+#line 16905 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -16890,16 +16914,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16893: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16917: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16896: \$? = $ac_status" >&5
+  echo "$as_me:16920: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16899: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16923: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16902: \$? = $ac_status" >&5
+  echo "$as_me:16926: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -16916,7 +16940,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}:16919: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:16943: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -16933,7 +16957,7 @@ fi
 
 }
 
-echo "$as_me:16936: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:16960: checking for $cf_ncuhdr_root header in include-path" >&5
 echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -16945,7 +16969,7 @@ else
 	do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 16948 "configure"
+#line 16972 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -16969,16 +16993,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16972: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16996: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16975: \$? = $ac_status" >&5
+  echo "$as_me:16999: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16978: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17002: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16981: \$? = $ac_status" >&5
+  echo "$as_me:17005: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -16993,14 +17017,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 	done
 
 fi
-echo "$as_me:16996: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:17020: result: $cf_cv_ncurses_h" >&5
 echo "${ECHO_T}$cf_cv_ncurses_h" >&6
 
 if test "$cf_cv_ncurses_h" != no ; then
 	cf_cv_ncurses_header=$cf_cv_ncurses_h
 else
 
-echo "$as_me:17003: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:17027: checking for $cf_ncuhdr_root include-path" >&5
 echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17135,7 +17159,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 17138 "configure"
+#line 17162 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -17147,16 +17171,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17150: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17174: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17153: \$? = $ac_status" >&5
+  echo "$as_me:17177: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17156: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17180: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17159: \$? = $ac_status" >&5
+  echo "$as_me:17183: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -17173,7 +17197,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}:17176: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:17200: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -17194,7 +17218,7 @@ fi
 		do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 17197 "configure"
+#line 17221 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -17218,16 +17242,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17221: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17245: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17224: \$? = $ac_status" >&5
+  echo "$as_me:17248: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17227: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17251: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17230: \$? = $ac_status" >&5
+  echo "$as_me:17254: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -17248,12 +17272,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:17251: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:17275: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:17256: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:17280: result: $cf_cv_ncurses_h2" >&5
 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
 
 	cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
@@ -17286,7 +17310,7 @@ if test -n "$cf_1st_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 17289 "configure"
+#line 17313 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -17298,16 +17322,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17301: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17325: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17304: \$? = $ac_status" >&5
+  echo "$as_me:17328: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17307: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17331: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17310: \$? = $ac_status" >&5
+  echo "$as_me:17334: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -17324,7 +17348,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}:17327: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:17351: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -17367,7 +17391,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:17370: checking for terminfo header" >&5
+echo "$as_me:17394: checking for terminfo header" >&5
 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
 if test "${cf_cv_term_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17385,7 +17409,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 17388 "configure"
+#line 17412 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -17400,16 +17424,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17403: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17427: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17406: \$? = $ac_status" >&5
+  echo "$as_me:17430: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17409: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17433: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17412: \$? = $ac_status" >&5
+  echo "$as_me:17436: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -17425,7 +17449,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:17428: result: $cf_cv_term_header" >&5
+echo "$as_me:17452: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -17459,7 +17483,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:17462: checking for ncurses version" >&5
+echo "$as_me:17486: checking for ncurses version" >&5
 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
 if test "${cf_cv_ncurses_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17485,10 +17509,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:17488: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:17512: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:17491: \$? = $ac_status" >&5
+  echo "$as_me:17515: \$? = $ac_status" >&5
   (exit $ac_status); }
 	if test -f conftest.out ; then
 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
@@ -17498,7 +17522,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 17501 "configure"
+#line 17525 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -17523,15 +17547,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:17526: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17550: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17529: \$? = $ac_status" >&5
+  echo "$as_me:17553: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:17531: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17555: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17534: \$? = $ac_status" >&5
+  echo "$as_me:17558: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -17545,7 +17569,7 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:17548: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:17572: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF
 #define NCURSES 1
@@ -17557,7 +17581,7 @@ cf_nculib_root=ncurses
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:17560: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:17584: checking for Gpm_Open in -lgpm" >&5
 echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
 if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17565,7 +17589,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 17568 "configure"
+#line 17592 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17584,16 +17608,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17587: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17611: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17590: \$? = $ac_status" >&5
+  echo "$as_me:17614: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17593: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17617: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17596: \$? = $ac_status" >&5
+  echo "$as_me:17620: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -17604,10 +17628,10 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17607: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:17631: result: $ac_cv_lib_gpm_Gpm_Open" >&5
 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
 if test $ac_cv_lib_gpm_Gpm_Open = yes; then
-  echo "$as_me:17610: checking for initscr in -lgpm" >&5
+  echo "$as_me:17634: checking for initscr in -lgpm" >&5
 echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
 if test "${ac_cv_lib_gpm_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17615,7 +17639,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 17618 "configure"
+#line 17642 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17634,16 +17658,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17637: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17661: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17640: \$? = $ac_status" >&5
+  echo "$as_me:17664: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17643: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17667: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17646: \$? = $ac_status" >&5
+  echo "$as_me:17670: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -17654,7 +17678,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17657: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:17681: result: $ac_cv_lib_gpm_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
 if test $ac_cv_lib_gpm_initscr = yes; then
   LIBS="$cf_ncurses_SAVE"
@@ -17669,7 +17693,7 @@ freebsd*)
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it's static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:17672: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:17696: checking for tgoto in -lmytinfo" >&5
 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -17677,7 +17701,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 17680 "configure"
+#line 17704 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17696,16 +17720,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17699: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17723: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17702: \$? = $ac_status" >&5
+  echo "$as_me:17726: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17705: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17729: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17708: \$? = $ac_status" >&5
+  echo "$as_me:17732: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -17716,7 +17740,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17719: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:17743: result: $ac_cv_lib_mytinfo_tgoto" >&5
 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
 if test $ac_cv_lib_mytinfo_tgoto = yes; then
   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
@@ -17750,7 +17774,7 @@ if test -n "$cf_cv_curses_dir/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:17753: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:17777: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -17763,13 +17787,13 @@ else
 
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
-	echo "$as_me:17766: checking for initscr" >&5
+	echo "$as_me:17790: checking for initscr" >&5
 echo $ECHO_N "checking for initscr... $ECHO_C" >&6
 if test "${ac_cv_func_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 17772 "configure"
+#line 17796 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */
@@ -17800,16 +17824,16 @@ f = initscr;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17803: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17827: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17806: \$? = $ac_status" >&5
+  echo "$as_me:17830: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17809: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17833: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17812: \$? = $ac_status" >&5
+  echo "$as_me:17836: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -17819,18 +17843,18 @@ ac_cv_func_initscr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:17822: result: $ac_cv_func_initscr" >&5
+echo "$as_me:17846: result: $ac_cv_func_initscr" >&5
 echo "${ECHO_T}$ac_cv_func_initscr" >&6
 if test $ac_cv_func_initscr = yes; then
   eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:17829: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:17853: checking for initscr in -l$cf_nculib_root" >&5
 echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
 		LIBS="-l$cf_nculib_root $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 17833 "configure"
+#line 17857 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -17842,25 +17866,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17845: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17869: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17848: \$? = $ac_status" >&5
+  echo "$as_me:17872: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17851: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17875: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17854: \$? = $ac_status" >&5
+  echo "$as_me:17878: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:17856: result: yes" >&5
+  echo "$as_me:17880: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:17863: result: no" >&5
+echo "$as_me:17887: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_library_path_list=""
@@ -17949,11 +17973,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:17952: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:17976: checking for -l$cf_nculib_root in $cf_libdir" >&5
 echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 17956 "configure"
+#line 17980 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -17965,25 +17989,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17968: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17992: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17971: \$? = $ac_status" >&5
+  echo "$as_me:17995: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17974: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17998: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17977: \$? = $ac_status" >&5
+  echo "$as_me:18001: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:17979: result: yes" >&5
+  echo "$as_me:18003: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:17986: result: no" >&5
+echo "$as_me:18010: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -17998,7 +18022,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:18001: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:18025: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -18006,7 +18030,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:18009: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:18033: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
 echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
 	cf_ncurses_SAVE="$LIBS"
 	for p in $cf_ncurses_LIBS ; do
@@ -18016,7 +18040,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >conftest.$ac_ext <<_ACEOF
-#line 18019 "configure"
+#line 18043 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -18028,23 +18052,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18031: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18055: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18034: \$? = $ac_status" >&5
+  echo "$as_me:18058: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18037: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18061: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18040: \$? = $ac_status" >&5
+  echo "$as_me:18064: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:18042: result: yes" >&5
+  echo "$as_me:18066: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:18047: result: no" >&5
+echo "$as_me:18071: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -18062,7 +18086,7 @@ fi
 	;;
 ncursesw)
 
-echo "$as_me:18065: checking for multibyte character support" >&5
+echo "$as_me:18089: checking for multibyte character support" >&5
 echo $ECHO_N "checking for multibyte character support... $ECHO_C" >&6
 if test "${cf_cv_utf8_lib+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18070,7 +18094,7 @@ else
 
 	cf_save_LIBS="$LIBS"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 18073 "configure"
+#line 18097 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -18083,16 +18107,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18086: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18110: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18089: \$? = $ac_status" >&5
+  echo "$as_me:18113: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18092: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18116: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18095: \$? = $ac_status" >&5
+  echo "$as_me:18119: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_utf8_lib=yes
 else
@@ -18104,10 +18128,10 @@ cat conftest.$ac_ext >&5
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
-echo "${as_me-configure}:18107: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me-configure}:18131: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 18110 "configure"
+#line 18134 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -18120,16 +18144,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18123: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18147: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18126: \$? = $ac_status" >&5
+  echo "$as_me:18150: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18129: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18153: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18132: \$? = $ac_status" >&5
+  echo "$as_me:18156: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_find_linkage_utf8=yes
 else
@@ -18140,9 +18164,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
 
-echo "${as_me-configure}:18143: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me-configure}:18167: testing find linkage for utf8 library ..." 1>&5
 
-echo "${as_me-configure}:18145: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me-configure}:18169: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -18250,11 +18274,11 @@ cf_search="$cf_header_path_list $cf_search"
       if test -d $cf_cv_header_path_utf8 ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
 
-echo "${as_me-configure}:18253: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me-configure}:18277: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
 
         CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_utf8"
         cat >conftest.$ac_ext <<_ACEOF
-#line 18257 "configure"
+#line 18281 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -18267,21 +18291,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18270: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18294: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18273: \$? = $ac_status" >&5
+  echo "$as_me:18297: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18276: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18300: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18279: \$? = $ac_status" >&5
+  echo "$as_me:18303: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found utf8 headers in $cf_cv_header_path_utf8" 1>&6
 
-echo "${as_me-configure}:18284: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me-configure}:18308: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
 
             cf_cv_find_linkage_utf8=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -18299,7 +18323,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
-echo "${as_me-configure}:18302: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me-configure}:18326: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -18395,13 +18419,13 @@ cf_search="$cf_library_path_list $cf_search"
           if test -d $cf_cv_library_path_utf8 ; then
             test -n "$verbose" && echo "	... testing $cf_cv_library_path_utf8" 1>&6
 
-echo "${as_me-configure}:18398: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me-configure}:18422: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
 
             CPPFLAGS="$cf_test_CPPFLAGS"
             LIBS="-lutf8  $cf_save_LIBS"
             LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_utf8"
             cat >conftest.$ac_ext <<_ACEOF
-#line 18404 "configure"
+#line 18428 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -18414,21 +18438,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18417: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18441: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18420: \$? = $ac_status" >&5
+  echo "$as_me:18444: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18423: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18447: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18426: \$? = $ac_status" >&5
+  echo "$as_me:18450: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
                 test -n "$verbose" && echo "	... found utf8 library in $cf_cv_library_path_utf8" 1>&6
 
-echo "${as_me-configure}:18431: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me-configure}:18455: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
 
                 cf_cv_find_linkage_utf8=yes
                 cf_cv_library_file_utf8="-lutf8"
@@ -18466,7 +18490,7 @@ fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:18469: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:18493: result: $cf_cv_utf8_lib" >&5
 echo "${ECHO_T}$cf_cv_utf8_lib" >&6
 
 # HAVE_LIBUTF8_H is used by ncurses if curses.h is shared between
@@ -18500,7 +18524,7 @@ if test -n "$cf_cv_header_path_utf8" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 18503 "configure"
+#line 18527 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -18512,16 +18536,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18515: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18539: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18518: \$? = $ac_status" >&5
+  echo "$as_me:18542: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18521: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18545: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18524: \$? = $ac_status" >&5
+  echo "$as_me:18548: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -18538,7 +18562,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}:18541: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:18565: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -18572,7 +18596,7 @@ if test -n "$cf_cv_library_path_utf8" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:18575: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:18599: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -18590,7 +18614,7 @@ for ac_prog in ${cf_ncuconfig_root}6-config ${cf_ncuconfig_root}5-config
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:18593: checking for $ac_word" >&5
+echo "$as_me:18617: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_NCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18607,7 +18631,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_NCURSES_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:18610: found $ac_dir/$ac_word" >&5
+   echo "$as_me:18634: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -18618,10 +18642,10 @@ fi
 NCURSES_CONFIG=$ac_cv_path_NCURSES_CONFIG
 
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:18621: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:18645: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:18624: result: no" >&5
+  echo "$as_me:18648: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -18679,7 +18703,7 @@ if test -n "$cf_cv_curses_dir/include $cf_cv_curses_dir/include/$cf_ncuhdr_root"
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 18682 "configure"
+#line 18706 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -18691,16 +18715,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18694: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18718: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18697: \$? = $ac_status" >&5
+  echo "$as_me:18721: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18700: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18724: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18703: \$? = $ac_status" >&5
+  echo "$as_me:18727: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -18717,7 +18741,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}:18720: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:18744: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -18734,7 +18758,7 @@ fi
 
 }
 
-echo "$as_me:18737: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:18761: checking for $cf_ncuhdr_root header in include-path" >&5
 echo $ECHO_N "checking for $cf_ncuhdr_root header in include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18746,7 +18770,7 @@ else
 	do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 18749 "configure"
+#line 18773 "configure"
 #include "confdefs.h"
 
 #define _XOPEN_SOURCE_EXTENDED
@@ -18778,16 +18802,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18781: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18805: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18784: \$? = $ac_status" >&5
+  echo "$as_me:18808: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18787: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18811: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18790: \$? = $ac_status" >&5
+  echo "$as_me:18814: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -18802,14 +18826,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 	done
 
 fi
-echo "$as_me:18805: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:18829: result: $cf_cv_ncurses_h" >&5
 echo "${ECHO_T}$cf_cv_ncurses_h" >&6
 
 if test "$cf_cv_ncurses_h" != no ; then
 	cf_cv_ncurses_header=$cf_cv_ncurses_h
 else
 
-echo "$as_me:18812: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:18836: checking for $cf_ncuhdr_root include-path" >&5
 echo $ECHO_N "checking for $cf_ncuhdr_root include-path... $ECHO_C" >&6
 if test "${cf_cv_ncurses_h2+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -18944,7 +18968,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 18947 "configure"
+#line 18971 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -18956,16 +18980,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18959: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18983: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18962: \$? = $ac_status" >&5
+  echo "$as_me:18986: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18965: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18989: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18968: \$? = $ac_status" >&5
+  echo "$as_me:18992: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -18982,7 +19006,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}:18985: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:19009: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -19003,7 +19027,7 @@ fi
 		do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 19006 "configure"
+#line 19030 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -19027,16 +19051,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19030: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19054: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19033: \$? = $ac_status" >&5
+  echo "$as_me:19057: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19036: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19060: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19039: \$? = $ac_status" >&5
+  echo "$as_me:19063: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -19057,12 +19081,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 		CPPFLAGS="$cf_save2_CPPFLAGS"
 		test "$cf_cv_ncurses_h2" != no && break
 	done
-	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:19060: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:19084: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:19065: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:19089: result: $cf_cv_ncurses_h2" >&5
 echo "${ECHO_T}$cf_cv_ncurses_h2" >&6
 
 	cf_1st_incdir=`echo $cf_cv_ncurses_h2 | sed -e 's%/[^/]*$%%'`
@@ -19095,7 +19119,7 @@ if test -n "$cf_1st_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 19098 "configure"
+#line 19122 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -19107,16 +19131,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19110: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19134: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19113: \$? = $ac_status" >&5
+  echo "$as_me:19137: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19116: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19140: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19119: \$? = $ac_status" >&5
+  echo "$as_me:19143: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -19133,7 +19157,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}:19136: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:19160: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -19176,7 +19200,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:19179: checking for terminfo header" >&5
+echo "$as_me:19203: checking for terminfo header" >&5
 echo $ECHO_N "checking for terminfo header... $ECHO_C" >&6
 if test "${cf_cv_term_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19194,7 +19218,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 19197 "configure"
+#line 19221 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -19209,16 +19233,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19212: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19236: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19215: \$? = $ac_status" >&5
+  echo "$as_me:19239: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19218: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19242: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19221: \$? = $ac_status" >&5
+  echo "$as_me:19245: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -19234,7 +19258,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:19237: result: $cf_cv_term_header" >&5
+echo "$as_me:19261: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -19268,7 +19292,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:19271: checking for ncurses version" >&5
+echo "$as_me:19295: checking for ncurses version" >&5
 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
 if test "${cf_cv_ncurses_version+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19294,10 +19318,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:19297: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:19321: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:19300: \$? = $ac_status" >&5
+  echo "$as_me:19324: \$? = $ac_status" >&5
   (exit $ac_status); }
 	if test -f conftest.out ; then
 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
@@ -19307,7 +19331,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 19310 "configure"
+#line 19334 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -19332,15 +19356,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:19335: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19359: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19338: \$? = $ac_status" >&5
+  echo "$as_me:19362: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:19340: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19364: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19343: \$? = $ac_status" >&5
+  echo "$as_me:19367: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -19354,7 +19378,7 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:19357: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:19381: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no || cat >>confdefs.h <<\EOF
 #define NCURSES 1
@@ -19366,7 +19390,7 @@ cf_nculib_root=ncursesw
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:19369: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:19393: checking for Gpm_Open in -lgpm" >&5
 echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
 if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19374,7 +19398,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 19377 "configure"
+#line 19401 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19393,16 +19417,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19396: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19420: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19399: \$? = $ac_status" >&5
+  echo "$as_me:19423: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19402: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19426: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19405: \$? = $ac_status" >&5
+  echo "$as_me:19429: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -19413,10 +19437,10 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19416: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:19440: result: $ac_cv_lib_gpm_Gpm_Open" >&5
 echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
 if test $ac_cv_lib_gpm_Gpm_Open = yes; then
-  echo "$as_me:19419: checking for initscr in -lgpm" >&5
+  echo "$as_me:19443: checking for initscr in -lgpm" >&5
 echo $ECHO_N "checking for initscr in -lgpm... $ECHO_C" >&6
 if test "${ac_cv_lib_gpm_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19424,7 +19448,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 19427 "configure"
+#line 19451 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19443,16 +19467,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19446: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19470: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19449: \$? = $ac_status" >&5
+  echo "$as_me:19473: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19452: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19476: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19455: \$? = $ac_status" >&5
+  echo "$as_me:19479: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -19463,7 +19487,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19466: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:19490: result: $ac_cv_lib_gpm_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_gpm_initscr" >&6
 if test $ac_cv_lib_gpm_initscr = yes; then
   LIBS="$cf_ncurses_SAVE"
@@ -19478,7 +19502,7 @@ freebsd*)
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it's static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:19481: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:19505: checking for tgoto in -lmytinfo" >&5
 echo $ECHO_N "checking for tgoto in -lmytinfo... $ECHO_C" >&6
 if test "${ac_cv_lib_mytinfo_tgoto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -19486,7 +19510,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 19489 "configure"
+#line 19513 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19505,16 +19529,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19508: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19532: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19511: \$? = $ac_status" >&5
+  echo "$as_me:19535: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19514: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19538: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19517: \$? = $ac_status" >&5
+  echo "$as_me:19541: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -19525,7 +19549,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19528: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:19552: result: $ac_cv_lib_mytinfo_tgoto" >&5
 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6
 if test $ac_cv_lib_mytinfo_tgoto = yes; then
   cf_ncurses_LIBS="-lmytinfo $cf_ncurses_LIBS"
@@ -19559,7 +19583,7 @@ if test -n "$cf_cv_curses_dir/lib" ; then
       if test "$cf_have_libdir" = no ; then
         test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me-configure}:19562: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:19586: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -19572,13 +19596,13 @@ else
 
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
-	echo "$as_me:19575: checking for initscr" >&5
+	echo "$as_me:19599: checking for initscr" >&5
 echo $ECHO_N "checking for initscr... $ECHO_C" >&6
 if test "${ac_cv_func_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 19581 "configure"
+#line 19605 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */
@@ -19609,16 +19633,16 @@ f = initscr;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19612: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19636: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19615: \$? = $ac_status" >&5
+  echo "$as_me:19639: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19618: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19642: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19621: \$? = $ac_status" >&5
+  echo "$as_me:19645: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -19628,18 +19652,18 @@ ac_cv_func_initscr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:19631: result: $ac_cv_func_initscr" >&5
+echo "$as_me:19655: result: $ac_cv_func_initscr" >&5
 echo "${ECHO_T}$ac_cv_func_initscr" >&6
 if test $ac_cv_func_initscr = yes; then
   eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:19638: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:19662: checking for initscr in -l$cf_nculib_root" >&5
 echo $ECHO_N "checking for initscr in -l$cf_nculib_root... $ECHO_C" >&6
 		LIBS="-l$cf_nculib_root $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 19642 "configure"
+#line 19666 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -19651,25 +19675,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19654: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19678: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19657: \$? = $ac_status" >&5
+  echo "$as_me:19681: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19660: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19684: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19663: \$? = $ac_status" >&5
+  echo "$as_me:19687: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:19665: result: yes" >&5
+  echo "$as_me:19689: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:19672: result: no" >&5
+echo "$as_me:19696: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_library_path_list=""
@@ -19758,11 +19782,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:19761: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:19785: checking for -l$cf_nculib_root in $cf_libdir" >&5
 echo $ECHO_N "checking for -l$cf_nculib_root in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 19765 "configure"
+#line 19789 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -19774,25 +19798,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19777: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19801: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19780: \$? = $ac_status" >&5
+  echo "$as_me:19804: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19783: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19807: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19786: \$? = $ac_status" >&5
+  echo "$as_me:19810: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:19788: result: yes" >&5
+  echo "$as_me:19812: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:19795: result: no" >&5
+echo "$as_me:19819: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -19807,7 +19831,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:19810: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:19834: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -19815,7 +19839,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:19818: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:19842: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
 echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS... $ECHO_C" >&6
 	cf_ncurses_SAVE="$LIBS"
 	for p in $cf_ncurses_LIBS ; do
@@ -19825,7 +19849,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >conftest.$ac_ext <<_ACEOF
-#line 19828 "configure"
+#line 19852 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -19837,23 +19861,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19840: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19864: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19843: \$? = $ac_status" >&5
+  echo "$as_me:19867: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19846: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19870: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19849: \$? = $ac_status" >&5
+  echo "$as_me:19873: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:19851: result: yes" >&5
+  echo "$as_me:19875: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:19856: result: no" >&5
+echo "$as_me:19880: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -19876,14 +19900,14 @@ pdcurses)
 	;;
 slang)
 
-echo "$as_me:19879: checking for slang header file" >&5
+echo "$as_me:19903: checking for slang header file" >&5
 echo $ECHO_N "checking for slang header file... $ECHO_C" >&6
 if test "${cf_cv_slang_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 19886 "configure"
+#line 19910 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -19895,16 +19919,16 @@ printf("%s\n", SLANG_VERSION)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19898: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19922: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19901: \$? = $ac_status" >&5
+  echo "$as_me:19925: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19904: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19928: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19907: \$? = $ac_status" >&5
+  echo "$as_me:19931: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_header=predefined
 else
@@ -20022,14 +20046,14 @@ cf_search="$cf_header_path_list $cf_search"
 		done
 		test -n "$cf_cv_slang_header" && break
 	done
-	test -z "$cf_cv_slang_header" && { { echo "$as_me:20025: error: not found" >&5
+	test -z "$cf_cv_slang_header" && { { echo "$as_me:20049: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:20032: result: $cf_cv_slang_header" >&5
+echo "$as_me:20056: result: $cf_cv_slang_header" >&5
 echo "${ECHO_T}$cf_cv_slang_header" >&6
 cat >>confdefs.h <<\EOF
 #define USE_SLANG 1
@@ -20066,7 +20090,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 20069 "configure"
+#line 20093 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -20078,16 +20102,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20081: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20105: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20084: \$? = $ac_status" >&5
+  echo "$as_me:20108: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20087: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20111: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20090: \$? = $ac_status" >&5
+  echo "$as_me:20114: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -20104,7 +20128,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}:20107: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:20131: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -20124,14 +20148,14 @@ esac
 
 # There's an unofficial set of patches for slang that gives it some limited
 # UTF8 capability.  Unfortunately it won't compile unless one defines UTF8.
-echo "$as_me:20127: checking if we must define UTF8" >&5
+echo "$as_me:20151: checking if we must define UTF8" >&5
 echo $ECHO_N "checking if we must define UTF8... $ECHO_C" >&6
 if test "${cf_cv_slang_utf8+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 20134 "configure"
+#line 20158 "configure"
 #include "confdefs.h"
 
 #include <slang.h>
@@ -20144,16 +20168,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20147: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20171: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20150: \$? = $ac_status" >&5
+  echo "$as_me:20174: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20153: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20177: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20156: \$? = $ac_status" >&5
+  echo "$as_me:20180: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_utf8=no
 else
@@ -20161,7 +20185,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 20164 "configure"
+#line 20188 "configure"
 #include "confdefs.h"
 
 #define UTF8
@@ -20175,16 +20199,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20178: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20202: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20181: \$? = $ac_status" >&5
+  echo "$as_me:20205: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20184: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20208: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20187: \$? = $ac_status" >&5
+  echo "$as_me:20211: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_utf8=yes
 else
@@ -20197,7 +20221,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:20200: result: $cf_cv_slang_utf8" >&5
+echo "$as_me:20224: result: $cf_cv_slang_utf8" >&5
 echo "${ECHO_T}$cf_cv_slang_utf8" >&6
 
 if test "$cf_cv_slang_utf8" = yes ; then
@@ -20215,7 +20239,7 @@ else
 
 cf_cv_termlib=none
 cat >conftest.$ac_ext <<_ACEOF
-#line 20218 "configure"
+#line 20242 "configure"
 #include "confdefs.h"
 
 int
@@ -20227,19 +20251,19 @@ char *x=(char*)tgoto("",0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20230: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20254: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20233: \$? = $ac_status" >&5
+  echo "$as_me:20257: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20236: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20260: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20239: \$? = $ac_status" >&5
+  echo "$as_me:20263: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 20242 "configure"
+#line 20266 "configure"
 #include "confdefs.h"
 
 int
@@ -20251,16 +20275,16 @@ int x=tigetstr("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20254: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20278: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20257: \$? = $ac_status" >&5
+  echo "$as_me:20281: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20260: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20284: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20263: \$? = $ac_status" >&5
+  echo "$as_me:20287: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termlib=terminfo
 else
@@ -20271,7 +20295,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	test -n "$verbose" && echo "	using functions in predefined $cf_cv_termlib LIBS" 1>&6
 
-echo "${as_me-configure}:20274: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
+echo "${as_me-configure}:20298: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
 
 else
   echo "$as_me: failed program was:" >&5
@@ -20286,10 +20310,10 @@ if test "$cf_cv_termlib" = none; then
 	LIBS="-l$cf_lib $cf_save_LIBS"
 	for cf_func in tigetstr tgetstr
 	do
-		echo "$as_me:20289: checking for $cf_func in -l$cf_lib" >&5
+		echo "$as_me:20313: checking for $cf_func in -l$cf_lib" >&5
 echo $ECHO_N "checking for $cf_func in -l$cf_lib... $ECHO_C" >&6
 		cat >conftest.$ac_ext <<_ACEOF
-#line 20292 "configure"
+#line 20316 "configure"
 #include "confdefs.h"
 
 int
@@ -20301,16 +20325,16 @@ int x=$cf_func("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20304: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20328: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20307: \$? = $ac_status" >&5
+  echo "$as_me:20331: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20310: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20334: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20313: \$? = $ac_status" >&5
+  echo "$as_me:20337: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -20319,7 +20343,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-		echo "$as_me:20322: result: $cf_result" >&5
+		echo "$as_me:20346: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 		if test "$cf_result" = yes ; then
 			if test "$cf_func" = tigetstr ; then
@@ -20336,7 +20360,7 @@ echo "${ECHO_T}$cf_result" >&6
 fi
 if test "$cf_cv_termlib" = none; then
 	# allow curses library for broken AIX system.
-	echo "$as_me:20339: checking for initscr in -lcurses" >&5
+	echo "$as_me:20363: checking for initscr in -lcurses" >&5
 echo $ECHO_N "checking for initscr in -lcurses... $ECHO_C" >&6
 if test "${ac_cv_lib_curses_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20344,7 +20368,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 20347 "configure"
+#line 20371 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20363,16 +20387,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20366: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20390: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20369: \$? = $ac_status" >&5
+  echo "$as_me:20393: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20372: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20396: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20375: \$? = $ac_status" >&5
+  echo "$as_me:20399: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_curses_initscr=yes
 else
@@ -20383,13 +20407,13 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20386: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:20410: result: $ac_cv_lib_curses_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_curses_initscr" >&6
 if test $ac_cv_lib_curses_initscr = yes; then
   LIBS="$LIBS -lcurses" cf_cv_termlib=termcap
 fi
 
-	echo "$as_me:20392: checking for tgoto in -ltermcap" >&5
+	echo "$as_me:20416: checking for tgoto in -ltermcap" >&5
 echo $ECHO_N "checking for tgoto in -ltermcap... $ECHO_C" >&6
 if test "${ac_cv_lib_termcap_tgoto+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20397,7 +20421,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 20400 "configure"
+#line 20424 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20416,16 +20440,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20419: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20443: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20422: \$? = $ac_status" >&5
+  echo "$as_me:20446: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20425: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20449: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20428: \$? = $ac_status" >&5
+  echo "$as_me:20452: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_termcap_tgoto=yes
 else
@@ -20436,7 +20460,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20439: result: $ac_cv_lib_termcap_tgoto" >&5
+echo "$as_me:20463: result: $ac_cv_lib_termcap_tgoto" >&5
 echo "${ECHO_T}$ac_cv_lib_termcap_tgoto" >&6
 if test $ac_cv_lib_termcap_tgoto = yes; then
   LIBS="$LIBS -ltermcap" cf_cv_termlib=termcap
@@ -20447,20 +20471,20 @@ fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 if test "$cf_cv_termlib" = none; then
-	{ echo "$as_me:20450: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
+	{ echo "$as_me:20474: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
 echo "$as_me: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&2;}
 fi
 
 fi
 
 cf_slang_LIBS2="$LIBS"
-echo "$as_me:20457: checking for acos" >&5
+echo "$as_me:20481: checking for acos" >&5
 echo $ECHO_N "checking for acos... $ECHO_C" >&6
 if test "${ac_cv_func_acos+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 20463 "configure"
+#line 20487 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char acos (); below.  */
@@ -20491,16 +20515,16 @@ f = acos;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20494: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20518: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20497: \$? = $ac_status" >&5
+  echo "$as_me:20521: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20500: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20524: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20503: \$? = $ac_status" >&5
+  echo "$as_me:20527: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_acos=yes
 else
@@ -20510,13 +20534,13 @@ ac_cv_func_acos=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:20513: result: $ac_cv_func_acos" >&5
+echo "$as_me:20537: result: $ac_cv_func_acos" >&5
 echo "${ECHO_T}$ac_cv_func_acos" >&6
 if test $ac_cv_func_acos = yes; then
   :
 else
 
-echo "$as_me:20519: checking for acos in -lm" >&5
+echo "$as_me:20543: checking for acos in -lm" >&5
 echo $ECHO_N "checking for acos in -lm... $ECHO_C" >&6
 if test "${ac_cv_lib_m_acos+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20524,7 +20548,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm $LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 20527 "configure"
+#line 20551 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -20543,16 +20567,16 @@ acos ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20546: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20570: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20549: \$? = $ac_status" >&5
+  echo "$as_me:20573: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20552: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20576: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20555: \$? = $ac_status" >&5
+  echo "$as_me:20579: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_m_acos=yes
 else
@@ -20563,7 +20587,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:20566: result: $ac_cv_lib_m_acos" >&5
+echo "$as_me:20590: result: $ac_cv_lib_m_acos" >&5
 echo "${ECHO_T}$ac_cv_lib_m_acos" >&6
 if test $ac_cv_lib_m_acos = yes; then
 
@@ -20589,13 +20613,13 @@ os2*)
 
 	eval 'cf_cv_have_lib_'video'=no'
 	cf_libdir=""
-	echo "$as_me:20592: checking for v_init" >&5
+	echo "$as_me:20616: checking for v_init" >&5
 echo $ECHO_N "checking for v_init... $ECHO_C" >&6
 if test "${ac_cv_func_v_init+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 20598 "configure"
+#line 20622 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char v_init (); below.  */
@@ -20626,16 +20650,16 @@ f = v_init;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20629: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20653: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20632: \$? = $ac_status" >&5
+  echo "$as_me:20656: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20635: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20659: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20638: \$? = $ac_status" >&5
+  echo "$as_me:20662: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_v_init=yes
 else
@@ -20645,18 +20669,18 @@ ac_cv_func_v_init=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:20648: result: $ac_cv_func_v_init" >&5
+echo "$as_me:20672: result: $ac_cv_func_v_init" >&5
 echo "${ECHO_T}$ac_cv_func_v_init" >&6
 if test $ac_cv_func_v_init = yes; then
   eval 'cf_cv_have_lib_'video'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:20655: checking for v_init in -lvideo" >&5
+		echo "$as_me:20679: checking for v_init in -lvideo" >&5
 echo $ECHO_N "checking for v_init in -lvideo... $ECHO_C" >&6
 		LIBS="-lvideo $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 20659 "configure"
+#line 20683 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -20668,25 +20692,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20671: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20695: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20674: \$? = $ac_status" >&5
+  echo "$as_me:20698: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20677: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20701: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20680: \$? = $ac_status" >&5
+  echo "$as_me:20704: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:20682: result: yes" >&5
+  echo "$as_me:20706: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'video'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:20689: result: no" >&5
+echo "$as_me:20713: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_library_path_list=""
@@ -20775,11 +20799,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:20778: checking for -lvideo in $cf_libdir" >&5
+				echo "$as_me:20802: checking for -lvideo in $cf_libdir" >&5
 echo $ECHO_N "checking for -lvideo in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -lvideo $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 20782 "configure"
+#line 20806 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -20791,25 +20815,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20794: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20818: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20797: \$? = $ac_status" >&5
+  echo "$as_me:20821: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20800: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20824: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20803: \$? = $ac_status" >&5
+  echo "$as_me:20827: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:20805: result: yes" >&5
+  echo "$as_me:20829: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'video'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:20812: result: no" >&5
+echo "$as_me:20836: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -20824,7 +20848,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'video
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:20827: error: Cannot link video library" >&5
+	{ { echo "$as_me:20851: error: Cannot link video library" >&5
 echo "$as_me: error: Cannot link video library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -20834,13 +20858,13 @@ esac
 
 	eval 'cf_cv_have_lib_'slang'=no'
 	cf_libdir=""
-	echo "$as_me:20837: checking for SLtt_get_screen_size" >&5
+	echo "$as_me:20861: checking for SLtt_get_screen_size" >&5
 echo $ECHO_N "checking for SLtt_get_screen_size... $ECHO_C" >&6
 if test "${ac_cv_func_SLtt_get_screen_size+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 20843 "configure"
+#line 20867 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char SLtt_get_screen_size (); below.  */
@@ -20871,16 +20895,16 @@ f = SLtt_get_screen_size;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20874: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20898: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20877: \$? = $ac_status" >&5
+  echo "$as_me:20901: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20880: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20904: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20883: \$? = $ac_status" >&5
+  echo "$as_me:20907: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_SLtt_get_screen_size=yes
 else
@@ -20890,18 +20914,18 @@ ac_cv_func_SLtt_get_screen_size=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:20893: result: $ac_cv_func_SLtt_get_screen_size" >&5
+echo "$as_me:20917: result: $ac_cv_func_SLtt_get_screen_size" >&5
 echo "${ECHO_T}$ac_cv_func_SLtt_get_screen_size" >&6
 if test $ac_cv_func_SLtt_get_screen_size = yes; then
   eval 'cf_cv_have_lib_'slang'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:20900: checking for SLtt_get_screen_size in -lslang" >&5
+		echo "$as_me:20924: checking for SLtt_get_screen_size in -lslang" >&5
 echo $ECHO_N "checking for SLtt_get_screen_size in -lslang... $ECHO_C" >&6
 		LIBS="-lslang $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 20904 "configure"
+#line 20928 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -20913,25 +20937,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20916: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20940: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20919: \$? = $ac_status" >&5
+  echo "$as_me:20943: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20922: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20946: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20925: \$? = $ac_status" >&5
+  echo "$as_me:20949: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:20927: result: yes" >&5
+  echo "$as_me:20951: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'slang'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:20934: result: no" >&5
+echo "$as_me:20958: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_library_path_list=""
@@ -21020,11 +21044,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:21023: checking for -lslang in $cf_libdir" >&5
+				echo "$as_me:21047: checking for -lslang in $cf_libdir" >&5
 echo $ECHO_N "checking for -lslang in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -lslang $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 21027 "configure"
+#line 21051 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -21036,25 +21060,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21039: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21063: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21042: \$? = $ac_status" >&5
+  echo "$as_me:21066: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21045: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21069: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21048: \$? = $ac_status" >&5
+  echo "$as_me:21072: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:21050: result: yes" >&5
+  echo "$as_me:21074: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'slang'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:21057: result: no" >&5
+echo "$as_me:21081: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -21069,13 +21093,13 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'slang
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:21072: error: Cannot link slang library" >&5
+	{ { echo "$as_me:21096: error: Cannot link slang library" >&5
 echo "$as_me: error: Cannot link slang library" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 cf_slang_LIBS3="$LIBS"
-echo "$as_me:21078: checking if we can link slang without termcap" >&5
+echo "$as_me:21102: checking if we can link slang without termcap" >&5
 echo $ECHO_N "checking if we can link slang without termcap... $ECHO_C" >&6
 if test -n "`echo $cf_slang_LIBS1 | sed -e 's/ //g'`" ; then
 	cf_exclude=`echo ".$cf_slang_LIBS2" | sed -e "s%$cf_slang_LIBS1%%" -e 's%^.%%'`
@@ -21084,7 +21108,7 @@ else
 fi
 LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s%$cf_exclude%%" -e 's%^.%%'`
 cat >conftest.$ac_ext <<_ACEOF
-#line 21087 "configure"
+#line 21111 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -21096,16 +21120,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21099: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21123: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21102: \$? = $ac_status" >&5
+  echo "$as_me:21126: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21105: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21129: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21108: \$? = $ac_status" >&5
+  echo "$as_me:21132: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -21114,18 +21138,18 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:21117: result: $cf_result" >&5
+echo "$as_me:21141: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 test $cf_result = no && LIBS="$cf_slang_LIBS3"
 
-echo "$as_me:21121: checking if we must tell slang this is UNIX" >&5
+echo "$as_me:21145: checking if we must tell slang this is UNIX" >&5
 echo $ECHO_N "checking if we must tell slang this is UNIX... $ECHO_C" >&6
 if test "${cf_cv_slang_unix+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 21128 "configure"
+#line 21152 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -21144,16 +21168,16 @@ SLang_TT_Baud_Rate = 1
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21147: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21171: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21150: \$? = $ac_status" >&5
+  echo "$as_me:21174: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21153: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21177: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21156: \$? = $ac_status" >&5
+  echo "$as_me:21180: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_unix=yes
 else
@@ -21164,7 +21188,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:21167: result: $cf_cv_slang_unix" >&5
+echo "$as_me:21191: result: $cf_cv_slang_unix" >&5
 echo "${ECHO_T}$cf_cv_slang_unix" >&6
 test $cf_cv_slang_unix = yes && cat >>confdefs.h <<\EOF
 #define REAL_UNIX_SYSTEM 1
@@ -21174,7 +21198,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:21177: checking if you want the wide-curses features" >&5
+echo "$as_me:21201: checking if you want the wide-curses features" >&5
 echo $ECHO_N "checking if you want the wide-curses features... $ECHO_C" >&6
 
 # Check whether --enable-widec or --disable-widec was given.
@@ -21191,10 +21215,10 @@ else
   use_wide_curses=$cf_wide_curses
 
 fi;
-echo "$as_me:21194: result: $use_wide_curses" >&5
+echo "$as_me:21218: result: $use_wide_curses" >&5
 echo "${ECHO_T}$use_wide_curses" >&6
 
-echo "$as_me:21197: checking if color-style code should be used" >&5
+echo "$as_me:21221: checking if color-style code should be used" >&5
 echo $ECHO_N "checking if color-style code should be used... $ECHO_C" >&6
 
 # Check whether --enable-color-style or --disable-color-style was given.
@@ -21214,7 +21238,7 @@ fi;
 
 case $use_color_style in
 no)
-	echo "$as_me:21217: result: no" >&5
+	echo "$as_me:21241: result: no" >&5
 echo "${ECHO_T}no" >&6
 	INSTALL_LSS=
 	;;
@@ -21223,10 +21247,10 @@ echo "${ECHO_T}no" >&6
 #define USE_COLOR_STYLE 1
 EOF
 
-	echo "$as_me:21226: result: yes" >&5
+	echo "$as_me:21250: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-	echo "$as_me:21229: checking for location of style-sheet file" >&5
+	echo "$as_me:21253: checking for location of style-sheet file" >&5
 echo $ECHO_N "checking for location of style-sheet file... $ECHO_C" >&6
 
 # Check whether --with-lss-file or --without-lss-file was given.
@@ -21262,7 +21286,7 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:21265: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:21289: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -21271,7 +21295,7 @@ esac
 fi
 LYNX_LSS_FILE="$withval"
 
-	echo "$as_me:21274: result: $LYNX_LSS_FILE" >&5
+	echo "$as_me:21298: result: $LYNX_LSS_FILE" >&5
 echo "${ECHO_T}$LYNX_LSS_FILE" >&6
 
 	test "$LYNX_LSS_FILE" = no && LYNX_LSS_FILE=
@@ -21283,7 +21307,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:21286: checking for the default configuration-file" >&5
+echo "$as_me:21310: checking for the default configuration-file" >&5
 echo $ECHO_N "checking for the default configuration-file... $ECHO_C" >&6
 
 # Check whether --with-cfg-file or --without-cfg-file was given.
@@ -21319,7 +21343,7 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:21322: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:21346: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -21328,7 +21352,7 @@ esac
 fi
 LYNX_CFG_FILE="$withval"
 
-echo "$as_me:21331: result: $LYNX_CFG_FILE" >&5
+echo "$as_me:21355: result: $LYNX_CFG_FILE" >&5
 echo "${ECHO_T}$LYNX_CFG_FILE" >&6
 
 test "$LYNX_CFG_FILE" = no && LYNX_CFG_FILE=
@@ -21336,7 +21360,7 @@ cat >>confdefs.h <<EOF
 #define LYNX_CFG_FILE "$LYNX_CFG_FILE"
 EOF
 
-echo "$as_me:21339: checking if htmlized lynx.cfg should be built" >&5
+echo "$as_me:21363: checking if htmlized lynx.cfg should be built" >&5
 echo $ECHO_N "checking if htmlized lynx.cfg should be built... $ECHO_C" >&6
 
 # Check whether --enable-htmlized-cfg or --disable-htmlized-cfg was given.
@@ -21353,7 +21377,7 @@ else
   use_htmlized_cfg=no
 
 fi;
-echo "$as_me:21356: result: $use_htmlized_cfg" >&5
+echo "$as_me:21380: result: $use_htmlized_cfg" >&5
 echo "${ECHO_T}$use_htmlized_cfg" >&6
 
 LYNXCFG_MAKE=''
@@ -21361,7 +21385,7 @@ if test $use_htmlized_cfg = no ; then
 	LYNXCFG_MAKE='#'
 fi
 
-echo "$as_me:21364: checking if local doc directory should be linked to help page" >&5
+echo "$as_me:21388: checking if local doc directory should be linked to help page" >&5
 echo $ECHO_N "checking if local doc directory should be linked to help page... $ECHO_C" >&6
 
 # Check whether --enable-local-docs or --disable-local-docs was given.
@@ -21378,7 +21402,7 @@ else
   use_local_docs=no
 
 fi;
-echo "$as_me:21381: result: $use_local_docs" >&5
+echo "$as_me:21405: result: $use_local_docs" >&5
 echo "${ECHO_T}$use_local_docs" >&6
 
 LYNXDOC_MAKE=''
@@ -21386,7 +21410,7 @@ if test $use_local_docs = no ; then
 	LYNXDOC_MAKE='#'
 fi
 
-echo "$as_me:21389: checking for MIME library directory" >&5
+echo "$as_me:21413: checking for MIME library directory" >&5
 echo $ECHO_N "checking for MIME library directory... $ECHO_C" >&6
 
 # Check whether --with-mime-libdir or --without-mime-libdir was given.
@@ -21422,7 +21446,7 @@ case ".$withval" in #(vi
   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
   ;;
 *)
-  { { echo "$as_me:21425: error: expected a pathname, not \"$withval\"" >&5
+  { { echo "$as_me:21449: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
   ;;
@@ -21431,14 +21455,14 @@ esac
 fi
 MIME_LIBDIR="$withval"
 
-echo "$as_me:21434: result: $MIME_LIBDIR" >&5
+echo "$as_me:21458: result: $MIME_LIBDIR" >&5
 echo "${ECHO_T}$MIME_LIBDIR" >&6
 MIME_LIBDIR=`echo "$MIME_LIBDIR" | sed -e 's,/$,,' -e 's,$,/,'`
 cat >>confdefs.h <<EOF
 #define MIME_LIBDIR "$MIME_LIBDIR"
 EOF
 
-echo "$as_me:21441: checking if locale-charset selection logic should be used" >&5
+echo "$as_me:21465: checking if locale-charset selection logic should be used" >&5
 echo $ECHO_N "checking if locale-charset selection logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-locale-charset or --disable-locale-charset was given.
@@ -21455,7 +21479,7 @@ else
   use_locale_charset=yes
 
 fi;
-echo "$as_me:21458: result: $use_locale_charset" >&5
+echo "$as_me:21482: result: $use_locale_charset" >&5
 echo "${ECHO_T}$use_locale_charset" >&6
 test $use_locale_charset != no && cat >>confdefs.h <<\EOF
 #define USE_LOCALE_CHARSET 1
@@ -21463,7 +21487,7 @@ EOF
 
 CHARSET_DEFS=
 
-echo "$as_me:21466: checking if you want only a few charsets" >&5
+echo "$as_me:21490: checking if you want only a few charsets" >&5
 echo $ECHO_N "checking if you want only a few charsets... $ECHO_C" >&6
 
 # Check whether --with-charsets or --without-charsets was given.
@@ -21475,7 +21499,7 @@ else
 fi;
 
 if test -n "$cf_charsets" ; then
-	echo "$as_me:21478: result: yes" >&5
+	echo "$as_me:21502: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	cat >>confdefs.h <<\EOF
 #define ALL_CHARSETS 0
@@ -21488,7 +21512,7 @@ EOF
 	if test "$cf_charsets" = "minimal" ; then
 		test -n "$verbose" && echo "	using minimal list of charsets: $cf_min_charsets" 1>&6
 
-echo "${as_me-configure}:21491: testing using minimal list of charsets: $cf_min_charsets ..." 1>&5
+echo "${as_me-configure}:21515: testing using minimal list of charsets: $cf_min_charsets ..." 1>&5
 
 	fi
 	cf_charsets=`echo $cf_charsets | sed -e "s/minimal/$cf_min_charsets/g" -e 's/,/ /g'`
@@ -21515,28 +21539,28 @@ echo "${as_me-configure}:21491: testing using minimal list of charsets: $cf_min_
 		then
 			test -n "$verbose" && echo "	found $cf_charset" 1>&6
 
-echo "${as_me-configure}:21518: testing found $cf_charset ..." 1>&5
+echo "${as_me-configure}:21542: testing found $cf_charset ..." 1>&5
 
 			CHARSET_DEFS="-DNO_CHARSET_${cf_def_charset}=0 $CHARSET_DEFS"
 		else
 			test -n "$verbose" && echo "	not found $cf_charset" 1>&6
 
-echo "${as_me-configure}:21524: testing not found $cf_charset ..." 1>&5
+echo "${as_me-configure}:21548: testing not found $cf_charset ..." 1>&5
 
 		fi
 	done
 else
-	echo "$as_me:21529: result: no" >&5
+	echo "$as_me:21553: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:21533: checking for ANSI C header files" >&5
+echo "$as_me:21557: checking for ANSI C header files" >&5
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 21539 "configure"
+#line 21563 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -21544,13 +21568,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:21547: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:21571: \"$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:21553: \$? = $ac_status" >&5
+  echo "$as_me:21577: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -21572,7 +21596,7 @@ rm -f conftest.err conftest.$ac_ext
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 21575 "configure"
+#line 21599 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -21590,7 +21614,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 21593 "configure"
+#line 21617 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -21611,7 +21635,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 21614 "configure"
+#line 21638 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -21637,15 +21661,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:21640: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21664: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21643: \$? = $ac_status" >&5
+  echo "$as_me:21667: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:21645: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21669: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21648: \$? = $ac_status" >&5
+  echo "$as_me:21672: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -21658,7 +21682,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:21661: result: $ac_cv_header_stdc" >&5
+echo "$as_me:21685: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -21668,13 +21692,13 @@ EOF
 
 fi
 
-echo "$as_me:21671: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:21695: checking whether time.h and sys/time.h may both be included" >&5
 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
 if test "${ac_cv_header_time+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 21677 "configure"
+#line 21701 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -21690,16 +21714,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21693: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21717: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21696: \$? = $ac_status" >&5
+  echo "$as_me:21720: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21699: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21723: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21702: \$? = $ac_status" >&5
+  echo "$as_me:21726: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_header_time=yes
 else
@@ -21709,7 +21733,7 @@ ac_cv_header_time=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:21712: result: $ac_cv_header_time" >&5
+echo "$as_me:21736: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -21722,13 +21746,13 @@ fi
 ac_header_dirent=no
 for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
   as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-echo "$as_me:21725: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:21749: checking for $ac_hdr that defines DIR" >&5
 echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 21731 "configure"
+#line 21755 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -21743,16 +21767,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21746: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21770: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21749: \$? = $ac_status" >&5
+  echo "$as_me:21773: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21752: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21776: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21755: \$? = $ac_status" >&5
+  echo "$as_me:21779: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -21762,7 +21786,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:21765: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:21789: 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
@@ -21775,7 +21799,7 @@ fi
 done
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
-  echo "$as_me:21778: checking for opendir in -ldir" >&5
+  echo "$as_me:21802: checking for opendir in -ldir" >&5
 echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
 if test "${ac_cv_lib_dir_opendir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21783,7 +21807,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 21786 "configure"
+#line 21810 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21802,16 +21826,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21805: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21829: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21808: \$? = $ac_status" >&5
+  echo "$as_me:21832: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21811: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21835: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21814: \$? = $ac_status" >&5
+  echo "$as_me:21838: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -21822,14 +21846,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21825: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:21849: result: $ac_cv_lib_dir_opendir" >&5
 echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
 if test $ac_cv_lib_dir_opendir = yes; then
   LIBS="$LIBS -ldir"
 fi
 
 else
-  echo "$as_me:21832: checking for opendir in -lx" >&5
+  echo "$as_me:21856: checking for opendir in -lx" >&5
 echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
 if test "${ac_cv_lib_x_opendir+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21837,7 +21861,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 21840 "configure"
+#line 21864 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21856,16 +21880,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21859: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21883: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21862: \$? = $ac_status" >&5
+  echo "$as_me:21886: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21865: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21889: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21868: \$? = $ac_status" >&5
+  echo "$as_me:21892: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -21876,7 +21900,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21879: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:21903: result: $ac_cv_lib_x_opendir" >&5
 echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
 if test $ac_cv_lib_x_opendir = yes; then
   LIBS="$LIBS -lx"
@@ -21904,23 +21928,23 @@ for ac_header in \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:21907: checking for $ac_header" >&5
+echo "$as_me:21931: 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 21913 "configure"
+#line 21937 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:21917: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:21941: \"$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:21923: \$? = $ac_status" >&5
+  echo "$as_me:21947: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -21939,7 +21963,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:21942: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:21966: 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
@@ -21949,14 +21973,14 @@ EOF
 fi
 done
 
-echo "$as_me:21952: checking termio.h and termios.h" >&5
+echo "$as_me:21976: 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 21959 "configure"
+#line 21983 "configure"
 #include "confdefs.h"
 
 #if HAVE_TERMIO_H
@@ -21974,16 +21998,16 @@ putchar (0x0a)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21977: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22001: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21980: \$? = $ac_status" >&5
+  echo "$as_me:22004: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21983: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22007: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21986: \$? = $ac_status" >&5
+  echo "$as_me:22010: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termio_and_termios=yes
 else
@@ -21994,20 +22018,20 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:21997: result: $cf_cv_termio_and_termios" >&5
+echo "$as_me:22021: 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:22003: checking for sigaction and structs" >&5
+echo "$as_me:22027: 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 22010 "configure"
+#line 22034 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -22027,16 +22051,16 @@ struct sigaction act;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22030: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22054: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22033: \$? = $ac_status" >&5
+  echo "$as_me:22057: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22036: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22060: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22039: \$? = $ac_status" >&5
+  echo "$as_me:22063: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_func_sigaction=yes
 else
@@ -22047,7 +22071,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:22050: result: $cf_cv_func_sigaction" >&5
+echo "$as_me:22074: 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
@@ -22056,23 +22080,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:22059: checking for $ac_header" >&5
+echo "$as_me:22083: 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 22065 "configure"
+#line 22089 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22069: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:22093: \"$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:22075: \$? = $ac_status" >&5
+  echo "$as_me:22099: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22091,7 +22115,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:22094: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:22118: 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
@@ -22112,23 +22136,23 @@ else
 for ac_header in wait.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22115: checking for $ac_header" >&5
+echo "$as_me:22139: 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 22121 "configure"
+#line 22145 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22125: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:22149: \"$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:22131: \$? = $ac_status" >&5
+  echo "$as_me:22155: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22147,7 +22171,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:22150: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:22174: 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
@@ -22160,23 +22184,23 @@ done
 for ac_header in waitstatus.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:22163: checking for $ac_header" >&5
+echo "$as_me:22187: 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 22169 "configure"
+#line 22193 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22173: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:22197: \"$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:22179: \$? = $ac_status" >&5
+  echo "$as_me:22203: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22195,7 +22219,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:22198: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:22222: 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
@@ -22217,14 +22241,14 @@ cf_wait_headers="$cf_wait_headers
 fi
 fi
 
-echo "$as_me:22220: checking for union wait" >&5
+echo "$as_me:22244: 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 22227 "configure"
+#line 22251 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -22240,16 +22264,16 @@ int x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22243: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22267: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22246: \$? = $ac_status" >&5
+  echo "$as_me:22270: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22249: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22273: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22252: \$? = $ac_status" >&5
+  echo "$as_me:22276: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_unionwait=no
 	 echo compiles ok w/o union wait 1>&5
@@ -22259,7 +22283,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 22262 "configure"
+#line 22286 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -22279,16 +22303,16 @@ union wait x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22282: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22306: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22285: \$? = $ac_status" >&5
+  echo "$as_me:22309: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22288: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22312: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22291: \$? = $ac_status" >&5
+  echo "$as_me:22315: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_unionwait=yes
 	 echo compiles ok with union wait and possibly macros too 1>&5
@@ -22303,7 +22327,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:22306: result: $cf_cv_type_unionwait" >&5
+echo "$as_me:22330: 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
@@ -22311,14 +22335,14 @@ EOF
 
 if test $cf_cv_type_unionwait = yes; then
 
-	echo "$as_me:22314: checking if union wait can be used as wait-arg" >&5
+	echo "$as_me:22338: 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 22321 "configure"
+#line 22345 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -22330,16 +22354,16 @@ union wait x; wait(&x)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22333: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22357: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22336: \$? = $ac_status" >&5
+  echo "$as_me:22360: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22339: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22363: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22342: \$? = $ac_status" >&5
+  echo "$as_me:22366: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_arg_union_wait=yes
 else
@@ -22351,20 +22375,20 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-	echo "$as_me:22354: result: $cf_cv_arg_union_wait" >&5
+	echo "$as_me:22378: 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:22360: checking if union wait can be used as waitpid-arg" >&5
+	echo "$as_me:22384: 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 22367 "configure"
+#line 22391 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -22376,16 +22400,16 @@ union wait x; waitpid(0, &x, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22379: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22403: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22382: \$? = $ac_status" >&5
+  echo "$as_me:22406: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22385: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22409: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22388: \$? = $ac_status" >&5
+  echo "$as_me:22412: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_arg_union_waitpid=yes
 else
@@ -22397,7 +22421,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-	echo "$as_me:22400: result: $cf_cv_arg_union_waitpid" >&5
+	echo "$as_me:22424: 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
@@ -22405,13 +22429,13 @@ EOF
 
 fi
 
-echo "$as_me:22408: checking for uid_t in sys/types.h" >&5
+echo "$as_me:22432: 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 22414 "configure"
+#line 22438 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -22425,7 +22449,7 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:22428: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:22452: 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
 
@@ -22439,7 +22463,7 @@ EOF
 
 fi
 
-echo "$as_me:22442: checking type of array argument to getgroups" >&5
+echo "$as_me:22466: 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
@@ -22448,7 +22472,7 @@ else
   ac_cv_type_getgroups=cross
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 22451 "configure"
+#line 22475 "configure"
 #include "confdefs.h"
 /* Thanks to Mike Rendell for this test.  */
 #include <sys/types.h>
@@ -22474,15 +22498,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:22477: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22501: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22480: \$? = $ac_status" >&5
+  echo "$as_me:22504: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:22482: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22506: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22485: \$? = $ac_status" >&5
+  echo "$as_me:22509: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_getgroups=gid_t
 else
@@ -22495,7 +22519,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 22498 "configure"
+#line 22522 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 
@@ -22510,20 +22534,20 @@ rm -f conftest*
 
 fi
 fi
-echo "$as_me:22513: result: $ac_cv_type_getgroups" >&5
+echo "$as_me:22537: 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:22520: checking for off_t" >&5
+echo "$as_me:22544: 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 22526 "configure"
+#line 22550 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -22538,16 +22562,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22541: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22565: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22544: \$? = $ac_status" >&5
+  echo "$as_me:22568: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22547: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22571: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22550: \$? = $ac_status" >&5
+  echo "$as_me:22574: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -22557,7 +22581,7 @@ ac_cv_type_off_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:22560: result: $ac_cv_type_off_t" >&5
+echo "$as_me:22584: 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
   :
@@ -22569,13 +22593,13 @@ EOF
 
 fi
 
-echo "$as_me:22572: checking for pid_t" >&5
+echo "$as_me:22596: 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 22578 "configure"
+#line 22602 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -22590,16 +22614,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22593: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22617: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22596: \$? = $ac_status" >&5
+  echo "$as_me:22620: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22599: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22623: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22602: \$? = $ac_status" >&5
+  echo "$as_me:22626: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -22609,7 +22633,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:22612: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:22636: 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
   :
@@ -22621,13 +22645,13 @@ EOF
 
 fi
 
-echo "$as_me:22624: checking for uid_t in sys/types.h" >&5
+echo "$as_me:22648: 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 22630 "configure"
+#line 22654 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -22641,7 +22665,7 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:22644: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:22668: 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
 
@@ -22655,13 +22679,13 @@ EOF
 
 fi
 
-echo "$as_me:22658: checking for mode_t" >&5
+echo "$as_me:22682: 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 22664 "configure"
+#line 22688 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -22676,16 +22700,16 @@ if (sizeof (mode_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22679: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22703: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22682: \$? = $ac_status" >&5
+  echo "$as_me:22706: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22685: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22709: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22688: \$? = $ac_status" >&5
+  echo "$as_me:22712: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_mode_t=yes
 else
@@ -22695,7 +22719,7 @@ ac_cv_type_mode_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:22698: result: $ac_cv_type_mode_t" >&5
+echo "$as_me:22722: 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
   :
@@ -22707,13 +22731,13 @@ EOF
 
 fi
 
-	echo "$as_me:22710: checking for socklen_t" >&5
+	echo "$as_me:22734: 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 22716 "configure"
+#line 22740 "configure"
 #include "confdefs.h"
 #include <sys/socket.h>
 
@@ -22729,16 +22753,16 @@ if (sizeof (socklen_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22732: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22756: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22735: \$? = $ac_status" >&5
+  echo "$as_me:22759: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22738: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22762: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22741: \$? = $ac_status" >&5
+  echo "$as_me:22765: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_socklen_t=yes
 else
@@ -22748,7 +22772,7 @@ ac_cv_type_socklen_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:22751: result: $ac_cv_type_socklen_t" >&5
+echo "$as_me:22775: 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
@@ -22763,14 +22787,14 @@ EOF
 
 fi
 
-echo "$as_me:22766: checking for tm.tm_gmtoff" >&5
+echo "$as_me:22790: 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 22773 "configure"
+#line 22797 "configure"
 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME
@@ -22795,16 +22819,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22798: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22822: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22801: \$? = $ac_status" >&5
+  echo "$as_me:22825: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22804: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22828: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22807: \$? = $ac_status" >&5
+  echo "$as_me:22831: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_tm_gmtoff=yes
 else
@@ -22815,19 +22839,19 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:22818: result: $cf_cv_tm_gmtoff" >&5
+echo "$as_me:22842: 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:22824: checking for int" >&5
+echo "$as_me:22848: 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 22830 "configure"
+#line 22854 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -22842,16 +22866,16 @@ if (sizeof (int))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22845: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22869: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22848: \$? = $ac_status" >&5
+  echo "$as_me:22872: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22851: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22875: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22854: \$? = $ac_status" >&5
+  echo "$as_me:22878: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_int=yes
 else
@@ -22861,10 +22885,10 @@ ac_cv_type_int=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:22864: result: $ac_cv_type_int" >&5
+echo "$as_me:22888: result: $ac_cv_type_int" >&5
 echo "${ECHO_T}$ac_cv_type_int" >&6
 
-echo "$as_me:22867: checking size of int" >&5
+echo "$as_me:22891: 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
@@ -22873,7 +22897,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 22876 "configure"
+#line 22900 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -22885,21 +22909,21 @@ int _array_ [1 - 2 * !((sizeof (int)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22888: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22912: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22891: \$? = $ac_status" >&5
+  echo "$as_me:22915: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22894: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22918: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22897: \$? = $ac_status" >&5
+  echo "$as_me:22921: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 22902 "configure"
+#line 22926 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -22911,16 +22935,16 @@ int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22914: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22938: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22917: \$? = $ac_status" >&5
+  echo "$as_me:22941: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22920: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22944: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22923: \$? = $ac_status" >&5
+  echo "$as_me:22947: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -22936,7 +22960,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 22939 "configure"
+#line 22963 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -22948,16 +22972,16 @@ int _array_ [1 - 2 * !((sizeof (int)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22951: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22975: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22954: \$? = $ac_status" >&5
+  echo "$as_me:22978: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22957: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22981: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22960: \$? = $ac_status" >&5
+  echo "$as_me:22984: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -22973,7 +22997,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 22976 "configure"
+#line 23000 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -22985,16 +23009,16 @@ int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22988: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23012: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22991: \$? = $ac_status" >&5
+  echo "$as_me:23015: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22994: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23018: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22997: \$? = $ac_status" >&5
+  echo "$as_me:23021: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -23007,12 +23031,12 @@ done
 ac_cv_sizeof_int=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:23010: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:23034: 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 23015 "configure"
+#line 23039 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23028,15 +23052,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:23031: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23055: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23034: \$? = $ac_status" >&5
+  echo "$as_me:23058: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:23036: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23060: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23039: \$? = $ac_status" >&5
+  echo "$as_me:23063: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_int=`cat conftest.val`
 else
@@ -23052,19 +23076,19 @@ else
   ac_cv_sizeof_int=0
 fi
 fi
-echo "$as_me:23055: result: $ac_cv_sizeof_int" >&5
+echo "$as_me:23079: 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:23061: checking for long" >&5
+echo "$as_me:23085: 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 23067 "configure"
+#line 23091 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23079,16 +23103,16 @@ if (sizeof (long))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23082: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23106: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23085: \$? = $ac_status" >&5
+  echo "$as_me:23109: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23088: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23112: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23091: \$? = $ac_status" >&5
+  echo "$as_me:23115: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_long=yes
 else
@@ -23098,10 +23122,10 @@ ac_cv_type_long=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:23101: result: $ac_cv_type_long" >&5
+echo "$as_me:23125: result: $ac_cv_type_long" >&5
 echo "${ECHO_T}$ac_cv_type_long" >&6
 
-echo "$as_me:23104: checking size of long" >&5
+echo "$as_me:23128: 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
@@ -23110,7 +23134,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 23113 "configure"
+#line 23137 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23122,21 +23146,21 @@ int _array_ [1 - 2 * !((sizeof (long)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23125: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23149: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23128: \$? = $ac_status" >&5
+  echo "$as_me:23152: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23131: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23155: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23134: \$? = $ac_status" >&5
+  echo "$as_me:23158: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 23139 "configure"
+#line 23163 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23148,16 +23172,16 @@ int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23151: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23175: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23154: \$? = $ac_status" >&5
+  echo "$as_me:23178: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23157: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23181: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23160: \$? = $ac_status" >&5
+  echo "$as_me:23184: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -23173,7 +23197,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 23176 "configure"
+#line 23200 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23185,16 +23209,16 @@ int _array_ [1 - 2 * !((sizeof (long)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23188: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23212: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23191: \$? = $ac_status" >&5
+  echo "$as_me:23215: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23194: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23218: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23197: \$? = $ac_status" >&5
+  echo "$as_me:23221: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -23210,7 +23234,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 23213 "configure"
+#line 23237 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23222,16 +23246,16 @@ int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23225: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23249: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23228: \$? = $ac_status" >&5
+  echo "$as_me:23252: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23231: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23255: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23234: \$? = $ac_status" >&5
+  echo "$as_me:23258: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -23244,12 +23268,12 @@ done
 ac_cv_sizeof_long=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:23247: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:23271: 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 23252 "configure"
+#line 23276 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23265,15 +23289,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:23268: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23292: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23271: \$? = $ac_status" >&5
+  echo "$as_me:23295: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:23273: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23297: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23276: \$? = $ac_status" >&5
+  echo "$as_me:23300: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_long=`cat conftest.val`
 else
@@ -23289,19 +23313,19 @@ else
   ac_cv_sizeof_long=0
 fi
 fi
-echo "$as_me:23292: result: $ac_cv_sizeof_long" >&5
+echo "$as_me:23316: 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:23298: checking for off_t" >&5
+echo "$as_me:23322: 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 23304 "configure"
+#line 23328 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23316,16 +23340,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23319: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23343: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23322: \$? = $ac_status" >&5
+  echo "$as_me:23346: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23325: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23349: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23328: \$? = $ac_status" >&5
+  echo "$as_me:23352: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -23335,10 +23359,10 @@ ac_cv_type_off_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:23338: result: $ac_cv_type_off_t" >&5
+echo "$as_me:23362: result: $ac_cv_type_off_t" >&5
 echo "${ECHO_T}$ac_cv_type_off_t" >&6
 
-echo "$as_me:23341: checking size of off_t" >&5
+echo "$as_me:23365: 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
@@ -23347,7 +23371,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 23350 "configure"
+#line 23374 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23359,21 +23383,21 @@ int _array_ [1 - 2 * !((sizeof (off_t)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23362: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23386: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23365: \$? = $ac_status" >&5
+  echo "$as_me:23389: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23368: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23392: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23371: \$? = $ac_status" >&5
+  echo "$as_me:23395: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 23376 "configure"
+#line 23400 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23385,16 +23409,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23388: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23412: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23391: \$? = $ac_status" >&5
+  echo "$as_me:23415: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23394: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23418: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23397: \$? = $ac_status" >&5
+  echo "$as_me:23421: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -23410,7 +23434,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 23413 "configure"
+#line 23437 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23422,16 +23446,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23425: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23449: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23428: \$? = $ac_status" >&5
+  echo "$as_me:23452: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23431: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23455: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23434: \$? = $ac_status" >&5
+  echo "$as_me:23458: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -23447,7 +23471,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 23450 "configure"
+#line 23474 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23459,16 +23483,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23462: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23486: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23465: \$? = $ac_status" >&5
+  echo "$as_me:23489: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23468: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23492: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23471: \$? = $ac_status" >&5
+  echo "$as_me:23495: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -23481,12 +23505,12 @@ done
 ac_cv_sizeof_off_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:23484: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:23508: 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 23489 "configure"
+#line 23513 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23502,15 +23526,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:23505: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23529: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23508: \$? = $ac_status" >&5
+  echo "$as_me:23532: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:23510: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23534: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23513: \$? = $ac_status" >&5
+  echo "$as_me:23537: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_off_t=`cat conftest.val`
 else
@@ -23526,19 +23550,19 @@ else
   ac_cv_sizeof_off_t=0
 fi
 fi
-echo "$as_me:23529: result: $ac_cv_sizeof_off_t" >&5
+echo "$as_me:23553: 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:23535: checking for time_t" >&5
+echo "$as_me:23559: 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 23541 "configure"
+#line 23565 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23553,16 +23577,16 @@ if (sizeof (time_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23556: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23580: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23559: \$? = $ac_status" >&5
+  echo "$as_me:23583: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23562: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23586: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23565: \$? = $ac_status" >&5
+  echo "$as_me:23589: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_time_t=yes
 else
@@ -23572,10 +23596,10 @@ ac_cv_type_time_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:23575: result: $ac_cv_type_time_t" >&5
+echo "$as_me:23599: result: $ac_cv_type_time_t" >&5
 echo "${ECHO_T}$ac_cv_type_time_t" >&6
 
-echo "$as_me:23578: checking size of time_t" >&5
+echo "$as_me:23602: 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
@@ -23584,7 +23608,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 23587 "configure"
+#line 23611 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23596,21 +23620,21 @@ int _array_ [1 - 2 * !((sizeof (time_t)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23599: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23623: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23602: \$? = $ac_status" >&5
+  echo "$as_me:23626: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23605: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23629: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23608: \$? = $ac_status" >&5
+  echo "$as_me:23632: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 23613 "configure"
+#line 23637 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23622,16 +23646,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23625: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23649: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23628: \$? = $ac_status" >&5
+  echo "$as_me:23652: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23631: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23655: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23634: \$? = $ac_status" >&5
+  echo "$as_me:23658: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -23647,7 +23671,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 23650 "configure"
+#line 23674 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23659,16 +23683,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23662: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23686: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23665: \$? = $ac_status" >&5
+  echo "$as_me:23689: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23668: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23692: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23671: \$? = $ac_status" >&5
+  echo "$as_me:23695: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -23684,7 +23708,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 23687 "configure"
+#line 23711 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23696,16 +23720,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23699: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23723: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23702: \$? = $ac_status" >&5
+  echo "$as_me:23726: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23705: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23729: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23708: \$? = $ac_status" >&5
+  echo "$as_me:23732: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -23718,12 +23742,12 @@ done
 ac_cv_sizeof_time_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:23721: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:23745: 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 23726 "configure"
+#line 23750 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -23739,15 +23763,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:23742: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23766: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23745: \$? = $ac_status" >&5
+  echo "$as_me:23769: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:23747: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23771: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23750: \$? = $ac_status" >&5
+  echo "$as_me:23774: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_time_t=`cat conftest.val`
 else
@@ -23763,7 +23787,7 @@ else
   ac_cv_sizeof_time_t=0
 fi
 fi
-echo "$as_me:23766: result: $ac_cv_sizeof_time_t" >&5
+echo "$as_me:23790: 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
@@ -23771,13 +23795,13 @@ EOF
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo "$as_me:23774: checking for working alloca.h" >&5
+echo "$as_me:23798: 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 23780 "configure"
+#line 23804 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int
@@ -23789,16 +23813,16 @@ char *p = (char *) alloca (2 * sizeof (int));
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23792: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23816: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23795: \$? = $ac_status" >&5
+  echo "$as_me:23819: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23798: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23822: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23801: \$? = $ac_status" >&5
+  echo "$as_me:23825: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_working_alloca_h=yes
 else
@@ -23808,7 +23832,7 @@ ac_cv_working_alloca_h=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:23811: result: $ac_cv_working_alloca_h" >&5
+echo "$as_me:23835: 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
 
@@ -23818,13 +23842,13 @@ EOF
 
 fi
 
-echo "$as_me:23821: checking for alloca" >&5
+echo "$as_me:23845: 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 23827 "configure"
+#line 23851 "configure"
 #include "confdefs.h"
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -23856,16 +23880,16 @@ char *p = (char *) alloca (1);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23859: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23883: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23862: \$? = $ac_status" >&5
+  echo "$as_me:23886: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23865: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23889: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23868: \$? = $ac_status" >&5
+  echo "$as_me:23892: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_alloca_works=yes
 else
@@ -23875,7 +23899,7 @@ ac_cv_func_alloca_works=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:23878: result: $ac_cv_func_alloca_works" >&5
+echo "$as_me:23902: 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
@@ -23896,13 +23920,13 @@ cat >>confdefs.h <<\EOF
 #define C_ALLOCA 1
 EOF
 
-echo "$as_me:23899: checking whether \`alloca.c' needs Cray hooks" >&5
+echo "$as_me:23923: 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 23905 "configure"
+#line 23929 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -23920,18 +23944,18 @@ fi
 rm -f conftest*
 
 fi
-echo "$as_me:23923: result: $ac_cv_os_cray" >&5
+echo "$as_me:23947: 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:23928: checking for $ac_func" >&5
+echo "$as_me:23952: 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 23934 "configure"
+#line 23958 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -23962,16 +23986,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23965: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23989: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23968: \$? = $ac_status" >&5
+  echo "$as_me:23992: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23971: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23995: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23974: \$? = $ac_status" >&5
+  echo "$as_me:23998: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -23981,7 +24005,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:23984: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:24008: 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
 
@@ -23995,7 +24019,7 @@ fi
   done
 fi
 
-echo "$as_me:23998: checking stack direction for C alloca" >&5
+echo "$as_me:24022: 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
@@ -24004,7 +24028,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 24007 "configure"
+#line 24031 "configure"
 #include "confdefs.h"
 int
 find_stack_direction ()
@@ -24027,15 +24051,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:24030: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24054: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24033: \$? = $ac_status" >&5
+  echo "$as_me:24057: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:24035: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24059: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24038: \$? = $ac_status" >&5
+  echo "$as_me:24062: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_stack_direction=1
 else
@@ -24047,7 +24071,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:24050: result: $ac_cv_c_stack_direction" >&5
+echo "$as_me:24074: result: $ac_cv_c_stack_direction" >&5
 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
 cat >>confdefs.h <<EOF
@@ -24059,23 +24083,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:24062: checking for $ac_header" >&5
+echo "$as_me:24086: 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 24068 "configure"
+#line 24092 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:24072: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:24096: \"$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:24078: \$? = $ac_status" >&5
+  echo "$as_me:24102: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -24094,7 +24118,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:24097: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:24121: 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
@@ -24107,13 +24131,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:24110: checking for $ac_func" >&5
+echo "$as_me:24134: 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 24116 "configure"
+#line 24140 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -24144,16 +24168,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24147: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24171: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24150: \$? = $ac_status" >&5
+  echo "$as_me:24174: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24153: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24177: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24156: \$? = $ac_status" >&5
+  echo "$as_me:24180: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -24163,7 +24187,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:24166: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:24190: 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
@@ -24175,7 +24199,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:24178: checking for working fork" >&5
+  echo "$as_me:24202: 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
@@ -24198,15 +24222,15 @@ else
       }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:24201: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24225: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24204: \$? = $ac_status" >&5
+  echo "$as_me:24228: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:24206: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24230: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24209: \$? = $ac_status" >&5
+  echo "$as_me:24233: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -24218,7 +24242,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:24221: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:24245: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -24232,12 +24256,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:24235: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24259: 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:24240: checking for working vfork" >&5
+  echo "$as_me:24264: 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
@@ -24246,7 +24270,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 24249 "configure"
+#line 24273 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -24343,15 +24367,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:24346: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24370: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24349: \$? = $ac_status" >&5
+  echo "$as_me:24373: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:24351: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24375: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24354: \$? = $ac_status" >&5
+  echo "$as_me:24378: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -24363,13 +24387,13 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:24366: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:24390: 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:24372: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:24396: 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
 
@@ -24394,14 +24418,14 @@ EOF
 
 fi
 
-echo "$as_me:24397: checking if we should use fcntl or ioctl" >&5
+echo "$as_me:24421: 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 24404 "configure"
+#line 24428 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -24418,16 +24442,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24421: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24445: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24424: \$? = $ac_status" >&5
+  echo "$as_me:24448: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24427: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24451: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24430: \$? = $ac_status" >&5
+  echo "$as_me:24454: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fionbio=ioctl
 else
@@ -24435,7 +24459,7 @@ else
 cat conftest.$ac_ext >&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 24438 "configure"
+#line 24462 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -24457,16 +24481,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24460: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24484: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24463: \$? = $ac_status" >&5
+  echo "$as_me:24487: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24466: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24490: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24469: \$? = $ac_status" >&5
+  echo "$as_me:24493: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fionbio=fcntl
 else
@@ -24479,20 +24503,20 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:24482: result: $cf_cv_fionbio" >&5
+echo "$as_me:24506: 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:24488: checking for broken/missing definition of remove" >&5
+echo "$as_me:24512: 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 24495 "configure"
+#line 24519 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24504,23 +24528,23 @@ remove("dummy")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24507: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24531: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24510: \$? = $ac_status" >&5
+  echo "$as_me:24534: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24513: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24537: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24516: \$? = $ac_status" >&5
+  echo "$as_me:24540: \$? = $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 24523 "configure"
+#line 24547 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 		int __unlink(name) { return unlink(name); }
@@ -24533,16 +24557,16 @@ remove("dummy")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24536: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24560: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24539: \$? = $ac_status" >&5
+  echo "$as_me:24563: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24542: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24566: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24545: \$? = $ac_status" >&5
+  echo "$as_me:24569: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_baddef_remove=yes
 else
@@ -24557,20 +24581,20 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:24560: result: $cf_cv_baddef_remove" >&5
+echo "$as_me:24584: 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:24566: checking for lstat" >&5
+echo "$as_me:24590: 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 24573 "configure"
+#line 24597 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -24584,16 +24608,16 @@ lstat(".", (struct stat *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24587: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24611: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24590: \$? = $ac_status" >&5
+  echo "$as_me:24614: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24593: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24617: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24596: \$? = $ac_status" >&5
+  echo "$as_me:24620: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_lstat=yes
 else
@@ -24605,7 +24629,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:24608: result: $ac_cv_func_lstat " >&5
+echo "$as_me:24632: 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
@@ -24639,13 +24663,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:24642: checking for $ac_func" >&5
+echo "$as_me:24666: 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 24648 "configure"
+#line 24672 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -24676,16 +24700,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24679: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24703: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24682: \$? = $ac_status" >&5
+  echo "$as_me:24706: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24685: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24709: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24688: \$? = $ac_status" >&5
+  echo "$as_me:24712: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -24695,7 +24719,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:24698: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:24722: 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
@@ -24711,13 +24735,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:24714: checking for $ac_func" >&5
+echo "$as_me:24738: 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 24720 "configure"
+#line 24744 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -24748,16 +24772,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24751: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24775: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24754: \$? = $ac_status" >&5
+  echo "$as_me:24778: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24757: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24781: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24760: \$? = $ac_status" >&5
+  echo "$as_me:24784: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -24767,7 +24791,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:24770: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:24794: 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
@@ -24779,7 +24803,7 @@ else
 fi
 done
 
-echo "$as_me:24782: checking for random-integer functions" >&5
+echo "$as_me:24806: 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
@@ -24799,7 +24823,7 @@ do
 	esac
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 24802 "configure"
+#line 24826 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -24818,16 +24842,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:24821: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24845: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24824: \$? = $ac_status" >&5
+  echo "$as_me:24848: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24827: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24851: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24830: \$? = $ac_status" >&5
+  echo "$as_me:24854: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_srand_func=$cf_func
  break
@@ -24839,10 +24863,10 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:24842: result: $cf_cv_srand_func" >&5
+echo "$as_me:24866: 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:24845: checking for range of random-integers" >&5
+	echo "$as_me:24869: 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
@@ -24863,7 +24887,7 @@ else
 			;;
 		esac
 		cat >conftest.$ac_ext <<_ACEOF
-#line 24866 "configure"
+#line 24890 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -24882,16 +24906,16 @@ long x = $cf_cv_rand_max
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24885: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24909: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24888: \$? = $ac_status" >&5
+  echo "$as_me:24912: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24891: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24915: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24894: \$? = $ac_status" >&5
+  echo "$as_me:24918: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -24902,7 +24926,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:24905: result: $cf_cv_rand_max" >&5
+echo "$as_me:24929: result: $cf_cv_rand_max" >&5
 echo "${ECHO_T}$cf_cv_rand_max" >&6
 
 	cf_srand_func=`echo $cf_func | sed -e 's%/.*%%'`
@@ -24933,13 +24957,13 @@ fi
 for ac_func in strstr
 do
 
-echo "$as_me:24936: checking for $ac_func declaration" >&5
+echo "$as_me:24960: 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 24942 "configure"
+#line 24966 "configure"
 #include "confdefs.h"
 #include <string.h>
 int
@@ -24953,20 +24977,20 @@ extern	int	${ac_func}();
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24956: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24980: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24959: \$? = $ac_status" >&5
+  echo "$as_me:24983: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24962: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24986: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24965: \$? = $ac_status" >&5
+  echo "$as_me:24989: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 24969 "configure"
+#line 24993 "configure"
 #include "confdefs.h"
 #include <string.h>
 int
@@ -24980,16 +25004,16 @@ int	(*p)() = ${ac_func};
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24983: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25007: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24986: \$? = $ac_status" >&5
+  echo "$as_me:25010: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24989: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25013: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24992: \$? = $ac_status" >&5
+  echo "$as_me:25016: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -25010,11 +25034,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:25013: result: yes" >&5
+  echo "$as_me:25037: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:25017: result: no" >&5
+  echo "$as_me:25041: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -25029,13 +25053,13 @@ done
 for ac_func in getgrgid getgrnam
 do
 
-echo "$as_me:25032: checking for $ac_func declaration" >&5
+echo "$as_me:25056: 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 25038 "configure"
+#line 25062 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -25051,20 +25075,20 @@ extern	int	${ac_func}();
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25054: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25078: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25057: \$? = $ac_status" >&5
+  echo "$as_me:25081: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25060: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25084: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25063: \$? = $ac_status" >&5
+  echo "$as_me:25087: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 25067 "configure"
+#line 25091 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -25080,16 +25104,16 @@ int	(*p)() = ${ac_func};
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25083: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25107: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25086: \$? = $ac_status" >&5
+  echo "$as_me:25110: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25089: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25113: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25092: \$? = $ac_status" >&5
+  echo "$as_me:25116: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -25110,11 +25134,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:25113: result: yes" >&5
+  echo "$as_me:25137: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:25117: result: no" >&5
+  echo "$as_me:25141: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -25126,14 +25150,14 @@ EOF
 fi
 done
 
-echo "$as_me:25129: checking if TRUE/FALSE are defined" >&5
+echo "$as_me:25153: 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 25136 "configure"
+#line 25160 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -25147,16 +25171,16 @@ int x = TRUE, y = FALSE
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25150: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25174: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25153: \$? = $ac_status" >&5
+  echo "$as_me:25177: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25156: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25180: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25159: \$? = $ac_status" >&5
+  echo "$as_me:25183: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_bool_defs=yes
 else
@@ -25167,7 +25191,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:25170: result: $cf_cv_bool_defs" >&5
+echo "$as_me:25194: 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
@@ -25180,14 +25204,14 @@ EOF
 
 fi
 
-echo "$as_me:25183: checking if external errno is declared" >&5
+echo "$as_me:25207: 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 25190 "configure"
+#line 25214 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -25205,16 +25229,16 @@ int x = (int) errno
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25208: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25232: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25211: \$? = $ac_status" >&5
+  echo "$as_me:25235: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25214: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25238: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25217: \$? = $ac_status" >&5
+  echo "$as_me:25241: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -25225,7 +25249,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:25228: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:25252: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -25240,14 +25264,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:25243: checking if external errno exists" >&5
+echo "$as_me:25267: 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 25250 "configure"
+#line 25274 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -25262,16 +25286,16 @@ errno = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25265: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25289: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25268: \$? = $ac_status" >&5
+  echo "$as_me:25292: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25271: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25295: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25274: \$? = $ac_status" >&5
+  echo "$as_me:25298: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_errno=yes
 else
@@ -25282,7 +25306,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:25285: result: $cf_cv_have_errno" >&5
+echo "$as_me:25309: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -25295,7 +25319,7 @@ EOF
 
 fi
 
-echo "$as_me:25298: checking if we can set errno" >&5
+echo "$as_me:25322: 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
@@ -25303,7 +25327,7 @@ else
 
 if test "$cross_compiling" = yes; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 25306 "configure"
+#line 25330 "configure"
 #include "confdefs.h"
 #include <errno.h>
 int
@@ -25315,16 +25339,16 @@ errno = 255
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25318: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25342: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25321: \$? = $ac_status" >&5
+  echo "$as_me:25345: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25324: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25348: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25327: \$? = $ac_status" >&5
+  echo "$as_me:25351: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_set_errno=maybe
 else
@@ -25335,7 +25359,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 25338 "configure"
+#line 25362 "configure"
 #include "confdefs.h"
 
 #include <errno.h>
@@ -25346,15 +25370,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:25349: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25373: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25352: \$? = $ac_status" >&5
+  echo "$as_me:25376: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:25354: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25378: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25357: \$? = $ac_status" >&5
+  echo "$as_me:25381: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_set_errno=yes
 else
@@ -25367,20 +25391,20 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:25370: result: $cf_cv_set_errno" >&5
+echo "$as_me:25394: 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:25376: checking for setlocale()" >&5
+echo "$as_me:25400: 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 25383 "configure"
+#line 25407 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int
@@ -25392,16 +25416,16 @@ setlocale(LC_ALL, "")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25395: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25419: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25398: \$? = $ac_status" >&5
+  echo "$as_me:25422: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25401: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25425: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25404: \$? = $ac_status" >&5
+  echo "$as_me:25428: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_locale=yes
 else
@@ -25413,21 +25437,21 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:25416: result: $cf_cv_locale" >&5
+echo "$as_me:25440: 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:25423: checking if NGROUPS is defined" >&5
+echo "$as_me:25447: 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 25430 "configure"
+#line 25454 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -25446,23 +25470,23 @@ int x = NGROUPS
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25449: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25473: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25452: \$? = $ac_status" >&5
+  echo "$as_me:25476: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25455: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25479: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25458: \$? = $ac_status" >&5
+  echo "$as_me:25482: \$? = $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 25465 "configure"
+#line 25489 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -25481,16 +25505,16 @@ int x = NGROUPS_MAX
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25484: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25508: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25487: \$? = $ac_status" >&5
+  echo "$as_me:25511: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25490: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25514: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25493: \$? = $ac_status" >&5
+  echo "$as_me:25517: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ngroups=NGROUPS_MAX
 else
@@ -25502,7 +25526,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:25505: result: $cf_cv_ngroups" >&5
+echo "$as_me:25529: result: $cf_cv_ngroups" >&5
 echo "${ECHO_T}$cf_cv_ngroups" >&6
 
 fi
@@ -25519,14 +25543,14 @@ EOF
 
 fi
 
-echo "$as_me:25522: checking if external sys_nerr is declared" >&5
+echo "$as_me:25546: 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 25529 "configure"
+#line 25553 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -25544,16 +25568,16 @@ int x = (int) sys_nerr
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25547: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25571: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25550: \$? = $ac_status" >&5
+  echo "$as_me:25574: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25553: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25577: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25556: \$? = $ac_status" >&5
+  echo "$as_me:25580: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_sys_nerr=yes
 else
@@ -25564,7 +25588,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:25567: result: $cf_cv_dcl_sys_nerr" >&5
+echo "$as_me:25591: 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
@@ -25579,14 +25603,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:25582: checking if external sys_nerr exists" >&5
+echo "$as_me:25606: 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 25589 "configure"
+#line 25613 "configure"
 #include "confdefs.h"
 
 #undef sys_nerr
@@ -25601,16 +25625,16 @@ sys_nerr = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25604: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25628: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25607: \$? = $ac_status" >&5
+  echo "$as_me:25631: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25610: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25634: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25613: \$? = $ac_status" >&5
+  echo "$as_me:25637: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_sys_nerr=yes
 else
@@ -25621,7 +25645,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:25624: result: $cf_cv_have_sys_nerr" >&5
+echo "$as_me:25648: 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
@@ -25634,14 +25658,14 @@ EOF
 
 fi
 
-echo "$as_me:25637: checking if external sys_errlist is declared" >&5
+echo "$as_me:25661: 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 25644 "configure"
+#line 25668 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -25659,16 +25683,16 @@ int x = (int) sys_errlist
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25662: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25686: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25665: \$? = $ac_status" >&5
+  echo "$as_me:25689: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25668: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25692: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25671: \$? = $ac_status" >&5
+  echo "$as_me:25695: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_sys_errlist=yes
 else
@@ -25679,7 +25703,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:25682: result: $cf_cv_dcl_sys_errlist" >&5
+echo "$as_me:25706: 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
@@ -25694,14 +25718,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:25697: checking if external sys_errlist exists" >&5
+echo "$as_me:25721: 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 25704 "configure"
+#line 25728 "configure"
 #include "confdefs.h"
 
 #undef sys_errlist
@@ -25716,16 +25740,16 @@ sys_errlist = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25719: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25743: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25722: \$? = $ac_status" >&5
+  echo "$as_me:25746: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25725: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25749: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25728: \$? = $ac_status" >&5
+  echo "$as_me:25752: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_sys_errlist=yes
 else
@@ -25736,7 +25760,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:25739: result: $cf_cv_have_sys_errlist" >&5
+echo "$as_me:25763: 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
@@ -25752,23 +25776,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:25755: checking for $ac_header" >&5
+echo "$as_me:25779: 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 25761 "configure"
+#line 25785 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:25765: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:25789: \"$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:25771: \$? = $ac_status" >&5
+  echo "$as_me:25795: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -25787,7 +25811,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:25790: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:25814: 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
@@ -25797,14 +25821,14 @@ EOF
 fi
 done
 
-echo "$as_me:25800: checking for lastlog path" >&5
+echo "$as_me:25824: 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 25807 "configure"
+#line 25831 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -25824,16 +25848,16 @@ char *path = _PATH_LASTLOG
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25827: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25851: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25830: \$? = $ac_status" >&5
+  echo "$as_me:25854: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25833: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25857: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25836: \$? = $ac_status" >&5
+  echo "$as_me:25860: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_path_lastlog="_PATH_LASTLOG"
 else
@@ -25848,13 +25872,13 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:25851: result: $cf_cv_path_lastlog" >&5
+echo "$as_me:25875: 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:25857: checking for utmp implementation" >&5
+echo "$as_me:25881: 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
@@ -25871,7 +25895,7 @@ cf_utmp_includes="
 #endif
 "
 	cat >conftest.$ac_ext <<_ACEOF
-#line 25874 "configure"
+#line 25898 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -25885,16 +25909,16 @@ struct $cf_header x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25888: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25912: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25891: \$? = $ac_status" >&5
+  echo "$as_me:25915: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25894: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25918: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25897: \$? = $ac_status" >&5
+  echo "$as_me:25921: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -25903,7 +25927,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 25906 "configure"
+#line 25930 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -25917,16 +25941,16 @@ struct $cf_header x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25920: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25944: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25923: \$? = $ac_status" >&5
+  echo "$as_me:25947: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25926: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25950: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25929: \$? = $ac_status" >&5
+  echo "$as_me:25953: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -25941,7 +25965,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:25944: result: $cf_cv_have_utmp" >&5
+echo "$as_me:25968: result: $cf_cv_have_utmp" >&5
 echo "${ECHO_T}$cf_cv_have_utmp" >&6
 
 if test $cf_cv_have_utmp != no ; then
@@ -25954,14 +25978,14 @@ EOF
 EOF
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:25957: checking if ${cf_cv_have_utmp}.ut_host is declared" >&5
+echo "$as_me:25981: 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 25964 "configure"
+#line 25988 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -25975,16 +25999,16 @@ struct $cf_cv_have_utmp x; char *y = &x.ut_host[0]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25978: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26002: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25981: \$? = $ac_status" >&5
+  echo "$as_me:26005: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25984: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26008: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25987: \$? = $ac_status" >&5
+  echo "$as_me:26011: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_host=yes
 else
@@ -25996,7 +26020,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:25999: result: $cf_cv_have_utmp_ut_host" >&5
+echo "$as_me:26023: 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
@@ -26005,14 +26029,14 @@ EOF
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:26008: checking if ${cf_cv_have_utmp}.ut_syslen is declared" >&5
+echo "$as_me:26032: 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 26015 "configure"
+#line 26039 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -26026,16 +26050,16 @@ struct $cf_cv_have_utmp x; int y = x.ut_syslen
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26029: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26053: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26032: \$? = $ac_status" >&5
+  echo "$as_me:26056: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26035: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26059: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26038: \$? = $ac_status" >&5
+  echo "$as_me:26062: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_syslen=yes
 else
@@ -26047,7 +26071,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:26050: result: $cf_cv_have_utmp_ut_syslen" >&5
+echo "$as_me:26074: 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
@@ -26056,7 +26080,7 @@ EOF
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:26059: checking if ${cf_cv_have_utmp}.ut_name is declared" >&5
+echo "$as_me:26083: 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
@@ -26073,7 +26097,7 @@ cf_utmp_includes="
 "
 for cf_header in ut_name ut_user ; do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 26076 "configure"
+#line 26100 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -26087,16 +26111,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26090: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26114: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26093: \$? = $ac_status" >&5
+  echo "$as_me:26117: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26096: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26120: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26099: \$? = $ac_status" >&5
+  echo "$as_me:26123: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_name=$cf_header
 	 break
@@ -26108,12 +26132,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:26111: result: $cf_cv_have_utmp_ut_name" >&5
+echo "$as_me:26135: 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:26116: error: Cannot find declaration for ut.ut_name" >&5
+	{ { echo "$as_me:26140: 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; }; }
 	;;
@@ -26127,7 +26151,7 @@ esac
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:26130: checking for exit-status in $cf_cv_have_utmp" >&5
+echo "$as_me:26154: 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
@@ -26140,7 +26164,7 @@ for cf_result in \
 	ut_exit.ut_exit
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 26143 "configure"
+#line 26167 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -26154,16 +26178,16 @@ struct $cf_cv_have_utmp x; long y = x.$cf_result = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26157: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26181: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26160: \$? = $ac_status" >&5
+  echo "$as_me:26184: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26163: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26187: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26166: \$? = $ac_status" >&5
+  echo "$as_me:26190: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_xstatus=$cf_result
 	 break
@@ -26176,7 +26200,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:26179: result: $cf_cv_have_utmp_ut_xstatus" >&5
+echo "$as_me:26203: 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
@@ -26191,14 +26215,14 @@ fi
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:26194: checking if ${cf_cv_have_utmp}.ut_xtime is declared" >&5
+echo "$as_me:26218: 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 26201 "configure"
+#line 26225 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -26212,23 +26236,23 @@ struct $cf_cv_have_utmp x; long y = x.ut_xtime = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26215: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26239: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26218: \$? = $ac_status" >&5
+  echo "$as_me:26242: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26221: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26245: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26224: \$? = $ac_status" >&5
+  echo "$as_me:26248: \$? = $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 26231 "configure"
+#line 26255 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -26242,16 +26266,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:26245: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26269: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26248: \$? = $ac_status" >&5
+  echo "$as_me:26272: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26251: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26275: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26254: \$? = $ac_status" >&5
+  echo "$as_me:26278: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_xtime=define
 else
@@ -26265,7 +26289,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:26268: result: $cf_cv_have_utmp_ut_xtime" >&5
+echo "$as_me:26292: 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
@@ -26282,14 +26306,14 @@ fi
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:26285: checking if ${cf_cv_have_utmp}.ut_session is declared" >&5
+echo "$as_me:26309: 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 26292 "configure"
+#line 26316 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -26303,16 +26327,16 @@ struct $cf_cv_have_utmp x; long y = x.ut_session
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26306: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26330: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26309: \$? = $ac_status" >&5
+  echo "$as_me:26333: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26312: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26336: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26315: \$? = $ac_status" >&5
+  echo "$as_me:26339: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_session=yes
 else
@@ -26323,7 +26347,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:26326: result: $cf_cv_have_utmp_ut_session" >&5
+echo "$as_me:26350: 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
@@ -26333,7 +26357,7 @@ EOF
 fi
 fi
 
-echo "$as_me:26336: checking if $cf_cv_have_utmp is SYSV flavor" >&5
+echo "$as_me:26360: 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
@@ -26341,7 +26365,7 @@ else
 
 test "$cf_cv_have_utmp" = "utmp" && cf_prefix="ut" || cf_prefix="utx"
 cat >conftest.$ac_ext <<_ACEOF
-#line 26344 "configure"
+#line 26368 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -26360,16 +26384,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26363: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26387: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26366: \$? = $ac_status" >&5
+  echo "$as_me:26390: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26369: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26393: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26372: \$? = $ac_status" >&5
+  echo "$as_me:26396: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_sysv_utmp=yes
 else
@@ -26380,7 +26404,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:26383: result: $cf_cv_sysv_utmp" >&5
+echo "$as_me:26407: 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
@@ -26388,14 +26412,14 @@ EOF
 
 fi
 
-echo "$as_me:26391: checking if external h_errno exists" >&5
+echo "$as_me:26415: 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 26398 "configure"
+#line 26422 "configure"
 #include "confdefs.h"
 
 #undef h_errno
@@ -26410,16 +26434,16 @@ h_errno = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26413: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26437: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26416: \$? = $ac_status" >&5
+  echo "$as_me:26440: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26419: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26443: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26422: \$? = $ac_status" >&5
+  echo "$as_me:26446: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_h_errno=yes
 else
@@ -26430,7 +26454,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:26433: result: $cf_cv_have_h_errno" >&5
+echo "$as_me:26457: 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
@@ -26443,7 +26467,7 @@ EOF
 
 fi
 
-echo "$as_me:26446: checking if bibp: URLs should be supported" >&5
+echo "$as_me:26470: 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.
@@ -26460,13 +26484,13 @@ else
   use_bibp_urls=yes
 
 fi;
-echo "$as_me:26463: result: $use_bibp_urls" >&5
+echo "$as_me:26487: 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:26469: checking if configuration info should be browsable" >&5
+echo "$as_me:26493: 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.
@@ -26483,13 +26507,13 @@ else
   use_config_info=yes
 
 fi;
-echo "$as_me:26486: result: $use_config_info" >&5
+echo "$as_me:26510: 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:26492: checking if new-style forms-based options screen should be used" >&5
+echo "$as_me:26516: 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.
@@ -26506,13 +26530,13 @@ else
   use_forms_options=yes
 
 fi;
-echo "$as_me:26509: result: $use_forms_options" >&5
+echo "$as_me:26533: 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:26515: checking if old-style options menu should be used" >&5
+echo "$as_me:26539: 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.
@@ -26529,13 +26553,13 @@ else
   use_menu_options=yes
 
 fi;
-echo "$as_me:26532: result: $use_menu_options" >&5
+echo "$as_me:26556: 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:26538: checking if experimental address-list page should be used" >&5
+echo "$as_me:26562: checking if experimental address-list page should be used" >&5
 echo $ECHO_N "checking if experimental address-list page should be used... $ECHO_C" >&6
 
 # Check whether --enable-addrlist-page or --disable-addrlist-page was given.
@@ -26552,13 +26576,13 @@ else
   use_addrlist_page=no
 
 fi;
-echo "$as_me:26555: result: $use_addrlist_page" >&5
+echo "$as_me:26579: result: $use_addrlist_page" >&5
 echo "${ECHO_T}$use_addrlist_page" >&6
 test $use_addrlist_page != no && cat >>confdefs.h <<\EOF
 #define EXP_ADDRLIST_PAGE 1
 EOF
 
-echo "$as_me:26561: checking if experimental ascii case-conversion" >&5
+echo "$as_me:26585: checking if experimental ascii case-conversion" >&5
 echo $ECHO_N "checking if experimental ascii case-conversion... $ECHO_C" >&6
 
 # Check whether --enable-ascii-ctypes or --disable-ascii-ctypes was given.
@@ -26575,13 +26599,13 @@ else
   use_ascii_ctypes=no
 
 fi;
-echo "$as_me:26578: result: $use_ascii_ctypes" >&5
+echo "$as_me:26602: result: $use_ascii_ctypes" >&5
 echo "${ECHO_T}$use_ascii_ctypes" >&6
 test $use_ascii_ctypes != no && cat >>confdefs.h <<\EOF
 #define EXP_ASCII_CTYPES 1
 EOF
 
-echo "$as_me:26584: checking if experimental charset-selection logic should be used" >&5
+echo "$as_me:26608: checking if experimental charset-selection logic should be used" >&5
 echo $ECHO_N "checking if experimental charset-selection logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-charset-choice or --disable-charset-choice was given.
@@ -26598,13 +26622,13 @@ else
   use_charset_choice=no
 
 fi;
-echo "$as_me:26601: result: $use_charset_choice" >&5
+echo "$as_me:26625: result: $use_charset_choice" >&5
 echo "${ECHO_T}$use_charset_choice" >&6
 test $use_charset_choice != no && cat >>confdefs.h <<\EOF
 #define EXP_CHARSET_CHOICE 1
 EOF
 
-echo "$as_me:26607: checking if experimental CJK logic should be used" >&5
+echo "$as_me:26631: 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.
@@ -26621,13 +26645,13 @@ else
   use_cjk=no
 
 fi;
-echo "$as_me:26624: result: $use_cjk" >&5
+echo "$as_me:26648: 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:26630: checking if experimental Japanese UTF-8 logic should be used" >&5
+echo "$as_me:26654: 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.
@@ -26644,7 +26668,7 @@ else
   use_ja_utf8=no
 
 fi;
-echo "$as_me:26647: result: $use_ja_utf8" >&5
+echo "$as_me:26671: result: $use_ja_utf8" >&5
 echo "${ECHO_T}$use_ja_utf8" >&6
 if test $use_ja_utf8 != no ; then
 	cat >>confdefs.h <<\EOF
@@ -26689,7 +26713,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 26692 "configure"
+#line 26716 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -26701,16 +26725,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26704: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26728: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26707: \$? = $ac_status" >&5
+  echo "$as_me:26731: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26710: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26734: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26713: \$? = $ac_status" >&5
+  echo "$as_me:26737: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -26727,7 +26751,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}:26730: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:26754: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -26768,7 +26792,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 26771 "configure"
+#line 26795 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -26780,16 +26804,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26783: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26807: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26786: \$? = $ac_status" >&5
+  echo "$as_me:26810: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26789: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26813: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26792: \$? = $ac_status" >&5
+  echo "$as_me:26816: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -26806,7 +26830,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}:26809: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:26833: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -26822,7 +26846,7 @@ echo "${as_me-configure}:26809: testing adding $cf_add_incdir to include-path ..
 fi
 
 	else
-{ { echo "$as_me:26825: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:26849: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -26847,7 +26871,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}:26850: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:26874: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -26876,7 +26900,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}:26879: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:26903: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -26885,7 +26909,7 @@ echo "${as_me-configure}:26879: testing adding $cf_add_libdir to library-path ..
 fi
 
 	else
-{ { echo "$as_me:26888: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:26912: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -26896,7 +26920,7 @@ done
 
 fi;
 
-  echo "$as_me:26899: checking for iconv" >&5
+  echo "$as_me:26923: 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
@@ -26907,10 +26931,10 @@ else
 cf_cv_header_path_iconv=
 cf_cv_library_path_iconv=
 
-echo "${as_me-configure}:26910: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me-configure}:26934: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 26913 "configure"
+#line 26937 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -26929,16 +26953,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26932: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26956: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26935: \$? = $ac_status" >&5
+  echo "$as_me:26959: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26938: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26962: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26941: \$? = $ac_status" >&5
+  echo "$as_me:26965: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_find_linkage_iconv=yes
 else
@@ -26949,9 +26973,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for iconv library" 1>&6
 
-echo "${as_me-configure}:26952: testing find linkage for iconv library ..." 1>&5
+echo "${as_me-configure}:26976: testing find linkage for iconv library ..." 1>&5
 
-echo "${as_me-configure}:26954: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me-configure}:26978: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -27059,11 +27083,11 @@ cf_search="$cf_header_path_list $cf_search"
       if test -d $cf_cv_header_path_iconv ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_iconv" 1>&6
 
-echo "${as_me-configure}:27062: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me-configure}:27086: 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 27066 "configure"
+#line 27090 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -27082,21 +27106,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27085: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27109: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27088: \$? = $ac_status" >&5
+  echo "$as_me:27112: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27091: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27115: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27094: \$? = $ac_status" >&5
+  echo "$as_me:27118: \$? = $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}:27099: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me-configure}:27123: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
 
             cf_cv_find_linkage_iconv=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -27114,7 +27138,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_iconv" = maybe ; then
 
-echo "${as_me-configure}:27117: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me-configure}:27141: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -27210,13 +27234,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}:27213: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me-configure}:27237: 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 27219 "configure"
+#line 27243 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -27235,21 +27259,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27238: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27262: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27241: \$? = $ac_status" >&5
+  echo "$as_me:27265: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27244: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27268: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27247: \$? = $ac_status" >&5
+  echo "$as_me:27271: \$? = $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}:27252: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me-configure}:27276: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
 
                 cf_cv_find_linkage_iconv=yes
                 cf_cv_library_file_iconv="-liconv"
@@ -27285,7 +27309,7 @@ am_cv_func_iconv="no, consider installing GNU libiconv"
 fi
 
 fi
-echo "$as_me:27288: result: $am_cv_func_iconv" >&5
+echo "$as_me:27312: result: $am_cv_func_iconv" >&5
 echo "${ECHO_T}$am_cv_func_iconv" >&6
 
   if test "$am_cv_func_iconv" = yes; then
@@ -27294,14 +27318,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_ICONV 1
 EOF
 
-    echo "$as_me:27297: checking if the declaration of iconv() needs const." >&5
+    echo "$as_me:27321: 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 27304 "configure"
+#line 27328 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -27326,16 +27350,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27329: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27353: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27332: \$? = $ac_status" >&5
+  echo "$as_me:27356: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27335: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27359: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27338: \$? = $ac_status" >&5
+  echo "$as_me:27362: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_proto_iconv_const=no
 else
@@ -27345,7 +27369,7 @@ am_cv_proto_iconv_const=yes
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27348: result: $am_cv_proto_iconv_const" >&5
+echo "$as_me:27372: 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
@@ -27387,7 +27411,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 27390 "configure"
+#line 27414 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -27399,16 +27423,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27402: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27426: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27405: \$? = $ac_status" >&5
+  echo "$as_me:27429: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27408: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27432: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27411: \$? = $ac_status" >&5
+  echo "$as_me:27435: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -27425,7 +27449,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}:27428: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:27452: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -27462,7 +27486,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}:27465: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:27489: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -27486,7 +27510,7 @@ curses|slang|ncurses*)
 esac
 
 if test "$use_dft_colors" != no ; then
-echo "$as_me:27489: checking if you want to use default-colors" >&5
+echo "$as_me:27513: 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.
@@ -27503,7 +27527,7 @@ else
   use_dft_colors=no
 
 fi;
-echo "$as_me:27506: result: $use_dft_colors" >&5
+echo "$as_me:27530: 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
@@ -27511,7 +27535,7 @@ EOF
 
 fi
 
-echo "$as_me:27514: checking if experimental keyboard-layout logic should be used" >&5
+echo "$as_me:27538: 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.
@@ -27528,13 +27552,13 @@ else
   use_kbd_layout=no
 
 fi;
-echo "$as_me:27531: result: $use_kbd_layout" >&5
+echo "$as_me:27555: 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:27537: checking if experimental nested-table logic should be used" >&5
+echo "$as_me:27561: 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.
@@ -27551,13 +27575,13 @@ else
   use_nested_tables=no
 
 fi;
-echo "$as_me:27554: result: $use_nested_tables" >&5
+echo "$as_me:27578: 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:27560: checking if progress-bar code should be used" >&5
+echo "$as_me:27584: 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.
@@ -27574,13 +27598,13 @@ else
   use_progressbar=no
 
 fi;
-echo "$as_me:27577: result: $use_progressbar" >&5
+echo "$as_me:27601: 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:27583: checking if scrollbar code should be used" >&5
+echo "$as_me:27607: 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.
@@ -27597,10 +27621,10 @@ else
   use_scrollbar=no
 
 fi;
-echo "$as_me:27600: result: $use_scrollbar" >&5
+echo "$as_me:27624: result: $use_scrollbar" >&5
 echo "${ECHO_T}$use_scrollbar" >&6
 
-echo "$as_me:27603: checking if sessions code should be used" >&5
+echo "$as_me:27627: 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.
@@ -27617,7 +27641,7 @@ else
   use_sessions=no
 
 fi;
-echo "$as_me:27620: result: $use_sessions" >&5
+echo "$as_me:27644: result: $use_sessions" >&5
 echo "${ECHO_T}$use_sessions" >&6
 if test $use_sessions != no ; then
 	cat >>confdefs.h <<\EOF
@@ -27627,7 +27651,7 @@ EOF
 	EXTRA_OBJS="$EXTRA_OBJS LYSession\$o"
 fi
 
-echo "$as_me:27630: checking if session-caching code should be used" >&5
+echo "$as_me:27654: 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.
@@ -27644,7 +27668,7 @@ else
   use_session_cache=no
 
 fi;
-echo "$as_me:27647: result: $use_session_cache" >&5
+echo "$as_me:27671: result: $use_session_cache" >&5
 echo "${ECHO_T}$use_session_cache" >&6
 if test $use_session_cache != no ; then
     cat >>confdefs.h <<\EOF
@@ -27653,7 +27677,7 @@ EOF
 
 fi
 
-echo "$as_me:27656: checking if alternative line-edit bindings should be used" >&5
+echo "$as_me:27680: 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.
@@ -27670,13 +27694,13 @@ else
   use_alt_bindings=yes
 
 fi;
-echo "$as_me:27673: result: $use_alt_bindings" >&5
+echo "$as_me:27697: result: $use_alt_bindings" >&5
 echo "${ECHO_T}$use_alt_bindings" >&6
 test $use_alt_bindings != no && cat >>confdefs.h <<\EOF
 #define EXP_ALT_BINDINGS 1
 EOF
 
-echo "$as_me:27679: checking if you want to use extended HTML DTD logic" >&5
+echo "$as_me:27703: 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.
@@ -27693,13 +27717,13 @@ else
   use_ext_htmldtd=yes
 
 fi;
-echo "$as_me:27696: result: $use_ext_htmldtd" >&5
+echo "$as_me:27720: 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:27702: checking if file-upload logic should be used" >&5
+echo "$as_me:27726: 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.
@@ -27716,13 +27740,13 @@ else
   use_file_upload=yes
 
 fi;
-echo "$as_me:27719: result: $use_file_upload" >&5
+echo "$as_me:27743: 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:27725: checking if element-justification logic should be used" >&5
+echo "$as_me:27749: 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.
@@ -27739,13 +27763,13 @@ else
   use_justify_elts=yes
 
 fi;
-echo "$as_me:27742: result: $use_justify_elts" >&5
+echo "$as_me:27766: result: $use_justify_elts" >&5
 echo "${ECHO_T}$use_justify_elts" >&6
 test $use_justify_elts != no && cat >>confdefs.h <<\EOF
 #define EXP_JUSTIFY_ELTS 1
 EOF
 
-echo "$as_me:27748: checking if partial-display should be used" >&5
+echo "$as_me:27772: 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.
@@ -27762,13 +27786,13 @@ else
   use_partial_display=yes
 
 fi;
-echo "$as_me:27765: result: $use_partial_display" >&5
+echo "$as_me:27789: 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:27771: checking if persistent-cookie logic should be used" >&5
+echo "$as_me:27795: 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.
@@ -27785,13 +27809,13 @@ else
   use_filed_cookies=yes
 
 fi;
-echo "$as_me:27788: result: $use_filed_cookies" >&5
+echo "$as_me:27812: 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:27794: checking if html source should be colorized" >&5
+echo "$as_me:27818: 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.
@@ -27808,13 +27832,13 @@ else
   use_prettysrc=yes
 
 fi;
-echo "$as_me:27811: result: $use_prettysrc" >&5
+echo "$as_me:27835: 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:27817: checking if read-progress message should show ETA" >&5
+echo "$as_me:27841: 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.
@@ -27831,13 +27855,13 @@ else
   use_read_eta=yes
 
 fi;
-echo "$as_me:27834: result: $use_read_eta" >&5
+echo "$as_me:27858: 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:27840: checking if source caching should be used" >&5
+echo "$as_me:27864: 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.
@@ -27854,13 +27878,13 @@ else
   use_source_cache=yes
 
 fi;
-echo "$as_me:27857: result: $use_source_cache" >&5
+echo "$as_me:27881: 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:27863: checking if you want to use external commands" >&5
+echo "$as_me:27887: 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.
@@ -27877,7 +27901,7 @@ else
   use_externs=no
 
 fi;
-echo "$as_me:27880: result: $use_externs" >&5
+echo "$as_me:27904: result: $use_externs" >&5
 echo "${ECHO_T}$use_externs" >&6
 if test $use_externs != "no" ; then
 	cat >>confdefs.h <<\EOF
@@ -27887,7 +27911,7 @@ EOF
 	EXTRA_OBJS="$EXTRA_OBJS LYExtern\$o"
 fi
 
-echo "$as_me:27890: checking if you want to use setfont support" >&5
+echo "$as_me:27914: 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.
@@ -27904,7 +27928,7 @@ else
   use_setfont=no
 
 fi;
-echo "$as_me:27907: result: $use_setfont" >&5
+echo "$as_me:27931: result: $use_setfont" >&5
 echo "${ECHO_T}$use_setfont" >&6
 if test $use_setfont = yes ; then
 	case $host_os in
@@ -27915,7 +27939,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:27918: checking for $ac_word" >&5
+echo "$as_me:27942: 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
@@ -27932,7 +27956,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:27935: found $ac_dir/$ac_word" >&5
+   echo "$as_me:27959: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -27943,10 +27967,10 @@ fi
 SETFONT=$ac_cv_path_SETFONT
 
 if test -n "$SETFONT"; then
-  echo "$as_me:27946: result: $SETFONT" >&5
+  echo "$as_me:27970: result: $SETFONT" >&5
 echo "${ECHO_T}$SETFONT" >&6
 else
-  echo "$as_me:27949: result: no" >&5
+  echo "$as_me:27973: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -28014,7 +28038,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:28017: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:28041: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define SETFONT_PATH "$cf_path_prog"
@@ -28031,19 +28055,19 @@ fi
 		SETFONT=built-in
 		test -n "$verbose" && echo "	Assume $host_os has font-switching" 1>&6
 
-echo "${as_me-configure}:28034: testing Assume $host_os has font-switching ..." 1>&5
+echo "${as_me-configure}:28058: 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}:28041: testing Assume $host_os has no font-switching ..." 1>&5
+echo "${as_me-configure}:28065: testing Assume $host_os has no font-switching ..." 1>&5
 
 		;;
 	esac
 	if test -z "$SETFONT" ; then
-		{ echo "$as_me:28046: WARNING: Cannot find a font-setting program" >&5
+		{ echo "$as_me:28070: 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
@@ -28053,7 +28077,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:28056: checking if you want cgi-link support" >&5
+echo "$as_me:28080: 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.
@@ -28069,10 +28093,10 @@ EOF
 else
   enableval=no
 fi;
-echo "$as_me:28072: result: $enableval" >&5
+echo "$as_me:28096: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:28075: checking if you want change-exec support" >&5
+echo "$as_me:28099: 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.
@@ -28089,13 +28113,13 @@ else
   use_change_exec=no
 
 fi;
-echo "$as_me:28092: result: $use_change_exec" >&5
+echo "$as_me:28116: 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:28098: checking if you want exec-links support" >&5
+echo "$as_me:28122: 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.
@@ -28112,13 +28136,13 @@ else
   use_exec_links=$enableval
 
 fi;
-echo "$as_me:28115: result: $use_exec_links" >&5
+echo "$as_me:28139: 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:28121: checking if you want exec-scripts support" >&5
+echo "$as_me:28145: 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.
@@ -28135,13 +28159,13 @@ else
   use_exec_scripts=$enableval
 
 fi;
-echo "$as_me:28138: result: $use_exec_scripts" >&5
+echo "$as_me:28162: 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:28144: checking if you want internal-links feature" >&5
+echo "$as_me:28168: 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.
@@ -28158,13 +28182,13 @@ else
   use_internal_links=no
 
 fi;
-echo "$as_me:28161: result: $use_internal_links" >&5
+echo "$as_me:28185: 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:28167: checking if you want to fork NSL requests" >&5
+echo "$as_me:28191: 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.
@@ -28181,7 +28205,7 @@ else
   use_nsl_fork=no
 
 fi;
-echo "$as_me:28184: result: $use_nsl_fork" >&5
+echo "$as_me:28208: result: $use_nsl_fork" >&5
 echo "${ECHO_T}$use_nsl_fork" >&6
 if test $use_nsl_fork = yes ; then
 	case $host_os in
@@ -28200,7 +28224,7 @@ EOF
 	esac
 fi
 
-echo "$as_me:28203: checking if you want to log URL requests via syslog" >&5
+echo "$as_me:28227: 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.
@@ -28217,13 +28241,13 @@ else
   use_syslog=no
 
 fi;
-echo "$as_me:28220: result: $use_syslog" >&5
+echo "$as_me:28244: 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:28226: checking if you want to underline links" >&5
+echo "$as_me:28250: 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.
@@ -28240,7 +28264,7 @@ else
   use_underline=no
 
 fi;
-echo "$as_me:28243: result: $use_underline" >&5
+echo "$as_me:28267: result: $use_underline" >&5
 echo "${ECHO_T}$use_underline" >&6
 test $use_underline = yes && cat >>confdefs.h <<\EOF
 #define UNDERLINE_LINKS 1
@@ -28250,7 +28274,7 @@ test $use_underline = no  && cat >>confdefs.h <<\EOF
 #define UNDERLINE_LINKS 0
 EOF
 
-echo "$as_me:28253: checking if help files should be gzip'ed" >&5
+echo "$as_me:28277: 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.
@@ -28267,10 +28291,10 @@ else
   use_gzip_help=no
 
 fi;
-echo "$as_me:28270: result: $use_gzip_help" >&5
+echo "$as_me:28294: result: $use_gzip_help" >&5
 echo "${ECHO_T}$use_gzip_help" >&6
 
-echo "$as_me:28273: checking if you want to use libbz2 for decompression of some bzip2 files" >&5
+echo "$as_me:28297: 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.
@@ -28280,7 +28304,7 @@ if test "${with_bzlib+set}" = set; then
 else
   use_bzlib=no
 fi;
-echo "$as_me:28283: result: $use_bzlib" >&5
+echo "$as_me:28307: result: $use_bzlib" >&5
 echo "${ECHO_T}$use_bzlib" >&6
 
 if test ".$use_bzlib" != ".no" ; then
@@ -28319,7 +28343,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 28322 "configure"
+#line 28346 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -28331,16 +28355,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28334: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28358: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28337: \$? = $ac_status" >&5
+  echo "$as_me:28361: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28340: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28364: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28343: \$? = $ac_status" >&5
+  echo "$as_me:28367: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -28357,7 +28381,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}:28360: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:28384: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -28398,7 +28422,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 28401 "configure"
+#line 28425 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -28410,16 +28434,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28413: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28437: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28416: \$? = $ac_status" >&5
+  echo "$as_me:28440: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28419: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28443: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28422: \$? = $ac_status" >&5
+  echo "$as_me:28446: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -28436,7 +28460,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}:28439: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:28463: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -28452,7 +28476,7 @@ echo "${as_me-configure}:28439: testing adding $cf_add_incdir to include-path ..
 fi
 
 	else
-{ { echo "$as_me:28455: error: cannot find  under $use_bzlib" >&5
+{ { echo "$as_me:28479: error: cannot find  under $use_bzlib" >&5
 echo "$as_me: error: cannot find  under $use_bzlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -28477,7 +28501,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}:28480: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:28504: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -28506,7 +28530,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}:28509: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:28533: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -28515,7 +28539,7 @@ echo "${as_me-configure}:28509: testing adding $cf_add_libdir to library-path ..
 fi
 
 	else
-{ { echo "$as_me:28518: error: cannot find  under $use_bzlib" >&5
+{ { echo "$as_me:28542: error: cannot find  under $use_bzlib" >&5
 echo "$as_me: error: cannot find  under $use_bzlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -28529,10 +28553,10 @@ done
 cf_cv_header_path_bz2=
 cf_cv_library_path_bz2=
 
-echo "${as_me-configure}:28532: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me-configure}:28556: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 28535 "configure"
+#line 28559 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -28549,16 +28573,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28552: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28576: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28555: \$? = $ac_status" >&5
+  echo "$as_me:28579: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28558: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28582: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28561: \$? = $ac_status" >&5
+  echo "$as_me:28585: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_find_linkage_bz2=yes
 else
@@ -28569,9 +28593,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for bz2 library" 1>&6
 
-echo "${as_me-configure}:28572: testing find linkage for bz2 library ..." 1>&5
+echo "${as_me-configure}:28596: testing find linkage for bz2 library ..." 1>&5
 
-echo "${as_me-configure}:28574: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me-configure}:28598: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -28679,11 +28703,11 @@ cf_search="$cf_header_path_list $cf_search"
       if test -d $cf_cv_header_path_bz2 ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_bz2" 1>&6
 
-echo "${as_me-configure}:28682: testing ... testing $cf_cv_header_path_bz2 ..." 1>&5
+echo "${as_me-configure}:28706: 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 28686 "configure"
+#line 28710 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -28700,21 +28724,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28703: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28727: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28706: \$? = $ac_status" >&5
+  echo "$as_me:28730: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28709: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28733: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28712: \$? = $ac_status" >&5
+  echo "$as_me:28736: \$? = $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}:28717: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5
+echo "${as_me-configure}:28741: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5
 
             cf_cv_find_linkage_bz2=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -28732,7 +28756,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_bz2" = maybe ; then
 
-echo "${as_me-configure}:28735: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me-configure}:28759: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -28740,7 +28764,7 @@ echo "${as_me-configure}:28735: testing Searching for bz2 library in FIND_LINKAG
         CPPFLAGS="$cf_test_CPPFLAGS"
         LIBS="-lbz2  $cf_save_LIBS"
         cat >conftest.$ac_ext <<_ACEOF
-#line 28743 "configure"
+#line 28767 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -28757,21 +28781,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28760: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28784: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28763: \$? = $ac_status" >&5
+  echo "$as_me:28787: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28766: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28790: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28769: \$? = $ac_status" >&5
+  echo "$as_me:28793: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found bz2 library in system" 1>&6
 
-echo "${as_me-configure}:28774: testing ... found bz2 library in system ..." 1>&5
+echo "${as_me-configure}:28798: testing ... found bz2 library in system ..." 1>&5
 
             cf_cv_find_linkage_bz2=yes
 else
@@ -28873,13 +28897,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}:28876: testing ... testing $cf_cv_library_path_bz2 ..." 1>&5
+echo "${as_me-configure}:28900: 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 28882 "configure"
+#line 28906 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -28896,21 +28920,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28899: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28923: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28902: \$? = $ac_status" >&5
+  echo "$as_me:28926: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28905: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28929: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28908: \$? = $ac_status" >&5
+  echo "$as_me:28932: \$? = $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}:28913: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5
+echo "${as_me-configure}:28937: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5
 
                 cf_cv_find_linkage_bz2=yes
                 cf_cv_library_file_bz2="-lbz2"
@@ -28965,7 +28989,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 28968 "configure"
+#line 28992 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -28977,16 +29001,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28980: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29004: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28983: \$? = $ac_status" >&5
+  echo "$as_me:29007: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28986: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29010: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28989: \$? = $ac_status" >&5
+  echo "$as_me:29013: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -29003,7 +29027,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}:29006: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:29030: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -29037,7 +29061,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}:29040: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:29064: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -29048,7 +29072,7 @@ fi
   LIBS="-lbz2 $LIBS"
 
 else
-{ echo "$as_me:29051: WARNING: Cannot find bz2 library" >&5
+{ echo "$as_me:29075: WARNING: Cannot find bz2 library" >&5
 echo "$as_me: WARNING: Cannot find bz2 library" >&2;}
 fi
 
@@ -29058,7 +29082,7 @@ EOF
 
 fi
 
-echo "$as_me:29061: checking if you want to use zlib for decompression of some gzip files" >&5
+echo "$as_me:29085: 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.
@@ -29068,7 +29092,7 @@ if test "${with_zlib+set}" = set; then
 else
   use_zlib=no
 fi;
-echo "$as_me:29071: result: $use_zlib" >&5
+echo "$as_me:29095: result: $use_zlib" >&5
 echo "${ECHO_T}$use_zlib" >&6
 
 if test ".$use_zlib" != ".no" ; then
@@ -29107,7 +29131,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 29110 "configure"
+#line 29134 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -29119,16 +29143,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29122: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29146: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29125: \$? = $ac_status" >&5
+  echo "$as_me:29149: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29128: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29152: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29131: \$? = $ac_status" >&5
+  echo "$as_me:29155: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -29145,7 +29169,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}:29148: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:29172: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -29186,7 +29210,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 29189 "configure"
+#line 29213 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -29198,16 +29222,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29201: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29225: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29204: \$? = $ac_status" >&5
+  echo "$as_me:29228: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29207: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29231: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29210: \$? = $ac_status" >&5
+  echo "$as_me:29234: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -29224,7 +29248,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}:29227: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:29251: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -29240,7 +29264,7 @@ echo "${as_me-configure}:29227: testing adding $cf_add_incdir to include-path ..
 fi
 
 	else
-{ { echo "$as_me:29243: error: cannot find  under $use_zlib" >&5
+{ { echo "$as_me:29267: error: cannot find  under $use_zlib" >&5
 echo "$as_me: error: cannot find  under $use_zlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -29265,7 +29289,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}:29268: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:29292: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -29294,7 +29318,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}:29297: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:29321: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -29303,7 +29327,7 @@ echo "${as_me-configure}:29297: testing adding $cf_add_libdir to library-path ..
 fi
 
 	else
-{ { echo "$as_me:29306: error: cannot find  under $use_zlib" >&5
+{ { echo "$as_me:29330: error: cannot find  under $use_zlib" >&5
 echo "$as_me: error: cannot find  under $use_zlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -29317,10 +29341,10 @@ done
 cf_cv_header_path_z=
 cf_cv_library_path_z=
 
-echo "${as_me-configure}:29320: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me-configure}:29344: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 29323 "configure"
+#line 29347 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -29336,16 +29360,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29339: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29363: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29342: \$? = $ac_status" >&5
+  echo "$as_me:29366: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29345: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29369: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29348: \$? = $ac_status" >&5
+  echo "$as_me:29372: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_find_linkage_z=yes
 else
@@ -29356,9 +29380,9 @@ cat conftest.$ac_ext >&5
 
     test -n "$verbose" && echo "	find linkage for z library" 1>&6
 
-echo "${as_me-configure}:29359: testing find linkage for z library ..." 1>&5
+echo "${as_me-configure}:29383: testing find linkage for z library ..." 1>&5
 
-echo "${as_me-configure}:29361: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me-configure}:29385: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5
 
     cf_save_CPPFLAGS="$CPPFLAGS"
     cf_test_CPPFLAGS="$CPPFLAGS"
@@ -29466,11 +29490,11 @@ cf_search="$cf_header_path_list $cf_search"
       if test -d $cf_cv_header_path_z ; then
         test -n "$verbose" && echo "	... testing $cf_cv_header_path_z" 1>&6
 
-echo "${as_me-configure}:29469: testing ... testing $cf_cv_header_path_z ..." 1>&5
+echo "${as_me-configure}:29493: 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 29473 "configure"
+#line 29497 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -29486,21 +29510,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29489: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29513: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29492: \$? = $ac_status" >&5
+  echo "$as_me:29516: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29495: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29519: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29498: \$? = $ac_status" >&5
+  echo "$as_me:29522: \$? = $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}:29503: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5
+echo "${as_me-configure}:29527: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5
 
             cf_cv_find_linkage_z=maybe
             cf_test_CPPFLAGS="$CPPFLAGS"
@@ -29518,7 +29542,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
     if test "$cf_cv_find_linkage_z" = maybe ; then
 
-echo "${as_me-configure}:29521: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me-configure}:29545: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5
 
       cf_save_LIBS="$LIBS"
       cf_save_LDFLAGS="$LDFLAGS"
@@ -29526,7 +29550,7 @@ echo "${as_me-configure}:29521: testing Searching for z library in FIND_LINKAGE(
         CPPFLAGS="$cf_test_CPPFLAGS"
         LIBS="-lz  $cf_save_LIBS"
         cat >conftest.$ac_ext <<_ACEOF
-#line 29529 "configure"
+#line 29553 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -29542,21 +29566,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29545: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29569: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29548: \$? = $ac_status" >&5
+  echo "$as_me:29572: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29551: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29575: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29554: \$? = $ac_status" >&5
+  echo "$as_me:29578: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
             test -n "$verbose" && echo "	... found z library in system" 1>&6
 
-echo "${as_me-configure}:29559: testing ... found z library in system ..." 1>&5
+echo "${as_me-configure}:29583: testing ... found z library in system ..." 1>&5
 
             cf_cv_find_linkage_z=yes
 else
@@ -29658,13 +29682,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}:29661: testing ... testing $cf_cv_library_path_z ..." 1>&5
+echo "${as_me-configure}:29685: 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 29667 "configure"
+#line 29691 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -29680,21 +29704,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29683: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29707: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29686: \$? = $ac_status" >&5
+  echo "$as_me:29710: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29689: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29713: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29692: \$? = $ac_status" >&5
+  echo "$as_me:29716: \$? = $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}:29697: testing ... found z library in $cf_cv_library_path_z ..." 1>&5
+echo "${as_me-configure}:29721: testing ... found z library in $cf_cv_library_path_z ..." 1>&5
 
                 cf_cv_find_linkage_z=yes
                 cf_cv_library_file_z="-lz"
@@ -29749,7 +29773,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 29752 "configure"
+#line 29776 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -29761,16 +29785,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29764: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29788: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29767: \$? = $ac_status" >&5
+  echo "$as_me:29791: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29770: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29794: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29773: \$? = $ac_status" >&5
+  echo "$as_me:29797: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -29787,7 +29811,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}:29790: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me-configure}:29814: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
 
@@ -29821,7 +29845,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}:29824: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me-configure}:29848: testing adding $cf_add_libdir to library-path ..." 1>&5
 
         LDFLAGS="-L$cf_add_libdir $LDFLAGS"
       fi
@@ -29832,7 +29856,7 @@ fi
   LIBS="-lz $LIBS"
 
 else
-{ echo "$as_me:29835: WARNING: Cannot find z library" >&5
+{ echo "$as_me:29859: WARNING: Cannot find z library" >&5
 echo "$as_me: WARNING: Cannot find z library" >&2;}
 fi
 
@@ -29842,7 +29866,7 @@ EOF
 
 fi
 
-echo "$as_me:29845: checking if you want to exclude FINGER code" >&5
+echo "$as_me:29869: 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.
@@ -29859,13 +29883,13 @@ else
   use_finger=no
 
 fi;
-echo "$as_me:29862: result: $use_finger" >&5
+echo "$as_me:29886: 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:29868: checking if you want to exclude GOPHER code" >&5
+echo "$as_me:29892: 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.
@@ -29882,13 +29906,13 @@ else
   use_gopher=no
 
 fi;
-echo "$as_me:29885: result: $use_gopher" >&5
+echo "$as_me:29909: 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:29891: checking if you want to exclude NEWS code" >&5
+echo "$as_me:29915: 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.
@@ -29905,13 +29929,13 @@ else
   use_news=no
 
 fi;
-echo "$as_me:29908: result: $use_news" >&5
+echo "$as_me:29932: 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:29914: checking if you want to exclude FTP code" >&5
+echo "$as_me:29938: 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.
@@ -29928,7 +29952,7 @@ else
   use_ftp=no
 
 fi;
-echo "$as_me:29931: result: $use_ftp" >&5
+echo "$as_me:29955: result: $use_ftp" >&5
 echo "${ECHO_T}$use_ftp" >&6
 test $use_ftp != "no" && cat >>confdefs.h <<\EOF
 #define DISABLE_FTP 1
@@ -29936,7 +29960,7 @@ EOF
 
 # All DirEd functions that were enabled on compilation can be disabled
 # or modified at run time via DIRED_MENU symbols in lynx.cfg.
-echo "$as_me:29939: checking if directory-editor code should be used" >&5
+echo "$as_me:29963: 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.
@@ -29953,7 +29977,7 @@ else
   use_dired=yes
 
 fi;
-echo "$as_me:29956: result: $use_dired" >&5
+echo "$as_me:29980: result: $use_dired" >&5
 echo "${ECHO_T}$use_dired" >&6
 
 if test ".$use_dired" != ".no" ; then
@@ -29962,7 +29986,7 @@ if test ".$use_dired" != ".no" ; then
 #define DIRED_SUPPORT 1
 EOF
 
-	echo "$as_me:29965: checking if you wish to allow extracting from archives via DirEd" >&5
+	echo "$as_me:29989: 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.
@@ -29978,10 +30002,10 @@ EOF
 else
   enableval=yes
 fi;
-	echo "$as_me:29981: result: $enableval" >&5
+	echo "$as_me:30005: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:29984: checking if DirEd mode should override keys" >&5
+	echo "$as_me:30008: 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.
@@ -30003,10 +30027,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:30006: result: $enableval" >&5
+	echo "$as_me:30030: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:30009: checking if you wish to allow permissions commands via DirEd" >&5
+	echo "$as_me:30033: 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.
@@ -30028,10 +30052,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:30031: result: $enableval" >&5
+	echo "$as_me:30055: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:30034: checking if you wish to allow executable-permission commands via DirEd" >&5
+	echo "$as_me:30058: 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.
@@ -30047,10 +30071,10 @@ EOF
 else
   enableval=yes
 fi;
-	echo "$as_me:30050: result: $enableval" >&5
+	echo "$as_me:30074: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:30053: checking if you wish to allow \"tar\" commands from DirEd" >&5
+	echo "$as_me:30077: 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.
@@ -30072,10 +30096,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:30075: result: $enableval" >&5
+	echo "$as_me:30099: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:30078: checking if you wish to allow \"uudecode\" commands from DirEd" >&5
+	echo "$as_me:30102: 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.
@@ -30097,10 +30121,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:30100: result: $enableval" >&5
+	echo "$as_me:30124: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:30103: checking if you wish to allow \"zip\" and \"unzip\" commands from DirEd" >&5
+	echo "$as_me:30127: 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.
@@ -30122,10 +30146,10 @@ else
 EOF
 
 fi;
-	echo "$as_me:30125: result: $enableval" >&5
+	echo "$as_me:30149: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:30128: checking if you wish to allow \"gzip\" and \"gunzip\" commands from DirEd" >&5
+	echo "$as_me:30152: 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.
@@ -30147,11 +30171,11 @@ else
 EOF
 
 fi;
-	echo "$as_me:30150: result: $enableval" >&5
+	echo "$as_me:30174: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 fi
 
-echo "$as_me:30154: checking if you want long-directory listings" >&5
+echo "$as_me:30178: 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.
@@ -30173,10 +30197,10 @@ else
 EOF
 
 fi;
-echo "$as_me:30176: result: $enableval" >&5
+echo "$as_me:30200: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:30179: checking if parent-directory references are permitted" >&5
+echo "$as_me:30203: 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.
@@ -30192,7 +30216,7 @@ EOF
 else
   enableval=yes
 fi;
-echo "$as_me:30195: result: $enableval" >&5
+echo "$as_me:30219: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 test -z "$TELNET" && TELNET=telnet
@@ -30200,7 +30224,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:30203: checking for $ac_word" >&5
+echo "$as_me:30227: 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
@@ -30217,7 +30241,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:30220: found $ac_dir/$ac_word" >&5
+   echo "$as_me:30244: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -30228,10 +30252,10 @@ fi
 TELNET=$ac_cv_path_TELNET
 
 if test -n "$TELNET"; then
-  echo "$as_me:30231: result: $TELNET" >&5
+  echo "$as_me:30255: result: $TELNET" >&5
 echo "${ECHO_T}$TELNET" >&6
 else
-  echo "$as_me:30234: result: no" >&5
+  echo "$as_me:30258: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -30299,7 +30323,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:30302: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:30326: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define TELNET_PATH "$cf_path_prog"
@@ -30316,7 +30340,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:30319: checking for $ac_word" >&5
+echo "$as_me:30343: 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
@@ -30333,7 +30357,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:30336: found $ac_dir/$ac_word" >&5
+   echo "$as_me:30360: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -30344,10 +30368,10 @@ fi
 TN3270=$ac_cv_path_TN3270
 
 if test -n "$TN3270"; then
-  echo "$as_me:30347: result: $TN3270" >&5
+  echo "$as_me:30371: result: $TN3270" >&5
 echo "${ECHO_T}$TN3270" >&6
 else
-  echo "$as_me:30350: result: no" >&5
+  echo "$as_me:30374: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -30415,7 +30439,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:30418: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:30442: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define TN3270_PATH "$cf_path_prog"
@@ -30432,7 +30456,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:30435: checking for $ac_word" >&5
+echo "$as_me:30459: 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
@@ -30449,7 +30473,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:30452: found $ac_dir/$ac_word" >&5
+   echo "$as_me:30476: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -30460,10 +30484,10 @@ fi
 RLOGIN=$ac_cv_path_RLOGIN
 
 if test -n "$RLOGIN"; then
-  echo "$as_me:30463: result: $RLOGIN" >&5
+  echo "$as_me:30487: result: $RLOGIN" >&5
 echo "${ECHO_T}$RLOGIN" >&6
 else
-  echo "$as_me:30466: result: no" >&5
+  echo "$as_me:30490: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -30531,7 +30555,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:30534: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:30558: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define RLOGIN_PATH "$cf_path_prog"
@@ -30548,7 +30572,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:30551: checking for $ac_word" >&5
+echo "$as_me:30575: 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
@@ -30565,7 +30589,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:30568: found $ac_dir/$ac_word" >&5
+   echo "$as_me:30592: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -30576,10 +30600,10 @@ fi
 MV=$ac_cv_path_MV
 
 if test -n "$MV"; then
-  echo "$as_me:30579: result: $MV" >&5
+  echo "$as_me:30603: result: $MV" >&5
 echo "${ECHO_T}$MV" >&6
 else
-  echo "$as_me:30582: result: no" >&5
+  echo "$as_me:30606: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -30647,7 +30671,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:30650: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:30674: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define MV_PATH "$cf_path_prog"
@@ -30664,7 +30688,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:30667: checking for $ac_word" >&5
+echo "$as_me:30691: 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
@@ -30681,7 +30705,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:30684: found $ac_dir/$ac_word" >&5
+   echo "$as_me:30708: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -30692,10 +30716,10 @@ fi
 GZIP=$ac_cv_path_GZIP
 
 if test -n "$GZIP"; then
-  echo "$as_me:30695: result: $GZIP" >&5
+  echo "$as_me:30719: result: $GZIP" >&5
 echo "${ECHO_T}$GZIP" >&6
 else
-  echo "$as_me:30698: result: no" >&5
+  echo "$as_me:30722: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -30763,7 +30787,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:30766: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:30790: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define GZIP_PATH "$cf_path_prog"
@@ -30780,7 +30804,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:30783: checking for $ac_word" >&5
+echo "$as_me:30807: 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
@@ -30797,7 +30821,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:30800: found $ac_dir/$ac_word" >&5
+   echo "$as_me:30824: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -30808,10 +30832,10 @@ fi
 UNCOMPRESS=$ac_cv_path_UNCOMPRESS
 
 if test -n "$UNCOMPRESS"; then
-  echo "$as_me:30811: result: $UNCOMPRESS" >&5
+  echo "$as_me:30835: result: $UNCOMPRESS" >&5
 echo "${ECHO_T}$UNCOMPRESS" >&6
 else
-  echo "$as_me:30814: result: no" >&5
+  echo "$as_me:30838: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -30879,7 +30903,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:30882: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:30906: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define UNCOMPRESS_PATH "$cf_path_prog"
@@ -30896,7 +30920,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:30899: checking for $ac_word" >&5
+echo "$as_me:30923: 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
@@ -30913,7 +30937,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:30916: found $ac_dir/$ac_word" >&5
+   echo "$as_me:30940: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -30924,10 +30948,10 @@ fi
 UNZIP=$ac_cv_path_UNZIP
 
 if test -n "$UNZIP"; then
-  echo "$as_me:30927: result: $UNZIP" >&5
+  echo "$as_me:30951: result: $UNZIP" >&5
 echo "${ECHO_T}$UNZIP" >&6
 else
-  echo "$as_me:30930: result: no" >&5
+  echo "$as_me:30954: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -30995,7 +31019,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:30998: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:31022: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define UNZIP_PATH "$cf_path_prog"
@@ -31012,7 +31036,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:31015: checking for $ac_word" >&5
+echo "$as_me:31039: 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
@@ -31029,7 +31053,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:31032: found $ac_dir/$ac_word" >&5
+   echo "$as_me:31056: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -31040,10 +31064,10 @@ fi
 BZIP2=$ac_cv_path_BZIP2
 
 if test -n "$BZIP2"; then
-  echo "$as_me:31043: result: $BZIP2" >&5
+  echo "$as_me:31067: result: $BZIP2" >&5
 echo "${ECHO_T}$BZIP2" >&6
 else
-  echo "$as_me:31046: result: no" >&5
+  echo "$as_me:31070: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -31111,7 +31135,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:31114: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:31138: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define BZIP2_PATH "$cf_path_prog"
@@ -31128,7 +31152,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:31131: checking for $ac_word" >&5
+echo "$as_me:31155: 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
@@ -31145,7 +31169,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:31148: found $ac_dir/$ac_word" >&5
+   echo "$as_me:31172: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -31156,10 +31180,10 @@ fi
 TAR=$ac_cv_path_TAR
 
 if test -n "$TAR"; then
-  echo "$as_me:31159: result: $TAR" >&5
+  echo "$as_me:31183: result: $TAR" >&5
 echo "${ECHO_T}$TAR" >&6
 else
-  echo "$as_me:31162: result: no" >&5
+  echo "$as_me:31186: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -31227,7 +31251,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:31230: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:31254: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define TAR_PATH "$cf_path_prog"
@@ -31284,7 +31308,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:31287: checking for $ac_word" >&5
+echo "$as_me:31311: 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
@@ -31301,7 +31325,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:31304: found $ac_dir/$ac_word" >&5
+   echo "$as_me:31328: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -31312,10 +31336,10 @@ fi
 COMPRESS=$ac_cv_path_COMPRESS
 
 if test -n "$COMPRESS"; then
-  echo "$as_me:31315: result: $COMPRESS" >&5
+  echo "$as_me:31339: result: $COMPRESS" >&5
 echo "${ECHO_T}$COMPRESS" >&6
 else
-  echo "$as_me:31318: result: no" >&5
+  echo "$as_me:31342: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -31383,7 +31407,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:31386: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:31410: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define COMPRESS_PATH "$cf_path_prog"
@@ -31400,7 +31424,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:31403: checking for $ac_word" >&5
+echo "$as_me:31427: 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
@@ -31417,7 +31441,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:31420: found $ac_dir/$ac_word" >&5
+   echo "$as_me:31444: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -31428,10 +31452,10 @@ fi
 RM=$ac_cv_path_RM
 
 if test -n "$RM"; then
-  echo "$as_me:31431: result: $RM" >&5
+  echo "$as_me:31455: result: $RM" >&5
 echo "${ECHO_T}$RM" >&6
 else
-  echo "$as_me:31434: result: no" >&5
+  echo "$as_me:31458: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -31499,7 +31523,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:31502: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:31526: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define RM_PATH "$cf_path_prog"
@@ -31516,7 +31540,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:31519: checking for $ac_word" >&5
+echo "$as_me:31543: 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
@@ -31533,7 +31557,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:31536: found $ac_dir/$ac_word" >&5
+   echo "$as_me:31560: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -31544,10 +31568,10 @@ fi
 UUDECODE=$ac_cv_path_UUDECODE
 
 if test -n "$UUDECODE"; then
-  echo "$as_me:31547: result: $UUDECODE" >&5
+  echo "$as_me:31571: result: $UUDECODE" >&5
 echo "${ECHO_T}$UUDECODE" >&6
 else
-  echo "$as_me:31550: result: no" >&5
+  echo "$as_me:31574: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -31615,7 +31639,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:31618: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:31642: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define UUDECODE_PATH "$cf_path_prog"
@@ -31632,7 +31656,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:31635: checking for $ac_word" >&5
+echo "$as_me:31659: 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
@@ -31649,7 +31673,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:31652: found $ac_dir/$ac_word" >&5
+   echo "$as_me:31676: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -31660,10 +31684,10 @@ fi
 ZCAT=$ac_cv_path_ZCAT
 
 if test -n "$ZCAT"; then
-  echo "$as_me:31663: result: $ZCAT" >&5
+  echo "$as_me:31687: result: $ZCAT" >&5
 echo "${ECHO_T}$ZCAT" >&6
 else
-  echo "$as_me:31666: result: no" >&5
+  echo "$as_me:31690: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -31731,7 +31755,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:31734: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:31758: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define ZCAT_PATH "$cf_path_prog"
@@ -31748,7 +31772,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:31751: checking for $ac_word" >&5
+echo "$as_me:31775: 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
@@ -31765,7 +31789,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:31768: found $ac_dir/$ac_word" >&5
+   echo "$as_me:31792: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -31776,10 +31800,10 @@ fi
 ZIP=$ac_cv_path_ZIP
 
 if test -n "$ZIP"; then
-  echo "$as_me:31779: result: $ZIP" >&5
+  echo "$as_me:31803: result: $ZIP" >&5
 echo "${ECHO_T}$ZIP" >&6
 else
-  echo "$as_me:31782: result: no" >&5
+  echo "$as_me:31806: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -31847,7 +31871,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:31850: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:31874: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define ZIP_PATH "$cf_path_prog"
@@ -31874,7 +31898,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:31877: checking for $ac_word" >&5
+echo "$as_me:31901: 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
@@ -31891,7 +31915,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:31894: found $ac_dir/$ac_word" >&5
+   echo "$as_me:31918: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -31902,10 +31926,10 @@ fi
 INSTALL=$ac_cv_path_INSTALL
 
 if test -n "$INSTALL"; then
-  echo "$as_me:31905: result: $INSTALL" >&5
+  echo "$as_me:31929: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 else
-  echo "$as_me:31908: result: no" >&5
+  echo "$as_me:31932: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -31973,7 +31997,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me-configure}:31976: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me-configure}:32000: testing defining path for ${cf_path_prog} ..." 1>&5
 
 	cat >>confdefs.h <<EOF
 #define INSTALL_PATH "$cf_path_prog"
@@ -31999,7 +32023,7 @@ fi
 
 if test $cf_cv_screen = pdcurses ; then
 
-	echo "$as_me:32002: checking for X" >&5
+	echo "$as_me:32026: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -32096,17 +32120,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 32099 "configure"
+#line 32123 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:32103: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:32127: \"$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:32109: \$? = $ac_status" >&5
+  echo "$as_me:32133: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -32139,7 +32163,7 @@ if test "$ac_x_libraries" = no; then
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >conftest.$ac_ext <<_ACEOF
-#line 32142 "configure"
+#line 32166 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -32151,16 +32175,16 @@ XtMalloc (0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32154: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32178: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32157: \$? = $ac_status" >&5
+  echo "$as_me:32181: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32160: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32184: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32163: \$? = $ac_status" >&5
+  echo "$as_me:32187: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -32198,7 +32222,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:32201: result: $have_x" >&5
+  echo "$as_me:32225: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -32208,7 +32232,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:32211: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:32235: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -32232,11 +32256,11 @@ else
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:32235: checking whether -R must be followed by a space" >&5
+      echo "$as_me:32259: 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 32239 "configure"
+#line 32263 "configure"
 #include "confdefs.h"
 
 int
@@ -32248,16 +32272,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32251: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32275: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32254: \$? = $ac_status" >&5
+  echo "$as_me:32278: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32257: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32281: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32260: \$? = $ac_status" >&5
+  echo "$as_me:32284: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_nospace=yes
 else
@@ -32267,13 +32291,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:32270: result: no" >&5
+	echo "$as_me:32294: 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 32276 "configure"
+#line 32300 "configure"
 #include "confdefs.h"
 
 int
@@ -32285,16 +32309,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32288: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32312: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32291: \$? = $ac_status" >&5
+  echo "$as_me:32315: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32294: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32318: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32297: \$? = $ac_status" >&5
+  echo "$as_me:32321: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_space=yes
 else
@@ -32304,11 +32328,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:32307: result: yes" >&5
+	  echo "$as_me:32331: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:32311: result: neither works" >&5
+	  echo "$as_me:32335: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -32328,7 +32352,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 32331 "configure"
+#line 32355 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -32347,22 +32371,22 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32350: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32374: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32353: \$? = $ac_status" >&5
+  echo "$as_me:32377: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32356: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32380: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32359: \$? = $ac_status" >&5
+  echo "$as_me:32383: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:32365: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:32389: 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
@@ -32370,7 +32394,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 32373 "configure"
+#line 32397 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -32389,16 +32413,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32392: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32416: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32395: \$? = $ac_status" >&5
+  echo "$as_me:32419: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32398: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32422: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32401: \$? = $ac_status" >&5
+  echo "$as_me:32425: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -32409,14 +32433,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:32412: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:32436: 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:32419: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:32443: 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
@@ -32424,7 +32448,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 32427 "configure"
+#line 32451 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -32443,16 +32467,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32446: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32470: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32449: \$? = $ac_status" >&5
+  echo "$as_me:32473: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32452: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32476: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32455: \$? = $ac_status" >&5
+  echo "$as_me:32479: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -32463,7 +32487,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:32466: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:32490: 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"
@@ -32482,13 +32506,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:32485: checking for gethostbyname" >&5
+    echo "$as_me:32509: 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 32491 "configure"
+#line 32515 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname (); below.  */
@@ -32519,16 +32543,16 @@ f = gethostbyname;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32522: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32546: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32525: \$? = $ac_status" >&5
+  echo "$as_me:32549: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32528: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32552: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32531: \$? = $ac_status" >&5
+  echo "$as_me:32555: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -32538,11 +32562,11 @@ ac_cv_func_gethostbyname=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:32541: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:32565: 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:32545: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:32569: 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
@@ -32550,7 +32574,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 32553 "configure"
+#line 32577 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -32569,16 +32593,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32572: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32596: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32575: \$? = $ac_status" >&5
+  echo "$as_me:32599: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32578: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32602: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32581: \$? = $ac_status" >&5
+  echo "$as_me:32605: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -32589,14 +32613,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:32592: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:32616: 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:32599: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:32623: 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
@@ -32604,7 +32628,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 32607 "configure"
+#line 32631 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -32623,16 +32647,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32626: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32650: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32629: \$? = $ac_status" >&5
+  echo "$as_me:32653: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32632: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32656: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32635: \$? = $ac_status" >&5
+  echo "$as_me:32659: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -32643,7 +32667,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:32646: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:32670: 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"
@@ -32659,13 +32683,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:32662: checking for connect" >&5
+    echo "$as_me:32686: 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 32668 "configure"
+#line 32692 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect (); below.  */
@@ -32696,16 +32720,16 @@ f = connect;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32699: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32723: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32702: \$? = $ac_status" >&5
+  echo "$as_me:32726: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32705: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32729: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32708: \$? = $ac_status" >&5
+  echo "$as_me:32732: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_connect=yes
 else
@@ -32715,11 +32739,11 @@ ac_cv_func_connect=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:32718: result: $ac_cv_func_connect" >&5
+echo "$as_me:32742: 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:32722: checking for connect in -lsocket" >&5
+      echo "$as_me:32746: 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
@@ -32727,7 +32751,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 32730 "configure"
+#line 32754 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -32746,16 +32770,16 @@ connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32749: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32773: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32752: \$? = $ac_status" >&5
+  echo "$as_me:32776: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32755: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32779: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32758: \$? = $ac_status" >&5
+  echo "$as_me:32782: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -32766,7 +32790,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:32769: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:32793: 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"
@@ -32775,13 +32799,13 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:32778: checking for remove" >&5
+    echo "$as_me:32802: 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 32784 "configure"
+#line 32808 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove (); below.  */
@@ -32812,16 +32836,16 @@ f = remove;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32815: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32839: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32818: \$? = $ac_status" >&5
+  echo "$as_me:32842: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32821: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32845: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32824: \$? = $ac_status" >&5
+  echo "$as_me:32848: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_remove=yes
 else
@@ -32831,11 +32855,11 @@ ac_cv_func_remove=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:32834: result: $ac_cv_func_remove" >&5
+echo "$as_me:32858: 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:32838: checking for remove in -lposix" >&5
+      echo "$as_me:32862: 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
@@ -32843,7 +32867,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 32846 "configure"
+#line 32870 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -32862,16 +32886,16 @@ remove ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32865: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32889: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32868: \$? = $ac_status" >&5
+  echo "$as_me:32892: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32871: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32895: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32874: \$? = $ac_status" >&5
+  echo "$as_me:32898: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -32882,7 +32906,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:32885: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:32909: 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"
@@ -32891,13 +32915,13 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:32894: checking for shmat" >&5
+    echo "$as_me:32918: 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 32900 "configure"
+#line 32924 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat (); below.  */
@@ -32928,16 +32952,16 @@ f = shmat;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32931: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32955: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32934: \$? = $ac_status" >&5
+  echo "$as_me:32958: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32937: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32961: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32940: \$? = $ac_status" >&5
+  echo "$as_me:32964: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -32947,11 +32971,11 @@ ac_cv_func_shmat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:32950: result: $ac_cv_func_shmat" >&5
+echo "$as_me:32974: 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:32954: checking for shmat in -lipc" >&5
+      echo "$as_me:32978: 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
@@ -32959,7 +32983,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 32962 "configure"
+#line 32986 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -32978,16 +33002,16 @@ shmat ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32981: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33005: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32984: \$? = $ac_status" >&5
+  echo "$as_me:33008: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32987: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33011: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32990: \$? = $ac_status" >&5
+  echo "$as_me:33014: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -32998,7 +33022,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:33001: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:33025: 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"
@@ -33016,7 +33040,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:33019: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:33043: 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
@@ -33024,7 +33048,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 33027 "configure"
+#line 33051 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -33043,16 +33067,16 @@ IceConnectionNumber ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33046: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33070: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33049: \$? = $ac_status" >&5
+  echo "$as_me:33073: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33052: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33076: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33055: \$? = $ac_status" >&5
+  echo "$as_me:33079: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -33063,7 +33087,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:33066: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:33090: 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"
@@ -33081,7 +33105,7 @@ LDFLAGS="$X_LIBS $LDFLAGS"
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me-configure}:33084: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me-configure}:33108: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -33142,7 +33166,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}:33145: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me-configure}:33169: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	CFLAGS="$CFLAGS $cf_new_cflags"
 fi
@@ -33150,7 +33174,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}:33153: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me-configure}:33177: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
 fi
@@ -33158,14 +33182,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}:33161: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me-configure}:33185: 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 33168 "configure"
+#line 33192 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -33177,16 +33201,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33180: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33204: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33183: \$? = $ac_status" >&5
+  echo "$as_me:33207: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33186: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33210: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33189: \$? = $ac_status" >&5
+  echo "$as_me:33213: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -33194,12 +33218,12 @@ else
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me-configure}:33197: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me-configure}:33221: 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}:33202: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me-configure}:33226: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_flags"
@@ -33207,13 +33231,13 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:33210: checking for XOpenDisplay" >&5
+echo "$as_me:33234: 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 33216 "configure"
+#line 33240 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char XOpenDisplay (); below.  */
@@ -33244,16 +33268,16 @@ f = XOpenDisplay;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33247: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33271: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33250: \$? = $ac_status" >&5
+  echo "$as_me:33274: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33253: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33277: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33256: \$? = $ac_status" >&5
+  echo "$as_me:33280: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_XOpenDisplay=yes
 else
@@ -33263,13 +33287,13 @@ ac_cv_func_XOpenDisplay=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:33266: result: $ac_cv_func_XOpenDisplay" >&5
+echo "$as_me:33290: 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:33272: checking for XOpenDisplay in -lX11" >&5
+echo "$as_me:33296: 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
@@ -33277,7 +33301,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 33280 "configure"
+#line 33304 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -33296,16 +33320,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33299: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33323: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33302: \$? = $ac_status" >&5
+  echo "$as_me:33326: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33305: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33329: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33308: \$? = $ac_status" >&5
+  echo "$as_me:33332: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -33316,7 +33340,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:33319: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:33343: 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"
@@ -33324,13 +33348,13 @@ fi
 
 fi
 
-echo "$as_me:33327: checking for XtAppInitialize" >&5
+echo "$as_me:33351: 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 33333 "configure"
+#line 33357 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char XtAppInitialize (); below.  */
@@ -33361,16 +33385,16 @@ f = XtAppInitialize;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33364: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33388: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33367: \$? = $ac_status" >&5
+  echo "$as_me:33391: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33370: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33394: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33373: \$? = $ac_status" >&5
+  echo "$as_me:33397: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_XtAppInitialize=yes
 else
@@ -33380,13 +33404,13 @@ ac_cv_func_XtAppInitialize=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:33383: result: $ac_cv_func_XtAppInitialize" >&5
+echo "$as_me:33407: 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:33389: checking for XtAppInitialize in -lXt" >&5
+echo "$as_me:33413: 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
@@ -33394,7 +33418,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 33397 "configure"
+#line 33421 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -33413,16 +33437,16 @@ XtAppInitialize ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33416: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33440: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33419: \$? = $ac_status" >&5
+  echo "$as_me:33443: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33422: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33446: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33425: \$? = $ac_status" >&5
+  echo "$as_me:33449: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xt_XtAppInitialize=yes
 else
@@ -33433,7 +33457,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:33436: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "$as_me:33460: 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
@@ -33447,7 +33471,7 @@ fi
 fi
 
 if test $cf_have_X_LIBS = no ; then
-	{ echo "$as_me:33450: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+	{ echo "$as_me:33474: 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
@@ -33457,7 +33481,7 @@ fi
 
 cf_x_athena=${cf_x_athena-Xaw}
 
-echo "$as_me:33460: checking if you want to link with Xaw 3d library" >&5
+echo "$as_me:33484: 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=
 
@@ -33468,14 +33492,14 @@ if test "${with_Xaw3d+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3d
-	echo "$as_me:33471: result: yes" >&5
+	echo "$as_me:33495: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:33474: result: no" >&5
+	echo "$as_me:33498: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:33478: checking if you want to link with neXT Athena library" >&5
+echo "$as_me:33502: 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=
 
@@ -33486,14 +33510,14 @@ if test "${with_neXtaw+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=neXtaw
-	echo "$as_me:33489: result: yes" >&5
+	echo "$as_me:33513: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:33492: result: no" >&5
+	echo "$as_me:33516: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:33496: checking if you want to link with Athena-Plus library" >&5
+echo "$as_me:33520: 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=
 
@@ -33504,14 +33528,14 @@ if test "${with_XawPlus+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=XawPlus
-	echo "$as_me:33507: result: yes" >&5
+	echo "$as_me:33531: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:33510: result: no" >&5
+	echo "$as_me:33534: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:33514: checking for XextCreateExtension in -lXext" >&5
+echo "$as_me:33538: 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
@@ -33519,7 +33543,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 33522 "configure"
+#line 33546 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -33538,16 +33562,16 @@ XextCreateExtension ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33541: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33565: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33544: \$? = $ac_status" >&5
+  echo "$as_me:33568: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33547: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33571: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33550: \$? = $ac_status" >&5
+  echo "$as_me:33574: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
@@ -33558,7 +33582,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:33561: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:33585: 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"
@@ -33580,14 +33604,14 @@ do
 		cf_test=X11/$cf_x_athena_root/SimpleMenu.h
 		if test $cf_path != default ; then
 			CPPFLAGS="-I$cf_path/include $cf_save"
-			echo "$as_me:33583: checking for $cf_test in $cf_path" >&5
+			echo "$as_me:33607: 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:33586: checking for $cf_test" >&5
+			echo "$as_me:33610: checking for $cf_test" >&5
 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
 		fi
 		cat >conftest.$ac_ext <<_ACEOF
-#line 33590 "configure"
+#line 33614 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -33601,16 +33625,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33604: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33628: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33607: \$? = $ac_status" >&5
+  echo "$as_me:33631: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33610: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33634: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33613: \$? = $ac_status" >&5
+  echo "$as_me:33637: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -33619,7 +33643,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-		echo "$as_me:33622: result: $cf_result" >&5
+		echo "$as_me:33646: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 		if test "$cf_result" = yes ; then
 			cf_x_athena_include=$cf_path
@@ -33631,7 +33655,7 @@ echo "${ECHO_T}$cf_result" >&6
 done
 
 if test -z "$cf_x_athena_include" ; then
-	{ echo "$as_me:33634: WARNING: Unable to successfully find Athena header files with test program" >&5
+	{ echo "$as_me:33658: WARNING: Unable to successfully find Athena header files with test program" >&5
 echo "$as_me: WARNING: Unable to successfully find Athena header files with test program" >&2;}
 elif test "$cf_x_athena_include" != default ; then
 	CPPFLAGS="$CPPFLAGS -I$cf_x_athena_include"
@@ -33656,15 +33680,15 @@ do
 			cf_test=XawSimpleMenuAddGlobalActions
 			if test $cf_path != default ; then
 				LIBS="-L$cf_path/lib $cf_lib $LIBS"
-				echo "$as_me:33659: checking for $cf_lib in $cf_path" >&5
+				echo "$as_me:33683: 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:33663: checking for $cf_test in $cf_lib" >&5
+				echo "$as_me:33687: 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 33667 "configure"
+#line 33691 "configure"
 #include "confdefs.h"
 
 int
@@ -33676,16 +33700,16 @@ $cf_test()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33679: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33703: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33682: \$? = $ac_status" >&5
+  echo "$as_me:33706: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33685: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33709: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33688: \$? = $ac_status" >&5
+  echo "$as_me:33712: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -33694,7 +33718,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-			echo "$as_me:33697: result: $cf_result" >&5
+			echo "$as_me:33721: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				cf_x_athena_lib="$cf_lib"
@@ -33706,7 +33730,7 @@ echo "${ECHO_T}$cf_result" >&6
 done
 
 if test -z "$cf_x_athena_lib" ; then
-	{ { echo "$as_me:33709: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+	{ { echo "$as_me:33733: 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
@@ -33721,7 +33745,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:33724: checking for $ac_word" >&5
+echo "$as_me:33748: 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
@@ -33738,7 +33762,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:33741: found $ac_dir/$ac_word" >&5
+   echo "$as_me:33765: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -33749,10 +33773,10 @@ fi
 XCURSES_CONFIG=$ac_cv_path_XCURSES_CONFIG
 
 if test -n "$XCURSES_CONFIG"; then
-  echo "$as_me:33752: result: $XCURSES_CONFIG" >&5
+  echo "$as_me:33776: result: $XCURSES_CONFIG" >&5
 echo "${ECHO_T}$XCURSES_CONFIG" >&6
 else
-  echo "$as_me:33755: result: no" >&5
+  echo "$as_me:33779: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -33773,7 +33797,7 @@ LDFLAGS="$LDFLAGS $X_LIBS"
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me-configure}:33776: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me-configure}:33800: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -33834,7 +33858,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}:33837: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me-configure}:33861: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
 
 	CFLAGS="$CFLAGS $cf_new_cflags"
 fi
@@ -33842,7 +33866,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}:33845: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me-configure}:33869: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
 
 	CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
 fi
@@ -33850,14 +33874,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}:33853: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me-configure}:33877: 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 33860 "configure"
+#line 33884 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -33869,16 +33893,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33872: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33896: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33875: \$? = $ac_status" >&5
+  echo "$as_me:33899: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33878: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33902: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33881: \$? = $ac_status" >&5
+  echo "$as_me:33905: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -33886,12 +33910,12 @@ else
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me-configure}:33889: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me-configure}:33913: 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}:33894: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me-configure}:33918: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_flags"
@@ -33899,7 +33923,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:33902: checking for XOpenDisplay in -lX11" >&5
+echo "$as_me:33926: 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
@@ -33907,7 +33931,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 33910 "configure"
+#line 33934 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -33926,16 +33950,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33929: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33953: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33932: \$? = $ac_status" >&5
+  echo "$as_me:33956: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33935: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33959: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33938: \$? = $ac_status" >&5
+  echo "$as_me:33962: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -33946,13 +33970,13 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:33949: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:33973: 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:33955: checking for XCurses library" >&5
+echo "$as_me:33979: 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
@@ -33960,7 +33984,7 @@ else
 
 LIBS="-lXCurses $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 33963 "configure"
+#line 33987 "configure"
 #include "confdefs.h"
 
 #include <xcurses.h>
@@ -33975,16 +33999,16 @@ XCursesExit();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33978: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34002: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33981: \$? = $ac_status" >&5
+  echo "$as_me:34005: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33984: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34008: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33987: \$? = $ac_status" >&5
+  echo "$as_me:34011: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_lib_XCurses=yes
 else
@@ -33995,7 +34019,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:33998: result: $cf_cv_lib_XCurses" >&5
+echo "$as_me:34022: result: $cf_cv_lib_XCurses" >&5
 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
 
 fi
@@ -34014,14 +34038,14 @@ EOF
 EOF
 
 else
-	{ { echo "$as_me:34017: error: Cannot link with XCurses" >&5
+	{ { echo "$as_me:34041: error: Cannot link with XCurses" >&5
 echo "$as_me: error: Cannot link with XCurses" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 else
 
-echo "$as_me:34024: checking if we can include termio.h with curses" >&5
+echo "$as_me:34048: 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
@@ -34031,7 +34055,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 34034 "configure"
+#line 34058 "configure"
 #include "confdefs.h"
 
 #include <LYCurses.h>
@@ -34045,16 +34069,16 @@ putchar(0x0a)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34048: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34072: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34051: \$? = $ac_status" >&5
+  echo "$as_me:34075: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:34054: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34078: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34057: \$? = $ac_status" >&5
+  echo "$as_me:34081: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termio_and_curses=yes
 else
@@ -34067,7 +34091,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
     rm -f lynx_cfg.h
 
 fi
-echo "$as_me:34070: result: $cf_cv_termio_and_curses" >&5
+echo "$as_me:34094: 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
@@ -34082,23 +34106,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:34085: checking for $ac_header" >&5
+echo "$as_me:34109: 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 34091 "configure"
+#line 34115 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:34095: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:34119: \"$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:34101: \$? = $ac_status" >&5
+  echo "$as_me:34125: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -34117,7 +34141,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:34120: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:34144: 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
@@ -34127,7 +34151,7 @@ EOF
 fi
 done
 
-echo "$as_me:34130: checking if curses supports alternate-character set" >&5
+echo "$as_me:34154: 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
@@ -34136,7 +34160,7 @@ else
 for mapname in acs_map _acs_map
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 34139 "configure"
+#line 34163 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -34150,16 +34174,16 @@ chtype x = $mapname['l']; $mapname['m'] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34153: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34177: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34156: \$? = $ac_status" >&5
+  echo "$as_me:34180: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:34159: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34183: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34162: \$? = $ac_status" >&5
+  echo "$as_me:34186: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_alt_char_set=$mapname
 	 break
@@ -34173,20 +34197,20 @@ done
 
 fi
 
-echo "$as_me:34176: result: $cf_cv_alt_char_set" >&5
+echo "$as_me:34200: 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:34182: checking if curses supports fancy attributes" >&5
+echo "$as_me:34206: 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 34189 "configure"
+#line 34213 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -34204,16 +34228,16 @@ attrset(A_UNDERLINE|A_BOLD|A_REVERSE);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34207: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34231: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34210: \$? = $ac_status" >&5
+  echo "$as_me:34234: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:34213: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34237: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34216: \$? = $ac_status" >&5
+  echo "$as_me:34240: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fancy_curses=yes
 else
@@ -34225,13 +34249,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:34228: result: $cf_cv_fancy_curses" >&5
+echo "$as_me:34252: 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:34234: checking for function curses_version" >&5
+echo "$as_me:34258: 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
@@ -34241,7 +34265,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_curses_version=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 34244 "configure"
+#line 34268 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -34254,15 +34278,15 @@ int main()
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:34257: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34281: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34260: \$? = $ac_status" >&5
+  echo "$as_me:34284: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:34262: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34286: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34265: \$? = $ac_status" >&5
+  echo "$as_me:34289: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_func_curses_version=yes
 
@@ -34277,21 +34301,21 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core
 fi
-echo "$as_me:34280: result: $cf_cv_func_curses_version" >&5
+echo "$as_me:34304: 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:34287: checking for obsolete/broken version of ncurses" >&5
+echo "$as_me:34311: 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 34294 "configure"
+#line 34318 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -34310,16 +34334,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34313: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34337: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34316: \$? = $ac_status" >&5
+  echo "$as_me:34340: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:34319: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34343: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34322: \$? = $ac_status" >&5
+  echo "$as_me:34346: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_broken=no
 else
@@ -34331,10 +34355,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:34334: result: $cf_cv_ncurses_broken" >&5
+echo "$as_me:34358: 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:34337: WARNING: hmm... you should get an up-to-date version of ncurses" >&5
+	{ echo "$as_me:34361: 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
@@ -34343,14 +34367,14 @@ EOF
 fi
 fi
 
-echo "$as_me:34346: checking if curses supports color attributes" >&5
+echo "$as_me:34370: 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 34353 "configure"
+#line 34377 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -34370,16 +34394,16 @@ chtype x = COLOR_BLUE;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34373: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34397: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34376: \$? = $ac_status" >&5
+  echo "$as_me:34400: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:34379: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34403: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34382: \$? = $ac_status" >&5
+  echo "$as_me:34406: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_color_curses=yes
 else
@@ -34391,7 +34415,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:34394: result: $cf_cv_color_curses" >&5
+echo "$as_me:34418: 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
@@ -34411,23 +34435,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:34414: checking for $ac_header" >&5
+echo "$as_me:34438: 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 34420 "configure"
+#line 34444 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:34424: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:34448: \"$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:34430: \$? = $ac_status" >&5
+  echo "$as_me:34454: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -34446,7 +34470,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:34449: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:34473: 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
@@ -34461,23 +34485,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:34464: checking for $ac_header" >&5
+echo "$as_me:34488: 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 34470 "configure"
+#line 34494 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:34474: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:34498: \"$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:34480: \$? = $ac_status" >&5
+  echo "$as_me:34504: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -34496,7 +34520,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:34499: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:34523: 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
@@ -34514,10 +34538,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:34517: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:34541: 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 34520 "configure"
+#line 34544 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -34529,16 +34553,16 @@ struct termios foo; int x = foo.c_iflag
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34532: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34556: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34535: \$? = $ac_status" >&5
+  echo "$as_me:34559: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:34538: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34562: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34541: \$? = $ac_status" >&5
+  echo "$as_me:34565: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   termios_bad=no
 else
@@ -34546,7 +34570,7 @@ else
 cat conftest.$ac_ext >&5
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 34549 "configure"
+#line 34573 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -34560,16 +34584,16 @@ struct termios foo; int x = foo.c_iflag
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34563: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34587: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34566: \$? = $ac_status" >&5
+  echo "$as_me:34590: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:34569: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34593: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34572: \$? = $ac_status" >&5
+  echo "$as_me:34596: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   termios_bad=unknown
 else
@@ -34584,12 +34608,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-	echo "$as_me:34587: result: $termios_bad" >&5
+	echo "$as_me:34611: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:34592: checking declaration of size-change" >&5
+echo "$as_me:34616: 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
@@ -34604,7 +34628,7 @@ do
     CPPFLAGS="$cf_save_CPPFLAGS"
     test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
     cat >conftest.$ac_ext <<_ACEOF
-#line 34607 "configure"
+#line 34631 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -34648,16 +34672,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34651: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34675: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34654: \$? = $ac_status" >&5
+  echo "$as_me:34678: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:34657: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34681: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34660: \$? = $ac_status" >&5
+  echo "$as_me:34684: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_sizechange=yes
 else
@@ -34676,7 +34700,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:34679: result: $cf_cv_sizechange" >&5
+echo "$as_me:34703: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 	cat >>confdefs.h <<\EOF
@@ -34693,14 +34717,14 @@ EOF
 	esac
 fi
 
-echo "$as_me:34696: checking if ttytype is declared in curses library" >&5
+echo "$as_me:34720: 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 34703 "configure"
+#line 34727 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header-curses.h}>
 int
@@ -34712,16 +34736,16 @@ char *x = &ttytype[1]; *x = 1
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34715: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34739: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34718: \$? = $ac_status" >&5
+  echo "$as_me:34742: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:34721: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34745: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34724: \$? = $ac_status" >&5
+  echo "$as_me:34748: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_ttytype=yes
 else
@@ -34733,7 +34757,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:34736: result: $cf_cv_have_ttytype" >&5
+echo "$as_me:34760: 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
@@ -34741,14 +34765,14 @@ EOF
 
 	if test "$use_wide_curses" = yes ; then
 
-echo "$as_me:34744: checking if curses supports wide characters" >&5
+echo "$as_me:34768: 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 34751 "configure"
+#line 34775 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -34767,16 +34791,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34770: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34794: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34773: \$? = $ac_status" >&5
+  echo "$as_me:34797: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:34776: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34800: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34779: \$? = $ac_status" >&5
+  echo "$as_me:34803: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_widec_curses=yes
 else
@@ -34787,7 +34811,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:34790: result: $cf_cv_widec_curses" >&5
+echo "$as_me:34814: result: $cf_cv_widec_curses" >&5
 echo "${ECHO_T}$cf_cv_widec_curses" >&6
 
 if test "$cf_cv_widec_curses" = yes ; then
@@ -34796,14 +34820,14 @@ if test "$cf_cv_widec_curses" = yes ; then
 EOF
 
 	# This is needed on Tru64 5.0 to declare mbstate_t
-	echo "$as_me:34799: checking if we must include wchar.h to declare mbstate_t" >&5
+	echo "$as_me:34823: 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 34806 "configure"
+#line 34830 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -34817,23 +34841,23 @@ mbstate_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34820: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34844: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34823: \$? = $ac_status" >&5
+  echo "$as_me:34847: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:34826: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34850: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34829: \$? = $ac_status" >&5
+  echo "$as_me:34853: \$? = $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 34836 "configure"
+#line 34860 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -34848,16 +34872,16 @@ mbstate_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34851: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34875: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34854: \$? = $ac_status" >&5
+  echo "$as_me:34878: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:34857: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34881: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34860: \$? = $ac_status" >&5
+  echo "$as_me:34884: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_widec_mbstate=yes
 else
@@ -34869,7 +34893,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:34872: result: $cf_cv_widec_mbstate" >&5
+echo "$as_me:34896: result: $cf_cv_widec_mbstate" >&5
 echo "${ECHO_T}$cf_cv_widec_mbstate" >&6
 
 if test "$cf_cv_widec_mbstate" = yes ; then
@@ -34890,14 +34914,14 @@ fi
 
 	fi
 
-echo "$as_me:34893: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
+echo "$as_me:34917: 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 34900 "configure"
+#line 34924 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -34914,23 +34938,23 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34917: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34941: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34920: \$? = $ac_status" >&5
+  echo "$as_me:34944: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:34923: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34947: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34926: \$? = $ac_status" >&5
+  echo "$as_me:34950: \$? = $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 34933 "configure"
+#line 34957 "configure"
 #include "confdefs.h"
 
 #define _XOPEN_SOURCE_EXTENDED
@@ -34948,16 +34972,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34951: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34975: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34954: \$? = $ac_status" >&5
+  echo "$as_me:34978: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:34957: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34981: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34960: \$? = $ac_status" >&5
+  echo "$as_me:34984: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_xopen_extension=yes
 else
@@ -34969,11 +34993,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:34972: result: $cf_cv_need_xopen_extension" >&5
+echo "$as_me:34996: 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:34976: checking for term.h" >&5
+echo "$as_me:35000: 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
@@ -34986,7 +35010,7 @@ for cf_header in \
 	term.h
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 34989 "configure"
+#line 35013 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header-curses.h}>
@@ -35000,16 +35024,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:35003: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35027: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35006: \$? = $ac_status" >&5
+  echo "$as_me:35030: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:35009: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35033: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35012: \$? = $ac_status" >&5
+  echo "$as_me:35036: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_term_header=$cf_header
 	 break
@@ -35022,7 +35046,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:35025: result: $cf_cv_term_header" >&5
+echo "$as_me:35049: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 case $cf_cv_term_header in #(vi
@@ -35073,10 +35097,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:35076: checking for ${cf_func}" >&5
+	echo "$as_me:35100: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me-configure}:35079: testing ${cf_func} ..." 1>&5
+echo "${as_me-configure}:35103: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -35085,7 +35109,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >conftest.$ac_ext <<_ACEOF
-#line 35088 "configure"
+#line 35112 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -35119,16 +35143,16 @@ ${cf_cv_main_return-return}(foo == 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35122: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35146: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35125: \$? = $ac_status" >&5
+  echo "$as_me:35149: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35128: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35152: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35131: \$? = $ac_status" >&5
+  echo "$as_me:35155: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -35144,7 +35168,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:35147: result: $cf_result" >&5
+	echo "$as_me:35171: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test $cf_result != no; then
 		cat >>confdefs.h <<EOF
@@ -35160,13 +35184,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:35163: checking for $ac_func" >&5
+echo "$as_me:35187: 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 35169 "configure"
+#line 35193 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -35197,16 +35221,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35200: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35224: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35203: \$? = $ac_status" >&5
+  echo "$as_me:35227: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35206: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35230: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35209: \$? = $ac_status" >&5
+  echo "$as_me:35233: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -35216,7 +35240,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:35219: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:35243: 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
@@ -35230,12 +35254,12 @@ fi
 
 if test $use_color_style != no ; then
 	if test .$cf_cv_color_curses != .yes ; then
-		{ { echo "$as_me:35233: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:35257: 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:35238: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:35262: error: Configuration does not support color-styles" >&5
 echo "$as_me: error: Configuration does not support color-styles" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -35243,7 +35267,7 @@ fi
 
 if test $use_scrollbar != no ; then
 	if test .$cf_cv_fancy_curses != .yes ; then
-		{ echo "$as_me:35246: WARNING: Configuration does not support ACS_xxx definitions" >&5
+		{ echo "$as_me:35270: 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
@@ -35348,7 +35372,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:35351: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:35375: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -35524,7 +35548,7 @@ cat >>$CONFIG_STATUS <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:35527: error: ambiguous option: $1
+    { { echo "$as_me:35551: 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;}
@@ -35543,7 +35567,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:35546: error: unrecognized option: $1
+  -*) { { echo "$as_me:35570: 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;}
@@ -35596,7 +35620,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:35599: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:35623: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -35722,7 +35746,7 @@ s,@RANLIB@,$RANLIB,;t t
 s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
 s,@AR@,$AR,;t t
 s,@ac_ct_AR@,$ac_ct_AR,;t t
-s,@AR_OPTS@,$AR_OPTS,;t t
+s,@ARFLAGS@,$ARFLAGS,;t t
 s,@ECHO_LT@,$ECHO_LT,;t t
 s,@ECHO_LD@,$ECHO_LD,;t t
 s,@RULE_CC@,$RULE_CC,;t t
@@ -35915,7 +35939,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:35918: creating $ac_file" >&5
+    { echo "$as_me:35942: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -35933,7 +35957,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:35936: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:35960: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -35946,7 +35970,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:35949: error: cannot find input file: $f" >&5
+           { { echo "$as_me:35973: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -36012,7 +36036,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:36015: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:36039: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -36023,7 +36047,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:36026: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:36050: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -36036,7 +36060,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:36039: error: cannot find input file: $f" >&5
+           { { echo "$as_me:36063: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -36154,7 +36178,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:36157: $ac_file is unchanged" >&5
+      { echo "$as_me:36181: $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 79a5adc2..9eee61d1 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $LynxId: configure.in,v 1.182 2009/01/01 01:22:26 tom Exp $
+dnl $LynxId: configure.in,v 1.183 2009/01/02 01:13:02 tom Exp $
 dnl
 dnl Process this file with autoconf to produce a configure script.
 dnl
@@ -103,9 +103,8 @@ AC_ISC_POSIX
 
 CF_BUILD_CC([#],[])
 
-AC_CHECK_TOOL(RANLIB, ranlib, ':')
-AC_CHECK_TOOL(AR, ar, ar)
-CF_SUBST(archiver options,AR_OPTS,rv)
+CF_PROG_RANLIB
+CF_AR_FLAGS
 
 dnl --------------------------------------------------------------------------
 dnl Debug/development/test
diff --git a/po/id.po b/po/id.po
index 685752b0..dfab9ae5 100644
--- a/po/id.po
+++ b/po/id.po
@@ -1,14 +1,14 @@
 # Pesan bahasa indonesia untuk lynx
 # Copyright (C) 2008 Arif E. Nugroho <arif_endro@yahoo.com>
 # This file is distributed under the same license as the lynx package.
-# Arif E. Nugroho <arif_endro@yahoo.com>, 2008.
+# Arif E. Nugroho <arif_endro@yahoo.com>, 2008, 2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: lynx 2.8.7-dev9\n"
+"Project-Id-Version: lynx 2.8.7-dev12\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-26 20:04-0500\n"
-"PO-Revision-Date: 2008-12-26 10:50+0700\n"
+"POT-Creation-Date: 2009-01-01 20:55-0500\n"
+"PO-Revision-Date: 2009-01-01 18:53+0700\n"
 "Last-Translator: Arif E. Nugroho <arif_endro@yahoo.com>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -2247,7 +2247,7 @@ msgstr "(Tidak ada nama.)"
 msgid "(No value.)"
 msgstr "(Tidak ada nilai.)"
 
-#: LYMessages.c:716 src/LYOptions.c:2402
+#: LYMessages.c:716 src/LYOptions.c:2406
 msgid "None"
 msgstr "Kosong"
 
@@ -2807,7 +2807,7 @@ msgstr "Dokumen dengan isi POST tidak ditemukan dalam cache. Kirim kembali?"
 msgid "Loading failed, use a previous copy."
 msgstr "Pemuatan gagal, gunakan salinan sebelumnya."
 
-#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8542
+#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8513
 msgid "Loading incomplete."
 msgstr "Pemuatan tidak lengkap."
 
@@ -2830,7 +2830,7 @@ msgstr "**** HTAccess: Status yang dikembalikan: %d\n"
 #. * hack: if we fail in HTAccess.c
 #. * avoid duplicating URL, oh.
 #.
-#: WWW/Library/Implementation/HTAccess.c:1087 src/LYMainLoop.c:7756
+#: WWW/Library/Implementation/HTAccess.c:1087 src/LYMainLoop.c:7757
 msgid "Can't Access"
 msgstr "Tidak dapat mengakses"
 
@@ -2855,20 +2855,20 @@ msgstr "tutup master socket"
 msgid "socket for master socket"
 msgstr "socket untuk master socket"
 
-#: WWW/Library/Implementation/HTFTP.c:2977
+#: WWW/Library/Implementation/HTFTP.c:2976
 msgid "Receiving FTP directory."
 msgstr "Menerima direktori FTP."
 
-#: WWW/Library/Implementation/HTFTP.c:3113
+#: WWW/Library/Implementation/HTFTP.c:3112
 #, c-format
 msgid "Transferred %d bytes (%5d)"
 msgstr "Ditransfer %d bytes (%5d)"
 
-#: WWW/Library/Implementation/HTFTP.c:3467
+#: WWW/Library/Implementation/HTFTP.c:3466
 msgid "connect for data"
 msgstr "hubungi untuk data"
 
-#: WWW/Library/Implementation/HTFTP.c:4128
+#: WWW/Library/Implementation/HTFTP.c:4127
 msgid "Receiving FTP file."
 msgstr "Menerima berkas FTP."
 
@@ -2892,34 +2892,34 @@ msgstr "Tidak dapat mengakses host finger."
 msgid "No response from finger server."
 msgstr "Tidak ada balasan dari server finger."
 
-#: WWW/Library/Implementation/HTNews.c:426
+#: WWW/Library/Implementation/HTNews.c:425
 #, c-format
 msgid "Username for news host '%s':"
 msgstr "Nama pengguna untuk news host '%s':"
 
-#: WWW/Library/Implementation/HTNews.c:479
+#: WWW/Library/Implementation/HTNews.c:478
 msgid "Change username?"
 msgstr "Ubah nama pengguna?"
 
-#: WWW/Library/Implementation/HTNews.c:483
+#: WWW/Library/Implementation/HTNews.c:482
 msgid "Username:"
 msgstr "Nama pengguna:"
 
-#: WWW/Library/Implementation/HTNews.c:508
+#: WWW/Library/Implementation/HTNews.c:507
 #, c-format
 msgid "Password for news host '%s':"
 msgstr "Kata sandi untuk news host '%s':"
 
-#: WWW/Library/Implementation/HTNews.c:591
+#: WWW/Library/Implementation/HTNews.c:590
 msgid "Change password?"
 msgstr "Ubah kata sandi?"
 
-#: WWW/Library/Implementation/HTNews.c:1711
+#: WWW/Library/Implementation/HTNews.c:1710
 #, c-format
 msgid "No matches for: %s"
 msgstr "Tidak cocok untuk: %s"
 
-#: WWW/Library/Implementation/HTNews.c:1761
+#: WWW/Library/Implementation/HTNews.c:1760
 msgid ""
 "\n"
 "No articles in this group.\n"
@@ -2927,7 +2927,7 @@ msgstr ""
 "\n"
 "Tidak ada artikel dalam grup ini.\n"
 
-#: WWW/Library/Implementation/HTNews.c:1773
+#: WWW/Library/Implementation/HTNews.c:1772
 msgid ""
 "\n"
 "No articles in this range.\n"
@@ -2938,16 +2938,16 @@ msgstr ""
 #.
 #. * Set window title.
 #.
-#: WWW/Library/Implementation/HTNews.c:1786
+#: WWW/Library/Implementation/HTNews.c:1785
 #, c-format
 msgid "%s,  Articles %d-%d"
 msgstr "%s, Artikel %d-%d"
 
-#: WWW/Library/Implementation/HTNews.c:1809
+#: WWW/Library/Implementation/HTNews.c:1808
 msgid "Earlier articles"
 msgstr "Artikel sebelumnya"
 
-#: WWW/Library/Implementation/HTNews.c:1822
+#: WWW/Library/Implementation/HTNews.c:1821
 #, c-format
 msgid ""
 "\n"
@@ -2958,41 +2958,41 @@ msgstr ""
 "Disana ada sekitar %d artikel yang saat ini tersedia dalam %s, ID sebagai berikut:\n"
 "\n"
 
-#: WWW/Library/Implementation/HTNews.c:1884
+#: WWW/Library/Implementation/HTNews.c:1883
 msgid "All available articles in "
 msgstr "Semua artikel yang tersedia dalam "
 
-#: WWW/Library/Implementation/HTNews.c:2098
+#: WWW/Library/Implementation/HTNews.c:2097
 msgid "Later articles"
 msgstr "Artikel selanjutnya"
 
-#: WWW/Library/Implementation/HTNews.c:2121
+#: WWW/Library/Implementation/HTNews.c:2120
 msgid "Post to "
 msgstr "Post ke "
 
-#: WWW/Library/Implementation/HTNews.c:2342
+#: WWW/Library/Implementation/HTNews.c:2341
 msgid "This client does not contain support for SNEWS URLs."
 msgstr "Klien ini tidak memiliki dukungan untuk URL SNEWS."
 
-#: WWW/Library/Implementation/HTNews.c:2550
+#: WWW/Library/Implementation/HTNews.c:2548
 msgid "No target for raw text!"
 msgstr "Tidak ada target untuk teks mentah!"
 
-#: WWW/Library/Implementation/HTNews.c:2581
+#: WWW/Library/Implementation/HTNews.c:2578
 msgid "Connecting to NewsHost ..."
 msgstr "Menghubungi ke NewsHost ..."
 
-#: WWW/Library/Implementation/HTNews.c:2633
+#: WWW/Library/Implementation/HTNews.c:2630
 #, c-format
 msgid "Could not access %s."
 msgstr "Tidak dapat mengakses %s."
 
-#: WWW/Library/Implementation/HTNews.c:2739
+#: WWW/Library/Implementation/HTNews.c:2736
 #, c-format
 msgid "Can't read news info.  News host %.20s responded: %.200s"
 msgstr "Tidak dapat membaca informasi news. News host %.20s dibalas: %.200s"
 
-#: WWW/Library/Implementation/HTNews.c:2743
+#: WWW/Library/Implementation/HTNews.c:2740
 #, c-format
 msgid "Can't read news info, empty response from host %s"
 msgstr "Tidak dapat membaca informasi news, balasan kosong dari host %s"
@@ -3000,22 +3000,22 @@ msgstr "Tidak dapat membaca informasi news, balasan kosong dari host %s"
 #.
 #. * List available newsgroups.  - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:2947
+#: WWW/Library/Implementation/HTNews.c:2944
 msgid "Reading list of available newsgroups."
 msgstr "Membaca daftar dari newsgroups yang tersedia."
 
-#: WWW/Library/Implementation/HTNews.c:2968
+#: WWW/Library/Implementation/HTNews.c:2965
 msgid "Reading list of articles in newsgroup."
 msgstr "Membaca daftar dari artikel dalam newsgrup."
 
 #.
 #. * Get an article from a news group.  - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:2974
+#: WWW/Library/Implementation/HTNews.c:2971
 msgid "Reading news article."
 msgstr "Membaca news artikel."
 
-#: WWW/Library/Implementation/HTNews.c:3004
+#: WWW/Library/Implementation/HTNews.c:3001
 msgid "Sorry, could not load requested news."
 msgstr "Maaf, tidak dapat memuat berita yang diminta."
 
@@ -3068,9 +3068,8 @@ msgid "Could not restore socket to blocking."
 msgstr "Tidak dapat mengembalikan socket ke bloking."
 
 #: WWW/Library/Implementation/HTTCP.c:2016
-#, fuzzy
 msgid "Socket read failed (too many tries)."
-msgstr "Koneksi gagal (terlalu banyak percobaan)."
+msgstr "Pembacaan socket gagal (terlalu banyak percobaan)."
 
 #: WWW/Library/Implementation/HTTP.c:84
 #, c-format
@@ -3193,27 +3192,27 @@ msgstr "Permintaan dipenuhi. Reset Isi."
 #. * 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:1891
+#: WWW/Library/Implementation/HTTP.c:1890
 msgid "Got unexpected 304 Not Modified status."
 msgstr "Diperoleh tidak terduga 304 status Tidak Termodifikasi."
 
-#: WWW/Library/Implementation/HTTP.c:1954
+#: WWW/Library/Implementation/HTTP.c:1953
 msgid "Redirection of POST content requires user approval."
 msgstr "Redireksi dari isi POST membutuhkan persetujuan pengguna."
 
-#: WWW/Library/Implementation/HTTP.c:1969
+#: WWW/Library/Implementation/HTTP.c:1968
 msgid "Have POST content.  Treating Permanent Redirection as Temporary.\n"
 msgstr "Memiliki isi POST. Memperlakukan Redireksi Permanen sebagai Sementara.\n"
 
-#: WWW/Library/Implementation/HTTP.c:2011
+#: WWW/Library/Implementation/HTTP.c:2010
 msgid "Retrying with access authorization information."
 msgstr "Mencoba kembali dengan informasi otorisasi akses."
 
-#: WWW/Library/Implementation/HTTP.c:2023
+#: WWW/Library/Implementation/HTTP.c:2022
 msgid "Show the 401 message body?"
 msgstr "Tampilkan tubuh pesan 401?"
 
-#: WWW/Library/Implementation/HTTP.c:2066
+#: WWW/Library/Implementation/HTTP.c:2065
 msgid "Show the 407 message body?"
 msgstr "Tampilkan tubuh pesan 407?"
 
@@ -3221,7 +3220,7 @@ msgstr "Tampilkan tubuh pesan 407?"
 #. * Bad or unknown server_status number.  Take a chance and hope
 #. * there is something to display.  - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:2166
+#: WWW/Library/Implementation/HTTP.c:2165
 msgid "Unknown status reply from server!"
 msgstr "Balasan status dari server tidak diketahui!"
 
@@ -3409,106 +3408,106 @@ msgstr "Pengelola"
 msgid "Host"
 msgstr "Host"
 
-#: src/GridText.c:705
+#: src/GridText.c:704
 msgid "Memory exhausted, display interrupted!"
 msgstr "Kehabisan memori, penampilan terinterupsi!"
 
-#: src/GridText.c:710
+#: src/GridText.c:709
 msgid "Memory exhausted, will interrupt transfer!"
 msgstr "Kehabisan memori, akan menginterupsi transfer!"
 
-#: src/GridText.c:3654
+#: src/GridText.c:3663
 msgid " *** MEMORY EXHAUSTED ***"
 msgstr " *** KEHABISAN MEMORI ***"
 
-#: src/GridText.c:6089 src/GridText.c:6096 src/LYList.c:239
+#: src/GridText.c:6057 src/GridText.c:6064 src/LYList.c:239
 msgid "unknown field or link"
 msgstr "field atau link tidak diketahui"
 
-#: src/GridText.c:6105
+#: src/GridText.c:6073
 msgid "text entry field"
 msgstr "daerah masukan teks"
 
-#: src/GridText.c:6108
+#: src/GridText.c:6076
 msgid "password entry field"
 msgstr "daerah masukan kata sandi"
 
-#: src/GridText.c:6111
+#: src/GridText.c:6079
 msgid "checkbox"
 msgstr "checkbox"
 
-#: src/GridText.c:6114
+#: src/GridText.c:6082
 msgid "radio button"
 msgstr "tombol radio"
 
-#: src/GridText.c:6117
+#: src/GridText.c:6085
 msgid "submit button"
 msgstr "tombol kirim"
 
-#: src/GridText.c:6120
+#: src/GridText.c:6088
 msgid "reset button"
 msgstr "tombol reset"
 
-#: src/GridText.c:6123
+#: src/GridText.c:6091
 msgid "popup menu"
 msgstr "menu popup"
 
-#: src/GridText.c:6126
+#: src/GridText.c:6094
 msgid "hidden form field"
 msgstr "daerah formulir tersembunyi"
 
-#: src/GridText.c:6129
+#: src/GridText.c:6097
 msgid "text entry area"
 msgstr "daerah masukan teks"
 
-#: src/GridText.c:6132
+#: src/GridText.c:6100
 msgid "range entry field"
 msgstr "daerah masukan jangkauan"
 
-#: src/GridText.c:6135
+#: src/GridText.c:6103
 msgid "file entry field"
 msgstr "daerah masukan berkas"
 
-#: src/GridText.c:6138
+#: src/GridText.c:6106
 msgid "text-submit field"
 msgstr "daerah teks-kirim"
 
-#: src/GridText.c:6141
+#: src/GridText.c:6109
 msgid "image-submit button"
 msgstr "tombol gambar-kirim"
 
-#: src/GridText.c:6144
+#: src/GridText.c:6112
 msgid "keygen field"
 msgstr "daerah keygen"
 
-#: src/GridText.c:6147
+#: src/GridText.c:6115
 msgid "unknown form field"
 msgstr "daerah formulir tidak diketahui"
 
-#: src/GridText.c:10275
+#: src/GridText.c:10245
 msgid "Can't open file for uploading"
 msgstr "Tidak dapat membuka berkas untuk upload"
 
-#: src/GridText.c:11434
+#: src/GridText.c:11404
 #, c-format
 msgid "Submitting %s"
 msgstr "Mengirimkan %s"
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12487
+#: src/GridText.c:12457
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr "Hang Deteksi: TextAnchor struct terkorupsi - disarankan untuk dibatalkan!"
 
 #. don't show previous state
-#: src/GridText.c:12624
+#: src/GridText.c:12594
 msgid "Wrap lines to fit displayed area?"
 msgstr "Potong baris untuk menyesuaikan daerah penampilan?"
 
-#: src/GridText.c:12676
+#: src/GridText.c:12646
 msgid "Very long lines have been wrapped!"
 msgstr "Baris sangat panjang telah dipotong!"
 
-#: src/GridText.c:13181
+#: src/GridText.c:13151
 msgid "Very long lines have been truncated!"
 msgstr "Baris sangat panjang telah dipotong!"
 
@@ -3602,35 +3601,35 @@ msgstr "tidak"
 msgid "Y/N/A/V"
 msgstr "Y/N/A/V"
 
-#: src/HTML.c:5913
+#: src/HTML.c:5912
 msgid "Description:"
 msgstr "Deskripsi:"
 
-#: src/HTML.c:5918
+#: src/HTML.c:5917
 msgid "(none)"
 msgstr "(kosong)"
 
-#: src/HTML.c:5922
+#: src/HTML.c:5921
 msgid "Filepath:"
 msgstr "Jalur berkas:"
 
-#: src/HTML.c:5928
+#: src/HTML.c:5927
 msgid "(unknown)"
 msgstr "(tidak diketahui)"
 
-#: src/HTML.c:7355
+#: src/HTML.c:7352
 msgid "Document has only hidden links.  Use the 'l'ist command."
 msgstr "Dokumen hanya memiliki link tersembunyi. Gunakan perintah l."
 
-#: src/HTML.c:7854
+#: src/HTML.c:7851
 msgid "Source cache error - disk full?"
 msgstr "Cache sumber error - disk penuh?"
 
-#: src/HTML.c:7867
+#: src/HTML.c:7864
 msgid "Source cache error - not enough memory!"
 msgstr "Cache sumber error - tidak cukup memori!"
 
-#: src/LYBookmark.c:164
+#: src/LYBookmark.c:167
 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"
@@ -3642,7 +3641,7 @@ msgstr ""
 "     bookmark, ini biasanya dengan tombol 'R' tetapi mungkin telah dipetakan\n"
 "     oleh anda atau sistem administrasi anda."
 
-#: src/LYBookmark.c:371
+#: src/LYBookmark.c:374
 #, c-format
 msgid ""
 "     You can delete links by the 'R' key<br>\n"
@@ -3651,7 +3650,7 @@ msgstr ""
 "     Anda dapat menghapus link dengan tombol 'R'<br>\n"
 "<ol>\n"
 
-#: src/LYBookmark.c:374
+#: src/LYBookmark.c:377
 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"
@@ -3661,7 +3660,7 @@ msgstr ""
 "     biasanya tombol 'R' tetapi mungkin telah dipetakan oleh anda atau\n"
 "     sistem administrator anda."
 
-#: src/LYBookmark.c:378
+#: src/LYBookmark.c:381
 msgid ""
 "     This file also may be edited with a standard text editor to delete\n"
 "     outdated or invalid links, or to change their order."
@@ -3669,7 +3668,7 @@ msgstr ""
 "     Berkas ini juga mungkin telah diubah dengan pengubah teks standar\n"
 "     untuk menghapus outdated atau links tidak valid, atau mengubah urutannya."
 
-#: src/LYBookmark.c:381
+#: src/LYBookmark.c:384
 msgid ""
 "Note: if you edit this file manually\n"
 "      you should not change the format within the lines\n"
@@ -3681,7 +3680,7 @@ msgstr ""
 "       atau menambahkan markup HTML.\n"
 "       Pastikan link bookmark disimpan sebagai sebuah baris tunggal."
 
-#: src/LYBookmark.c:677
+#: src/LYBookmark.c:680
 #, c-format
 msgid "File may be recoverable from %s during this session"
 msgstr "Berkas mungkin dapat direkover dari %s selama sesi ini"
@@ -4246,19 +4245,19 @@ msgstr "Pesan ini secara otomatis dibuat oleh"
 msgid "No system mailer configured"
 msgstr "Tidak ada pengirim surat sistem yang dikonfigurasikan"
 
-#: src/LYMain.c:1025
+#: src/LYMain.c:1001
 msgid "No Winsock found, sorry."
 msgstr "Tidak ada Winsock ditemukan, maaf."
 
-#: src/LYMain.c:1222
+#: src/LYMain.c:1198
 msgid "You MUST define a valid TMP or TEMP area!"
 msgstr "Anda HARUS mendefinisikan sebuah daerah valid TMP atau TEMP!"
 
-#: src/LYMain.c:1275 src/LYMainLoop.c:5051
+#: src/LYMain.c:1251 src/LYMainLoop.c:5051
 msgid "No such directory"
 msgstr "Tidak ada direktori seperti itu"
 
-#: src/LYMain.c:1460
+#: src/LYMain.c:1436
 #, c-format
 msgid ""
 "\n"
@@ -4269,7 +4268,7 @@ msgstr ""
 "Berkas konfigurasi \"%s\" tidak tersedia.\n"
 "\n"
 
-#: src/LYMain.c:1470
+#: src/LYMain.c:1446
 #, c-format
 msgid ""
 "\n"
@@ -4280,7 +4279,7 @@ msgstr ""
 "Karakter set Lynx tidak dideklarasikan.\n"
 "\n"
 
-#: src/LYMain.c:1499
+#: src/LYMain.c:1475
 #, c-format
 msgid ""
 "\n"
@@ -4291,7 +4290,7 @@ msgstr ""
 "Lunx peta pengubahan tidak dideklarasikan.\n"
 "\n"
 
-#: src/LYMain.c:1575
+#: src/LYMain.c:1551
 #, c-format
 msgid ""
 "\n"
@@ -4302,66 +4301,66 @@ msgstr ""
 "Berkas Lynx \"%s\" tidak tersedia.\n"
 "\n"
 
-#: src/LYMain.c:1650
+#: src/LYMain.c:1626
 #, c-format
 msgid "Ignored %d characters from standard input.\n"
 msgstr "Diabaikan %d karakter dari standar masukan.\n"
 
-#: src/LYMain.c:1652
+#: src/LYMain.c:1628
 #, c-format
 msgid "Use \"-stdin\" or \"-\" to tell how to handle piped input.\n"
 msgstr "Gunakan \"-stdin\" atatu \"-\" untuk mengetahui bagaimana menangani masukan piped.\n"
 
-#: src/LYMain.c:1800
+#: src/LYMain.c:1776
 msgid "Warning:"
 msgstr "Peringatan:"
 
-#: src/LYMain.c:2365
+#: src/LYMain.c:2341
 msgid "persistent cookies state will be changed in next session only."
 msgstr "persisten keadaan cookies hanya akan berubah di sesi selanjutnya saja."
 
-#: src/LYMain.c:2610 src/LYMain.c:2655
+#: src/LYMain.c:2586 src/LYMain.c:2631
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr "Lynx: mengabaikan charset=%s tidak diketahui\n"
 
-#: src/LYMain.c:3174
+#: src/LYMain.c:3150
 #, c-format
 msgid "%s Version %s (%s)"
 msgstr "%s Versi %s (%s)"
 
-#: src/LYMain.c:3212
+#: src/LYMain.c:3188
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr "Dibuat di %s %s %s\n"
 
-#: src/LYMain.c:3234
+#: src/LYMain.c:3210
 msgid "Copyrights held by the Lynx Developers Group,"
 msgstr "Hak Cipta dipegang oleh Lynx Developers Group,"
 
-#: src/LYMain.c:3235
+#: src/LYMain.c:3211
 msgid "the University of Kansas, CERN, and other contributors."
 msgstr "the University of Kansas, CERN, dan kontributor lain."
 
-#: src/LYMain.c:3236
+#: src/LYMain.c:3212
 msgid "Distributed under the GNU General Public License (Version 2)."
 msgstr "Didistribusikan dibawah GNU General Public License (Version 2)."
 
-#: src/LYMain.c:3237
+#: src/LYMain.c:3213
 msgid "See http://lynx.isc.org/ and the online help for more information."
 msgstr "Lihat http://lynx.isc.org/ dan bantuan online untuk informasi lebih lanjut."
 
-#: src/LYMain.c:4056
+#: src/LYMain.c:4032
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "PENGGUNAAN: %s [opsi] [berkas]\n"
 
-#: src/LYMain.c:4057
+#: src/LYMain.c:4033
 #, c-format
 msgid "Options are:\n"
 msgstr "Opsi adalah:\n"
 
-#: src/LYMain.c:4356
+#: src/LYMain.c:4332
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr "%s: Opsi tidak valid: %s\n"
@@ -4418,56 +4417,56 @@ msgstr "gagal untuk berpindah direktori"
 msgid "Reparsing document under current settings..."
 msgstr "Reparsing dokumen dibawah konfigurasi saat ini..."
 
-#: src/LYMainLoop.c:6520
+#: src/LYMainLoop.c:6521
 #, c-format
 msgid "Fatal error - could not open output file %s\n"
 msgstr "Fatal error - tidak dapat membuka berkas keluaran %s\n"
 
-#: src/LYMainLoop.c:6857
+#: src/LYMainLoop.c:6858
 msgid "TABLE center enable."
 msgstr "pusat TABEL aktif."
 
-#: src/LYMainLoop.c:6860
+#: src/LYMainLoop.c:6861
 msgid "TABLE center disable."
 msgstr "pusat TABEL tidak aktif."
 
-#: src/LYMainLoop.c:6937
+#: src/LYMainLoop.c:6938
 msgid "Current URL is empty."
 msgstr "URL sekarang kosong."
 
-#: src/LYMainLoop.c:6939 src/LYUtils.c:1828
+#: src/LYMainLoop.c:6940 src/LYUtils.c:1828
 msgid "Copy to clipboard failed."
 msgstr "Salin ke clipboard gagal."
 
-#: src/LYMainLoop.c:6941
+#: src/LYMainLoop.c:6942
 msgid "Document URL put to clipboard."
 msgstr "URL dokumen diletakan ke clipboard."
 
-#: src/LYMainLoop.c:6943
+#: src/LYMainLoop.c:6944
 msgid "Link URL put to clipboard."
 msgstr "Sambungan URL diletakan ke clipboard."
 
-#: src/LYMainLoop.c:6970
+#: src/LYMainLoop.c:6971
 msgid "No URL in the clipboard."
 msgstr "Tidak ada URL dalam clipboard."
 
-#: src/LYMainLoop.c:7641 src/LYMainLoop.c:7811
+#: src/LYMainLoop.c:7642 src/LYMainLoop.c:7812
 msgid "-index-"
 msgstr "-index-"
 
-#: src/LYMainLoop.c:7751
+#: src/LYMainLoop.c:7752
 msgid "lynx: Can't access startfile"
 msgstr "lynx: Tidak dapat mengakses startfile"
 
-#: src/LYMainLoop.c:7763
+#: src/LYMainLoop.c:7764
 msgid "lynx: Start file could not be found or is not text/html or text/plain"
 msgstr "lynx: Start file tidak dapat ditemukana atau bukan teks/html atau teks/plain"
 
-#: src/LYMainLoop.c:7764
+#: src/LYMainLoop.c:7765
 msgid "      Exiting..."
 msgstr "      Keluar..."
 
-#: src/LYMainLoop.c:7805
+#: src/LYMainLoop.c:7806
 msgid "-more-"
 msgstr "-lebih-"
 
@@ -4531,348 +4530,348 @@ msgstr ""
 msgid "Message has no original text!"
 msgstr "Pesan tidak memiliki teks asli!"
 
-#: src/LYOptions.c:765
+#: src/LYOptions.c:768
 msgid "review/edit B)ookmarks files"
 msgstr "ulas/ubah berkas B)ookmarks"
 
-#: src/LYOptions.c:767
+#: src/LYOptions.c:770
 msgid "B)ookmark file: "
 msgstr "berkas B)ookmark: "
 
-#: src/LYOptions.c:2127 src/LYOptions.c:2134
+#: src/LYOptions.c:2131 src/LYOptions.c:2138
 msgid "ON"
 msgstr "ON"
 
 #. verbose_img variable
-#: src/LYOptions.c:2128 src/LYOptions.c:2133 src/LYOptions.c:2285 src/LYOptions.c:2296
+#: src/LYOptions.c:2132 src/LYOptions.c:2137 src/LYOptions.c:2289 src/LYOptions.c:2300
 msgid "OFF"
 msgstr "OFF"
 
-#: src/LYOptions.c:2129
+#: src/LYOptions.c:2133
 msgid "NEVER"
 msgstr "NEVER"
 
-#: src/LYOptions.c:2130
+#: src/LYOptions.c:2134
 msgid "ALWAYS"
 msgstr "SELALU"
 
-#: src/LYOptions.c:2146 src/LYOptions.c:2277
+#: src/LYOptions.c:2150 src/LYOptions.c:2281
 msgid "ignore"
 msgstr "abaikan"
 
-#: src/LYOptions.c:2147
+#: src/LYOptions.c:2151
 msgid "ask user"
 msgstr "tanya pengguna"
 
-#: src/LYOptions.c:2148
+#: src/LYOptions.c:2152
 msgid "accept all"
 msgstr "terima semua"
 
-#: src/LYOptions.c:2160
+#: src/LYOptions.c:2164
 msgid "ALWAYS OFF"
 msgstr "SELALU OFF"
 
-#: src/LYOptions.c:2161
+#: src/LYOptions.c:2165
 msgid "FOR LOCAL FILES ONLY"
 msgstr "UNTUK BERKAS LOKAL SAJA"
 
-#: src/LYOptions.c:2163
+#: src/LYOptions.c:2167
 msgid "ALWAYS ON"
 msgstr "SELALU ON"
 
-#: src/LYOptions.c:2175
+#: src/LYOptions.c:2179
 msgid "Numbers act as arrows"
 msgstr "Angka berlaku sebagai panah"
 
-#: src/LYOptions.c:2177
+#: src/LYOptions.c:2181
 msgid "Links are numbered"
 msgstr "Sambungan dinomori"
 
-#: src/LYOptions.c:2180
+#: src/LYOptions.c:2184
 msgid "Links and form fields are numbered"
 msgstr "Sambungan dan daerah formulir dinomori"
 
-#: src/LYOptions.c:2183
+#: src/LYOptions.c:2187
 msgid "Form fields are numbered"
 msgstr "Daerah formulir dinomori"
 
-#: src/LYOptions.c:2197
+#: src/LYOptions.c:2201
 msgid "Case insensitive"
 msgstr "Tidak memperhatikan besar huruf"
 
-#: src/LYOptions.c:2198
+#: src/LYOptions.c:2202
 msgid "Case sensitive"
 msgstr "Memperhatikan besar huruf"
 
-#: src/LYOptions.c:2222
+#: src/LYOptions.c:2226
 msgid "prompt normally"
 msgstr "tanya secara manual"
 
-#: src/LYOptions.c:2223
+#: src/LYOptions.c:2227
 msgid "force yes-response"
 msgstr "paksa balasan ya"
 
-#: src/LYOptions.c:2224
+#: src/LYOptions.c:2228
 msgid "force no-response"
 msgstr "paksa balasan tidak"
 
-#: src/LYOptions.c:2242
+#: src/LYOptions.c:2246
 msgid "Novice"
 msgstr "Pemula"
 
-#: src/LYOptions.c:2243
+#: src/LYOptions.c:2247
 msgid "Intermediate"
 msgstr "Menengah"
 
-#: src/LYOptions.c:2244
+#: src/LYOptions.c:2248
 msgid "Advanced"
 msgstr "Ahli"
 
-#: src/LYOptions.c:2253
+#: src/LYOptions.c:2257
 msgid "By First Visit"
 msgstr "Dengan Kunjungan Pertama"
 
-#: src/LYOptions.c:2255
+#: src/LYOptions.c:2259
 msgid "By First Visit Reversed"
 msgstr "Dengan Kunjungan Pertama dibalik"
 
-#: src/LYOptions.c:2256
+#: src/LYOptions.c:2260
 msgid "As Visit Tree"
 msgstr "Sebagai Pohon Pengunjung"
 
-#: src/LYOptions.c:2257
+#: src/LYOptions.c:2261
 msgid "By Last Visit"
 msgstr "Dengan Kunjungan Terakhir"
 
-#: src/LYOptions.c:2259
+#: src/LYOptions.c:2263
 msgid "By Last Visit Reversed"
 msgstr "Dengan Kunjungan Terakhir Dibalik"
 
 #. Old_DTD variable
-#: src/LYOptions.c:2270
+#: src/LYOptions.c:2274
 msgid "relaxed (TagSoup mode)"
 msgstr "relaxed (mode TagSoup)"
 
-#: src/LYOptions.c:2271
+#: src/LYOptions.c:2275
 msgid "strict (SortaSGML mode)"
 msgstr "strict (mode SortaSGML)"
 
-#: src/LYOptions.c:2278
+#: src/LYOptions.c:2282
 msgid "as labels"
 msgstr "sebagai labels"
 
-#: src/LYOptions.c:2279
+#: src/LYOptions.c:2283
 msgid "as links"
 msgstr "sebagai links"
 
-#: src/LYOptions.c:2286
+#: src/LYOptions.c:2290
 msgid "show filename"
 msgstr "tampilkan nama berkas"
 
-#: src/LYOptions.c:2297
+#: src/LYOptions.c:2301
 msgid "STANDARD"
 msgstr "STANDAR"
 
-#: src/LYOptions.c:2298
+#: src/LYOptions.c:2302
 msgid "ADVANCED"
 msgstr "ADVANCED"
 
-#: src/LYOptions.c:2329
+#: src/LYOptions.c:2333
 msgid "Directories first"
 msgstr "Direktori dahulu"
 
-#: src/LYOptions.c:2330
+#: src/LYOptions.c:2334
 msgid "Files first"
 msgstr "Berkas dahulu"
 
-#: src/LYOptions.c:2331
+#: src/LYOptions.c:2335
 msgid "Mixed style"
 msgstr "Gaya campur"
 
-#: src/LYOptions.c:2339 src/LYOptions.c:2359
+#: src/LYOptions.c:2343 src/LYOptions.c:2363
 msgid "By Name"
 msgstr "Dengan Nama"
 
-#: src/LYOptions.c:2340 src/LYOptions.c:2360
+#: src/LYOptions.c:2344 src/LYOptions.c:2364
 msgid "By Type"
 msgstr "Dengan Tipe"
 
-#: src/LYOptions.c:2341 src/LYOptions.c:2361
+#: src/LYOptions.c:2345 src/LYOptions.c:2365
 msgid "By Size"
 msgstr "Dengan Ukuran"
 
-#: src/LYOptions.c:2342 src/LYOptions.c:2362
+#: src/LYOptions.c:2346 src/LYOptions.c:2366
 msgid "By Date"
 msgstr "Dengan Tanggal"
 
-#: src/LYOptions.c:2343
+#: src/LYOptions.c:2347
 msgid "By Mode"
 msgstr "Dengan Mode"
 
-#: src/LYOptions.c:2345
+#: src/LYOptions.c:2349
 msgid "By User"
 msgstr "Dengan Pengguna"
 
-#: src/LYOptions.c:2346
+#: src/LYOptions.c:2350
 msgid "By Group"
 msgstr "Dengan Grup"
 
-#: src/LYOptions.c:2371
+#: src/LYOptions.c:2375
 msgid "Do not show rate"
 msgstr "Jangan tampilkan kecepatan"
 
-#: src/LYOptions.c:2372 src/LYOptions.c:2373
+#: src/LYOptions.c:2376 src/LYOptions.c:2377
 #, c-format
 msgid "Show %s/sec rate"
 msgstr "Tampilkan kecepatan %s/detik"
 
-#: src/LYOptions.c:2375 src/LYOptions.c:2376
+#: src/LYOptions.c:2379 src/LYOptions.c:2380
 #, c-format
 msgid "Show %s/sec, ETA"
 msgstr "Tampilkan ETA %s/detik"
 
-#: src/LYOptions.c:2379
+#: src/LYOptions.c:2383
 msgid "Show progressbar"
 msgstr "Tampilkan bar perkembangan"
 
-#: src/LYOptions.c:2391
+#: src/LYOptions.c:2395
 msgid "Accept lynx's internal types"
 msgstr "Terima tipe internal lynx"
 
-#: src/LYOptions.c:2392
+#: src/LYOptions.c:2396
 msgid "Also accept lynx.cfg's types"
 msgstr "Juga terima tipe lynx.cfg"
 
-#: src/LYOptions.c:2393
+#: src/LYOptions.c:2397
 msgid "Also accept user's types"
 msgstr "Juga terima tipe pengguna"
 
-#: src/LYOptions.c:2394
+#: src/LYOptions.c:2398
 msgid "Also accept system's types"
 msgstr "Juga terima tipe sistem"
 
-#: src/LYOptions.c:2395
+#: src/LYOptions.c:2399
 msgid "Accept all types"
 msgstr "Terima semua tipe"
 
-#: src/LYOptions.c:2404
+#: src/LYOptions.c:2408
 msgid "gzip"
 msgstr "gzip"
 
-#: src/LYOptions.c:2405
+#: src/LYOptions.c:2409
 msgid "deflate"
 msgstr "deflate"
 
-#: src/LYOptions.c:2408
+#: src/LYOptions.c:2412
 msgid "compress"
 msgstr "compress"
 
-#: src/LYOptions.c:2411
+#: src/LYOptions.c:2415
 msgid "bzip2"
 msgstr "bzip2"
 
-#: src/LYOptions.c:2413
+#: src/LYOptions.c:2417
 msgid "All"
 msgstr "Semua"
 
-#: src/LYOptions.c:2681 src/LYOptions.c:2705
+#: src/LYOptions.c:2685 src/LYOptions.c:2709
 #, c-format
 msgid "Use %s to invoke the Options menu!"
 msgstr "Gunakan %s untuk menjalankan Opsi menu!"
 
-#: src/LYOptions.c:3477
+#: src/LYOptions.c:3481
 msgid "(options marked with (!) will not be saved)"
 msgstr "(opsi ditandai dengan (!) tidak akan disimpan)"
 
-#: src/LYOptions.c:3485
+#: src/LYOptions.c:3489
 msgid "General Preferences"
 msgstr "Kesukaan Umum"
 
 #. ***************************************************************
 #. User Mode: SELECT
-#: src/LYOptions.c:3489
+#: src/LYOptions.c:3493
 msgid "User mode"
 msgstr "Mode pengguna"
 
 #. Editor: INPUT
-#: src/LYOptions.c:3495
+#: src/LYOptions.c:3499
 msgid "Editor"
 msgstr "Pengubah"
 
 #. Search Type: SELECT
-#: src/LYOptions.c:3500
+#: src/LYOptions.c:3504
 msgid "Type of Search"
 msgstr "Tipe Pencarian"
 
-#: src/LYOptions.c:3505
+#: src/LYOptions.c:3509
 msgid "Security and Privacy"
 msgstr "Keamanan dan Privasi"
 
 #. ***************************************************************
 #. Cookies: SELECT
-#: src/LYOptions.c:3509
+#: src/LYOptions.c:3513
 msgid "Cookies"
 msgstr "Cookies"
 
 #. Cookie Prompting: SELECT
-#: src/LYOptions.c:3523
+#: src/LYOptions.c:3527
 msgid "Invalid-Cookie Prompting"
 msgstr "Tanya Cookie Tidak valid"
 
 #. SSL Prompting: SELECT
-#: src/LYOptions.c:3530
+#: src/LYOptions.c:3534
 msgid "SSL Prompting"
 msgstr "Tanya SSL"
 
-#: src/LYOptions.c:3536
+#: src/LYOptions.c:3540
 msgid "Keyboard Input"
 msgstr "Masukan Keyboard"
 
 #. ***************************************************************
 #. Keypad Mode: SELECT
-#: src/LYOptions.c:3540
+#: src/LYOptions.c:3544
 msgid "Keypad mode"
 msgstr "Mode Keypad"
 
 #. Emacs keys: ON/OFF
-#: src/LYOptions.c:3546
+#: src/LYOptions.c:3550
 msgid "Emacs keys"
 msgstr "Tombol Emacs"
 
 #. VI Keys: ON/OFF
-#: src/LYOptions.c:3552
+#: src/LYOptions.c:3556
 msgid "VI keys"
 msgstr "Tombol VI"
 
 #. Line edit style: SELECT
 #. well, at least 2 line edit styles available
-#: src/LYOptions.c:3559
+#: src/LYOptions.c:3563
 msgid "Line edit style"
 msgstr "Gaya pengubahan baris"
 
 #. Keyboard layout: SELECT
-#: src/LYOptions.c:3571
+#: src/LYOptions.c:3575
 msgid "Keyboard layout"
 msgstr "Layout keyboard"
 
 #.
 #. * Display and Character Set
 #.
-#: src/LYOptions.c:3585
+#: src/LYOptions.c:3589
 msgid "Display and Character Set"
 msgstr "Layar dan Set Karakter"
 
 #. Use locale-based character set: ON/OFF
-#: src/LYOptions.c:3590
+#: src/LYOptions.c:3594
 msgid "Use locale-based character set"
 msgstr "Gunakan Set Karakter berbasis lokal"
 
 #. Display Character Set: SELECT
-#: src/LYOptions.c:3599
+#: src/LYOptions.c:3603
 msgid "Display character set"
 msgstr "Karakter Set Penampilan"
 
-#: src/LYOptions.c:3630
+#: src/LYOptions.c:3634
 msgid "Assumed document character set"
 msgstr "Asumsikan karakter set dokumen"
 
@@ -4881,185 +4880,185 @@ msgstr "Asumsikan karakter set dokumen"
 #. * we split the header to make it more readable:
 #. * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others.
 #.
-#: src/LYOptions.c:3650
+#: src/LYOptions.c:3654
 msgid "CJK mode"
 msgstr "mode CJK"
 
-#: src/LYOptions.c:3652
+#: src/LYOptions.c:3656
 msgid "Raw 8-bit"
 msgstr "Raw 8-bit"
 
 #. X Display: INPUT
-#: src/LYOptions.c:3660
+#: src/LYOptions.c:3664
 msgid "X Display"
 msgstr "Tampilan X"
 
 #.
 #. * Document Appearance
 #.
-#: src/LYOptions.c:3666
+#: src/LYOptions.c:3670
 msgid "Document Appearance"
 msgstr "Tampilan Dokumen"
 
-#: src/LYOptions.c:3672
+#: src/LYOptions.c:3676
 msgid "Show color"
 msgstr "Tampilkan warna"
 
 #. Show cursor: ON/OFF
-#: src/LYOptions.c:3696
+#: src/LYOptions.c:3700
 msgid "Show cursor"
 msgstr "Tampilkan cursor"
 
 #. Underline links: ON/OFF
-#: src/LYOptions.c:3702
+#: src/LYOptions.c:3706
 msgid "Underline links"
 msgstr "Garis bawah sambungan"
 
 #. Show scrollbar: ON/OFF
-#: src/LYOptions.c:3709
+#: src/LYOptions.c:3713
 msgid "Show scrollbar"
 msgstr "Tampilkan scrollbar"
 
 #. Select Popups: ON/OFF
-#: src/LYOptions.c:3716
+#: src/LYOptions.c:3720
 msgid "Popups for select fields"
 msgstr "Popups untuk daerah yang dipilih"
 
 #. HTML error recovery: SELECT
-#: src/LYOptions.c:3722
+#: src/LYOptions.c:3726
 msgid "HTML error recovery"
 msgstr "HTML error rekoveri"
 
 #. Show Images: SELECT
-#: src/LYOptions.c:3728
+#: src/LYOptions.c:3732
 msgid "Show images"
 msgstr "Tampilkan gambar"
 
 #. Verbose Images: ON/OFF
-#: src/LYOptions.c:3742
+#: src/LYOptions.c:3746
 msgid "Verbose images"
 msgstr "Verbose gambar"
 
 #.
 #. * Headers Transferred to Remote Servers
 #.
-#: src/LYOptions.c:3750
+#: src/LYOptions.c:3754
 msgid "Headers Transferred to Remote Servers"
 msgstr "Headers ditransfer ke Server Remote"
 
 #. ***************************************************************
 #. Mail Address: INPUT
-#: src/LYOptions.c:3754
+#: src/LYOptions.c:3758
 msgid "Personal mail address"
 msgstr "Alamat surat pribadi"
 
-#: src/LYOptions.c:3760
+#: src/LYOptions.c:3764
 msgid "Password for anonymous ftp"
 msgstr "Kata sandi untuk ftp anonim"
 
 #. Preferred media type: SELECT
-#: src/LYOptions.c:3766
+#: src/LYOptions.c:3770
 msgid "Preferred media type"
 msgstr "Tipe media yang disukai"
 
 #. Preferred encoding: SELECT
-#: src/LYOptions.c:3772
+#: src/LYOptions.c:3776
 msgid "Preferred encoding"
 msgstr "Pengkodean yang disukai"
 
 #. Preferred Document Character Set: INPUT
-#: src/LYOptions.c:3778
+#: src/LYOptions.c:3782
 msgid "Preferred document character set"
 msgstr "Set Karakter dokumen yang disukai"
 
 #. Preferred Document Language: INPUT
-#: src/LYOptions.c:3783
+#: src/LYOptions.c:3787
 msgid "Preferred document language"
 msgstr "Bahasa dokumen yang disukai"
 
-#: src/LYOptions.c:3789
+#: src/LYOptions.c:3793
 msgid "User-Agent header"
 msgstr "Header User-Agent"
 
 #.
 #. * Listing and Accessing Files
 #.
-#: src/LYOptions.c:3797
+#: src/LYOptions.c:3801
 msgid "Listing and Accessing Files"
 msgstr "Mendaftar dan Mengakses Berkas"
 
 #. FTP sort: SELECT
-#: src/LYOptions.c:3802
+#: src/LYOptions.c:3806
 msgid "Use Passive FTP"
 msgstr "Gunakan Passive FTP"
 
 #. FTP sort: SELECT
-#: src/LYOptions.c:3808
+#: src/LYOptions.c:3812
 msgid "FTP sort criteria"
 msgstr "Kriteria pengurutan FTP"
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:3816
+#: src/LYOptions.c:3820
 msgid "Local directory sort criteria"
 msgstr "Kriteria pengurutan direktori lokal"
 
 #. Local Directory Order: SELECT
-#: src/LYOptions.c:3822
+#: src/LYOptions.c:3826
 msgid "Local directory sort order"
 msgstr "Pengurutan direktori lokal"
 
-#: src/LYOptions.c:3831
+#: src/LYOptions.c:3835
 msgid "Show dot files"
 msgstr "Tampilkan berkas titik"
 
-#: src/LYOptions.c:3839
+#: src/LYOptions.c:3843
 msgid "Execution links"
 msgstr "Eksekusi sambungan"
 
 #. Show transfer rate: SELECT
-#: src/LYOptions.c:3859
+#: src/LYOptions.c:3863
 msgid "Show transfer rate"
 msgstr "Tampilkan kecepatan transfer"
 
 #.
 #. * Special Files and Screens
 #.
-#: src/LYOptions.c:3879
+#: src/LYOptions.c:3883
 msgid "Special Files and Screens"
 msgstr "Berkas Spesial dan Layar"
 
-#: src/LYOptions.c:3884
+#: src/LYOptions.c:3888
 msgid "Multi-bookmarks"
 msgstr "Multi-bookmarks"
 
-#: src/LYOptions.c:3892
+#: src/LYOptions.c:3896
 msgid "Review/edit Bookmarks files"
 msgstr "Ulas/ubah berkas Bookmarks"
 
-#: src/LYOptions.c:3894
+#: src/LYOptions.c:3898
 msgid "Goto multi-bookmark menu"
 msgstr "Goto menu multi-bookmark"
 
-#: src/LYOptions.c:3896
+#: src/LYOptions.c:3900
 msgid "Bookmarks file"
 msgstr "Berkas bookmarks"
 
 #. Auto Session: ON/OFF
-#: src/LYOptions.c:3903
+#: src/LYOptions.c:3907
 msgid "Auto Session"
 msgstr "Sesi otomatis"
 
 #. Session File Menu: INPUT
-#: src/LYOptions.c:3909
+#: src/LYOptions.c:3913
 msgid "Session file"
 msgstr "Berkas sesi"
 
 #. Visited Pages: SELECT
-#: src/LYOptions.c:3915
+#: src/LYOptions.c:3919
 msgid "Visited Pages"
 msgstr "Halaman Dikunjungi"
 
-#: src/LYOptions.c:3920
+#: src/LYOptions.c:3924
 msgid "View the file "
 msgstr "Lihat berkas "
 
@@ -5446,7 +5445,7 @@ msgstr ""
 "dimana OBJECT adalah salah satu dari EM,STRONG,B,I,U,BLINK etc.\n"
 "\n"
 
-#: src/LYTraversal.c:108
+#: src/LYTraversal.c:111
 msgid "here is a list of the history stack so that you may rebuild"
 msgstr "disini adalah daftar dari sejarah stack yang dapat anda buat kembali"
 
@@ -5482,29 +5481,29 @@ msgstr "Opsi Upload:"
 msgid "Download document URL put to clipboard."
 msgstr "URL unduh dokumen diletakan ke clipboard."
 
-#: src/LYUtils.c:2615
+#: src/LYUtils.c:2614
 msgid "Unexpected access protocol for this URL scheme."
 msgstr "Protokol akses tidak terduga untuk skema URL ini."
 
-#: src/LYUtils.c:3423
+#: src/LYUtils.c:3422
 msgid "Too many tempfiles"
 msgstr "Terlalu banyak berkas tempfiles"
 
-#: src/LYUtils.c:3723
+#: src/LYUtils.c:3722
 msgid "unknown restriction"
 msgstr "restriksi tidak diketahui"
 
-#: src/LYUtils.c:3754
+#: src/LYUtils.c:3753
 #, c-format
 msgid "No restrictions set.\n"
 msgstr "Tidak ada set restriksi.\n"
 
-#: src/LYUtils.c:3757
+#: src/LYUtils.c:3756
 #, c-format
 msgid "Restrictions set:\n"
 msgstr "Set restriksi:\n"
 
-#: src/LYUtils.c:5135
+#: src/LYUtils.c:5134
 msgid "Cannot find HOME directory"
 msgstr "Tidak dapat menemukan direktori HOME"
 
@@ -6035,6 +6034,8 @@ msgid ""
 "Lynx User Defaults File\n"
 "\n"
 msgstr ""
+"Berkas Baku Pengguna Lynx\n"
+"\n"
 
 #: src/LYrcFile.c:882
 msgid ""
@@ -6042,12 +6043,17 @@ msgid ""
 "with the 'o' key).  To save options with that screen, you must select the\n"
 "checkbox:\n"
 msgstr ""
+"Berkas ini berisi opsi disimpan dari Opsi Layar Lynx (secara normal\n"
+"dengan tombol 'o'). Untuk menyimpan opsi di layar itu, anda harus\n"
+"memilih checkbox:\n"
 
 #: src/LYrcFile.c:889
 msgid ""
 "You must then save the settings using the link on the line above the\n"
 "checkbox:\n"
 msgstr ""
+"Anda harus menyimpan konfigurasi menggunakan sambungan di baris\n"
+"diatas checkbox:\n"
 
 #: src/LYrcFile.c:896
 msgid ""
@@ -6055,6 +6061,9 @@ msgid ""
 "the simpler Options Menu instead.  Save options with that using the '>' key.\n"
 "\n"
 msgstr ""
+"Anda juga boleh menggunakan opsi baris-perintah \" -forms_options\", yang\n"
+"menampilkan Opsi Menu lebih sederhana. Simpan opsi dengan itu menggunakan\n"
+"tombol '>'.\n"
 
 #: src/LYrcFile.c:903
 msgid ""
@@ -6062,9 +6071,11 @@ msgid ""
 "with the '>' key).\n"
 "\n"
 msgstr ""
+"Berkas ini berisi opsi disimpan dari Layar Opsi Lynx (secara normal\n"
+"dengan tombol '>').\n"
+"\n"
 
 #: src/LYrcFile.c:910
-#, fuzzy
 msgid ""
 "There is normally no need to edit this file manually, since the defaults\n"
 "here can be controlled from the Options Screen, and the next time options\n"
@@ -6075,16 +6086,14 @@ msgid ""
 "called \"lynx.cfg\".  It has different content and a different format.\n"
 "It is not this file.\n"
 msgstr ""
-"Berkas Pengguna Baku Lynx\n"
-"\n"
-"Berkas ini berisi opsi disimpan dari Layar Opsi Lynx (secara normal dengan\n"
-"tombol '>'). Disana secara normal tidak dibutuhkan untuk mengubah berkas ini\n"
+"Disana secara normal tidak dibutuhkan untuk mengubah berkas ini\n"
 "secara manual, karena disini baku dapat dikontrol dari Layar Opsi, dan opsi\n"
 "selanjutnya disimpan dari Layar Opsi berkas ini akan ditulis ulang.\n"
 "Anda telah diperingatkan...\n"
+"\n"
 "Jika anda mencari untuk berkas konfigurasi umum - ini secara normal dipanggil\n"
 "lynx.cfg, dan ini memiliki isi berbeda dan sebuah format berbeda.\n"
-"Ini bukan berkas ini.\n"
+"Tapi bukan berkas ini.\n"
 
 #~ msgid "Socket read failed for 180,000 tries."
 #~ msgstr "Pembacaan socket gagal untuk pencobaan 180,000 kali."
diff --git a/po/nl.po b/po/nl.po
index b30fc317..129bb618 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,16 +6,15 @@
 # Benno Schulenberg <benno@vertaalt.nl>, 2008.
 msgid ""
 msgstr ""
-"Project-Id-Version: lynx-2.8.7-dev9\n"
+"Project-Id-Version: lynx-2.8.7-dev12\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-07 20:02-0500\n"
-"PO-Revision-Date: 2008-07-13 15:30+0200\n"
-"Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
+"POT-Creation-Date: 2009-01-01 20:55-0500\n"
+"PO-Revision-Date: 2009-01-01 11:49+0100\n"
+"Last-Translator: Erwin Poeze <erwin.poeze@gmail.com>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. ******************************************************************
@@ -60,7 +59,7 @@ msgstr "Verbinding is onderbroken."
 
 #: LYMessages.c:39
 msgid "Data transfer interrupted."
-msgstr "Gegevensoverdracht is gestopt."
+msgstr "Gegevensoverdracht is onderbroken."
 
 #: LYMessages.c:40
 msgid "Cancelled!!!"
@@ -2250,7 +2249,7 @@ msgstr "(Geen naam.)"
 msgid "(No value.)"
 msgstr "(Geen waarde.)"
 
-#: LYMessages.c:716 src/LYOptions.c:2402
+#: LYMessages.c:716 src/LYOptions.c:2406
 msgid "None"
 msgstr "geen"
 
@@ -2416,16 +2415,21 @@ msgstr "Terug naar "
 msgid "Current directory is "
 msgstr "Huidige map is "
 
-#. HTGopher.c
+#. HTFTP.c
 #: LYMessages.c:765
+msgid "Symbolic Link"
+msgstr "Symbolische koppeling"
+
+#. HTGopher.c
+#: LYMessages.c:768
 msgid "No response from server!"
 msgstr "Geen reactie van die server!"
 
-#: LYMessages.c:766
+#: LYMessages.c:769
 msgid "CSO index"
 msgstr "CSO-index"
 
-#: LYMessages.c:767
+#: LYMessages.c:770
 msgid ""
 "\n"
 "This is a searchable index of a CSO database.\n"
@@ -2433,16 +2437,16 @@ msgstr ""
 "\n"
 "Dit is een doorzoekbare index van een CSO-databank.\n"
 
-#: LYMessages.c:768
+#: LYMessages.c:771
 msgid "CSO Search Results"
 msgstr "CSO-zoekresultaten"
 
-#: LYMessages.c:769
+#: LYMessages.c:772
 #, c-format
 msgid "Seek fail on %s\n"
 msgstr "Zoekopdracht is mislukt op %s\n"
 
-#: LYMessages.c:770
+#: LYMessages.c:773
 msgid ""
 "\n"
 "Press the 's' key and enter search keywords.\n"
@@ -2450,7 +2454,7 @@ msgstr ""
 "\n"
 "Druk op de 's'-toets en voer zoektermen in.\n"
 
-#: LYMessages.c:771
+#: LYMessages.c:774
 msgid ""
 "\n"
 "This is a searchable Gopher index.\n"
@@ -2458,35 +2462,35 @@ msgstr ""
 "\n"
 "Dit is een doorzoekbare Gopher-index.\n"
 
-#: LYMessages.c:772
+#: LYMessages.c:775
 msgid "Gopher index"
 msgstr "Gopher-index"
 
-#: LYMessages.c:773
+#: LYMessages.c:776
 msgid "Gopher Menu"
 msgstr "Gopher-menu"
 
-#: LYMessages.c:774
+#: LYMessages.c:777
 msgid " Search Results"
 msgstr " Zoekresultaten"
 
-#: LYMessages.c:775
+#: LYMessages.c:778
 msgid "Sending CSO/PH request."
 msgstr "Verzenden van CSO/PH-verzoek."
 
-#: LYMessages.c:776
+#: LYMessages.c:779
 msgid "Sending Gopher request."
 msgstr "Verzenden van Gopher-verzoek."
 
-#: LYMessages.c:777
+#: LYMessages.c:780
 msgid "CSO/PH request sent; waiting for response."
 msgstr "CSO/PH-verzoek is verzonden; wacht op antwoord."
 
-#: LYMessages.c:778
+#: LYMessages.c:781
 msgid "Gopher request sent; waiting for response."
 msgstr "Gopher-verzoek is verzonden; wacht op antwoord."
 
-#: LYMessages.c:779
+#: LYMessages.c:782
 msgid ""
 "\n"
 "Please enter search keywords.\n"
@@ -2494,7 +2498,7 @@ msgstr ""
 "\n"
 "Voer zoektermen in.\n"
 
-#: LYMessages.c:780
+#: LYMessages.c:783
 msgid ""
 "\n"
 "The keywords that you enter will allow you to search on a"
@@ -2502,201 +2506,201 @@ msgstr ""
 "\n"
 "De zoektermen die u opgeeft maken het mogelijk te zoeken op"
 
-#: LYMessages.c:781
+#: LYMessages.c:784
 msgid " person's name in the database.\n"
 msgstr " een persoonsnaam in de databank.\n"
 
 #. HTNews.c
-#: LYMessages.c:784
+#: LYMessages.c:787
 msgid "Connection closed ???"
 msgstr "Verbinding gesloten???"
 
-#: LYMessages.c:785
+#: LYMessages.c:788
 msgid "Cannot open temporary file for news POST."
 msgstr "Kan tijdelijk bestand niet openen voor nieuws-POST."
 
-#: LYMessages.c:786
+#: LYMessages.c:789
 msgid "This client does not contain support for posting to news with SSL."
 msgstr "Dit programma ondersteunt versturen van nieuwsberichten met SSL niet."
 
 #. HTStyle.c
-#: LYMessages.c:789
+#: LYMessages.c:792
 #, c-format
 msgid "Style %d `%s' SGML:%s.  Font %s %.1f point.\n"
 msgstr "Stijl %d '%s' SGML:%s.  Lettertype %s %.1f-punts.\n"
 
-#: LYMessages.c:791
+#: LYMessages.c:794
 #, c-format
 msgid "\tAlign=%d, %d tabs. (%.0f before, %.0f after)\n"
 msgstr "        Uitlijnen=%d, %d tabs. (%.0f voor, %.0f na)\n"
 
-#: LYMessages.c:792
+#: LYMessages.c:795
 #, c-format
 msgid "\t\tTab kind=%d at %.0f\n"
 msgstr "                Tabsoort=%d op %.0f\n"
 
 #. HTTP.c
-#: LYMessages.c:795
+#: LYMessages.c:798
 msgid "Can't proceed without a username and password."
 msgstr "Kan niet verder zonder gebruikersnaam en wachtwoord."
 
-#: LYMessages.c:796
+#: LYMessages.c:799
 msgid "Can't retry with authorization!  Contact the server's WebMaster."
 msgstr "Herhalen gaat niet met autorisatie!  Vraag beheerder van de webserver."
 
-#: LYMessages.c:797
+#: LYMessages.c:800
 msgid "Can't retry with proxy authorization!  Contact the server's WebMaster."
 msgstr "Herhalen gaat niet met proxy-autorisatie!  Vraag beheerder van de webserver."
 
-#: LYMessages.c:798
+#: LYMessages.c:801
 msgid "Retrying with proxy authorization information."
 msgstr "Nieuwe poging met proxy-autorisatie-informatie."
 
-#: LYMessages.c:799
+#: LYMessages.c:802
 #, c-format
 msgid "SSL error:%s-Continue?"
 msgstr "SSL-fout: %s -- Verdergaan?"
 
 #. HTWAIS.c
-#: LYMessages.c:802
+#: LYMessages.c:805
 msgid "HTWAIS: Return message too large."
 msgstr "HTWAIS: Geretourneerd bericht is te groot."
 
-#: LYMessages.c:803
+#: LYMessages.c:806
 msgid "Enter WAIS query: "
 msgstr "Voer een WAIS-verzoek in: "
 
 #. Miscellaneous status
-#: LYMessages.c:806
+#: LYMessages.c:809
 msgid "Retrying as HTTP0 request."
 msgstr "Nieuwe poging als HTTP0-verzoek."
 
-#: LYMessages.c:807
+#: LYMessages.c:810
 #, c-format
 msgid "Transferred %d bytes"
 msgstr "%d bytes overgezet"
 
-#: LYMessages.c:808
+#: LYMessages.c:811
 msgid "Data transfer complete"
 msgstr "Gegevensoverdracht is voltooid"
 
-#: LYMessages.c:809
+#: LYMessages.c:812
 #, c-format
 msgid "Error processing line %d of %s\n"
 msgstr "Fout bij verwerking van regel %d van %s\n"
 
 #. Lynx internal page titles
-#: LYMessages.c:812
+#: LYMessages.c:815
 msgid "Address List Page"
 msgstr "Adreslijst Pagina"
 
-#: LYMessages.c:813
+#: LYMessages.c:816
 msgid "Bookmark file"
 msgstr "Boekenleggerbestand"
 
-#: LYMessages.c:814
+#: LYMessages.c:817
 msgid "Configuration Definitions"
 msgstr "Instellingen"
 
-#: LYMessages.c:815
+#: LYMessages.c:818
 msgid "Cookie Jar"
 msgstr "Koekjestrommel"
 
-#: LYMessages.c:816
+#: LYMessages.c:819
 msgid "Current Key Map"
 msgstr "Huidige toetsenbordindeling"
 
-#: LYMessages.c:817
+#: LYMessages.c:820
 msgid "File Management Options"
 msgstr "Bestandsbeheeropties"
 
-#: LYMessages.c:818
+#: LYMessages.c:821
 msgid "Download Options"
 msgstr "Downloadopties"
 
-#: LYMessages.c:819
+#: LYMessages.c:822
 msgid "History Page"
 msgstr "Historiepagina"
 
-#: LYMessages.c:820
+#: LYMessages.c:823
 msgid "Cache Jar"
 msgstr "Cachetrommel"
 
-#: LYMessages.c:821
+#: LYMessages.c:824
 msgid "List Page"
 msgstr "Lijstenpagina"
 
-#: LYMessages.c:822
+#: LYMessages.c:825
 msgid "Lynx.cfg Information"
 msgstr "Lynx.cfg-informatie"
 
-#: LYMessages.c:823
+#: LYMessages.c:826
 msgid "Converted Mosaic Hotlist"
 msgstr "Geconverteerde Mosaic-hotlist"
 
-#: LYMessages.c:824
+#: LYMessages.c:827
 msgid "Options Menu"
 msgstr "Optiesmenu"
 
-#: LYMessages.c:825
+#: LYMessages.c:828
 msgid "File Permission Options"
 msgstr "Opties voor bestandstoegangsrechten"
 
-#: LYMessages.c:826
+#: LYMessages.c:829
 msgid "Printing Options"
 msgstr "Afdrukopties"
 
-#: LYMessages.c:827
+#: LYMessages.c:830
 msgid "Information about the current document"
 msgstr "Informatie over het huidige document"
 
-#: LYMessages.c:828
+#: LYMessages.c:831
 msgid "Your recent statusline messages"
 msgstr "Recente berichten van de statusregel"
 
-#: LYMessages.c:829
+#: LYMessages.c:832
 msgid "Upload Options"
 msgstr "Uploadopties"
 
-#: LYMessages.c:830
+#: LYMessages.c:833
 msgid "Visited Links Page"
 msgstr "Bezochte links-pagina"
 
 #. CONFIG_DEF_TITLE subtitles
-#: LYMessages.c:833
+#: LYMessages.c:836
 msgid "See also"
 msgstr "Zie ook"
 
-#: LYMessages.c:834
+#: LYMessages.c:837
 msgid "your"
 msgstr "uw"
 
-#: LYMessages.c:835
+#: LYMessages.c:838
 msgid "for runtime options"
 msgstr "voor uitvoeropties"
 
-#: LYMessages.c:836
+#: LYMessages.c:839
 msgid "compile time options"
 msgstr "compilatieopties"
 
-#: LYMessages.c:837
+#: LYMessages.c:840
 msgid "color-style configuration"
 msgstr "instellingen van kleurstijl"
 
-#: LYMessages.c:838
+#: LYMessages.c:841
 msgid "latest release"
 msgstr "laatste versie"
 
-#: LYMessages.c:839
+#: LYMessages.c:842
 msgid "pre-release version"
 msgstr "testversie"
 
-#: LYMessages.c:840
+#: LYMessages.c:843
 msgid "development version"
 msgstr "ontwikkelversie"
 
 #. #define AUTOCONF_CONFIG_CACHE
-#: LYMessages.c:842
+#: LYMessages.c:845
 msgid ""
 "The following data were derived during the automatic configuration/build\n"
 "process of this copy of Lynx.  When reporting a bug, please include a copy\n"
@@ -2707,7 +2711,7 @@ msgstr ""
 "een programmafout rapporteert."
 
 #. #define AUTOCONF_LYNXCFG_H
-#: LYMessages.c:846
+#: LYMessages.c:849
 msgid ""
 "The following data were used as automatically-configured compile-time\n"
 "definitions when this copy of Lynx was built."
@@ -2716,53 +2720,53 @@ msgstr ""
 "definities tijdens het compileren van dit exemplaar van Lynx."
 
 #. #define DIRED_NOVICELINE
-#: LYMessages.c:851
+#: LYMessages.c:854
 msgid "  C)reate  D)ownload  E)dit  F)ull menu  M)odify  R)emove  T)ag  U)pload     \n"
 msgstr "C)reëer D)ownload E)dit F)-volledig menu M)-wijzig R)-wis T)-vink U)pload\n"
 
-#: LYMessages.c:852
+#: LYMessages.c:855
 msgid "Failed to obtain status of current link!"
 msgstr "Kan status van de huidige link niet verkrijgen!"
 
 #. #define INVALID_PERMIT_URL
-#: LYMessages.c:855
+#: LYMessages.c:858
 msgid "Special URL only valid from current File Permission menu!"
 msgstr "Speciale URL is alleen geldig vanuit huidige Bestandstoegangsrechten-menu!"
 
-#: LYMessages.c:859
+#: LYMessages.c:862
 msgid "External support is currently disabled."
 msgstr "Externe ondersteuning is momenteel uitgeschakeld."
 
 #. new with 2.8.4dev.21
-#: LYMessages.c:863
+#: LYMessages.c:866
 msgid "Changing working-directory is currently disabled."
 msgstr "De werkmap wijzigen is momenteel uitgeschakeld."
 
-#: LYMessages.c:864
+#: LYMessages.c:867
 msgid "Linewrap OFF!"
 msgstr "Regelvouwen UIT!"
 
-#: LYMessages.c:865
+#: LYMessages.c:868
 msgid "Linewrap ON!"
 msgstr "Regelvouwen AAN!"
 
-#: LYMessages.c:866
+#: LYMessages.c:869
 msgid "Parsing nested-tables toggled OFF!  Reloading..."
 msgstr "Ontleden van geneste tabellen is UIT gezet!  Herladen..."
 
-#: LYMessages.c:867
+#: LYMessages.c:870
 msgid "Parsing nested-tables toggled ON!  Reloading..."
 msgstr "Ontleden van geneste tabellen is AAN gezet!  Herladen..."
 
-#: LYMessages.c:868
+#: LYMessages.c:871
 msgid "Shifting is disabled while line-wrap is in effect"
 msgstr "Gebruik van shift is uitgeschakeld als regelvouwen in gebruik is"
 
-#: LYMessages.c:869
+#: LYMessages.c:872
 msgid "Trace not supported"
 msgstr "Traceren wordt niet ondersteund"
 
-#: LYMessages.c:790
+#: LYMessages.c:793
 #, c-format
 msgid "\tIndents: first=%.0f others=%.0f, Height=%.1f Desc=%.1f\n"
 msgstr "        Inspringen: eerste=%.0f overigen=%.0f, hoogte=%.1f omschr=%.1f\n"
@@ -2805,7 +2809,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:8546
+#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8513
 msgid "Loading incomplete."
 msgstr "Laden niet voltooid."
 
@@ -2828,7 +2832,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:7779
+#: WWW/Library/Implementation/HTAccess.c:1087 src/LYMainLoop.c:7757
 msgid "Can't Access"
 msgstr "Kan geen toegang krijgen"
 
@@ -2853,28 +2857,20 @@ msgstr "hoofdsocket sluiten"
 msgid "socket for master socket"
 msgstr "socket voor hoofdsocket"
 
-#.
-#. * It's a symbolic link, does the user care about knowing if it is
-#. * symbolic?  I think so since it might be a directory.
-#.
-#: WWW/Library/Implementation/HTFTP.c:1733 WWW/Library/Implementation/HTFTP.c:2350
-msgid "Symbolic Link"
-msgstr "Symbolische koppeling"
-
-#: WWW/Library/Implementation/HTFTP.c:2707
+#: WWW/Library/Implementation/HTFTP.c:2976
 msgid "Receiving FTP directory."
 msgstr "Ophalen van FTP-bestandenoverzicht."
 
-#: WWW/Library/Implementation/HTFTP.c:2843
+#: WWW/Library/Implementation/HTFTP.c:3112
 #, c-format
 msgid "Transferred %d bytes (%5d)"
 msgstr "%d bytes overgezet (%5d)"
 
-#: WWW/Library/Implementation/HTFTP.c:3194
+#: WWW/Library/Implementation/HTFTP.c:3466
 msgid "connect for data"
 msgstr "verbinden voor datastroom"
 
-#: WWW/Library/Implementation/HTFTP.c:3855
+#: WWW/Library/Implementation/HTFTP.c:4127
 msgid "Receiving FTP file."
 msgstr "Ophalen van FTP-bestand."
 
@@ -2898,34 +2894,34 @@ msgstr "Kan finger-host niet bereiken."
 msgid "No response from finger server."
 msgstr "Geen antwoord van finger-server."
 
-#: WWW/Library/Implementation/HTNews.c:426
+#: WWW/Library/Implementation/HTNews.c:425
 #, c-format
 msgid "Username for news host '%s':"
 msgstr "Gebruikersnaam voor nieuws-host '%s':"
 
-#: WWW/Library/Implementation/HTNews.c:479
+#: WWW/Library/Implementation/HTNews.c:478
 msgid "Change username?"
 msgstr "Gebruikersnaam wijzigen?"
 
-#: WWW/Library/Implementation/HTNews.c:483
+#: WWW/Library/Implementation/HTNews.c:482
 msgid "Username:"
 msgstr "Gebruikersnaam:"
 
-#: WWW/Library/Implementation/HTNews.c:508
+#: WWW/Library/Implementation/HTNews.c:507
 #, c-format
 msgid "Password for news host '%s':"
 msgstr "Wachtwoord voor nieuws-host '%s':"
 
-#: WWW/Library/Implementation/HTNews.c:591
+#: WWW/Library/Implementation/HTNews.c:590
 msgid "Change password?"
 msgstr "Wachtwoord wijzigen?"
 
-#: WWW/Library/Implementation/HTNews.c:1711
+#: WWW/Library/Implementation/HTNews.c:1710
 #, c-format
 msgid "No matches for: %s"
 msgstr "Geen overeenkomsten voor: %s"
 
-#: WWW/Library/Implementation/HTNews.c:1761
+#: WWW/Library/Implementation/HTNews.c:1760
 msgid ""
 "\n"
 "No articles in this group.\n"
@@ -2933,7 +2929,7 @@ msgstr ""
 "\n"
 "Geen artikelen gevonden in deze groep.\n"
 
-#: WWW/Library/Implementation/HTNews.c:1773
+#: WWW/Library/Implementation/HTNews.c:1772
 msgid ""
 "\n"
 "No articles in this range.\n"
@@ -2944,16 +2940,16 @@ msgstr ""
 #.
 #. * Set window title.
 #.
-#: WWW/Library/Implementation/HTNews.c:1786
+#: WWW/Library/Implementation/HTNews.c:1785
 #, c-format
 msgid "%s,  Articles %d-%d"
 msgstr "%s,  Artikelen %d-%d"
 
-#: WWW/Library/Implementation/HTNews.c:1809
+#: WWW/Library/Implementation/HTNews.c:1808
 msgid "Earlier articles"
 msgstr "Eerdere artikelen"
 
-#: WWW/Library/Implementation/HTNews.c:1822
+#: WWW/Library/Implementation/HTNews.c:1821
 #, c-format
 msgid ""
 "\n"
@@ -2963,41 +2959,41 @@ msgstr ""
 "\n"
 "Er zijn momenteel ongeveer %d artikelen beschikbaar in %s, met volgende ID's:\n"
 
-#: WWW/Library/Implementation/HTNews.c:1884
+#: WWW/Library/Implementation/HTNews.c:1883
 msgid "All available articles in "
 msgstr "Alle beschikbare artikelen in "
 
-#: WWW/Library/Implementation/HTNews.c:2098
+#: WWW/Library/Implementation/HTNews.c:2097
 msgid "Later articles"
 msgstr "Latere artikelen"
 
-#: WWW/Library/Implementation/HTNews.c:2121
+#: WWW/Library/Implementation/HTNews.c:2120
 msgid "Post to "
 msgstr "Posten naar "
 
-#: WWW/Library/Implementation/HTNews.c:2342
+#: WWW/Library/Implementation/HTNews.c:2341
 msgid "This client does not contain support for SNEWS URLs."
 msgstr "Dit programma ondersteunt geen SNEWS-URL's."
 
-#: WWW/Library/Implementation/HTNews.c:2550
+#: WWW/Library/Implementation/HTNews.c:2548
 msgid "No target for raw text!"
 msgstr "Geen bestemming voor ruwe tekst!"
 
-#: WWW/Library/Implementation/HTNews.c:2581
+#: WWW/Library/Implementation/HTNews.c:2578
 msgid "Connecting to NewsHost ..."
 msgstr "Verbinden met nieuws-host ..."
 
-#: WWW/Library/Implementation/HTNews.c:2633
+#: WWW/Library/Implementation/HTNews.c:2630
 #, c-format
 msgid "Could not access %s."
 msgstr "Geen toegang tot %s."
 
-#: WWW/Library/Implementation/HTNews.c:2739
+#: WWW/Library/Implementation/HTNews.c:2736
 #, 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:2743
+#: WWW/Library/Implementation/HTNews.c:2740
 #, c-format
 msgid "Can't read news info, empty response from host %s"
 msgstr "Kan nieuwsinformatie niet lezen; loos antwoord van host %s"
@@ -3005,22 +3001,22 @@ msgstr "Kan nieuwsinformatie niet lezen; loos antwoord van host %s"
 #.
 #. * List available newsgroups.  - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:2947
+#: WWW/Library/Implementation/HTNews.c:2944
 msgid "Reading list of available newsgroups."
 msgstr "Lezen van lijst met beschikbare nieuwsgroepen."
 
-#: WWW/Library/Implementation/HTNews.c:2968
+#: WWW/Library/Implementation/HTNews.c:2965
 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:2974
+#: WWW/Library/Implementation/HTNews.c:2971
 msgid "Reading news article."
 msgstr "Lezen van nieuwsartikel."
 
-#: WWW/Library/Implementation/HTNews.c:3004
+#: WWW/Library/Implementation/HTNews.c:3001
 msgid "Sorry, could not load requested news."
 msgstr "Sorry, kan het opgevraagde nieuws niet laden."
 
@@ -3073,9 +3069,8 @@ msgid "Could not restore socket to blocking."
 msgstr "Kan socket niet naar blokkerende modus herstellen."
 
 #: WWW/Library/Implementation/HTTCP.c:2016
-#, fuzzy
 msgid "Socket read failed (too many tries)."
-msgstr "Verbinden is mislukt (te vaak opnieuw geprobeerd)."
+msgstr "Socket uitlezen is mislukt (te vaak opnieuw geprobeerd)."
 
 #: WWW/Library/Implementation/HTTP.c:84
 #, c-format
@@ -3092,80 +3087,80 @@ msgstr "Adres bevat een gebruikersnaam: %s"
 msgid "Certificate issued by: %s"
 msgstr "Certificaat is uitgeven door: %s"
 
-#: WWW/Library/Implementation/HTTP.c:620
+#: WWW/Library/Implementation/HTTP.c:643
 msgid "This client does not contain support for HTTPS URLs."
 msgstr "Dit programma ondersteunt geen HTTPS-URL's."
 
-#: WWW/Library/Implementation/HTTP.c:645
+#: WWW/Library/Implementation/HTTP.c:668
 msgid "Unable to connect to remote host."
 msgstr "Kan geen verbinding maken met gindse computer."
 
-#: WWW/Library/Implementation/HTTP.c:669
+#: WWW/Library/Implementation/HTTP.c:692
 msgid "Retrying connection without TLS."
 msgstr "Verbinding wordt opnieuw geprobeerd zonder TLS."
 
-#: WWW/Library/Implementation/HTTP.c:714
+#: WWW/Library/Implementation/HTTP.c:737
 msgid "no issuer was found"
 msgstr "geen uitgever gevonden"
 
-#: WWW/Library/Implementation/HTTP.c:716
+#: WWW/Library/Implementation/HTTP.c:739
 msgid "issuer is not a CA"
 msgstr "uitgever is geen CA"
 
-#: WWW/Library/Implementation/HTTP.c:718
+#: WWW/Library/Implementation/HTTP.c:741
 msgid "the certificate has no known issuer"
 msgstr "het certificaat heeft geen bekende uitgever"
 
-#: WWW/Library/Implementation/HTTP.c:720
+#: WWW/Library/Implementation/HTTP.c:743
 msgid "the certificate has been revoked"
 msgstr "het certificaat is herroepen"
 
-#: WWW/Library/Implementation/HTTP.c:722
+#: WWW/Library/Implementation/HTTP.c:745
 msgid "the certificate is not trusted"
 msgstr "het certificaat wordt niet vertrouwd"
 
-#: WWW/Library/Implementation/HTTP.c:807
+#: WWW/Library/Implementation/HTTP.c:821
 #, c-format
 msgid "Verified connection to %s (cert=%s)"
 msgstr "Geverifieerde verbinding met %s (cert=%s)"
 
-#: WWW/Library/Implementation/HTTP.c:855 WWW/Library/Implementation/HTTP.c:901
+#: WWW/Library/Implementation/HTTP.c:869 WWW/Library/Implementation/HTTP.c:911
 #, c-format
 msgid "Verified connection to %s (subj=%s)"
 msgstr "Geverifieerde verbinding met %s (subj=%s)"
 
-#: WWW/Library/Implementation/HTTP.c:931
+#: WWW/Library/Implementation/HTTP.c:941
 msgid "Can't find common name in certificate"
 msgstr "Kan in certificaat geen gewone naam vinden"
 
-#: WWW/Library/Implementation/HTTP.c:934
+#: WWW/Library/Implementation/HTTP.c:944
 #, c-format
 msgid "SSL error:host(%s)!=cert(%s)-Continue?"
 msgstr "SSL-fout: computer(%s)!=certificaat(%s).  Verdergaan?"
 
-#: WWW/Library/Implementation/HTTP.c:947
+#: WWW/Library/Implementation/HTTP.c:957
 #, c-format
 msgid "UNVERIFIED connection to %s (cert=%s)"
 msgstr "ONGEVERIFIEERDE verbinding met %s (cert=%s)"
 
-#: WWW/Library/Implementation/HTTP.c:956
+#: WWW/Library/Implementation/HTTP.c:966
 #, c-format
 msgid "Secure %d-bit %s (%s) HTTP connection"
 msgstr "Veilige %d-bits %s (%s) HTTP-verbinding"
 
-#: WWW/Library/Implementation/HTTP.c:1426
+#: WWW/Library/Implementation/HTTP.c:1433
 msgid "Sending HTTP request."
 msgstr "Zenden van HTTP-verzoek."
 
-#: WWW/Library/Implementation/HTTP.c:1465
+#: WWW/Library/Implementation/HTTP.c:1472
 msgid "Unexpected network write error; connection aborted."
 msgstr "Onverwachte fout bij schrijven naar netwerk; verbinding is verbroken."
 
-#: WWW/Library/Implementation/HTTP.c:1471
+#: WWW/Library/Implementation/HTTP.c:1478
 msgid "HTTP request sent; waiting for response."
 msgstr "HTTP-verzoek is verzonden; wacht op antwoord."
 
-#: WWW/Library/Implementation/HTTP.c:1539
+#: WWW/Library/Implementation/HTTP.c:1546
 msgid "Unexpected network read error; connection aborted."
 msgstr "Onverwachte fout bij lezen uit netwerk; verbinding is verbroken."
 
@@ -3178,7 +3173,7 @@ msgstr "Onverwachte fout bij lezen uit netwerk; verbinding is verbroken."
 #. * line and possibly other headers, so we'll deal with them by
 #. * showing the full header to the user as text/plain.  - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1733
+#: WWW/Library/Implementation/HTTP.c:1740
 msgid "Got unexpected Informational Status."
 msgstr "Onverwachte informatieve status ontvangen."
 
@@ -3188,7 +3183,7 @@ msgstr "Onverwachte informatieve status ontvangen."
 #. * content.  We'll instruct the user to do that, and
 #. * restore the current document.  - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1767
+#: WWW/Library/Implementation/HTTP.c:1774
 msgid "Request fulfilled.  Reset Content."
 msgstr "Verzoek is volbracht.  Herstellen van inhoud."
 
@@ -3198,27 +3193,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:1884
+#: WWW/Library/Implementation/HTTP.c:1890
 msgid "Got unexpected 304 Not Modified status."
 msgstr "Kreeg een onverwachte '304 Niet gewijzigd'-statusmelding."
 
-#: WWW/Library/Implementation/HTTP.c:1947
+#: WWW/Library/Implementation/HTTP.c:1953
 msgid "Redirection of POST content requires user approval."
 msgstr "Doorverwijzing van POST-inhoud vereist toestemming van de gebruiker."
 
-#: WWW/Library/Implementation/HTTP.c:1962
+#: WWW/Library/Implementation/HTTP.c:1968
 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:2004
+#: WWW/Library/Implementation/HTTP.c:2010
 msgid "Retrying with access authorization information."
 msgstr "Bezig opnieuw te proberen met toegangsautorisatie-informatie."
 
-#: WWW/Library/Implementation/HTTP.c:2016
+#: WWW/Library/Implementation/HTTP.c:2022
 msgid "Show the 401 message body?"
 msgstr "Inhoud van het 401-bericht laten zien?"
 
-#: WWW/Library/Implementation/HTTP.c:2059
+#: WWW/Library/Implementation/HTTP.c:2065
 msgid "Show the 407 message body?"
 msgstr "Inhoud van het 407-bericht laten zien?"
 
@@ -3226,7 +3221,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:2159
+#: WWW/Library/Implementation/HTTP.c:2165
 msgid "Unknown status reply from server!"
 msgstr "Onbekende statusmelding van server!"
 
@@ -3414,106 +3409,106 @@ msgstr "Beheerder"
 msgid "Host"
 msgstr "Computer"
 
-#: src/GridText.c:705
+#: src/GridText.c:704
 msgid "Memory exhausted, display interrupted!"
 msgstr "Geen geheugen meer beschikbar, weergave is onderbroken!"
 
-#: src/GridText.c:710
+#: src/GridText.c:709
 msgid "Memory exhausted, will interrupt transfer!"
 msgstr "Geen geheugen meer beschikbaar, overdracht wordt afgebroken!"
 
-#: src/GridText.c:3654
+#: src/GridText.c:3663
 msgid " *** MEMORY EXHAUSTED ***"
 msgstr " *** ONVOLDOENDE GEHEUGEN BESCHIKBAAR ***"
 
-#: src/GridText.c:6089 src/GridText.c:6096 src/LYList.c:239
+#: src/GridText.c:6057 src/GridText.c:6064 src/LYList.c:239
 msgid "unknown field or link"
 msgstr "onbekend veld of link"
 
-#: src/GridText.c:6105
+#: src/GridText.c:6073
 msgid "text entry field"
 msgstr "tekstinvoerveld"
 
-#: src/GridText.c:6108
+#: src/GridText.c:6076
 msgid "password entry field"
 msgstr "wachtwoordinvoerveld"
 
-#: src/GridText.c:6111
+#: src/GridText.c:6079
 msgid "checkbox"
 msgstr "aanvinkvakje"
 
-#: src/GridText.c:6114
+#: src/GridText.c:6082
 msgid "radio button"
 msgstr "drukknop"
 
-#: src/GridText.c:6117
+#: src/GridText.c:6085
 msgid "submit button"
 msgstr "verzendknop"
 
-#: src/GridText.c:6120
+#: src/GridText.c:6088
 msgid "reset button"
 msgstr "herstelknop"
 
-#: src/GridText.c:6123
+#: src/GridText.c:6091
 msgid "popup menu"
 msgstr "popup-menu"
 
-#: src/GridText.c:6126
+#: src/GridText.c:6094
 msgid "hidden form field"
 msgstr "verborgen formulierveld"
 
-#: src/GridText.c:6129
+#: src/GridText.c:6097
 msgid "text entry area"
 msgstr "tekstinvoergebied"
 
-#: src/GridText.c:6132
+#: src/GridText.c:6100
 msgid "range entry field"
 msgstr "bereikinvoerveld"
 
-#: src/GridText.c:6135
+#: src/GridText.c:6103
 msgid "file entry field"
 msgstr "bestandsnaaminvoerveld"
 
-#: src/GridText.c:6138
+#: src/GridText.c:6106
 msgid "text-submit field"
 msgstr "tekst-verzendveld"
 
-#: src/GridText.c:6141
+#: src/GridText.c:6109
 msgid "image-submit button"
 msgstr "afbeelding-verzendknop"
 
-#: src/GridText.c:6144
+#: src/GridText.c:6112
 msgid "keygen field"
 msgstr "sleutelaanmaakveld"
 
-#: src/GridText.c:6147
+#: src/GridText.c:6115
 msgid "unknown form field"
 msgstr "onbekend formulierveld"
 
-#: src/GridText.c:10279
+#: src/GridText.c:10245
 msgid "Can't open file for uploading"
 msgstr "Kan bestand niet openen voor upload"
 
-#: src/GridText.c:11438
+#: src/GridText.c:11404
 #, c-format
 msgid "Submitting %s"
 msgstr "Verzenden van %s"
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12491
+#: src/GridText.c:12457
 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:12628
+#: src/GridText.c:12594
 msgid "Wrap lines to fit displayed area?"
 msgstr "Regels omvouwen zodat alles zichtbaar is?"
 
-#: src/GridText.c:12680
+#: src/GridText.c:12646
 msgid "Very long lines have been wrapped!"
 msgstr "Erg lange regels zijn omgevouwen!"
 
-#: src/GridText.c:13185
+#: src/GridText.c:13151
 msgid "Very long lines have been truncated!"
 msgstr "Erg lange regels zijn afgekapt!"
 
@@ -3607,36 +3602,36 @@ msgstr "nee"
 msgid "Y/N/A/V"
 msgstr "J/N/A/V"
 
-#: src/HTML.c:5911
+#: src/HTML.c:5912
 msgid "Description:"
 msgstr "Omschrijving:"
 
-#: src/HTML.c:5916
+#: src/HTML.c:5917
 msgid "(none)"
 msgstr "(geen)"
 
-#: src/HTML.c:5920
+#: src/HTML.c:5921
 msgid "Filepath:"
 msgstr "Bestandspad:"
 
-#: src/HTML.c:5926
+#: src/HTML.c:5927
 msgid "(unknown)"
 msgstr "(onbekend)"
 
-#: src/HTML.c:7353
+#: src/HTML.c:7352
 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:7852
+#: src/HTML.c:7851
 msgid "Source cache error - disk full?"
 msgstr "Cache fout - schijf vol?"
 
-#: src/HTML.c:7865
+#: src/HTML.c:7864
 msgid "Source cache error - not enough memory!"
 msgstr "Cache fout - niet genoeg geheugen!"
 
-#: src/LYBookmark.c:164
+#: src/LYBookmark.c:167
 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"
@@ -3648,7 +3643,7 @@ msgstr ""
 "     het 'verwijder boekenlegger', welke doorgaans gekoppeld is aan\n"
 "     de 'R' toets, maar uw systeembeheerder heeft dit wellicht gewijzigd."
 
-#: src/LYBookmark.c:371
+#: src/LYBookmark.c:374
 #, c-format
 msgid ""
 "     You can delete links by the 'R' key<br>\n"
@@ -3657,7 +3652,7 @@ msgstr ""
 "     U kunt links verwijderen met de 'R' toets<br>\n"
 "<ol>\n"
 
-#: src/LYBookmark.c:374
+#: src/LYBookmark.c:377
 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"
@@ -3667,7 +3662,7 @@ msgstr ""
 "     Dit is doorgaans de 'R' toets, maar uw systeembeheerder kan dit\n"
 "     gewijzigd hebben."
 
-#: src/LYBookmark.c:378
+#: src/LYBookmark.c:381
 msgid ""
 "     This file also may be edited with a standard text editor to delete\n"
 "     outdated or invalid links, or to change their order."
@@ -3675,7 +3670,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:381
+#: src/LYBookmark.c:384
 msgid ""
 "Note: if you edit this file manually\n"
 "      you should not change the format within the lines\n"
@@ -3687,7 +3682,7 @@ msgstr ""
 "      of andere HTML opmaak toevoegen.\n"
 "      Boekenlegger-links dienen als één regel te worden opgeslagen."
 
-#: src/LYBookmark.c:677
+#: src/LYBookmark.c:680
 #, 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"
@@ -3725,19 +3720,19 @@ msgstr "Het biedt voortreffelijke CGI script ondersteuning.\n"
 msgid "Exiting via interrupt:"
 msgstr "Beëindiging via interrupt:"
 
-#: src/LYCookie.c:2461
+#: src/LYCookie.c:2477
 msgid "(from a previous session)"
 msgstr "(van een eerdere sessie)"
 
-#: src/LYCookie.c:2522
+#: src/LYCookie.c:2538
 msgid "Maximum Gobble Date:"
 msgstr "Uiterste Houdbaarheidsdatum:"
 
-#: src/LYCookie.c:2562
+#: src/LYCookie.c:2577
 msgid "Internal"
 msgstr "Intern"
 
-#: src/LYCookie.c:2563
+#: src/LYCookie.c:2578
 msgid "cookie_domain_flag_set error, aborting program"
 msgstr "cookie_domain_flag_set fout, programma wordt afgebroken"
 
@@ -3806,39 +3801,39 @@ msgstr "Editor is geëlimineerd door signaal"
 msgid "Editor returned with error status %s"
 msgstr "Editor gaf afsluitwaarde %s terug"
 
-#: src/LYDownload.c:504
+#: src/LYDownload.c:506
 msgid "Downloaded link:"
 msgstr "Gedownloade link:"
 
-#: src/LYDownload.c:509
+#: src/LYDownload.c:511
 msgid "Suggested file name:"
 msgstr "Voorgestelde bestandsnaam:"
 
-#: src/LYDownload.c:514
+#: src/LYDownload.c:516
 msgid "Standard download options:"
 msgstr "Standaard downloadmogelijkheden:"
 
-#: src/LYDownload.c:515
+#: src/LYDownload.c:517
 msgid "Download options:"
 msgstr "Downloadmogelijkheden:"
 
-#: src/LYDownload.c:531
+#: src/LYDownload.c:533
 msgid "Save to disk"
 msgstr "Opslaan op schijf"
 
-#: src/LYDownload.c:545
+#: src/LYDownload.c:547
 msgid "View temporary file"
 msgstr "Tijdelijk bestand bekijken"
 
-#: src/LYDownload.c:552
+#: src/LYDownload.c:554
 msgid "Save to disk disabled."
 msgstr "Opslaan op schijf is uitgeschakeld."
 
-#: src/LYDownload.c:556 src/LYPrint.c:1310
+#: src/LYDownload.c:558 src/LYPrint.c:1310
 msgid "Local additions:"
 msgstr "Lokale toevoegingen:"
 
-#: src/LYDownload.c:567 src/LYUpload.c:211
+#: src/LYDownload.c:569 src/LYUpload.c:211
 msgid "No Name Given"
 msgstr "Geen naam opgegeven"
 
@@ -4253,19 +4248,19 @@ msgstr "Dit bericht is automatisch gegenereerd door"
 msgid "No system mailer configured"
 msgstr "Geen systeemmailer geconfigureerd"
 
-#: src/LYMain.c:1023
+#: src/LYMain.c:1001
 msgid "No Winsock found, sorry."
 msgstr "Geen Winsock gevonden, sorry."
 
-#: src/LYMain.c:1226
+#: src/LYMain.c:1198
 msgid "You MUST define a valid TMP or TEMP area!"
 msgstr "U MOET een geldig TMP- of TEMP-gebied opgeven!"
 
-#: src/LYMain.c:1279 src/LYMainLoop.c:5074
+#: src/LYMain.c:1251 src/LYMainLoop.c:5051
 msgid "No such directory"
 msgstr "Map bestaat niet"
 
-#: src/LYMain.c:1464
+#: src/LYMain.c:1436
 #, c-format
 msgid ""
 "\n"
@@ -4276,7 +4271,7 @@ msgstr ""
 "Configuratiebestand '%s' is niet beschikbaar.\n"
 "\n"
 
-#: src/LYMain.c:1474
+#: src/LYMain.c:1446
 #, c-format
 msgid ""
 "\n"
@@ -4287,7 +4282,7 @@ msgstr ""
 "Lynx-tekensets zijn niet opgegeven.\n"
 "\n"
 
-#: src/LYMain.c:1503
+#: src/LYMain.c:1475
 #, c-format
 msgid ""
 "\n"
@@ -4298,7 +4293,7 @@ msgstr ""
 "Lynx-editkaart is niet opgegeven.\n"
 "\n"
 
-#: src/LYMain.c:1579
+#: src/LYMain.c:1551
 #, c-format
 msgid ""
 "\n"
@@ -4309,172 +4304,172 @@ msgstr ""
 "Lynx-bestand '%s' is niet beschikbaar.\n"
 "\n"
 
-#: src/LYMain.c:1654
+#: src/LYMain.c:1626
 #, c-format
 msgid "Ignored %d characters from standard input.\n"
 msgstr "Er zijn %d tekens van standaardinvoer genegeerd.\n"
 
-#: src/LYMain.c:1656
+#: src/LYMain.c:1628
 #, 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:1804
+#: src/LYMain.c:1776
 msgid "Warning:"
 msgstr "Waarschuwing:"
 
-#: src/LYMain.c:2372
+#: src/LYMain.c:2341
 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:2617 src/LYMain.c:2662
+#: src/LYMain.c:2586 src/LYMain.c:2631
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr "Lynx: onbekende tekenset '%s' wordt genegeerd\n"
 
-#: src/LYMain.c:3181
+#: src/LYMain.c:3150
 #, c-format
 msgid "%s Version %s (%s)"
 msgstr "%s versie %s (%s)"
 
-#: src/LYMain.c:3219
+#: src/LYMain.c:3188
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr "Gecompileerd op %s op %s om %s\n"
 
-#: src/LYMain.c:3241
+#: src/LYMain.c:3210
 msgid "Copyrights held by the Lynx Developers Group,"
 msgstr "De auteursrechten zijn in handen van de Lynx-ontwikkelaarsgroep,"
 
-#: src/LYMain.c:3242
+#: src/LYMain.c:3211
 msgid "the University of Kansas, CERN, and other contributors."
 msgstr "de Universiteit van Kansas, CERN, en andere medewerkers."
 
-#: src/LYMain.c:3243
+#: src/LYMain.c:3212
 msgid "Distributed under the GNU General Public License (Version 2)."
 msgstr "Gedistribueerd onder de GPL (GNU General Public License), versie 2."
 
-#: src/LYMain.c:3244
+#: src/LYMain.c:3213
 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:4065
+#: src/LYMain.c:4032
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "Gebruik:  %s [opties] [bestand]\n"
 
-#: src/LYMain.c:4066
+#: src/LYMain.c:4033
 #, c-format
 msgid "Options are:\n"
 msgstr "Mogelijke opties zijn:\n"
 
-#: src/LYMain.c:4365
+#: src/LYMain.c:4332
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr "%s: Ongeldige optie: %s\n"
 
-#: src/LYMainLoop.c:594
+#: src/LYMainLoop.c:571
 #, c-format
 msgid "Internal error: Invalid mouse link %d!"
 msgstr "**Interne fout**: Ongeldige muiskoppeling %d!"
 
-#: src/LYMainLoop.c:714 src/LYMainLoop.c:5096
+#: src/LYMainLoop.c:691 src/LYMainLoop.c:5073
 msgid "A URL specified by the user"
 msgstr "Een door de gebruiker opgegeven URL"
 
-#: src/LYMainLoop.c:1173
+#: src/LYMainLoop.c:1150
 msgid "Enctype multipart/form-data not yet supported!  Cannot submit."
 msgstr "Het Enctype 'multipart/form-data' wordt nog niet ondersteund!  Kan niet verzenden."
 
 #.
 #. * Make a name for this help file.
 #.
-#: src/LYMainLoop.c:3105
+#: src/LYMainLoop.c:3082
 msgid "Help Screen"
 msgstr "Hulpscherm"
 
-#: src/LYMainLoop.c:3226
+#: src/LYMainLoop.c:3203
 msgid "System Index"
 msgstr "Systeemindex"
 
-#: src/LYMainLoop.c:3585 src/LYMainLoop.c:5320
+#: src/LYMainLoop.c:3562 src/LYMainLoop.c:5297
 msgid "Entry into main screen"
 msgstr "Ingang naar beginscherm"
 
-#: src/LYMainLoop.c:3843
+#: src/LYMainLoop.c:3820
 msgid "No next document present"
 msgstr "Geen volgend document aanwezig"
 
-#: src/LYMainLoop.c:4139
+#: src/LYMainLoop.c:4116
 msgid "charset for this document specified explicitly, sorry..."
 msgstr "de tekenset voor dit document is expliciet opgegeven, sorry..."
 
-#: src/LYMainLoop.c:5052
+#: src/LYMainLoop.c:5029
 msgid "cd to:"
 msgstr "cd naar:"
 
-#: src/LYMainLoop.c:5077
+#: src/LYMainLoop.c:5054
 msgid "A component of path is not a directory"
 msgstr "Een component van het pad is geen map"
 
-#: src/LYMainLoop.c:5080
+#: src/LYMainLoop.c:5057
 msgid "failed to change directory"
 msgstr "Map wijzigen is mislukt"
 
-#: src/LYMainLoop.c:6252
+#: src/LYMainLoop.c:6229
 msgid "Reparsing document under current settings..."
 msgstr "Document wordt opnieuw ontleed met huidige instellingen..."
 
-#: src/LYMainLoop.c:6543
+#: src/LYMainLoop.c:6521
 #, c-format
 msgid "Fatal error - could not open output file %s\n"
 msgstr "Fatale fout: kan uitvoerbestand %s niet openen\n"
 
-#: src/LYMainLoop.c:6880
+#: src/LYMainLoop.c:6858
 msgid "TABLE center enable."
 msgstr "TABLE centreren ingeschakeld."
 
-#: src/LYMainLoop.c:6883
+#: src/LYMainLoop.c:6861
 msgid "TABLE center disable."
 msgstr "TABLE centreren uitgeschakeld."
 
-#: src/LYMainLoop.c:6960
+#: src/LYMainLoop.c:6938
 msgid "Current URL is empty."
 msgstr "Huidige URL is leeg."
 
-#: src/LYMainLoop.c:6962 src/LYUtils.c:1828
+#: src/LYMainLoop.c:6940 src/LYUtils.c:1828
 msgid "Copy to clipboard failed."
 msgstr "Kopiëren naar klembord is mislukt."
 
-#: src/LYMainLoop.c:6964
+#: src/LYMainLoop.c:6942
 msgid "Document URL put to clipboard."
 msgstr "Document-URL is op klembord geplaatst."
 
-#: src/LYMainLoop.c:6966
+#: src/LYMainLoop.c:6944
 msgid "Link URL put to clipboard."
 msgstr "Link-URL is op klembord geplaatst."
 
-#: src/LYMainLoop.c:6993
+#: src/LYMainLoop.c:6971
 msgid "No URL in the clipboard."
 msgstr "Geen URL op het klembord."
 
-#: src/LYMainLoop.c:7664 src/LYMainLoop.c:7834
+#: src/LYMainLoop.c:7642 src/LYMainLoop.c:7812
 msgid "-index-"
 msgstr "-index-"
 
-#: src/LYMainLoop.c:7774
+#: src/LYMainLoop.c:7752
 msgid "lynx: Can't access startfile"
 msgstr "lynx: Geen toegang tot startbestand"
 
-#: src/LYMainLoop.c:7786
+#: src/LYMainLoop.c:7764
 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:7787
+#: src/LYMainLoop.c:7765
 msgid "      Exiting..."
 msgstr "      Afsluiten..."
 
-#: src/LYMainLoop.c:7828
+#: src/LYMainLoop.c:7806
 msgid "-more-"
 msgstr "-meer-"
 
@@ -4538,348 +4533,348 @@ msgstr ""
 msgid "Message has no original text!"
 msgstr "Bericht bevat geen oorspronkelijke tekst!"
 
-#: src/LYOptions.c:765
+#: src/LYOptions.c:768
 msgid "review/edit B)ookmarks files"
 msgstr "B)ladwijzerbestanden bekijken/wijzigen"
 
-#: src/LYOptions.c:767
+#: src/LYOptions.c:770
 msgid "B)ookmark file: "
 msgstr "B)ladwijzerbestand: "
 
-#: src/LYOptions.c:2127 src/LYOptions.c:2134
+#: src/LYOptions.c:2131 src/LYOptions.c:2138
 msgid "ON"
 msgstr "AAN"
 
 #. verbose_img variable
-#: src/LYOptions.c:2128 src/LYOptions.c:2133 src/LYOptions.c:2285 src/LYOptions.c:2296
+#: src/LYOptions.c:2132 src/LYOptions.c:2137 src/LYOptions.c:2289 src/LYOptions.c:2300
 msgid "OFF"
 msgstr "UIT"
 
-#: src/LYOptions.c:2129
+#: src/LYOptions.c:2133
 msgid "NEVER"
 msgstr "NOOIT"
 
-#: src/LYOptions.c:2130
+#: src/LYOptions.c:2134
 msgid "ALWAYS"
 msgstr "ALTIJD"
 
-#: src/LYOptions.c:2146 src/LYOptions.c:2277
+#: src/LYOptions.c:2150 src/LYOptions.c:2281
 msgid "ignore"
 msgstr "negeren"
 
-#: src/LYOptions.c:2147
+#: src/LYOptions.c:2151
 msgid "ask user"
 msgstr "gebruiker vragen"
 
-#: src/LYOptions.c:2148
+#: src/LYOptions.c:2152
 msgid "accept all"
 msgstr "alles aanvaarden"
 
-#: src/LYOptions.c:2160
+#: src/LYOptions.c:2164
 msgid "ALWAYS OFF"
 msgstr "ALTIJD UIT"
 
-#: src/LYOptions.c:2161
+#: src/LYOptions.c:2165
 msgid "FOR LOCAL FILES ONLY"
 msgstr "ALLEEN VOOR LOKALE BESTANDEN"
 
-#: src/LYOptions.c:2163
+#: src/LYOptions.c:2167
 msgid "ALWAYS ON"
 msgstr "ALTIJD AAN"
 
-#: src/LYOptions.c:2175
+#: src/LYOptions.c:2179
 msgid "Numbers act as arrows"
 msgstr "cijfers doen als pijltjes"
 
-#: src/LYOptions.c:2177
+#: src/LYOptions.c:2181
 msgid "Links are numbered"
 msgstr "cijfers kiezen koppelingen"
 
-#: src/LYOptions.c:2180
+#: src/LYOptions.c:2184
 msgid "Links and form fields are numbered"
 msgstr "cijfers kiezen koppelingen/formuliervelden"
 
-#: src/LYOptions.c:2183
+#: src/LYOptions.c:2187
 msgid "Form fields are numbered"
 msgstr "cijfers kiezen formuliervelden"
 
-#: src/LYOptions.c:2197
+#: src/LYOptions.c:2201
 msgid "Case insensitive"
 msgstr "hoofdletterongevoelig"
 
-#: src/LYOptions.c:2198
+#: src/LYOptions.c:2202
 msgid "Case sensitive"
 msgstr "hoofdlettergevoelig"
 
-#: src/LYOptions.c:2222
+#: src/LYOptions.c:2226
 msgid "prompt normally"
 msgstr "normaal prompten"
 
-#: src/LYOptions.c:2223
+#: src/LYOptions.c:2227
 msgid "force yes-response"
 msgstr "ja-antwoord afdwingen"
 
-#: src/LYOptions.c:2224
+#: src/LYOptions.c:2228
 msgid "force no-response"
 msgstr "nee-antwoord afdwingen"
 
-#: src/LYOptions.c:2242
+#: src/LYOptions.c:2246
 msgid "Novice"
 msgstr "beginner"
 
-#: src/LYOptions.c:2243
+#: src/LYOptions.c:2247
 msgid "Intermediate"
 msgstr "gevorderd"
 
-#: src/LYOptions.c:2244
+#: src/LYOptions.c:2248
 msgid "Advanced"
 msgstr "expert"
 
-#: src/LYOptions.c:2253
+#: src/LYOptions.c:2257
 msgid "By First Visit"
 msgstr "op eerstbezocht"
 
-#: src/LYOptions.c:2255
+#: src/LYOptions.c:2259
 msgid "By First Visit Reversed"
 msgstr "omgekeerd eerstbezocht"
 
-#: src/LYOptions.c:2256
+#: src/LYOptions.c:2260
 msgid "As Visit Tree"
 msgstr "als bezoekboom"
 
-#: src/LYOptions.c:2257
+#: src/LYOptions.c:2261
 msgid "By Last Visit"
 msgstr "op laatstbezocht"
 
-#: src/LYOptions.c:2259
+#: src/LYOptions.c:2263
 msgid "By Last Visit Reversed"
 msgstr "omgekeerd laatstbezocht"
 
 #. Old_DTD variable
-#: src/LYOptions.c:2270
+#: src/LYOptions.c:2274
 msgid "relaxed (TagSoup mode)"
 msgstr "versoepeld (TagSoup-modus)"
 
-#: src/LYOptions.c:2271
+#: src/LYOptions.c:2275
 msgid "strict (SortaSGML mode)"
 msgstr "strikt (SortaSGML-modus)"
 
-#: src/LYOptions.c:2278
+#: src/LYOptions.c:2282
 msgid "as labels"
 msgstr "tonen als labels"
 
-#: src/LYOptions.c:2279
+#: src/LYOptions.c:2283
 msgid "as links"
 msgstr "tonen als koppelingen"
 
-#: src/LYOptions.c:2286
+#: src/LYOptions.c:2290
 msgid "show filename"
 msgstr "bestandsnaam tonen"
 
-#: src/LYOptions.c:2297
+#: src/LYOptions.c:2301
 msgid "STANDARD"
 msgstr "STANDAARD"
 
-#: src/LYOptions.c:2298
+#: src/LYOptions.c:2302
 msgid "ADVANCED"
 msgstr "GEAVANCEERD"
 
-#: src/LYOptions.c:2329
+#: src/LYOptions.c:2333
 msgid "Directories first"
 msgstr "mappen eerst"
 
-#: src/LYOptions.c:2330
+#: src/LYOptions.c:2334
 msgid "Files first"
 msgstr "bestanden eerst"
 
-#: src/LYOptions.c:2331
+#: src/LYOptions.c:2335
 msgid "Mixed style"
 msgstr "gemengd"
 
-#: src/LYOptions.c:2339 src/LYOptions.c:2359
+#: src/LYOptions.c:2343 src/LYOptions.c:2363
 msgid "By Name"
 msgstr "op naam"
 
-#: src/LYOptions.c:2340 src/LYOptions.c:2360
+#: src/LYOptions.c:2344 src/LYOptions.c:2364
 msgid "By Type"
 msgstr "op type"
 
-#: src/LYOptions.c:2341 src/LYOptions.c:2361
+#: src/LYOptions.c:2345 src/LYOptions.c:2365
 msgid "By Size"
 msgstr "op grootte"
 
-#: src/LYOptions.c:2342 src/LYOptions.c:2362
+#: src/LYOptions.c:2346 src/LYOptions.c:2366
 msgid "By Date"
 msgstr "op datum"
 
-#: src/LYOptions.c:2343
+#: src/LYOptions.c:2347
 msgid "By Mode"
 msgstr "op modus"
 
-#: src/LYOptions.c:2345
+#: src/LYOptions.c:2349
 msgid "By User"
 msgstr "op gebruiker"
 
-#: src/LYOptions.c:2346
+#: src/LYOptions.c:2350
 msgid "By Group"
 msgstr "op groep"
 
-#: src/LYOptions.c:2371
+#: src/LYOptions.c:2375
 msgid "Do not show rate"
 msgstr "niet tonen"
 
-#: src/LYOptions.c:2372 src/LYOptions.c:2373
+#: src/LYOptions.c:2376 src/LYOptions.c:2377
 #, c-format
 msgid "Show %s/sec rate"
 msgstr "als %s/s tonen"
 
-#: src/LYOptions.c:2375 src/LYOptions.c:2376
+#: src/LYOptions.c:2379 src/LYOptions.c:2380
 #, c-format
 msgid "Show %s/sec, ETA"
 msgstr "als %s/s plus ETA tonen"
 
-#: src/LYOptions.c:2379
+#: src/LYOptions.c:2383
 msgid "Show progressbar"
 msgstr "als voortgangsbalk"
 
-#: src/LYOptions.c:2391
+#: src/LYOptions.c:2395
 msgid "Accept lynx's internal types"
 msgstr "interne types van Lynx accepteren"
 
-#: src/LYOptions.c:2392
+#: src/LYOptions.c:2396
 msgid "Also accept lynx.cfg's types"
 msgstr "ook types uit lynx.cfg accepteren"
 
-#: src/LYOptions.c:2393
+#: src/LYOptions.c:2397
 msgid "Also accept user's types"
 msgstr "ook gebruikertypes accepteren"
 
-#: src/LYOptions.c:2394
+#: src/LYOptions.c:2398
 msgid "Also accept system's types"
 msgstr "ook systeemtypes accepteren"
 
-#: src/LYOptions.c:2395
+#: src/LYOptions.c:2399
 msgid "Accept all types"
 msgstr "alle types accepteren"
 
-#: src/LYOptions.c:2404
+#: src/LYOptions.c:2408
 msgid "gzip"
 msgstr "gzip"
 
-#: src/LYOptions.c:2405
+#: src/LYOptions.c:2409
 msgid "deflate"
 msgstr "deflate"
 
-#: src/LYOptions.c:2408
+#: src/LYOptions.c:2412
 msgid "compress"
 msgstr "compress"
 
-#: src/LYOptions.c:2411
+#: src/LYOptions.c:2415
 msgid "bzip2"
 msgstr "bzip2"
 
-#: src/LYOptions.c:2413
+#: src/LYOptions.c:2417
 msgid "All"
 msgstr "allemaal"
 
-#: src/LYOptions.c:2681 src/LYOptions.c:2705
+#: src/LYOptions.c:2685 src/LYOptions.c:2709
 #, c-format
 msgid "Use %s to invoke the Options menu!"
 msgstr "Gebruik %s om naar het Optiesmenu te gaan!"
 
-#: src/LYOptions.c:3477
+#: src/LYOptions.c:3481
 msgid "(options marked with (!) will not be saved)"
 msgstr "(opties gemarkeerd met (!) worden niet opgeslagen)"
 
-#: src/LYOptions.c:3485
+#: src/LYOptions.c:3489
 msgid "General Preferences"
 msgstr "Algemene voorkeuren"
 
 #. ***************************************************************
 #. User Mode: SELECT
-#: src/LYOptions.c:3489
+#: src/LYOptions.c:3493
 msgid "User mode"
 msgstr "Gebruikersmodus"
 
 #. Editor: INPUT
-#: src/LYOptions.c:3495
+#: src/LYOptions.c:3499
 msgid "Editor"
 msgstr "Editor"
 
 #. Search Type: SELECT
-#: src/LYOptions.c:3500
+#: src/LYOptions.c:3504
 msgid "Type of Search"
 msgstr "Zoekmethode"
 
-#: src/LYOptions.c:3505
+#: src/LYOptions.c:3509
 msgid "Security and Privacy"
 msgstr "Veiligheid en privacy"
 
 #. ***************************************************************
 #. Cookies: SELECT
-#: src/LYOptions.c:3509
+#: src/LYOptions.c:3513
 msgid "Cookies"
 msgstr "Koekjes"
 
 #. Cookie Prompting: SELECT
-#: src/LYOptions.c:3523
+#: src/LYOptions.c:3527
 msgid "Invalid-Cookie Prompting"
 msgstr "Prompt bij ongeldige koekjes"
 
 #. SSL Prompting: SELECT
-#: src/LYOptions.c:3530
+#: src/LYOptions.c:3534
 msgid "SSL Prompting"
 msgstr "SSL-prompt"
 
-#: src/LYOptions.c:3536
+#: src/LYOptions.c:3540
 msgid "Keyboard Input"
 msgstr "Toetsenbordinvoer"
 
 #. ***************************************************************
 #. Keypad Mode: SELECT
-#: src/LYOptions.c:3540
+#: src/LYOptions.c:3544
 msgid "Keypad mode"
 msgstr "Gedrag van cijfertoetsen"
 
 #. Emacs keys: ON/OFF
-#: src/LYOptions.c:3546
+#: src/LYOptions.c:3550
 msgid "Emacs keys"
 msgstr "Emacs-toetsen"
 
 #. VI Keys: ON/OFF
-#: src/LYOptions.c:3552
+#: src/LYOptions.c:3556
 msgid "VI keys"
 msgstr "VI-toetsen"
 
 #. Line edit style: SELECT
 #. well, at least 2 line edit styles available
-#: src/LYOptions.c:3559
+#: src/LYOptions.c:3563
 msgid "Line edit style"
 msgstr "Regelbewerkingsstijl"
 
 #. Keyboard layout: SELECT
-#: src/LYOptions.c:3571
+#: src/LYOptions.c:3575
 msgid "Keyboard layout"
 msgstr "Toetsenbordindeling"
 
 #.
 #. * Display and Character Set
 #.
-#: src/LYOptions.c:3585
+#: src/LYOptions.c:3589
 msgid "Display and Character Set"
 msgstr "Weergave en tekenset"
 
 #. Use locale-based character set: ON/OFF
-#: src/LYOptions.c:3590
+#: src/LYOptions.c:3594
 msgid "Use locale-based character set"
 msgstr "Tekenset van taalregio nemen"
 
 #. Display Character Set: SELECT
-#: src/LYOptions.c:3599
+#: src/LYOptions.c:3603
 msgid "Display character set"
 msgstr "Gebruikte tekenset op scherm"
 
-#: src/LYOptions.c:3630
+#: src/LYOptions.c:3634
 msgid "Assumed document character set"
 msgstr "Tekenset van huidig document"
 
@@ -4888,186 +4883,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:3650
+#: src/LYOptions.c:3654
 msgid "CJK mode"
 msgstr "CJK-modus"
 
-#: src/LYOptions.c:3652
+#: src/LYOptions.c:3656
 msgid "Raw 8-bit"
 msgstr "Kale 8-bit"
 
 #. X Display: INPUT
-#: src/LYOptions.c:3660
+#: src/LYOptions.c:3664
 msgid "X Display"
 msgstr "X-display"
 
 #.
 #. * Document Appearance
 #.
-#: src/LYOptions.c:3666
+#: src/LYOptions.c:3670
 msgid "Document Appearance"
 msgstr "Uiterlijk van document"
 
-#: src/LYOptions.c:3672
+#: src/LYOptions.c:3676
 msgid "Show color"
 msgstr "Kleur tonen"
 
 #. Show cursor: ON/OFF
-#: src/LYOptions.c:3696
+#: src/LYOptions.c:3700
 msgid "Show cursor"
 msgstr "Cursor tonen"
 
 #. Underline links: ON/OFF
-#: src/LYOptions.c:3702
+#: src/LYOptions.c:3706
 msgid "Underline links"
 msgstr "Koppelingen onderstrepen"
 
 #. Show scrollbar: ON/OFF
-#: src/LYOptions.c:3709
+#: src/LYOptions.c:3713
 msgid "Show scrollbar"
 msgstr "Schuifbalk tonen"
 
 #. Select Popups: ON/OFF
-#: src/LYOptions.c:3716
+#: src/LYOptions.c:3720
 msgid "Popups for select fields"
 msgstr "Menuutjes voor keuzevelden"
 
 #. HTML error recovery: SELECT
-#: src/LYOptions.c:3722
+#: src/LYOptions.c:3726
 msgid "HTML error recovery"
 msgstr "HTML-foutcorrectie"
 
 #. Show Images: SELECT
-#: src/LYOptions.c:3728
+#: src/LYOptions.c:3732
 msgid "Show images"
 msgstr "Afbeeldingen"
 
 #. Verbose Images: ON/OFF
-#: src/LYOptions.c:3742
+#: src/LYOptions.c:3746
 msgid "Verbose images"
 msgstr "Details van afbeeldingen"
 
 #.
 #. * Headers Transferred to Remote Servers
 #.
-#: src/LYOptions.c:3750
+#: src/LYOptions.c:3754
 msgid "Headers Transferred to Remote Servers"
 msgstr "Naar servers verzonden kopregels"
 
 #. ***************************************************************
 #. Mail Address: INPUT
-#: src/LYOptions.c:3754
+#: src/LYOptions.c:3758
 msgid "Personal mail address"
 msgstr "Persoonlijk e-mailadres"
 
-#: src/LYOptions.c:3760
+#: src/LYOptions.c:3764
 msgid "Password for anonymous ftp"
 msgstr "Wachtwoord voor anonieme FTP"
 
 #. Preferred media type: SELECT
-#: src/LYOptions.c:3766
+#: src/LYOptions.c:3770
 msgid "Preferred media type"
 msgstr "Voorkeursmediatype"
 
 # Het gaat over compressiemethodes, niet over codering.
 #. Preferred encoding: SELECT
-#: src/LYOptions.c:3772
+#: src/LYOptions.c:3776
 msgid "Preferred encoding"
 msgstr "Voorkeurscompressie"
 
 #. Preferred Document Character Set: INPUT
-#: src/LYOptions.c:3778
+#: src/LYOptions.c:3782
 msgid "Preferred document character set"
 msgstr "Voorkeurstekenset van document"
 
 #. Preferred Document Language: INPUT
-#: src/LYOptions.c:3783
+#: src/LYOptions.c:3787
 msgid "Preferred document language"
 msgstr "Voorkeurstaal van document"
 
-#: src/LYOptions.c:3789
+#: src/LYOptions.c:3793
 msgid "User-Agent header"
 msgstr "User-Agent-kopregel"
 
 #.
 #. * Listing and Accessing Files
 #.
-#: src/LYOptions.c:3797
+#: src/LYOptions.c:3801
 msgid "Listing and Accessing Files"
 msgstr "Bestandslijsten en snelheid"
 
 #. FTP sort: SELECT
-#: src/LYOptions.c:3802
+#: src/LYOptions.c:3806
 msgid "Use Passive FTP"
 msgstr "passieve FTP gebruiken"
 
 #. FTP sort: SELECT
-#: src/LYOptions.c:3808
+#: src/LYOptions.c:3812
 msgid "FTP sort criteria"
 msgstr "Sortering voor FTP"
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:3816
+#: src/LYOptions.c:3820
 msgid "Local directory sort criteria"
 msgstr "Groepering in lokale mappen"
 
 #. Local Directory Order: SELECT
-#: src/LYOptions.c:3822
+#: src/LYOptions.c:3826
 msgid "Local directory sort order"
 msgstr "Sortering van lokale bestanden"
 
-#: src/LYOptions.c:3831
+#: src/LYOptions.c:3835
 msgid "Show dot files"
 msgstr "puntbestanden tonen"
 
-#: src/LYOptions.c:3839
+#: src/LYOptions.c:3843
 msgid "Execution links"
 msgstr "verwijzingen die programma's starten"
 
 #. Show transfer rate: SELECT
-#: src/LYOptions.c:3859
+#: src/LYOptions.c:3863
 msgid "Show transfer rate"
 msgstr "Overdrachtssnelheid tonen"
 
 #.
 #. * Special Files and Screens
 #.
-#: src/LYOptions.c:3879
+#: src/LYOptions.c:3883
 msgid "Special Files and Screens"
 msgstr "Speciale bestanden en schermen"
 
-#: src/LYOptions.c:3884
+#: src/LYOptions.c:3888
 msgid "Multi-bookmarks"
 msgstr "Meervoudige boekenleggers"
 
-#: src/LYOptions.c:3892
+#: src/LYOptions.c:3896
 msgid "Review/edit Bookmarks files"
 msgstr "Boekenleggerbestanden bekijken/wijzigen"
 
-#: src/LYOptions.c:3894
+#: src/LYOptions.c:3898
 msgid "Goto multi-bookmark menu"
 msgstr "Naar multiboekenleggermenu"
 
-#: src/LYOptions.c:3896
+#: src/LYOptions.c:3900
 msgid "Bookmarks file"
 msgstr "Boekenleggerbestand"
 
 #. Auto Session: ON/OFF
-#: src/LYOptions.c:3903
+#: src/LYOptions.c:3907
 msgid "Auto Session"
 msgstr "Automatische sessie"
 
 #. Session File Menu: INPUT
-#: src/LYOptions.c:3909
+#: src/LYOptions.c:3913
 msgid "Session file"
 msgstr "Sessiebestand"
 
 #. Visited Pages: SELECT
-#: src/LYOptions.c:3915
+#: src/LYOptions.c:3919
 msgid "Visited Pages"
 msgstr "Bezochte pagina's"
 
-#: src/LYOptions.c:3920
+#: src/LYOptions.c:3924
 msgid "View the file "
 msgstr "Instellingenbestand bekijken: "
 
@@ -5187,38 +5182,38 @@ msgstr "Lynx: kan niet starten, CERN reglement bestand %s is niet beschikbaar\n"
 msgid "(no name)"
 msgstr "(naamloos)"
 
-#: src/LYReadCFG.c:1881
+#: src/LYReadCFG.c:1882
 #, c-format
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
 msgstr "Meer dan %d geneste insluitingen in lynx.cfg -- misschien een lus?!?\n"
 
-#: src/LYReadCFG.c:1883
+#: src/LYReadCFG.c:1884
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr "De laatst geprobeerde insluiting was '%s',\n"
 
-#: src/LYReadCFG.c:1884
+#: src/LYReadCFG.c:1885
 #, c-format
 msgid "included from '%s'.\n"
 msgstr "ingevoegd vanuit '%s'.\n"
 
-#: src/LYReadCFG.c:2292 src/LYReadCFG.c:2305 src/LYReadCFG.c:2363
+#: src/LYReadCFG.c:2289 src/LYReadCFG.c:2302 src/LYReadCFG.c:2360
 msgid "The following is read from your lynx.cfg file."
 msgstr "Onderstaande gegevens werden gelezen uit uw lynx.cfg-bestand."
 
-#: src/LYReadCFG.c:2293 src/LYReadCFG.c:2306
+#: src/LYReadCFG.c:2290 src/LYReadCFG.c:2303
 msgid "Please read the distribution"
 msgstr "Lees de meegeleverde versie van"
 
-#: src/LYReadCFG.c:2299 src/LYReadCFG.c:2309
+#: src/LYReadCFG.c:2296 src/LYReadCFG.c:2306
 msgid "for more comments."
 msgstr "voor meer opmerkingen."
 
-#: src/LYReadCFG.c:2345
+#: src/LYReadCFG.c:2342
 msgid "RELOAD THE CHANGES"
 msgstr "DE VERANDERINGEN HERLADEN"
 
-#: src/LYReadCFG.c:2353
+#: src/LYReadCFG.c:2350
 msgid "Your primary configuration"
 msgstr "Uw primaire instellingenbestand is:"
 
@@ -5454,7 +5449,7 @@ msgstr ""
 "waar OBJECT een van de volgende is: EM,STRONG,B,I,U,BLINK enz.\n"
 "\n"
 
-#: src/LYTraversal.c:108
+#: src/LYTraversal.c:111
 msgid "here is a list of the history stack so that you may rebuild"
 msgstr "hier is een lijst van de logs, zodat u opnieuw kunt bouwen"
 
@@ -5490,29 +5485,29 @@ msgstr "Zendopties:"
 msgid "Download document URL put to clipboard."
 msgstr "Document afhalings-URL op klembord geplaatst."
 
-#: src/LYUtils.c:2615
+#: src/LYUtils.c:2614
 msgid "Unexpected access protocol for this URL scheme."
 msgstr "Onverwacht toegangsprotocol voor deze URL-methode."
 
-#: src/LYUtils.c:3419
+#: src/LYUtils.c:3422
 msgid "Too many tempfiles"
 msgstr "Te veel tijdelijke bestanden"
 
-#: src/LYUtils.c:3719
+#: src/LYUtils.c:3722
 msgid "unknown restriction"
 msgstr "Onbekende beperking"
 
-#: src/LYUtils.c:3750
+#: src/LYUtils.c:3753
 #, c-format
 msgid "No restrictions set.\n"
 msgstr "Er zijn geen beperkingen gesteld.\n"
 
-#: src/LYUtils.c:3753
+#: src/LYUtils.c:3756
 #, c-format
 msgid "Restrictions set:\n"
 msgstr "Gestelde beperkingen:\n"
 
-#: src/LYUtils.c:5131
+#: src/LYUtils.c:5134
 msgid "Cannot find HOME directory"
 msgstr "Kan persoonlijke map niet vinden"
 
@@ -6048,6 +6043,8 @@ msgid ""
 "Lynx User Defaults File\n"
 "\n"
 msgstr ""
+"Lynxbestand met standaardinstellingen van gebruiker\n"
+"\n"
 
 #: src/LYrcFile.c:882
 msgid ""
@@ -6055,12 +6052,17 @@ msgid ""
 "with the 'o' key).  To save options with that screen, you must select the\n"
 "checkbox:\n"
 msgstr ""
+"Dit bestand bevat opties bewaard uit het scherm met Lynx-opties (meestal\n"
+"met de 'o'-toets). Om opties met dit venster te bewaren vinkt u het\n"
+"aanvinkveld aan:\n"
 
 #: src/LYrcFile.c:889
 msgid ""
 "You must then save the settings using the link on the line above the\n"
 "checkbox:\n"
 msgstr ""
+"U bewaart vervolgens de instellingen via de link op de regel boven het\n"
+"aanvinkveld:\n"
 
 #: src/LYrcFile.c:896
 msgid ""
@@ -6068,6 +6070,9 @@ msgid ""
 "the simpler Options Menu instead.  Save options with that using the '>' key.\n"
 "\n"
 msgstr ""
+"U kunt via de opdrachtregel ook de optie \"-forms_options\" opgegeven, zodat\n"
+"een eenvoudiger optiemenu wordt getoond. Bewaar hiermee de opties met de\n"
+"'>'-toets.\n"
 
 #: src/LYrcFile.c:903
 msgid ""
@@ -6075,9 +6080,11 @@ msgid ""
 "with the '>' key).\n"
 "\n"
 msgstr ""
+"Dit bestand bevat opties bewaard uit het Lynx-optiesscherm (meestal\n"
+"via de '>'-toets).\n"
+"\n"
 
 #: src/LYrcFile.c:910
-#, fuzzy
 msgid ""
 "There is normally no need to edit this file manually, since the defaults\n"
 "here can be controlled from the Options Screen, and the next time options\n"
@@ -6088,16 +6095,13 @@ msgid ""
 "called \"lynx.cfg\".  It has different content and a different format.\n"
 "It is not this file.\n"
 msgstr ""
-"Lynx Standaardinstellingenbestand voor Gebruiker\n"
-"\n"
-"Dit bestand bevat opties die opgeslagen zijn in het Lynx Opties Scherm\n"
-"(normaliter d.m.v. the '>' toets).  Er is doorgaans geen reden om dit\n"
-"bestand handmatig te wijzigen, omdat de instellingen vanuit het Opties\n"
-"Scherm kunnen worden bewerkt, en de eerstvolgende keer dat de opties\n"
-"daar opgeslagen worden zal dit bestand volledig worden herschreven.\n"
+"Er is doorgaans geen reden om dit bestand handmatig te wijzigen, omdat\n"
+"de instellingen vanuit het Optiesscherm kunnen worden bewerkt, en de\n"
+"eerstvolgende keer dat de opties daar opgeslagen worden zal dit bestand\n"
+"volledig worden herschreven.\n"
 "U bent gewaarschuwd...\n"
-"Als u op zoek bent naar het algemene configuratiebestand - dat is\n"
-"meestal lynx.cfg, en het heeft andere inhoud en een andere opmaak.\n"
+"Als u op zoek bent naar het algemene configuratiebestand: dat is\n"
+"meestal \"lynx.cfg\". Het heeft een andere inhoud en een andere opmaak.\n"
 "Het is niet dit bestand.\n"
 
 #~ msgid "Socket read failed for 180,000 tries."
diff --git a/po/tr.po b/po/tr.po
index 069913b2..35282a62 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,14 +1,14 @@
-# translation of lynx-2.8.7-dev9.po to Turkish
-# lynx-2.8.7-dev9.po'nun Türkçe çevirisi
-# Copyright (C) 2002, 2004, 2006 Free Software Foundation, Inc.
+# translation of lynx-2.8.7-dev12.po to Turkish
+# lynx-2.8.7-dev12.po'nun Türkçe çevirisi
+# Copyright (C) 2002, 2004, 2006, 2009 Free Software Foundation, Inc.
 # This file is distributed under the same license as the lynx package.
-# Eyüp Hakan Duran <hakan_duran@hotmail.com>, 2008.
+# Eyüp Hakan Duran <hakan_duran@hotmail.com>, 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: lynx-2.8.7-dev9\n"
+"Project-Id-Version: lynx-2.8.7-dev12\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-07 20:02-0500\n"
-"PO-Revision-Date: 2008-07-11 21:15-0400\n"
+"POT-Creation-Date: 2009-01-01 20:55-0500\n"
+"PO-Revision-Date: 2009-01-01 16:30-0500\n"
 "Last-Translator: Eyüp Hakan Duran <hakan_duran@hotmail.com>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -2248,7 +2248,7 @@ msgstr "(Ýsim yok.)"
 msgid "(No value.)"
 msgstr "(Deðer yok.)"
 
-#: LYMessages.c:716 src/LYOptions.c:2402
+#: LYMessages.c:716 src/LYOptions.c:2406
 msgid "None"
 msgstr "Hiçbiri"
 
@@ -2414,16 +2414,21 @@ msgstr "Üst sýnýr "
 msgid "Current directory is "
 msgstr "Mevcut dizin "
 
-#. HTGopher.c
+#. HTFTP.c
 #: LYMessages.c:765
+msgid "Symbolic Link"
+msgstr "Simgesel Link"
+
+#. HTGopher.c
+#: LYMessages.c:768
 msgid "No response from server!"
 msgstr "Sunucudan yanýt yok!"
 
-#: LYMessages.c:766
+#: LYMessages.c:769
 msgid "CSO index"
 msgstr "CSO indeksi"
 
-#: LYMessages.c:767
+#: LYMessages.c:770
 msgid ""
 "\n"
 "This is a searchable index of a CSO database.\n"
@@ -2431,16 +2436,16 @@ msgstr ""
 "\n"
 "Bu, CSO veritabanýnýn aranabilir bir indeksidir.\n"
 
-#: LYMessages.c:768
+#: LYMessages.c:771
 msgid "CSO Search Results"
 msgstr "CSO Arama Sonuçlarý"
 
-#: LYMessages.c:769
+#: LYMessages.c:772
 #, c-format
 msgid "Seek fail on %s\n"
 msgstr "Arama %s'de baþarýsýz\n"
 
-#: LYMessages.c:770
+#: LYMessages.c:773
 msgid ""
 "\n"
 "Press the 's' key and enter search keywords.\n"
@@ -2448,7 +2453,7 @@ msgstr ""
 "\n"
 "'s' tuþuna basýp, anahtar sözcükleri giriniz.\n"
 
-#: LYMessages.c:771
+#: LYMessages.c:774
 msgid ""
 "\n"
 "This is a searchable Gopher index.\n"
@@ -2456,35 +2461,35 @@ msgstr ""
 "\n"
 "Bu, arama yapýlabilen bir Gopher indeksidir.\n"
 
-#: LYMessages.c:772
+#: LYMessages.c:775
 msgid "Gopher index"
 msgstr "Gopher indeksi"
 
-#: LYMessages.c:773
+#: LYMessages.c:776
 msgid "Gopher Menu"
 msgstr "Gopher Menüsü"
 
-#: LYMessages.c:774
+#: LYMessages.c:777
 msgid " Search Results"
 msgstr " Arama Sonuçlarý"
 
-#: LYMessages.c:775
+#: LYMessages.c:778
 msgid "Sending CSO/PH request."
 msgstr "CSO/PH istemi gönderiliyor."
 
-#: LYMessages.c:776
+#: LYMessages.c:779
 msgid "Sending Gopher request."
 msgstr "Gopher istemi gönderiliyor."
 
-#: LYMessages.c:777
+#: LYMessages.c:780
 msgid "CSO/PH request sent; waiting for response."
 msgstr "CSO/PH istemi gönderildi; yanýt bekleniyor."
 
-#: LYMessages.c:778
+#: LYMessages.c:781
 msgid "Gopher request sent; waiting for response."
 msgstr "Gopher istemi gönderildi; yanýt bekleniyor."
 
-#: LYMessages.c:779
+#: LYMessages.c:782
 msgid ""
 "\n"
 "Please enter search keywords.\n"
@@ -2492,7 +2497,7 @@ msgstr ""
 "\n"
 "Lütfen arama için anahtar sözcükleri giriniz.\n"
 
-#: LYMessages.c:780
+#: LYMessages.c:783
 msgid ""
 "\n"
 "The keywords that you enter will allow you to search on a"
@@ -2500,201 +2505,201 @@ msgstr ""
 "\n"
 "Girdiðiniz anahtar sözcükler, veri tabanýnda bir kiþi adýnýn"
 
-#: LYMessages.c:781
+#: LYMessages.c:784
 msgid " person's name in the database.\n"
 msgstr " aranmasýný saðlayacak.\n"
 
 #. HTNews.c
-#: LYMessages.c:784
+#: LYMessages.c:787
 msgid "Connection closed ???"
 msgstr "Baðlantý kapatýldý mý ???"
 
-#: LYMessages.c:785
+#: LYMessages.c:788
 msgid "Cannot open temporary file for news POST."
 msgstr "Haber POSTu için geçici dosya açýlamýyor."
 
-#: LYMessages.c:786
+#: LYMessages.c:789
 msgid "This client does not contain support for posting to news with SSL."
 msgstr "Bu istemci SSL'li habere postalamak için destek içermiyor."
 
 #. HTStyle.c
-#: LYMessages.c:789
+#: LYMessages.c:792
 #, c-format
 msgid "Style %d `%s' SGML:%s.  Font %s %.1f point.\n"
 msgstr "Stil %d `%s' SGML:%s.  Yazýtipi %s %.1f boyut.\n"
 
-#: LYMessages.c:791
+#: LYMessages.c:794
 #, c-format
 msgid "\tAlign=%d, %d tabs. (%.0f before, %.0f after)\n"
 msgstr "\tYaslama=%d, %d sekme. (%.0f önce, %.0f sonra)\n"
 
-#: LYMessages.c:792
+#: LYMessages.c:795
 #, c-format
 msgid "\t\tTab kind=%d at %.0f\n"
 msgstr "\t\tSekme türü=%d konum %.0f\n"
 
 #. HTTP.c
-#: LYMessages.c:795
+#: LYMessages.c:798
 msgid "Can't proceed without a username and password."
 msgstr "Kullanýcý adý ve parola olmadan devam edilemez."
 
-#: LYMessages.c:796
+#: LYMessages.c:799
 msgid "Can't retry with authorization!  Contact the server's WebMaster."
 msgstr "Yetkilendirme yeniden denenemez!  Sunucunun site yöneticisiyle temas kurun."
 
-#: LYMessages.c:797
+#: LYMessages.c:800
 msgid "Can't retry with proxy authorization!  Contact the server's WebMaster."
 msgstr "Vekil(proxy) yetkilendirmesi yeniden denenemez! Sunucunun site yöneticisiyle temas kurun."
 
-#: LYMessages.c:798
+#: LYMessages.c:801
 msgid "Retrying with proxy authorization information."
 msgstr "Vekil(proxy) yetkilendirme bilgisiyle yeniden deneniyor."
 
-#: LYMessages.c:799
+#: LYMessages.c:802
 #, c-format
 msgid "SSL error:%s-Continue?"
 msgstr "SSL hatasý:%s-Devam edilsin mi?"
 
 #. HTWAIS.c
-#: LYMessages.c:802
+#: LYMessages.c:805
 msgid "HTWAIS: Return message too large."
 msgstr "HTWAIS: Dönüþ mesajý çok büyük."
 
-#: LYMessages.c:803
+#: LYMessages.c:806
 msgid "Enter WAIS query: "
 msgstr "WAIS sorgusu giriniz: "
 
 #. Miscellaneous status
-#: LYMessages.c:806
+#: LYMessages.c:809
 msgid "Retrying as HTTP0 request."
 msgstr "HTTP0 istemi olarak yeniden deneniyor."
 
-#: LYMessages.c:807
+#: LYMessages.c:810
 #, c-format
 msgid "Transferred %d bytes"
 msgstr "%d bayt aktarýldý"
 
-#: LYMessages.c:808
+#: LYMessages.c:811
 msgid "Data transfer complete"
 msgstr "Veri aktarýmý tamamlandý"
 
-#: LYMessages.c:809
+#: LYMessages.c:812
 #, c-format
 msgid "Error processing line %d of %s\n"
 msgstr "%2$s satýrdan %1$d.'sinin iþlenmesinde hata\n"
 
 #. Lynx internal page titles
-#: LYMessages.c:812
+#: LYMessages.c:815
 msgid "Address List Page"
 msgstr "Adres Listesi Sayfasý"
 
-#: LYMessages.c:813
+#: LYMessages.c:816
 msgid "Bookmark file"
 msgstr "Yer imi dosyasý"
 
-#: LYMessages.c:814
+#: LYMessages.c:817
 msgid "Configuration Definitions"
 msgstr "Ayar Tanýmlarý"
 
-#: LYMessages.c:815
+#: LYMessages.c:818
 msgid "Cookie Jar"
 msgstr "Çerez kavanozu"
 
-#: LYMessages.c:816
+#: LYMessages.c:819
 msgid "Current Key Map"
 msgstr "Mevcut Tuþ Eþlemi"
 
-#: LYMessages.c:817
+#: LYMessages.c:820
 msgid "File Management Options"
 msgstr "Dosya Yönetim Seçenekleri"
 
-#: LYMessages.c:818
+#: LYMessages.c:821
 msgid "Download Options"
 msgstr "Ýndirme Seçenekleri"
 
-#: LYMessages.c:819
+#: LYMessages.c:822
 msgid "History Page"
 msgstr "Tarihçe Sayfasý"
 
-#: LYMessages.c:820
+#: LYMessages.c:823
 msgid "Cache Jar"
 msgstr "Önbellek Kavanozu"
 
-#: LYMessages.c:821
+#: LYMessages.c:824
 msgid "List Page"
 msgstr "Liste Sayfasý"
 
-#: LYMessages.c:822
+#: LYMessages.c:825
 msgid "Lynx.cfg Information"
 msgstr "Lynx.cfg Bilgileri"
 
-#: LYMessages.c:823
+#: LYMessages.c:826
 msgid "Converted Mosaic Hotlist"
 msgstr "Dönüþtürülmüþ Mosaic Sýcaklistesi"
 
-#: LYMessages.c:824
+#: LYMessages.c:827
 msgid "Options Menu"
 msgstr "Seçenekler Menüsü"
 
-#: LYMessages.c:825
+#: LYMessages.c:828
 msgid "File Permission Options"
 msgstr "Dosya Ýzin Seçenekleri"
 
-#: LYMessages.c:826
+#: LYMessages.c:829
 msgid "Printing Options"
 msgstr "Yazdýrma Seçenekleri"
 
-#: LYMessages.c:827
+#: LYMessages.c:830
 msgid "Information about the current document"
 msgstr "Mevcut dosya bilgileri"
 
-#: LYMessages.c:828
+#: LYMessages.c:831
 msgid "Your recent statusline messages"
 msgstr "Son durumsatýrý mesajlarýnýz"
 
-#: LYMessages.c:829
+#: LYMessages.c:832
 msgid "Upload Options"
 msgstr "Yükleme Seçenekleri"
 
-#: LYMessages.c:830
+#: LYMessages.c:833
 msgid "Visited Links Page"
 msgstr "Uðranmýþ Linkler Sayfasý"
 
 #. CONFIG_DEF_TITLE subtitles
-#: LYMessages.c:833
+#: LYMessages.c:836
 msgid "See also"
 msgstr "Ayrýca bakýnýz"
 
-#: LYMessages.c:834
+#: LYMessages.c:837
 msgid "your"
 msgstr "sizin"
 
-#: LYMessages.c:835
+#: LYMessages.c:838
 msgid "for runtime options"
 msgstr "yürütüm süresi seçenekleri için"
 
-#: LYMessages.c:836
+#: LYMessages.c:839
 msgid "compile time options"
 msgstr "derleme süresi seçenekleri"
 
-#: LYMessages.c:837
+#: LYMessages.c:840
 msgid "color-style configuration"
 msgstr "renk stili ayarlama"
 
-#: LYMessages.c:838
+#: LYMessages.c:841
 msgid "latest release"
 msgstr "son daðýtým"
 
-#: LYMessages.c:839
+#: LYMessages.c:842
 msgid "pre-release version"
 msgstr "daðýtým öncesi sürüm"
 
-#: LYMessages.c:840
+#: LYMessages.c:843
 msgid "development version"
 msgstr "geliþtirme sürümü"
 
 #. #define AUTOCONF_CONFIG_CACHE
-#: LYMessages.c:842
+#: LYMessages.c:845
 msgid ""
 "The following data were derived during the automatic configuration/build\n"
 "process of this copy of Lynx.  When reporting a bug, please include a copy\n"
@@ -2705,7 +2710,7 @@ msgstr ""
 "kopyasýný da dahil ediniz."
 
 #. #define AUTOCONF_LYNXCFG_H
-#: LYMessages.c:846
+#: LYMessages.c:849
 msgid ""
 "The following data were used as automatically-configured compile-time\n"
 "definitions when this copy of Lynx was built."
@@ -2714,53 +2719,53 @@ msgstr ""
 "derleme süresi tanýmlarý olarak kullanýlmýþtýr."
 
 #. #define DIRED_NOVICELINE
-#: LYMessages.c:851
+#: LYMessages.c:854
 msgid "  C)reate  D)ownload  E)dit  F)ull menu  M)odify  R)emove  T)ag  U)pload     \n"
 msgstr "..Oluþtur(C)  Ýndir(D)  Düzenle(E)  Tam menü(F)  Deðiþtir(M)  Çýkart(R)  Ýþaretle(T)  Yükle(U)     \n"
 
-#: LYMessages.c:852
+#: LYMessages.c:855
 msgid "Failed to obtain status of current link!"
 msgstr "Mevcut linkin durumu elde edilemedi!"
 
 #. #define INVALID_PERMIT_URL
-#: LYMessages.c:855
+#: LYMessages.c:858
 msgid "Special URL only valid from current File Permission menu!"
 msgstr "Özel URL yalnýzca güncel Dosya Ýzin menüsünden geçerlidir!"
 
-#: LYMessages.c:859
+#: LYMessages.c:862
 msgid "External support is currently disabled."
 msgstr "Harici destek halen devre dýþý..."
 
 #. new with 2.8.4dev.21
-#: LYMessages.c:863
+#: LYMessages.c:866
 msgid "Changing working-directory is currently disabled."
 msgstr "Çalýþma dizinini deðiþtirme þu an devre dýþý."
 
-#: LYMessages.c:864
+#: LYMessages.c:867
 msgid "Linewrap OFF!"
 msgstr "Satýrsarma KAPALI!"
 
-#: LYMessages.c:865
+#: LYMessages.c:868
 msgid "Linewrap ON!"
 msgstr "Satýrsarma AÇIK!"
 
-#: LYMessages.c:866
+#: LYMessages.c:869
 msgid "Parsing nested-tables toggled OFF!  Reloading..."
 msgstr "Ýçice geçmiþ-tablo ayrýþtýrma KAPATILDI!  Yeniden yükleniyor..."
 
-#: LYMessages.c:867
+#: LYMessages.c:870
 msgid "Parsing nested-tables toggled ON!  Reloading..."
 msgstr "Ýçice geçmiþ-tablo ayrýþtýrma AÇILDI!  Yeniden yükleniyor..."
 
-#: LYMessages.c:868
+#: LYMessages.c:871
 msgid "Shifting is disabled while line-wrap is in effect"
 msgstr "Satýr-sarma etkinken kaydýrma (shifting) devre dýþýdýr"
 
-#: LYMessages.c:869
+#: LYMessages.c:872
 msgid "Trace not supported"
 msgstr "Ýz(leme) desteklenmiyor"
 
-#: LYMessages.c:790
+#: LYMessages.c:793
 #, c-format
 msgid "\tIndents: first=%.0f others=%.0f, Height=%.1f Desc=%.1f\n"
 msgstr "\tGirinti: ilk satýr=%.0f diðerleri=%.0f, Yükseklik=%.1f Alt çýkýntý=%.1f\n"
@@ -2803,7 +2808,7 @@ msgstr "Önbellekte POST içerikli belge bulunmadý.  Yeniden gönderilsin mi?"
 msgid "Loading failed, use a previous copy."
 msgstr "Yükleme baþarýsýz, önceki bir kopyayý kullanýn."
 
-#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8546
+#: WWW/Library/Implementation/HTAccess.c:1047 src/GridText.c:8513
 msgid "Loading incomplete."
 msgstr "Yükleme tamamlanmadý."
 
@@ -2826,7 +2831,7 @@ msgstr "**** HTAccess: Dönen durum: %d\n"
 #. * hack: if we fail in HTAccess.c
 #. * avoid duplicating URL, oh.
 #.
-#: WWW/Library/Implementation/HTAccess.c:1087 src/LYMainLoop.c:7779
+#: WWW/Library/Implementation/HTAccess.c:1087 src/LYMainLoop.c:7757
 msgid "Can't Access"
 msgstr "Eriþilemiyor"
 
@@ -2851,28 +2856,20 @@ msgstr "ana soketi kapatýnýz"
 msgid "socket for master socket"
 msgstr "ana soket için soket"
 
-#.
-#. * It's a symbolic link, does the user care about knowing if it is
-#. * symbolic?  I think so since it might be a directory.
-#.
-#: WWW/Library/Implementation/HTFTP.c:1733 WWW/Library/Implementation/HTFTP.c:2350
-msgid "Symbolic Link"
-msgstr "Simgesel Link"
-
-#: WWW/Library/Implementation/HTFTP.c:2707
+#: WWW/Library/Implementation/HTFTP.c:2976
 msgid "Receiving FTP directory."
 msgstr "FTP dizini alýnýyor."
 
-#: WWW/Library/Implementation/HTFTP.c:2843
+#: WWW/Library/Implementation/HTFTP.c:3112
 #, c-format
 msgid "Transferred %d bytes (%5d)"
 msgstr "%d bayt aktarýldý (%5d)"
 
-#: WWW/Library/Implementation/HTFTP.c:3194
+#: WWW/Library/Implementation/HTFTP.c:3466
 msgid "connect for data"
 msgstr "veri için baðlan"
 
-#: WWW/Library/Implementation/HTFTP.c:3855
+#: WWW/Library/Implementation/HTFTP.c:4127
 msgid "Receiving FTP file."
 msgstr "FTP dosyasý alýnýyor"
 
@@ -2896,34 +2893,34 @@ msgstr "Finger makinasýna eriþilemedi."
 msgid "No response from finger server."
 msgstr "Finger sunucusundan yanýt yok."
 
-#: WWW/Library/Implementation/HTNews.c:426
+#: WWW/Library/Implementation/HTNews.c:425
 #, c-format
 msgid "Username for news host '%s':"
 msgstr "'%s' adlý haber makinasý için kullanýcý adý:"
 
-#: WWW/Library/Implementation/HTNews.c:479
+#: WWW/Library/Implementation/HTNews.c:478
 msgid "Change username?"
 msgstr "Kullanýcý adý deðiþtirilsin mi?"
 
-#: WWW/Library/Implementation/HTNews.c:483
+#: WWW/Library/Implementation/HTNews.c:482
 msgid "Username:"
 msgstr "Kullanýcý adý:"
 
-#: WWW/Library/Implementation/HTNews.c:508
+#: WWW/Library/Implementation/HTNews.c:507
 #, c-format
 msgid "Password for news host '%s':"
 msgstr "'%s' adlý haber makinasý için parola:"
 
-#: WWW/Library/Implementation/HTNews.c:591
+#: WWW/Library/Implementation/HTNews.c:590
 msgid "Change password?"
 msgstr "Parola deðiþtirilsin mi?"
 
-#: WWW/Library/Implementation/HTNews.c:1711
+#: WWW/Library/Implementation/HTNews.c:1710
 #, c-format
 msgid "No matches for: %s"
 msgstr "%s için eþleþme yok..."
 
-#: WWW/Library/Implementation/HTNews.c:1761
+#: WWW/Library/Implementation/HTNews.c:1760
 msgid ""
 "\n"
 "No articles in this group.\n"
@@ -2931,7 +2928,7 @@ msgstr ""
 "\n"
 "Bu grupta hiç mesaj yok.\n"
 
-#: WWW/Library/Implementation/HTNews.c:1773
+#: WWW/Library/Implementation/HTNews.c:1772
 msgid ""
 "\n"
 "No articles in this range.\n"
@@ -2942,16 +2939,16 @@ msgstr ""
 #.
 #. * Set window title.
 #.
-#: WWW/Library/Implementation/HTNews.c:1786
+#: WWW/Library/Implementation/HTNews.c:1785
 #, c-format
 msgid "%s,  Articles %d-%d"
 msgstr "%s,  %d-%d mesaj"
 
-#: WWW/Library/Implementation/HTNews.c:1809
+#: WWW/Library/Implementation/HTNews.c:1808
 msgid "Earlier articles"
 msgstr "Önceki mesajlar"
 
-#: WWW/Library/Implementation/HTNews.c:1822
+#: WWW/Library/Implementation/HTNews.c:1821
 #, c-format
 msgid ""
 "\n"
@@ -2962,41 +2959,41 @@ msgstr ""
 "Halen %2$s'de yaklaþýk %1$d mesaj mevcut, kimlikler þu þekilde:\n"
 "\n"
 
-#: WWW/Library/Implementation/HTNews.c:1884
+#: WWW/Library/Implementation/HTNews.c:1883
 msgid "All available articles in "
 msgstr "Tüm mevcut mesajlar "
 
-#: WWW/Library/Implementation/HTNews.c:2098
+#: WWW/Library/Implementation/HTNews.c:2097
 msgid "Later articles"
 msgstr "Sonraki mesajlar"
 
-#: WWW/Library/Implementation/HTNews.c:2121
+#: WWW/Library/Implementation/HTNews.c:2120
 msgid "Post to "
 msgstr "Kime Gönderilecek "
 
-#: WWW/Library/Implementation/HTNews.c:2342
+#: WWW/Library/Implementation/HTNews.c:2341
 msgid "This client does not contain support for SNEWS URLs."
 msgstr "Bu istemci SNEWS URL'ler için destek içermiyor."
 
-#: WWW/Library/Implementation/HTNews.c:2550
+#: WWW/Library/Implementation/HTNews.c:2548
 msgid "No target for raw text!"
 msgstr "Ham metin için hiç hedef yok!"
 
-#: WWW/Library/Implementation/HTNews.c:2581
+#: WWW/Library/Implementation/HTNews.c:2578
 msgid "Connecting to NewsHost ..."
 msgstr "Haber makinasýna baðlanýlýyor ..."
 
-#: WWW/Library/Implementation/HTNews.c:2633
+#: WWW/Library/Implementation/HTNews.c:2630
 #, c-format
 msgid "Could not access %s."
 msgstr "%s'e eriþilemiyor."
 
-#: WWW/Library/Implementation/HTNews.c:2739
+#: WWW/Library/Implementation/HTNews.c:2736
 #, c-format
 msgid "Can't read news info.  News host %.20s responded: %.200s"
 msgstr "Haber bilgisi okunamýyor.  %.20s adlý haber makinasýnýn yanýtý: %.200s"
 
-#: WWW/Library/Implementation/HTNews.c:2743
+#: WWW/Library/Implementation/HTNews.c:2740
 #, c-format
 msgid "Can't read news info, empty response from host %s"
 msgstr "Haber bilgisi okunamýyor, %s makinasýndan boþ yanýt"
@@ -3004,22 +3001,22 @@ msgstr "Haber bilgisi okunamýyor, %s makinasýndan boþ yanýt"
 #.
 #. * List available newsgroups.  - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:2947
+#: WWW/Library/Implementation/HTNews.c:2944
 msgid "Reading list of available newsgroups."
 msgstr "Mevcut haber gruplarýnýn listesi okunuyor."
 
-#: WWW/Library/Implementation/HTNews.c:2968
+#: WWW/Library/Implementation/HTNews.c:2965
 msgid "Reading list of articles in newsgroup."
 msgstr "Haber grubundaki mesaj listesi okunuyor."
 
 #.
 #. * Get an article from a news group.  - FM
 #.
-#: WWW/Library/Implementation/HTNews.c:2974
+#: WWW/Library/Implementation/HTNews.c:2971
 msgid "Reading news article."
 msgstr "Haber mesajý okunuyor."
 
-#: WWW/Library/Implementation/HTNews.c:3004
+#: WWW/Library/Implementation/HTNews.c:3001
 msgid "Sorry, could not load requested news."
 msgstr "Üzgünüm, istenen haber yüklenemedi."
 
@@ -3072,9 +3069,8 @@ msgid "Could not restore socket to blocking."
 msgstr "Soket engellemeye (blocking) geri yüklenemedi."
 
 #: WWW/Library/Implementation/HTTCP.c:2016
-#, fuzzy
 msgid "Socket read failed (too many tries)."
-msgstr "Baðlantý baþarýsýz (çok sayýda yeniden deneme)."
+msgstr "Soket okuma baþarýsýz (çok sayýda deneme)."
 
 #: WWW/Library/Implementation/HTTP.c:84
 #, c-format
@@ -3091,80 +3087,80 @@ msgstr "Adres bir kullanýcý adý içeriyor: %s"
 msgid "Certificate issued by: %s"
 msgstr "Sertifikayý veren:%s"
 
-#: WWW/Library/Implementation/HTTP.c:620
+#: WWW/Library/Implementation/HTTP.c:643
 msgid "This client does not contain support for HTTPS URLs."
 msgstr "Bu istemci HTTPS URL'ler için destek içermiyor."
 
-#: WWW/Library/Implementation/HTTP.c:645
+#: WWW/Library/Implementation/HTTP.c:668
 msgid "Unable to connect to remote host."
 msgstr "Karþý makinaya baðlanýlamadý."
 
-#: WWW/Library/Implementation/HTTP.c:669
+#: WWW/Library/Implementation/HTTP.c:692
 msgid "Retrying connection without TLS."
 msgstr "Baðlantý, TLS'siz tekrar deneniyor."
 
-#: WWW/Library/Implementation/HTTP.c:714
+#: WWW/Library/Implementation/HTTP.c:737
 msgid "no issuer was found"
 msgstr "yayýnlayýcý bulunamadý"
 
-#: WWW/Library/Implementation/HTTP.c:716
+#: WWW/Library/Implementation/HTTP.c:739
 msgid "issuer is not a CA"
 msgstr "yayýnlayýcý bir CA deðil"
 
-#: WWW/Library/Implementation/HTTP.c:718
+#: WWW/Library/Implementation/HTTP.c:741
 msgid "the certificate has no known issuer"
 msgstr "sertifikanýn bilinen bir yayýnlayýcýsý yok"
 
-#: WWW/Library/Implementation/HTTP.c:720
+#: WWW/Library/Implementation/HTTP.c:743
 msgid "the certificate has been revoked"
 msgstr "sertifika hükümsüz kýlýnmýþ"
 
-#: WWW/Library/Implementation/HTTP.c:722
+#: WWW/Library/Implementation/HTTP.c:745
 msgid "the certificate is not trusted"
 msgstr "sertifikaya güvenilmiyor"
 
-#: WWW/Library/Implementation/HTTP.c:807
+#: WWW/Library/Implementation/HTTP.c:821
 #, c-format
 msgid "Verified connection to %s (cert=%s)"
 msgstr "%1$s'e doðrulanmýþ baðlantý (cert=%2$s)"
 
-#: WWW/Library/Implementation/HTTP.c:855 WWW/Library/Implementation/HTTP.c:901
+#: WWW/Library/Implementation/HTTP.c:869 WWW/Library/Implementation/HTTP.c:911
 #, c-format
 msgid "Verified connection to %s (subj=%s)"
 msgstr "%s'e baðlantý doðrulandý (konu=%s)"
 
-#: WWW/Library/Implementation/HTTP.c:931
+#: WWW/Library/Implementation/HTTP.c:941
 msgid "Can't find common name in certificate"
 msgstr "Sertifikada ortak ad bulunamadý"
 
-#: WWW/Library/Implementation/HTTP.c:934
+#: WWW/Library/Implementation/HTTP.c:944
 #, c-format
 msgid "SSL error:host(%s)!=cert(%s)-Continue?"
 msgstr "SSL hatasý:makina(%s)!=sert(%s)-Devam edilsin mi?"
 
-#: WWW/Library/Implementation/HTTP.c:947
+#: WWW/Library/Implementation/HTTP.c:957
 #, c-format
 msgid "UNVERIFIED connection to %s (cert=%s)"
 msgstr "%s'e DOÐRULANMAMIÞ baðlantý (cert=%s)"
 
-#: WWW/Library/Implementation/HTTP.c:956
+#: WWW/Library/Implementation/HTTP.c:966
 #, c-format
 msgid "Secure %d-bit %s (%s) HTTP connection"
 msgstr "Güvenli %d-bit %s (%s) HTTP baðlantýsý"
 
-#: WWW/Library/Implementation/HTTP.c:1426
+#: WWW/Library/Implementation/HTTP.c:1433
 msgid "Sending HTTP request."
 msgstr "HTTP istemi gönderiliyor."
 
-#: WWW/Library/Implementation/HTTP.c:1465
+#: WWW/Library/Implementation/HTTP.c:1472
 msgid "Unexpected network write error; connection aborted."
 msgstr "Umulmadýk aða yazma hatasý; baðlantý yarýda kesildi."
 
-#: WWW/Library/Implementation/HTTP.c:1471
+#: WWW/Library/Implementation/HTTP.c:1478
 msgid "HTTP request sent; waiting for response."
 msgstr "HTTP istemi gönderildi; yanýt bekleniyor."
 
-#: WWW/Library/Implementation/HTTP.c:1539
+#: WWW/Library/Implementation/HTTP.c:1546
 msgid "Unexpected network read error; connection aborted."
 msgstr "Umulmadýk aða yazma hatasý; baðlantý yarýda kesildi."
 
@@ -3177,7 +3173,7 @@ msgstr "Umulmadýk aða yazma hatasý; baðlantý yarýda kesildi."
 #. * line and possibly other headers, so we'll deal with them by
 #. * showing the full header to the user as text/plain.  - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1733
+#: WWW/Library/Implementation/HTTP.c:1740
 msgid "Got unexpected Informational Status."
 msgstr "Umulmadýk Bilgisel Durum alýndý."
 
@@ -3187,7 +3183,7 @@ msgstr "Umulmadýk Bilgisel Durum alýndý."
 #. * content.  We'll instruct the user to do that, and
 #. * restore the current document.  - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1767
+#: WWW/Library/Implementation/HTTP.c:1774
 msgid "Request fulfilled.  Reset Content."
 msgstr "Ýstem karþýlandý.  Ýçeriði temizle."
 
@@ -3197,27 +3193,27 @@ msgstr "Ýstem karþýlandý.  Ýçeriði temizle."
 #. * status is inappropriate.  We'll deal with it by showing
 #. * the full header to the user as text/plain.  - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1884
+#: WWW/Library/Implementation/HTTP.c:1890
 msgid "Got unexpected 304 Not Modified status."
 msgstr "Umulmadýk 304 Deðiþtirilmedi durumu alýndý."
 
-#: WWW/Library/Implementation/HTTP.c:1947
+#: WWW/Library/Implementation/HTTP.c:1953
 msgid "Redirection of POST content requires user approval."
 msgstr "POST içeriðinin yeniden yönlendirilmesi kullanýcý onayý gerektirir."
 
-#: WWW/Library/Implementation/HTTP.c:1962
+#: WWW/Library/Implementation/HTTP.c:1968
 msgid "Have POST content.  Treating Permanent Redirection as Temporary.\n"
 msgstr "POST içeriði mevcut.  Kalýcý Yeniden Yönlendirmeye Geçici muamelesi yapýlýyor.\n"
 
-#: WWW/Library/Implementation/HTTP.c:2004
+#: WWW/Library/Implementation/HTTP.c:2010
 msgid "Retrying with access authorization information."
 msgstr "Eriþim yetkilendirme bilgisiyle yeniden deneniyor."
 
-#: WWW/Library/Implementation/HTTP.c:2016
+#: WWW/Library/Implementation/HTTP.c:2022
 msgid "Show the 401 message body?"
 msgstr "401 mesaj gövdesi gösterilsin mi?"
 
-#: WWW/Library/Implementation/HTTP.c:2059
+#: WWW/Library/Implementation/HTTP.c:2065
 msgid "Show the 407 message body?"
 msgstr "407 mesaj gövdesi gösterilsin mi?"
 
@@ -3225,7 +3221,7 @@ msgstr "407 mesaj gövdesi gösterilsin mi?"
 #. * Bad or unknown server_status number.  Take a chance and hope
 #. * there is something to display.  - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:2159
+#: WWW/Library/Implementation/HTTP.c:2165
 msgid "Unknown status reply from server!"
 msgstr "Sunucudan bilinmeyen durum yanýtý!"
 
@@ -3413,106 +3409,106 @@ msgstr "Yönetici"
 msgid "Host"
 msgstr "Bilgisayar"
 
-#: src/GridText.c:705
+#: src/GridText.c:704
 msgid "Memory exhausted, display interrupted!"
 msgstr "Bellek tükendi, görüntü kesildi!"
 
-#: src/GridText.c:710
+#: src/GridText.c:709
 msgid "Memory exhausted, will interrupt transfer!"
 msgstr "Bellek tükendi, aktarým kesilecek!"
 
-#: src/GridText.c:3654
+#: src/GridText.c:3663
 msgid " *** MEMORY EXHAUSTED ***"
 msgstr " *** BELLEK TÜKENDÝ ***"
 
-#: src/GridText.c:6089 src/GridText.c:6096 src/LYList.c:239
+#: src/GridText.c:6057 src/GridText.c:6064 src/LYList.c:239
 msgid "unknown field or link"
 msgstr "bilinmeyen alan ya da link"
 
-#: src/GridText.c:6105
+#: src/GridText.c:6073
 msgid "text entry field"
 msgstr "metin giriþ alaný"
 
-#: src/GridText.c:6108
+#: src/GridText.c:6076
 msgid "password entry field"
 msgstr "parola giriþ alaný"
 
-#: src/GridText.c:6111
+#: src/GridText.c:6079
 msgid "checkbox"
 msgstr "onay kutusu"
 
-#: src/GridText.c:6114
+#: src/GridText.c:6082
 msgid "radio button"
 msgstr "radyo düðmesi"
 
-#: src/GridText.c:6117
+#: src/GridText.c:6085
 msgid "submit button"
 msgstr "gönderme düðmesi"
 
-#: src/GridText.c:6120
+#: src/GridText.c:6088
 msgid "reset button"
 msgstr "temizleme düðmesi"
 
-#: src/GridText.c:6123
+#: src/GridText.c:6091
 msgid "popup menu"
 msgstr "açýlýr menü"
 
-#: src/GridText.c:6126
+#: src/GridText.c:6094
 msgid "hidden form field"
 msgstr "gizli form alaný"
 
-#: src/GridText.c:6129
+#: src/GridText.c:6097
 msgid "text entry area"
 msgstr "metin giriþ alaný"
 
-#: src/GridText.c:6132
+#: src/GridText.c:6100
 msgid "range entry field"
 msgstr "erim giriþ alaný"
 
-#: src/GridText.c:6135
+#: src/GridText.c:6103
 msgid "file entry field"
 msgstr "dosya giriþ alaný"
 
-#: src/GridText.c:6138
+#: src/GridText.c:6106
 msgid "text-submit field"
 msgstr "metin-gönderme alaný"
 
-#: src/GridText.c:6141
+#: src/GridText.c:6109
 msgid "image-submit button"
 msgstr "resim-gönderme alaný"
 
-#: src/GridText.c:6144
+#: src/GridText.c:6112
 msgid "keygen field"
 msgstr "keygen alaný"
 
-#: src/GridText.c:6147
+#: src/GridText.c:6115
 msgid "unknown form field"
 msgstr "bilinmeyen form alaný"
 
-#: src/GridText.c:10279
+#: src/GridText.c:10245
 msgid "Can't open file for uploading"
 msgstr "Yüklemek için dosya açýlamýyor."
 
-#: src/GridText.c:11438
+#: src/GridText.c:11404
 #, c-format
 msgid "Submitting %s"
 msgstr "%s gönderiliyor"
 
 #. ugliness has happened; inform user and do the best we can
-#: src/GridText.c:12491
+#: src/GridText.c:12457
 msgid "Hang Detect: TextAnchor struct corrupted - suggest aborting!"
 msgstr "Takýlma Saptandý: TextAnchor struct bozuk - sonlandýrmanýz önerilir!"
 
 #. don't show previous state
-#: src/GridText.c:12628
+#: src/GridText.c:12594
 msgid "Wrap lines to fit displayed area?"
 msgstr "Görüntülenen alana sýðmak üzere satýrlar sarmalansýn mý?"
 
-#: src/GridText.c:12680
+#: src/GridText.c:12646
 msgid "Very long lines have been wrapped!"
 msgstr "Çok uzun satýrlar sarmalandý!"
 
-#: src/GridText.c:13185
+#: src/GridText.c:13151
 msgid "Very long lines have been truncated!"
 msgstr "Çok uzun satýrlarýn sonundan kýrpýldý!"
 
@@ -3606,35 +3602,35 @@ msgstr "hayýr"
 msgid "Y/N/A/V"
 msgstr "(E/H/Daima/Asla)"
 
-#: src/HTML.c:5911
+#: src/HTML.c:5912
 msgid "Description:"
 msgstr "Açýklama:"
 
-#: src/HTML.c:5916
+#: src/HTML.c:5917
 msgid "(none)"
 msgstr "(hiçbiri)"
 
-#: src/HTML.c:5920
+#: src/HTML.c:5921
 msgid "Filepath:"
 msgstr "Dosya yolu:"
 
-#: src/HTML.c:5926
+#: src/HTML.c:5927
 msgid "(unknown)"
 msgstr "(bilinmiyor)"
 
-#: src/HTML.c:7353
+#: src/HTML.c:7352
 msgid "Document has only hidden links.  Use the 'l'ist command."
 msgstr "Belgede yalnýzca gizli linkler var.  Listele(l) komutunu kullanýnýz."
 
-#: src/HTML.c:7852
+#: src/HTML.c:7851
 msgid "Source cache error - disk full?"
 msgstr "Kaynak önbellek hatasý - disk tamamen dolu mu?"
 
-#: src/HTML.c:7865
+#: src/HTML.c:7864
 msgid "Source cache error - not enough memory!"
 msgstr "Kaynak önbellek hatasý - bellek yetersiz!"
 
-#: src/LYBookmark.c:164
+#: src/LYBookmark.c:167
 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"
@@ -3646,7 +3642,7 @@ msgstr ""
 "     komutu kullanýlarak çýkartýlabilir, bu genellikle 'R' tuþudur, ancak\n"
 "     siz ya da sistem yöneticiniz tarafýndan yeniden eþlemlenmiþ olabilir."
 
-#: src/LYBookmark.c:371
+#: src/LYBookmark.c:374
 #, c-format
 msgid ""
 "     You can delete links by the 'R' key<br>\n"
@@ -3655,7 +3651,7 @@ msgstr ""
 "     Linkleri 'R' tuþuyla silebilirsiniz<br>\n"
 "<ol>\n"
 
-#: src/LYBookmark.c:374
+#: src/LYBookmark.c:377
 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"
@@ -3665,7 +3661,7 @@ msgstr ""
 "     'R' tuþudur, ancak siz ya da sistem yöneticiniz tarafýndan yeniden\n"
 "    .eþlemlenmiþ olabilir."
 
-#: src/LYBookmark.c:378
+#: src/LYBookmark.c:381
 msgid ""
 "     This file also may be edited with a standard text editor to delete\n"
 "     outdated or invalid links, or to change their order."
@@ -3673,7 +3669,7 @@ msgstr ""
 "     Bu dosya, kullanýmdan kalkmýþ, geçersiz linkleri silmek ya da sýralarýný\n"
 "     deðiþtirmek üzere standart bir metin düzenleyiciyle de düzenlenebilir."
 
-#: src/LYBookmark.c:381
+#: src/LYBookmark.c:384
 msgid ""
 "Note: if you edit this file manually\n"
 "      you should not change the format within the lines\n"
@@ -3685,7 +3681,7 @@ msgstr ""
 "      baþka HTML belirteci eklememelisiniz.\n"
 "      Herbir linkin tek satýr olarak kaydedildiðine emin olun."
 
-#: src/LYBookmark.c:677
+#: src/LYBookmark.c:680
 #, c-format
 msgid "File may be recoverable from %s during this session"
 msgstr "Dosya, bu oturum boyunca %s'den kurtarýlabilir"
@@ -3723,19 +3719,19 @@ msgstr "Güncel CGI betik desteðini saðlar.\n"
 msgid "Exiting via interrupt:"
 msgstr "Ýþkesmesi aracýlýðýyla kapanýyor:"
 
-#: src/LYCookie.c:2461
+#: src/LYCookie.c:2477
 msgid "(from a previous session)"
 msgstr "(önceki bir oturumdan)"
 
-#: src/LYCookie.c:2522
+#: src/LYCookie.c:2538
 msgid "Maximum Gobble Date:"
 msgstr "Maksimum Silip Süpürme Tarihi:"
 
-#: src/LYCookie.c:2562
+#: src/LYCookie.c:2577
 msgid "Internal"
 msgstr "Dahili"
 
-#: src/LYCookie.c:2563
+#: src/LYCookie.c:2578
 msgid "cookie_domain_flag_set error, aborting program"
 msgstr "cookie_domain_flag_set hatasý, program yarýda kesiliyor"
 
@@ -3803,39 +3799,39 @@ msgstr "Düzenleyici sinyalle öldürüldü"
 msgid "Editor returned with error status %s"
 msgstr "Düzenleyici %s hata durumuyla döndü."
 
-#: src/LYDownload.c:504
+#: src/LYDownload.c:506
 msgid "Downloaded link:"
 msgstr "Ýndirilmiþ link:"
 
-#: src/LYDownload.c:509
+#: src/LYDownload.c:511
 msgid "Suggested file name:"
 msgstr "Önerilen dosya adý:"
 
-#: src/LYDownload.c:514
+#: src/LYDownload.c:516
 msgid "Standard download options:"
 msgstr "Standart indirme seçenekleri:"
 
-#: src/LYDownload.c:515
+#: src/LYDownload.c:517
 msgid "Download options:"
 msgstr "Ýndirme seçenekleri:"
 
-#: src/LYDownload.c:531
+#: src/LYDownload.c:533
 msgid "Save to disk"
 msgstr "Diske kaydet"
 
-#: src/LYDownload.c:545
+#: src/LYDownload.c:547
 msgid "View temporary file"
 msgstr "Geçici dosyayý görüntüle"
 
-#: src/LYDownload.c:552
+#: src/LYDownload.c:554
 msgid "Save to disk disabled."
 msgstr "Diske kaydetme devre dýþý..."
 
-#: src/LYDownload.c:556 src/LYPrint.c:1310
+#: src/LYDownload.c:558 src/LYPrint.c:1310
 msgid "Local additions:"
 msgstr "Yerel eklentiler:"
 
-#: src/LYDownload.c:567 src/LYUpload.c:211
+#: src/LYDownload.c:569 src/LYUpload.c:211
 msgid "No Name Given"
 msgstr "Ýsim Verilmemiþ"
 
@@ -4250,19 +4246,19 @@ msgstr "Bu mesajý otomatik olarak oluþturan"
 msgid "No system mailer configured"
 msgstr "Ayarlanmýþ sistem postacýsý yok"
 
-#: src/LYMain.c:1023
+#: src/LYMain.c:1001
 msgid "No Winsock found, sorry."
 msgstr "Winsock bulunamadý, üzgünüm."
 
-#: src/LYMain.c:1226
+#: src/LYMain.c:1198
 msgid "You MUST define a valid TMP or TEMP area!"
 msgstr "Geçerli bir TMP ya da TEMP alaný tanýmlamalýsýnýz!"
 
-#: src/LYMain.c:1279 src/LYMainLoop.c:5074
+#: src/LYMain.c:1251 src/LYMainLoop.c:5051
 msgid "No such directory"
 msgstr "Böyle bir dizin yok"
 
-#: src/LYMain.c:1464
+#: src/LYMain.c:1436
 #, c-format
 msgid ""
 "\n"
@@ -4273,7 +4269,7 @@ msgstr ""
 "Ayarlama dosyasý \"%s\" temin edilemiyor.\n"
 "\n"
 
-#: src/LYMain.c:1474
+#: src/LYMain.c:1446
 #, c-format
 msgid ""
 "\n"
@@ -4284,7 +4280,7 @@ msgstr ""
 "Lynx karakter kümeleri bildirilmemiþ.\n"
 "\n"
 
-#: src/LYMain.c:1503
+#: src/LYMain.c:1475
 #, c-format
 msgid ""
 "\n"
@@ -4295,7 +4291,7 @@ msgstr ""
 "Lynx düzenleme eþlemi bildirilmemiþ.\n"
 "\n"
 
-#: src/LYMain.c:1579
+#: src/LYMain.c:1551
 #, c-format
 msgid ""
 "\n"
@@ -4306,172 +4302,172 @@ msgstr ""
 "Lynx dosyasý \"%s\" temin edilemiyor.\n"
 "\n"
 
-#: src/LYMain.c:1654
+#: src/LYMain.c:1626
 #, c-format
 msgid "Ignored %d characters from standard input.\n"
 msgstr "Standart girdiden %d karakter yok sayýldý.\n"
 
-#: src/LYMain.c:1656
+#: src/LYMain.c:1628
 #, c-format
 msgid "Use \"-stdin\" or \"-\" to tell how to handle piped input.\n"
 msgstr "Veriyolu girdisinin nasýl halledileceðini belirtmek için \"-stdin\" ya da \"-\" kullanýn.\n"
 
-#: src/LYMain.c:1804
+#: src/LYMain.c:1776
 msgid "Warning:"
 msgstr "Uyarý:"
 
-#: src/LYMain.c:2372
+#: src/LYMain.c:2341
 msgid "persistent cookies state will be changed in next session only."
 msgstr "kalýcý çerezler durumu, yalnýzca gelecek oturumda deðiþecek."
 
-#: src/LYMain.c:2617 src/LYMain.c:2662
+#: src/LYMain.c:2586 src/LYMain.c:2631
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr "Lynx: tanýnmayan karakterkümesi=%s yoksayýlýyor\n"
 
-#: src/LYMain.c:3181
+#: src/LYMain.c:3150
 #, c-format
 msgid "%s Version %s (%s)"
 msgstr "%s Sürüm %s (%s)"
 
-#: src/LYMain.c:3219
+#: src/LYMain.c:3188
 #, c-format
 msgid "Built on %s %s %s\n"
 msgstr "%s %s %s üzerine yapýlandýrýldý\n"
 
-#: src/LYMain.c:3241
+#: src/LYMain.c:3210
 msgid "Copyrights held by the Lynx Developers Group,"
 msgstr "Telif haklarý Lynx Geliþtirme Grubu,"
 
-#: src/LYMain.c:3242
+#: src/LYMain.c:3211
 msgid "the University of Kansas, CERN, and other contributors."
 msgstr "Kansas Üniversitesi, CERN ve diðer katýlýmcýlar tarafýndan (saklý) tutulmaktadýr."
 
-#: src/LYMain.c:3243
+#: src/LYMain.c:3212
 msgid "Distributed under the GNU General Public License (Version 2)."
 msgstr "GNU Genel Kamu Lisansý (Sürüm 2) altýnda daðýtýlmaktadýr."
 
-#: src/LYMain.c:3244
+#: src/LYMain.c:3213
 msgid "See http://lynx.isc.org/ and the online help for more information."
 msgstr "Daha fazla bilgi için http://lynx.isc.org/ ve çevrim içi yardýma bakýnýz."
 
-#: src/LYMain.c:4065
+#: src/LYMain.c:4032
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "KULLANIM: %s [seçenekler] [dosya]\n"
 
-#: src/LYMain.c:4066
+#: src/LYMain.c:4033
 #, c-format
 msgid "Options are:\n"
 msgstr "Seçenekler:\n"
 
-#: src/LYMain.c:4365
+#: src/LYMain.c:4332
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr "%s: Geçersiz Seçenek: %s\n"
 
-#: src/LYMainLoop.c:594
+#: src/LYMainLoop.c:571
 #, c-format
 msgid "Internal error: Invalid mouse link %d!"
 msgstr "Dahili hata: Geçersiz fare linki %d!"
 
-#: src/LYMainLoop.c:714 src/LYMainLoop.c:5096
+#: src/LYMainLoop.c:691 src/LYMainLoop.c:5073
 msgid "A URL specified by the user"
 msgstr "Kullanýcý tarafýndan belirtilmiþ bir URL"
 
-#: src/LYMainLoop.c:1173
+#: src/LYMainLoop.c:1150
 msgid "Enctype multipart/form-data not yet supported!  Cannot submit."
 msgstr "Enctip çok parçalý/form verisi henüz desteklenmiyor!  Gönderilemez."
 
 #.
 #. * Make a name for this help file.
 #.
-#: src/LYMainLoop.c:3105
+#: src/LYMainLoop.c:3082
 msgid "Help Screen"
 msgstr "Yardým Ekraný"
 
-#: src/LYMainLoop.c:3226
+#: src/LYMainLoop.c:3203
 msgid "System Index"
 msgstr "Sistem Ýndeksi"
 
-#: src/LYMainLoop.c:3585 src/LYMainLoop.c:5320
+#: src/LYMainLoop.c:3562 src/LYMainLoop.c:5297
 msgid "Entry into main screen"
 msgstr "Ana ekrana giriþ"
 
-#: src/LYMainLoop.c:3843
+#: src/LYMainLoop.c:3820
 msgid "No next document present"
 msgstr "Sonrasýnda baþka belge yok"
 
-#: src/LYMainLoop.c:4139
+#: src/LYMainLoop.c:4116
 msgid "charset for this document specified explicitly, sorry..."
 msgstr "bu belge için karakterkümesi özgün þekilde belirtilmiþtir, üzgünüm..."
 
-#: src/LYMainLoop.c:5052
+#: src/LYMainLoop.c:5029
 msgid "cd to:"
 msgstr "hangi dizine cd:"
 
-#: src/LYMainLoop.c:5077
+#: src/LYMainLoop.c:5054
 msgid "A component of path is not a directory"
 msgstr "Yolun bileþenlerinden biri dizin deðildir"
 
-#: src/LYMainLoop.c:5080
+#: src/LYMainLoop.c:5057
 msgid "failed to change directory"
 msgstr "dizin deðiþtirme baþarýsýz"
 
-#: src/LYMainLoop.c:6252
+#: src/LYMainLoop.c:6229
 msgid "Reparsing document under current settings..."
 msgstr "Mevcut ayarlarla belge yeniden ayrýþtýrýlýyor..."
 
-#: src/LYMainLoop.c:6543
+#: src/LYMainLoop.c:6521
 #, c-format
 msgid "Fatal error - could not open output file %s\n"
 msgstr "Ölümcül hata - çýktý dosyasý %s açýlamýyor\n"
 
-#: src/LYMainLoop.c:6880
+#: src/LYMainLoop.c:6858
 msgid "TABLE center enable."
 msgstr "TABLO ortala(mayý) etkinleþtir."
 
-#: src/LYMainLoop.c:6883
+#: src/LYMainLoop.c:6861
 msgid "TABLE center disable."
 msgstr "TABLO ortala(mayý) devre dýþý býrak."
 
-#: src/LYMainLoop.c:6960
+#: src/LYMainLoop.c:6938
 msgid "Current URL is empty."
 msgstr "Mevcut URL boþ."
 
-#: src/LYMainLoop.c:6962 src/LYUtils.c:1828
+#: src/LYMainLoop.c:6940 src/LYUtils.c:1828
 msgid "Copy to clipboard failed."
 msgstr "Panoya kopyalama baþarýsýz."
 
-#: src/LYMainLoop.c:6964
+#: src/LYMainLoop.c:6942
 msgid "Document URL put to clipboard."
 msgstr "Belge URL'sini panoya koy."
 
-#: src/LYMainLoop.c:6966
+#: src/LYMainLoop.c:6944
 msgid "Link URL put to clipboard."
 msgstr "Link URL'sini panoya koy."
 
-#: src/LYMainLoop.c:6993
+#: src/LYMainLoop.c:6971
 msgid "No URL in the clipboard."
 msgstr "Panoda URL yok."
 
-#: src/LYMainLoop.c:7664 src/LYMainLoop.c:7834
+#: src/LYMainLoop.c:7642 src/LYMainLoop.c:7812
 msgid "-index-"
 msgstr "-indeks-"
 
-#: src/LYMainLoop.c:7774
+#: src/LYMainLoop.c:7752
 msgid "lynx: Can't access startfile"
 msgstr "lynx: baþlat dosyasýna (startfile) eriþilemiyor"
 
-#: src/LYMainLoop.c:7786
+#: src/LYMainLoop.c:7764
 msgid "lynx: Start file could not be found or is not text/html or text/plain"
 msgstr "lynx: Baþlat dosyasý bulunamýyor ya da html-metin ya da salt-metin deðil"
 
-#: src/LYMainLoop.c:7787
+#: src/LYMainLoop.c:7765
 msgid "      Exiting..."
 msgstr "      Kapanýyor..."
 
-#: src/LYMainLoop.c:7828
+#: src/LYMainLoop.c:7806
 msgid "-more-"
 msgstr "-devam-"
 
@@ -4535,348 +4531,348 @@ msgstr ""
 msgid "Message has no original text!"
 msgstr "Mesajda orijinal metin yok!"
 
-#: src/LYOptions.c:765
+#: src/LYOptions.c:768
 msgid "review/edit B)ookmarks files"
 msgstr "Yer imi(B) dosyalarýný gözden geçir/düzenle"
 
-#: src/LYOptions.c:767
+#: src/LYOptions.c:770
 msgid "B)ookmark file: "
 msgstr "Yer imi(B) dosyasý: "
 
-#: src/LYOptions.c:2127 src/LYOptions.c:2134
+#: src/LYOptions.c:2131 src/LYOptions.c:2138
 msgid "ON"
 msgstr "AÇIK"
 
 #. verbose_img variable
-#: src/LYOptions.c:2128 src/LYOptions.c:2133 src/LYOptions.c:2285 src/LYOptions.c:2296
+#: src/LYOptions.c:2132 src/LYOptions.c:2137 src/LYOptions.c:2289 src/LYOptions.c:2300
 msgid "OFF"
 msgstr "KAPALI"
 
-#: src/LYOptions.c:2129
+#: src/LYOptions.c:2133
 msgid "NEVER"
 msgstr "ASLA"
 
-#: src/LYOptions.c:2130
+#: src/LYOptions.c:2134
 msgid "ALWAYS"
 msgstr "HER ZAMAN"
 
-#: src/LYOptions.c:2146 src/LYOptions.c:2277
+#: src/LYOptions.c:2150 src/LYOptions.c:2281
 msgid "ignore"
 msgstr "yoksay"
 
-#: src/LYOptions.c:2147
+#: src/LYOptions.c:2151
 msgid "ask user"
 msgstr "kullanýcýya sor"
 
-#: src/LYOptions.c:2148
+#: src/LYOptions.c:2152
 msgid "accept all"
 msgstr "tümünü kabul et"
 
-#: src/LYOptions.c:2160
+#: src/LYOptions.c:2164
 msgid "ALWAYS OFF"
 msgstr "HER ZAMAN KAPALI"
 
-#: src/LYOptions.c:2161
+#: src/LYOptions.c:2165
 msgid "FOR LOCAL FILES ONLY"
 msgstr "YALNIZCA YEREL DOSYALAR ÝÇÝN"
 
-#: src/LYOptions.c:2163
+#: src/LYOptions.c:2167
 msgid "ALWAYS ON"
 msgstr "HER ZAMAN AÇIK"
 
-#: src/LYOptions.c:2175
+#: src/LYOptions.c:2179
 msgid "Numbers act as arrows"
 msgstr "Rakamlar oklar gibi davranýrlar"
 
-#: src/LYOptions.c:2177
+#: src/LYOptions.c:2181
 msgid "Links are numbered"
 msgstr "Linkler numaralandý"
 
-#: src/LYOptions.c:2180
+#: src/LYOptions.c:2184
 msgid "Links and form fields are numbered"
 msgstr "Linkler ve form alanlarý numaralandý"
 
-#: src/LYOptions.c:2183
+#: src/LYOptions.c:2187
 msgid "Form fields are numbered"
 msgstr "Form alanlarý numaralandý"
 
-#: src/LYOptions.c:2197
+#: src/LYOptions.c:2201
 msgid "Case insensitive"
 msgstr "Büyük/küçük harf duyarsýz"
 
-#: src/LYOptions.c:2198
+#: src/LYOptions.c:2202
 msgid "Case sensitive"
 msgstr "Büyük/küçük harf duyarlý"
 
-#: src/LYOptions.c:2222
+#: src/LYOptions.c:2226
 msgid "prompt normally"
 msgstr "normal bilgi istemi"
 
-#: src/LYOptions.c:2223
+#: src/LYOptions.c:2227
 msgid "force yes-response"
 msgstr "evet-yanýtýna zorla"
 
-#: src/LYOptions.c:2224
+#: src/LYOptions.c:2228
 msgid "force no-response"
 msgstr "hayýr-yanýtýna zorla"
 
-#: src/LYOptions.c:2242
+#: src/LYOptions.c:2246
 msgid "Novice"
 msgstr "Acemi"
 
-#: src/LYOptions.c:2243
+#: src/LYOptions.c:2247
 msgid "Intermediate"
 msgstr "Orta düzey"
 
-#: src/LYOptions.c:2244
+#: src/LYOptions.c:2248
 msgid "Advanced"
 msgstr "Ýleri düzey"
 
-#: src/LYOptions.c:2253
+#: src/LYOptions.c:2257
 msgid "By First Visit"
 msgstr "Ýlk Ziyaretle"
 
-#: src/LYOptions.c:2255
+#: src/LYOptions.c:2259
 msgid "By First Visit Reversed"
 msgstr "Ýlk Ziyaretle-Tersten"
 
-#: src/LYOptions.c:2256
+#: src/LYOptions.c:2260
 msgid "As Visit Tree"
 msgstr "Ziyaret Aðacý Gibi"
 
-#: src/LYOptions.c:2257
+#: src/LYOptions.c:2261
 msgid "By Last Visit"
 msgstr "Son Ziyaretle"
 
-#: src/LYOptions.c:2259
+#: src/LYOptions.c:2263
 msgid "By Last Visit Reversed"
 msgstr "Son Ziyaretle-Tersten"
 
 #. Old_DTD variable
-#: src/LYOptions.c:2270
+#: src/LYOptions.c:2274
 msgid "relaxed (TagSoup mode)"
 msgstr "gevþek (TagSoup kipi)"
 
-#: src/LYOptions.c:2271
+#: src/LYOptions.c:2275
 msgid "strict (SortaSGML mode)"
 msgstr "katý (SortaSGML kipi)"
 
-#: src/LYOptions.c:2278
+#: src/LYOptions.c:2282
 msgid "as labels"
 msgstr "etiket gibi"
 
-#: src/LYOptions.c:2279
+#: src/LYOptions.c:2283
 msgid "as links"
 msgstr "link gibi"
 
-#: src/LYOptions.c:2286
+#: src/LYOptions.c:2290
 msgid "show filename"
 msgstr "dosya adýný göster"
 
-#: src/LYOptions.c:2297
+#: src/LYOptions.c:2301
 msgid "STANDARD"
 msgstr "STANDART"
 
-#: src/LYOptions.c:2298
+#: src/LYOptions.c:2302
 msgid "ADVANCED"
 msgstr "ÝLERÝ DÜZEY"
 
-#: src/LYOptions.c:2329
+#: src/LYOptions.c:2333
 msgid "Directories first"
 msgstr "Önce dizinler"
 
-#: src/LYOptions.c:2330
+#: src/LYOptions.c:2334
 msgid "Files first"
 msgstr "Önce dosyalar"
 
-#: src/LYOptions.c:2331
+#: src/LYOptions.c:2335
 msgid "Mixed style"
 msgstr "Karýþýk stil"
 
-#: src/LYOptions.c:2339 src/LYOptions.c:2359
+#: src/LYOptions.c:2343 src/LYOptions.c:2363
 msgid "By Name"
 msgstr "Ýsimle"
 
-#: src/LYOptions.c:2340 src/LYOptions.c:2360
+#: src/LYOptions.c:2344 src/LYOptions.c:2364
 msgid "By Type"
 msgstr "Türle"
 
-#: src/LYOptions.c:2341 src/LYOptions.c:2361
+#: src/LYOptions.c:2345 src/LYOptions.c:2365
 msgid "By Size"
 msgstr "Boyutla"
 
-#: src/LYOptions.c:2342 src/LYOptions.c:2362
+#: src/LYOptions.c:2346 src/LYOptions.c:2366
 msgid "By Date"
 msgstr "Tarihle"
 
-#: src/LYOptions.c:2343
+#: src/LYOptions.c:2347
 msgid "By Mode"
 msgstr "Kiple"
 
-#: src/LYOptions.c:2345
+#: src/LYOptions.c:2349
 msgid "By User"
 msgstr "Kullanýcýyla"
 
-#: src/LYOptions.c:2346
+#: src/LYOptions.c:2350
 msgid "By Group"
 msgstr "Grupla"
 
-#: src/LYOptions.c:2371
+#: src/LYOptions.c:2375
 msgid "Do not show rate"
 msgstr "Hýzý gösterme"
 
-#: src/LYOptions.c:2372 src/LYOptions.c:2373
+#: src/LYOptions.c:2376 src/LYOptions.c:2377
 #, c-format
 msgid "Show %s/sec rate"
 msgstr "%s/sn hýzýný göster"
 
-#: src/LYOptions.c:2375 src/LYOptions.c:2376
+#: src/LYOptions.c:2379 src/LYOptions.c:2380
 #, c-format
 msgid "Show %s/sec, ETA"
 msgstr "%s/sn'yi göster, ETA"
 
-#: src/LYOptions.c:2379
+#: src/LYOptions.c:2383
 msgid "Show progressbar"
 msgstr "Geliþim çubuðunu göster"
 
-#: src/LYOptions.c:2391
+#: src/LYOptions.c:2395
 msgid "Accept lynx's internal types"
 msgstr "Lynx'in dahili türlerini kabul et"
 
-#: src/LYOptions.c:2392
+#: src/LYOptions.c:2396
 msgid "Also accept lynx.cfg's types"
 msgstr "Lynx cfg'nin türlerini de kabul et"
 
-#: src/LYOptions.c:2393
+#: src/LYOptions.c:2397
 msgid "Also accept user's types"
 msgstr "Kullanýcýnýn türlerini de kabul et"
 
-#: src/LYOptions.c:2394
+#: src/LYOptions.c:2398
 msgid "Also accept system's types"
 msgstr "Sistemin türlerini de kabul et"
 
-#: src/LYOptions.c:2395
+#: src/LYOptions.c:2399
 msgid "Accept all types"
 msgstr "Tüm türleri kabul et"
 
-#: src/LYOptions.c:2404
+#: src/LYOptions.c:2408
 msgid "gzip"
 msgstr "gzip"
 
-#: src/LYOptions.c:2405
+#: src/LYOptions.c:2409
 msgid "deflate"
 msgstr "söndür"
 
-#: src/LYOptions.c:2408
+#: src/LYOptions.c:2412
 msgid "compress"
 msgstr "sýkýþtýr"
 
-#: src/LYOptions.c:2411
+#: src/LYOptions.c:2415
 msgid "bzip2"
 msgstr "bzip2"
 
-#: src/LYOptions.c:2413
+#: src/LYOptions.c:2417
 msgid "All"
 msgstr "Tümü"
 
-#: src/LYOptions.c:2681 src/LYOptions.c:2705
+#: src/LYOptions.c:2685 src/LYOptions.c:2709
 #, c-format
 msgid "Use %s to invoke the Options menu!"
 msgstr "Seçenekler menüsünü çaðýrmak için %s kullanýnýz!"
 
-#: src/LYOptions.c:3477
+#: src/LYOptions.c:3481
 msgid "(options marked with (!) will not be saved)"
 msgstr "((!) ile iþaretlenmiþ seçenekler kaydedilmeyecek)"
 
-#: src/LYOptions.c:3485
+#: src/LYOptions.c:3489
 msgid "General Preferences"
 msgstr "Genel Tercihler"
 
 #. ***************************************************************
 #. User Mode: SELECT
-#: src/LYOptions.c:3489
+#: src/LYOptions.c:3493
 msgid "User mode"
 msgstr "Kullanýcý kipi"
 
 #. Editor: INPUT
-#: src/LYOptions.c:3495
+#: src/LYOptions.c:3499
 msgid "Editor"
 msgstr "Düzenleyici"
 
 #. Search Type: SELECT
-#: src/LYOptions.c:3500
+#: src/LYOptions.c:3504
 msgid "Type of Search"
 msgstr "Arama Tipi"
 
-#: src/LYOptions.c:3505
+#: src/LYOptions.c:3509
 msgid "Security and Privacy"
 msgstr "Güvenlik ve Mahremiyet"
 
 #. ***************************************************************
 #. Cookies: SELECT
-#: src/LYOptions.c:3509
+#: src/LYOptions.c:3513
 msgid "Cookies"
 msgstr "Çerezler"
 
 #. Cookie Prompting: SELECT
-#: src/LYOptions.c:3523
+#: src/LYOptions.c:3527
 msgid "Invalid-Cookie Prompting"
 msgstr "Geçersiz Çerez Bilgi Ýstemi"
 
 #. SSL Prompting: SELECT
-#: src/LYOptions.c:3530
+#: src/LYOptions.c:3534
 msgid "SSL Prompting"
 msgstr "SSL Bilgi Ýstemi"
 
-#: src/LYOptions.c:3536
+#: src/LYOptions.c:3540
 msgid "Keyboard Input"
 msgstr "Klavye Girdisi"
 
 #. ***************************************************************
 #. Keypad Mode: SELECT
-#: src/LYOptions.c:3540
+#: src/LYOptions.c:3544
 msgid "Keypad mode"
 msgstr "Mini klavye(keypad) kipi"
 
 #. Emacs keys: ON/OFF
-#: src/LYOptions.c:3546
+#: src/LYOptions.c:3550
 msgid "Emacs keys"
 msgstr "Emacs tuþlarý"
 
 #. VI Keys: ON/OFF
-#: src/LYOptions.c:3552
+#: src/LYOptions.c:3556
 msgid "VI keys"
 msgstr "VI tuþlarý"
 
 #. Line edit style: SELECT
 #. well, at least 2 line edit styles available
-#: src/LYOptions.c:3559
+#: src/LYOptions.c:3563
 msgid "Line edit style"
 msgstr "Satýr düzenleme stili"
 
 #. Keyboard layout: SELECT
-#: src/LYOptions.c:3571
+#: src/LYOptions.c:3575
 msgid "Keyboard layout"
 msgstr "Klavye yerleþimi"
 
 #.
 #. * Display and Character Set
 #.
-#: src/LYOptions.c:3585
+#: src/LYOptions.c:3589
 msgid "Display and Character Set"
 msgstr "Görüntüleme ve Karakter Kümesi"
 
 #. Use locale-based character set: ON/OFF
-#: src/LYOptions.c:3590
+#: src/LYOptions.c:3594
 msgid "Use locale-based character set"
 msgstr "Yerel tabanlý karakter kümesini kullan"
 
 #. Display Character Set: SELECT
-#: src/LYOptions.c:3599
+#: src/LYOptions.c:3603
 msgid "Display character set"
 msgstr "Karakter kümesini görüntüle"
 
-#: src/LYOptions.c:3630
+#: src/LYOptions.c:3634
 msgid "Assumed document character set"
 msgstr "Varsayýlan belge karakter kümesi"
 
@@ -4885,185 +4881,185 @@ msgstr "Varsayýlan belge karakter kümesi"
 #. * we split the header to make it more readable:
 #. * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others.
 #.
-#: src/LYOptions.c:3650
+#: src/LYOptions.c:3654
 msgid "CJK mode"
 msgstr "CJK kipi"
 
-#: src/LYOptions.c:3652
+#: src/LYOptions.c:3656
 msgid "Raw 8-bit"
 msgstr "Ham 8-bit"
 
 #. X Display: INPUT
-#: src/LYOptions.c:3660
+#: src/LYOptions.c:3664
 msgid "X Display"
 msgstr "X Görüntüleme"
 
 #.
 #. * Document Appearance
 #.
-#: src/LYOptions.c:3666
+#: src/LYOptions.c:3670
 msgid "Document Appearance"
 msgstr "Belge Görünümü"
 
-#: src/LYOptions.c:3672
+#: src/LYOptions.c:3676
 msgid "Show color"
 msgstr "Renkleri göster"
 
 #. Show cursor: ON/OFF
-#: src/LYOptions.c:3696
+#: src/LYOptions.c:3700
 msgid "Show cursor"
 msgstr "Ýmleci göster"
 
 #. Underline links: ON/OFF
-#: src/LYOptions.c:3702
+#: src/LYOptions.c:3706
 msgid "Underline links"
 msgstr "Linklerin altý çizili"
 
 #. Show scrollbar: ON/OFF
-#: src/LYOptions.c:3709
+#: src/LYOptions.c:3713
 msgid "Show scrollbar"
 msgstr "Kaydýrma çubuðunu göster"
 
 #. Select Popups: ON/OFF
-#: src/LYOptions.c:3716
+#: src/LYOptions.c:3720
 msgid "Popups for select fields"
 msgstr "Seçme alanlar için açýlýrlar(popups)"
 
 #. HTML error recovery: SELECT
-#: src/LYOptions.c:3722
+#: src/LYOptions.c:3726
 msgid "HTML error recovery"
 msgstr "HTML hata kurtarma"
 
 #. Show Images: SELECT
-#: src/LYOptions.c:3728
+#: src/LYOptions.c:3732
 msgid "Show images"
 msgstr "Resimleri göster"
 
 #. Verbose Images: ON/OFF
-#: src/LYOptions.c:3742
+#: src/LYOptions.c:3746
 msgid "Verbose images"
 msgstr "Resimleri dillendir"
 
 #.
 #. * Headers Transferred to Remote Servers
 #.
-#: src/LYOptions.c:3750
+#: src/LYOptions.c:3754
 msgid "Headers Transferred to Remote Servers"
 msgstr "Baþlýklar Karþý Sunuculara Aktarýldý"
 
 #. ***************************************************************
 #. Mail Address: INPUT
-#: src/LYOptions.c:3754
+#: src/LYOptions.c:3758
 msgid "Personal mail address"
 msgstr "Kiþisel mektup adresi"
 
-#: src/LYOptions.c:3760
+#: src/LYOptions.c:3764
 msgid "Password for anonymous ftp"
 msgstr "Anonim ftp için parola"
 
 #. Preferred media type: SELECT
-#: src/LYOptions.c:3766
+#: src/LYOptions.c:3770
 msgid "Preferred media type"
 msgstr "Tercih edilen ortam türü"
 
 #. Preferred encoding: SELECT
-#: src/LYOptions.c:3772
+#: src/LYOptions.c:3776
 msgid "Preferred encoding"
 msgstr "Tercih edilen kodlama"
 
 #. Preferred Document Character Set: INPUT
-#: src/LYOptions.c:3778
+#: src/LYOptions.c:3782
 msgid "Preferred document character set"
 msgstr "Tercih edilen belge karakter kümesi"
 
 #. Preferred Document Language: INPUT
-#: src/LYOptions.c:3783
+#: src/LYOptions.c:3787
 msgid "Preferred document language"
 msgstr "Tercih edilen belge dili"
 
-#: src/LYOptions.c:3789
+#: src/LYOptions.c:3793
 msgid "User-Agent header"
 msgstr "Kullanýcý-Ajaný baþlýðý"
 
 #.
 #. * Listing and Accessing Files
 #.
-#: src/LYOptions.c:3797
+#: src/LYOptions.c:3801
 msgid "Listing and Accessing Files"
 msgstr "Dosya Listeleme ve Eriþim"
 
 #. FTP sort: SELECT
-#: src/LYOptions.c:3802
+#: src/LYOptions.c:3806
 msgid "Use Passive FTP"
 msgstr "Edilgen FTP Kullan"
 
 #. FTP sort: SELECT
-#: src/LYOptions.c:3808
+#: src/LYOptions.c:3812
 msgid "FTP sort criteria"
 msgstr "FTP sýralama ölçütleri"
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:3816
+#: src/LYOptions.c:3820
 msgid "Local directory sort criteria"
 msgstr "Yerel dizin sýralama ölçütleri"
 
 #. Local Directory Order: SELECT
-#: src/LYOptions.c:3822
+#: src/LYOptions.c:3826
 msgid "Local directory sort order"
 msgstr "Yerel dizin sýralama ölçütleri"
 
-#: src/LYOptions.c:3831
+#: src/LYOptions.c:3835
 msgid "Show dot files"
 msgstr "Nokta dosyalarý göster"
 
-#: src/LYOptions.c:3839
+#: src/LYOptions.c:3843
 msgid "Execution links"
 msgstr "Ýcra linkleri"
 
 #. Show transfer rate: SELECT
-#: src/LYOptions.c:3859
+#: src/LYOptions.c:3863
 msgid "Show transfer rate"
 msgstr "Aktarým hýzýný göster"
 
 #.
 #. * Special Files and Screens
 #.
-#: src/LYOptions.c:3879
+#: src/LYOptions.c:3883
 msgid "Special Files and Screens"
 msgstr "Özel Dosyalar ve Ekranlar"
 
-#: src/LYOptions.c:3884
+#: src/LYOptions.c:3888
 msgid "Multi-bookmarks"
 msgstr "Çoklu-yer imleri"
 
-#: src/LYOptions.c:3892
+#: src/LYOptions.c:3896
 msgid "Review/edit Bookmarks files"
 msgstr "Yer Ými dosyalarýný gözden geçir/düzenle"
 
-#: src/LYOptions.c:3894
+#: src/LYOptions.c:3898
 msgid "Goto multi-bookmark menu"
 msgstr "Çoklu-yer imi menüsüne git"
 
-#: src/LYOptions.c:3896
+#: src/LYOptions.c:3900
 msgid "Bookmarks file"
 msgstr "Yer Ýmleri dosyasý"
 
 #. Auto Session: ON/OFF
-#: src/LYOptions.c:3903
+#: src/LYOptions.c:3907
 msgid "Auto Session"
 msgstr "Otomatik Oturum"
 
 #. Session File Menu: INPUT
-#: src/LYOptions.c:3909
+#: src/LYOptions.c:3913
 msgid "Session file"
 msgstr "Oturum dosyasý"
 
 #. Visited Pages: SELECT
-#: src/LYOptions.c:3915
+#: src/LYOptions.c:3919
 msgid "Visited Pages"
 msgstr "Uðranan Sayfalar"
 
-#: src/LYOptions.c:3920
+#: src/LYOptions.c:3924
 msgid "View the file "
 msgstr "Dosyayý görüntüle"
 
@@ -5183,38 +5179,38 @@ msgstr "Lynx: baþlayamýyor, CERN kurallarý dosyasý %s temin edilemiyor\n"
 msgid "(no name)"
 msgstr "(isimsiz)"
 
-#: src/LYReadCFG.c:1881
+#: src/LYReadCFG.c:1882
 #, c-format
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
 msgstr "lynx.cfg içermeleri, %d'den çok içiçe geçmiþ -- belki bir döngü olmasýn?\n"
 
-#: src/LYReadCFG.c:1883
+#: src/LYReadCFG.c:1884
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr "Son kalkýþýlan içerme '%s' idi,\n"
 
-#: src/LYReadCFG.c:1884
+#: src/LYReadCFG.c:1885
 #, c-format
 msgid "included from '%s'.\n"
 msgstr "'%s'den içerilmiþti.\n"
 
-#: src/LYReadCFG.c:2292 src/LYReadCFG.c:2305 src/LYReadCFG.c:2363
+#: src/LYReadCFG.c:2289 src/LYReadCFG.c:2302 src/LYReadCFG.c:2360
 msgid "The following is read from your lynx.cfg file."
 msgstr "Aþaðýdaki, lynx.cfg dosyanýzdan okunmuþtur."
 
-#: src/LYReadCFG.c:2293 src/LYReadCFG.c:2306
+#: src/LYReadCFG.c:2290 src/LYReadCFG.c:2303
 msgid "Please read the distribution"
 msgstr "Lütfen daha fazla yorum için"
 
-#: src/LYReadCFG.c:2299 src/LYReadCFG.c:2309
+#: src/LYReadCFG.c:2296 src/LYReadCFG.c:2306
 msgid "for more comments."
 msgstr "daðýtýmý okuyunuz."
 
-#: src/LYReadCFG.c:2345
+#: src/LYReadCFG.c:2342
 msgid "RELOAD THE CHANGES"
 msgstr "DEÐÝÞÝKLÝKLERÝ YENÝDEN YÜKLE"
 
-#: src/LYReadCFG.c:2353
+#: src/LYReadCFG.c:2350
 msgid "Your primary configuration"
 msgstr "Birincil ayarlarýnýz"
 
@@ -5450,7 +5446,7 @@ msgstr ""
 "burada NESNE EM,STRONG,B,I,U,BLINK vs'den biri olmalýdýr.\n"
 "\n"
 
-#: src/LYTraversal.c:108
+#: src/LYTraversal.c:111
 msgid "here is a list of the history stack so that you may rebuild"
 msgstr "yeniden yapýlandýrabilmeniz için iþte bir tarihçe yýðýný listesi"
 
@@ -5486,29 +5482,29 @@ msgstr "Yükleme seçenekleri:"
 msgid "Download document URL put to clipboard."
 msgstr "Belge indirme URL'sini panoya koy."
 
-#: src/LYUtils.c:2615
+#: src/LYUtils.c:2614
 msgid "Unexpected access protocol for this URL scheme."
 msgstr "Bu URL þemasý için umulmadýk eriþim protokolü."
 
-#: src/LYUtils.c:3419
+#: src/LYUtils.c:3422
 msgid "Too many tempfiles"
 msgstr "Çok sayýda geçici dosya"
 
-#: src/LYUtils.c:3719
+#: src/LYUtils.c:3722
 msgid "unknown restriction"
 msgstr "bilinmeyen kýsýtlama"
 
-#: src/LYUtils.c:3750
+#: src/LYUtils.c:3753
 #, c-format
 msgid "No restrictions set.\n"
 msgstr "Hiçbir kýsýtlama kurulmamýþ.\n"
 
-#: src/LYUtils.c:3753
+#: src/LYUtils.c:3756
 #, c-format
 msgid "Restrictions set:\n"
 msgstr "Kurulmuþ kýsýtlamalar:\n"
 
-#: src/LYUtils.c:5131
+#: src/LYUtils.c:5134
 msgid "Cannot find HOME directory"
 msgstr "EV dizini bulunamýyor"
 
@@ -6040,6 +6036,8 @@ msgid ""
 "Lynx User Defaults File\n"
 "\n"
 msgstr ""
+"Lynx Kullanýcý Öntanýmlýlarý Dosyasý\n"
+"\n"
 
 #: src/LYrcFile.c:882
 msgid ""
@@ -6047,12 +6045,17 @@ msgid ""
 "with the 'o' key).  To save options with that screen, you must select the\n"
 "checkbox:\n"
 msgstr ""
+"Bu dosya Lynx Seçenekleri Ekraný'ndan kaydedilen seçenekleri içerir (normalde\n"
+"'o' tuþuyla birlikte).  O ekranla seçenekleri kaydetmek için onay\n"
+"kutusunu seçmelisiniz:\n"
 
 #: src/LYrcFile.c:889
 msgid ""
 "You must then save the settings using the link on the line above the\n"
 "checkbox:\n"
 msgstr ""
+"Daha sonra da onay kutusunun üstünde bulunan satýrdaki linki kullanarak\n"
+"ayarlarý kaydetmelisiniz:\n"
 
 #: src/LYrcFile.c:896
 msgid ""
@@ -6060,6 +6063,9 @@ msgid ""
 "the simpler Options Menu instead.  Save options with that using the '>' key.\n"
 "\n"
 msgstr ""
+"\"-forms_options\" komut satýrý seçeneðini de kullanabilirsiniz, bu, daha basit\n"
+"Seçenekler Menüsünü gösterecektir.  Seçenekleri buradan '>' tuþunu kullanarak kaydedebilirsiniz.\n"
+"\n"
 
 #: src/LYrcFile.c:903
 msgid ""
@@ -6067,9 +6073,11 @@ msgid ""
 "with the '>' key).\n"
 "\n"
 msgstr ""
+"Bu dosya Lynx Seçenekler Ekraný'ndan kaydedilmiþ seçenekleri içerir (normalde\n"
+"'>' tuþuyla).\n"
+"\n"
 
 #: src/LYrcFile.c:910
-#, fuzzy
 msgid ""
 "There is normally no need to edit this file manually, since the defaults\n"
 "here can be controlled from the Options Screen, and the next time options\n"
@@ -6080,16 +6088,11 @@ msgid ""
 "called \"lynx.cfg\".  It has different content and a different format.\n"
 "It is not this file.\n"
 msgstr ""
-"Lynx Kullanýcý Öntanýmlýlarý Dosyasý\n"
+"Buradaki öntanýmlýlar Seçenekler Ekraný'ndan kontrol edilebildiði ve seçenekler,\n"
+" Seçenekler Ekraný'ndan bir sonraki sefer kaydedildiðinde bu dosya\n"
+" tümüyle yeniden yazýlacaðýndan, normalde bu dosyayý elle düzenlemek gerekmez.\n"
+"Uyarýlmýþ oldunuz...\n"
 "\n"
-"Bu dosya, Lynx Seçenekler Ekraný'ndan (normalde '>' tuþuyla) kaydedilmiþ\n"
-"seçenekler içerir.  Buradaki öntanýmlýlar Seçenekler Ekraný'ndan kontrol\n"
-"edilebildiði ve seçenekler, Seçenekler Ekraný'ndan bir sonraki sefer\n"
-"kaydedildiðinde bu dosya tümüyle yeniden yazýlacaðýndan, normalde\n"
-"bu dosyayý elle düzenlemek gerekmez.  Uyarýlmýþ oldunuz...\n"
-"Eðer genel ayarlama dosyasýný arýyorsanýz - normalde lynx.cfg olarak\n"
-"anýlýr, onun farklý bir içeriði ve biçemi vardýr.\n"
+"Eðer genel ayarlama dosyasýný arýyorsanýz - normalde \"lynx.cfg\"\n"
+"olarak anýlýr.  Onun farklý bir içeriði ve biçemi vardýr.\n"
 "O, bu dosya deðildir.\n"
-
-#~ msgid "Socket read failed for 180,000 tries."
-#~ msgstr "Soket okunmasý 180,000 kez baþarýsýz."
diff --git a/src/GridText.c b/src/GridText.c
index c5dddab8..13d11148 100644
--- a/src/GridText.c
+++ b/src/GridText.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: GridText.c,v 1.162 2008/12/30 00:53:29 tom Exp $
+ * $LynxId: GridText.c,v 1.163 2009/01/02 00:18:17 tom Exp $
  *
  *		Character grid hypertext object
  *		===============================
@@ -1110,10 +1110,10 @@ HText *HText_new(HTParentAnchor *anchor)
     else
 	self->hiddenlinkflag = LYHiddenLinks;
     self->hidden_links = NULL;
-    self->no_cache = ((anchor->no_cache ||
-		       anchor->post_data)
-		      ? YES
-		      : NO);
+    self->no_cache = (BOOLEAN) ((anchor->no_cache ||
+				 anchor->post_data)
+				? YES
+				: NO);
     self->LastChar = '\0';
 
 #ifndef USE_PRETTYSRC
@@ -1727,7 +1727,7 @@ static void display_title(HText *text)
 	    } else {
 		for (i = 0, j = 0; title[i]; i++) {
 		    if (title[i] != CH_ESC) {	/* S/390 -- gil -- 1487 */
-			tmp[j++] = title[i];
+			tmp[j++] = UCH(title[i]);
 		    }
 		}
 		tmp[j] = '\0';
@@ -1747,7 +1747,7 @@ static void display_title(HText *text)
     }
 #ifdef USE_COLOR_STYLE
     if (s_forw_backw != NOSTYLE && (nhist || nhist_extra > 1)) {
-	int c = nhist ? ACS_LARROW : ' ';
+	chtype c = nhist ? ACS_LARROW : ' ';
 
 	/* turn the FORWBACKW.ARROW style on */
 	LynxChangeStyle(s_forw_backw, STACK_ON);
@@ -2951,7 +2951,8 @@ static void split_line(HText *text, unsigned split)
 		} else if (IS_UTF_EXTRA(p[i])) {
 		    utfxtra_on_this_line++;
 		}
-		if (p[i] == LY_SOFT_HYPHEN && (int) text->permissible_split < i)
+		if (p[i] == LY_SOFT_HYPHEN &&
+		    (int) text->permissible_split < i)
 		    text->permissible_split = i + 1;
 	    }
 	    ctrl_chars_on_this_line += utfxtra_on_this_line;
@@ -3434,7 +3435,7 @@ static void split_line(HText *text, unsigned split)
 	    char *p2 = previous->data;
 
 	    for (; p2 < previous->data + justify_start_position; ++p2)
-		*p2 = (*p2 == HT_NON_BREAK_SPACE ? ' ' : *p2);
+		*p2 = (char) (*p2 == HT_NON_BREAK_SPACE ? ' ' : *p2);
 	}
     } else {
 	if (REALLY_CAN_JUSTIFY(text)) {
@@ -3499,7 +3500,7 @@ static void blank_lines(HText *text, int newlines)
 {
     if (HText_LastLineEmpty(text, FALSE)) {	/* No text on current line */
 	HTLine *line = text->last_line->prev;
-	BOOL first = (line == text->last_line);
+	BOOL first = (BOOL) (line == text->last_line);
 
 	if (no_title && first)
 	    return;
@@ -4398,14 +4399,14 @@ void HText_appendCharacter(HText *text, int ch)
 		case EUC:
 		    if (text->kcode == SJIS) {
 			SJIS_TO_EUC1(hi, lo, tmp);
-			line->data[line->size++] = tmp[0];
-			line->data[line->size++] = tmp[1];
+			line->data[line->size++] = (char) tmp[0];
+			line->data[line->size++] = (char) tmp[1];
 		    } else if (IS_EUC(hi, lo)) {
 #ifdef CONV_JISX0201KANA_JISX0208KANA
 			JISx0201TO0208_EUC(hi, lo, &hi, &lo);
 #endif
-			line->data[line->size++] = hi;
-			line->data[line->size++] = lo;
+			line->data[line->size++] = (char) hi;
+			line->data[line->size++] = (char) lo;
 		    } else {
 			CTRACE((tfp,
 				"This character (%X:%X) doesn't seem Japanese\n",
@@ -4424,12 +4425,12 @@ void HText_appendCharacter(HText *text, int ch)
 #endif
 			{
 			    EUC_TO_SJIS1(hi, lo, tmp);
-			    line->data[line->size++] = tmp[0];
-			    line->data[line->size++] = tmp[1];
+			    line->data[line->size++] = (char) tmp[0];
+			    line->data[line->size++] = (char) tmp[1];
 			}
 		    } else if (IS_SJIS_2BYTE(hi, lo)) {
-			line->data[line->size++] = hi;
-			line->data[line->size++] = lo;
+			line->data[line->size++] = (char) hi;
+			line->data[line->size++] = (char) lo;
 		    } else {
 			line->data[line->size++] = '=';
 			line->data[line->size++] = '=';
@@ -4443,8 +4444,8 @@ void HText_appendCharacter(HText *text, int ch)
 		    break;
 		}
 	    } else {
-		line->data[line->size++] = hi;
-		line->data[line->size++] = lo;
+		line->data[line->size++] = (char) hi;
+		line->data[line->size++] = (char) lo;
 	    }
 	    text->kanji_buf = 0;
 	}
@@ -4883,7 +4884,7 @@ static void free_enclosed_stbl(HText *me)
 /*	Finish simple table handling
  *	Return TRUE if the table is nested inside another table.
  */
-int HText_endStblTABLE(HText *me)
+BOOLEAN HText_endStblTABLE(HText *me)
 {
     int ncols, lines_changed = 0;
     STable_info *enclosing = NULL;
@@ -4934,7 +4935,7 @@ int HText_endStblTABLE(HText *me)
     CTRACE((tfp, "endStblTABLE: have%s enclosing table (%p)\n",
 	    enclosing == 0 ? " NO" : "", (void *) enclosing));
 
-    return enclosing != 0;
+    return (BOOLEAN) (enclosing != 0);
 }
 
 /*	Start simple table row
@@ -8420,15 +8421,18 @@ void HTuncache_current_document(void)
 
 #ifdef USE_SOURCE_CACHE
 
+/* dummy - kw */
 static HTProtocol scm =
-{"source-cache-mem", 0, 0};	/* dummy - kw */
+{
+    "source-cache-mem", 0, 0
+};
 
 static BOOLEAN useSourceCache(void)
 {
     BOOLEAN result = FALSE;
 
     if (LYCacheSource == SOURCE_CACHE_FILE) {
-	result = (HTMainAnchor->source_cache_file != 0);
+	result = (BOOLEAN) (HTMainAnchor->source_cache_file != 0);
 	CTRACE((tfp, "SourceCache: file-cache%s found\n",
 		result ? "" : " not"));
     }
@@ -8440,7 +8444,7 @@ static BOOLEAN useMemoryCache(void)
     BOOLEAN result = FALSE;
 
     if (LYCacheSource == SOURCE_CACHE_MEMORY) {
-	result = (HTMainAnchor->source_cache_chunk != 0);
+	result = (BOOLEAN) (HTMainAnchor->source_cache_chunk != 0);
 	CTRACE((tfp, "SourceCache: memory-cache%s found\n",
 		result ? "" : " not"));
     }
@@ -8636,17 +8640,17 @@ BOOLEAN HTdocument_settings_changed(void)
 		    LYlines));
     }
 
-    return (HTMainText->clickable_images != clickable_images ||
-	    HTMainText->pseudo_inline_alts != pseudo_inline_alts ||
-	    HTMainText->verbose_img != verbose_img ||
-	    HTMainText->raw_mode != LYUseDefaultRawMode ||
-	    HTMainText->historical_comments != historical_comments ||
-	    (HTMainText->minimal_comments != minimal_comments &&
-	     !historical_comments) ||
-	    HTMainText->soft_dquotes != soft_dquotes ||
-	    HTMainText->old_dtd != Old_DTD ||
-	    HTMainText->keypad_mode != keypad_mode ||
-	    HTMainText->disp_cols != DISPLAY_COLS);
+    return (BOOLEAN) (HTMainText->clickable_images != clickable_images ||
+		      HTMainText->pseudo_inline_alts != pseudo_inline_alts ||
+		      HTMainText->verbose_img != verbose_img ||
+		      HTMainText->raw_mode != LYUseDefaultRawMode ||
+		      HTMainText->historical_comments != historical_comments ||
+		      (HTMainText->minimal_comments != minimal_comments &&
+		       !historical_comments) ||
+		      HTMainText->soft_dquotes != soft_dquotes ||
+		      HTMainText->old_dtd != Old_DTD ||
+		      HTMainText->keypad_mode != keypad_mode ||
+		      HTMainText->disp_cols != DISPLAY_COLS);
 }
 #endif
 
@@ -9501,7 +9505,7 @@ char *HText_setLastOptionValue(HText *text, char *value,
 		} else {
 		    for (i = 0, j = 0; cp[i]; i++) {
 			if (cp[i] != CH_ESC) {	/* S/390 -- gil -- 1604 */
-			    tmp[j++] = cp[i];
+			    tmp[j++] = UCH(cp[i]);
 			}
 		    }
 		}
@@ -9536,10 +9540,10 @@ char *HText_setLastOptionValue(HText *text, char *value,
 	    last_input->orig_submit_value = last_input->select_list->cp_submit_value;
 	    last_input->value_cs = new_ptr->value_cs;
 	} else {
-	    int newlen = strlen(new_ptr->name);
-	    int curlen = (HTCurSelectedOptionValue
-			  ? strlen(HTCurSelectedOptionValue)
-			  : 0);
+	    int newlen = (int) strlen(new_ptr->name);
+	    int curlen = (int) (HTCurSelectedOptionValue
+				? strlen(HTCurSelectedOptionValue)
+				: 0);
 
 	    /*
 	     * Make the selected Option Value as long as
@@ -9721,7 +9725,7 @@ int HText_beginInput(HText *text, BOOL underline,
 	    } else {
 		for (i = 0, j = 0; IValue[i]; i++) {
 		    if (IValue[i] != CH_ESC) {	/* S/390 -- gil -- 1621 */
-			tmp[j++] = IValue[i];
+			tmp[j++] = UCH(IValue[i]);
 		    }
 		}
 	    }
@@ -9983,7 +9987,7 @@ int HText_beginInput(HText *text, BOOL underline,
 	sprintf(marker, "[%d]", a->number);
 	adjust_marker = strlen(marker);
 	if (number_fields_on_left) {
-	    BOOL had_bracket = (f->type == F_OPTION_LIST_TYPE);
+	    BOOL had_bracket = (BOOL) (f->type == F_OPTION_LIST_TYPE);
 
 	    HText_appendText(text, had_bracket ? (marker + 1) : marker);
 	    if (had_bracket)
@@ -10311,7 +10315,7 @@ static void UpdateBoundary(char **Boundary,
 	    && !memcmp(want, text + j, have)) {
 	    char temp[2];
 
-	    temp[0] = isdigit(UCH(text[have + j])) ? 'a' : '0';
+	    temp[0] = (char) (isdigit(UCH(text[have + j])) ? 'a' : '0');
 	    temp[1] = '\0';
 	    StrAllocCat(want, temp);
 	    ++have;
@@ -10367,12 +10371,12 @@ static char *convert_to_base64(const char *src,
 		*r++ = *c++;
 	    chunk = 0;
 	}
-	c1 = *str++;
-	c2 = *str++;
+	c1 = UCH(*str++);
+	c2 = UCH(*str++);
 	*r++ = basis_64[c1 >> 2];
 	*r++ = basis_64[((c1 & 0x3) << 4) | ((c2 & 0xF0) >> 4)];
 	if (len > 2) {
-	    c3 = *str++;
+	    c3 = UCH(*str++);
 	    *r++ = basis_64[((c2 & 0xF) << 2) | ((c3 & 0xC0) >> 6)];
 	    *r++ = basis_64[c3 & 0x3F];
 	} else if (len == 2) {
@@ -11708,7 +11712,7 @@ void HText_setKcode(HText *text, const char *charset,
     if (!charset && !p_in) {
 	return;
     }
-    charset_explicit = charset ? TRUE : FALSE;
+    charset_explicit = (BOOLEAN) (charset ? TRUE : FALSE);
     /*
      * If no explicit charset string, use the implied one.  - kw
      */
@@ -12470,10 +12474,10 @@ static void update_subsequent_anchors(int newlines,
  */
 static BOOLEAN IsFormsTextarea(FormInfo * form, TextAnchor *anchor_ptr)
 {
-    return ((anchor_ptr->link_type == INPUT_ANCHOR) &&
-	    (anchor_ptr->input_field->type == F_TEXTAREA_TYPE) &&
-	    (anchor_ptr->input_field->number == form->number) &&
-	    !strcmp(anchor_ptr->input_field->name, form->name));
+    return (BOOLEAN) ((anchor_ptr->link_type == INPUT_ANCHOR) &&
+		      (anchor_ptr->input_field->type == F_TEXTAREA_TYPE) &&
+		      (anchor_ptr->input_field->number == form->number) &&
+		      !strcmp(anchor_ptr->input_field->name, form->name));
 }
 
 static int finish_ExtEditForm(LinkInfo * form_link, TextAnchor *start_anchor,
@@ -12969,7 +12973,7 @@ int HText_InsertFile(LinkInfo * form_link)
      * Read it into our buffer (abort on 0-length file).
      */
     if ((stat(fn, &stat_info) < 0) ||
-	((size = stat_info.st_size) == 0)) {
+	((size = (size_t) stat_info.st_size) == 0)) {
 	HTInfoMsg(FILE_INSERT_0_LENGTH);
 	CTRACE((tfp,
 		"GridText: file insert aborted - file=|%s|- was 0-length\n",
@@ -14019,7 +14023,7 @@ void redraw_lines_of_link(int cur)
 	 ++count) {
 	col = LYGetHilitePos(cur, count);
 	LYmove(row++, col);
-	redraw_part_of_line(todr1, text, strlen(text), HTMainText);
+	redraw_part_of_line(todr1, text, (int) strlen(text), HTMainText);
 	todr1 = todr1->next;
     }
 #undef pvtTITLE_HEIGHT
@@ -14114,7 +14118,7 @@ static int LYHandleCache(const char *arg,
     if (sscanf(arg, STR_LYNXCACHE "/%d", &x) == 1 && x > 0) {
 	CTRACE((tfp, "LYNXCACHE number is %d\n", x));
 	_statusline(CACHE_D_OR_CANCEL);
-	c = LYgetch_single();
+	c = (char) LYgetch_single();
 	if (c == 'D') {
 	    HText *t = (HText *) HTList_objectAt(loaded_texts, x - 1);
 
@@ -14144,7 +14148,7 @@ static int LYHandleCache(const char *arg,
      * Load HTML strings into buf and pass buf to the target for parsing and
      * rendering.
      */
-#define PUTS(buf)    (*target->isa->put_block)(target, buf, strlen(buf))
+#define PUTS(buf)    (*target->isa->put_block)(target, buf, (int) strlen(buf))
 
     HTSprintf0(&buf,
 	       "<html>\n<head>\n<title>%s</title>\n</head>\n<body>\n",
diff --git a/src/GridText.h b/src/GridText.h
index 1d39ea70..a3ed2b6e 100644
--- a/src/GridText.h
+++ b/src/GridText.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: GridText.h,v 1.60 2008/12/29 21:36:00 tom Exp $
+ * $LynxId: GridText.h,v 1.61 2009/01/01 23:02:02 tom Exp $
  *
  * Specialities of GridText as subclass of HText
  */
@@ -181,7 +181,7 @@ US-ASCII control characters <32 which are not defined in Unicode standard
     extern void *HText_pool_calloc(HText *text, unsigned size);
 
 /* "simple table" stuff */
-    extern int HText_endStblTABLE(HText *);
+    extern BOOLEAN HText_endStblTABLE(HText *);
     extern int HText_trimCellLines(HText *text);
     extern void HText_cancelStbl(HText *);
     extern void HText_endStblCOLGROUP(HText *);
diff --git a/src/HTFWriter.c b/src/HTFWriter.c
index c3273e90..5f882cd1 100644
--- a/src/HTFWriter.c
+++ b/src/HTFWriter.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTFWriter.c,v 1.90 2007/08/02 19:40:50 tom Exp $
+ * $LynxId: HTFWriter.c,v 1.91 2009/01/01 22:58:59 tom Exp $
  *
  *		FILE WRITER				HTFWrite.h
  *		===========
@@ -134,7 +134,7 @@ static void HTFWriter_write(HTStream *me, const char *s, int l)
     size_t result;
 
     if (me->fp) {
-	result = fwrite(s, 1, l, me->fp);
+	result = fwrite(s, 1, (unsigned) l, me->fp);
 	if (result != (size_t) l) {
 	    HTFWriter_error(me, "HTFWriter_write");
 	}
@@ -199,7 +199,7 @@ static void HTFWriter_free(HTStream *me)
 		 * and remove any previous uncompressed copy.  - FM
 		 */
 		StrAllocCopy(path, me->anchor->FileCache);
-		if ((len = strlen(path)) > 3 &&
+		if ((len = (int) strlen(path)) > 3 &&
 		    (!strcasecomp(&path[len - 2], "gz") ||
 		     !strcasecomp(&path[len - 2], "zz"))) {
 #ifdef USE_ZLIB
diff --git a/src/HTInit.c b/src/HTInit.c
index 12caeb65..015d5c39 100644
--- a/src/HTInit.c
+++ b/src/HTInit.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTInit.c,v 1.69 2008/09/10 23:17:45 tom Exp $
+ * $LynxId: HTInit.c,v 1.70 2009/01/01 22:58:06 tom Exp $
  *
  *		Configuration-specific Initialization		HTInit.c
  *		----------------------------------------
@@ -327,7 +327,7 @@ static void TrimCommand(char *command)
 			continue;
 		}
 	    }
-	    *d++ = ch;
+	    *d++ = (char) ch;
 	    c0 = ch;
 	}
 	*d = '\0';
@@ -608,7 +608,7 @@ static char *LYGetContentType(const char *name,
  */
 BOOL LYMailcapUsesPctS(const char *controlstring)
 {
-    int result = FALSE;
+    BOOL result = FALSE;
     const char *from;
     const char *next;
     int prefixed = 0;
diff --git a/src/HTML.c b/src/HTML.c
index 9ac89ab6..f1de8177 100644
--- a/src/HTML.c
+++ b/src/HTML.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTML.c,v 1.117 2008/12/29 21:22:28 tom Exp $
+ * $LynxId: HTML.c,v 1.118 2009/01/01 23:08:07 tom Exp $
  *
  *		Structured stream to Rich hypertext converter
  *		============================================
@@ -672,7 +672,8 @@ void HTML_write(HTStructured * me, const char *s, int l)
    string (resolution of relative URLs etc.).  This variable only used
    locally here, don't confuse with LYinternal_flag which is for
    overriding non-caching similar to LYoverride_no_cache. - kw */
-#define CHECK_FOR_INTERN(flag,s) flag = (s && (*s=='#' || *s=='\0')) ? TRUE : FALSE
+#define CHECK_FOR_INTERN(flag,s) \
+   	flag = (BOOLEAN) ((s && (*s=='#' || *s=='\0')) ? TRUE : FALSE)
 
 /* Last argument to pass to HTAnchor_findChildAndLink() calls,
    just an abbreviation. - kw */
@@ -693,10 +694,10 @@ static void free_Style_className(void)
 
 static void addClassName(const char *prefix,
 			 const char *actual,
-			 int length)
+			 unsigned length)
 {
-    int offset = strlen(prefix);
-    unsigned have = (Style_className_end - Style_className);
+    unsigned offset = strlen(prefix);
+    unsigned have = (unsigned) (Style_className_end - Style_className);
     unsigned need = (offset + length + 1);
 
     if ((have + need) >= Style_className_len) {
@@ -1064,9 +1065,9 @@ static int HTML_start_element(HTStructured * me, int element_number,
     force_classname = FALSE;
 
     if (force_current_tag_style == FALSE) {
-	current_tag_style = class_name[0]
-	    ? -1
-	    : cached_tag_styles[element_number];
+	current_tag_style = (class_name[0]
+			     ? -1
+			     : cached_tag_styles[element_number]);
     } else {
 	force_current_tag_style = FALSE;
     }
@@ -5279,7 +5280,7 @@ static int HTML_start_element(HTStructured * me, int element_number,
 		if (opnum > 0 && opnum < 100000) {
 		    sprintf(marker, "(%d)", opnum);
 		    HTML_put_string(me, marker);
-		    for (i = strlen(marker); i < 5; ++i) {
+		    for (i = (int) strlen(marker); i < 5; ++i) {
 			HTML_put_character(me, '_');
 		    }
 		}
@@ -7223,7 +7224,7 @@ static int HTML_end_element(HTStructured * me, int element_number,
 */
 int HTML_put_entity(HTStructured * me, int entity_number)
 {
-    int nent = HTML_dtd.number_of_entities;
+    int nent = (int) HTML_dtd.number_of_entities;
 
     if (entity_number < nent) {
 	HTML_put_string(me, p_entity_values[entity_number]);
@@ -7944,7 +7945,7 @@ static void CacheThru_write(HTStream *me, const char *str, int l)
 {
     if (me->status == HT_OK && l != 0) {
 	if (me->fp) {
-	    fwrite(str, 1, l, me->fp);
+	    fwrite(str, 1, (unsigned) l, me->fp);
 	    if (ferror(me->fp))
 		me->status = HT_ERROR;
 	} else if (me->chunk) {
diff --git a/src/LYBookmark.c b/src/LYBookmark.c
index 8c744f08..6d3a9caf 100644
--- a/src/LYBookmark.c
+++ b/src/LYBookmark.c
@@ -1,3 +1,6 @@
+/*
+ * $LynxId: LYBookmark.c,v 1.62 2009/01/02 00:01:00 tom Exp $
+ */
 #include <HTUtils.h>
 #include <HTAlert.h>
 #include <HTFile.h>
@@ -492,7 +495,7 @@ void remove_bookmark_link(int cur,
      * Explicitly preserve bookmark file mode on Unix.  - DSL
      */
     if (stat(filename_buffer, &stat_buf) == 0) {
-	regular = (S_ISREG(stat_buf.st_mode) && stat_buf.st_nlink == 1);
+	regular = (BOOLEAN) (S_ISREG(stat_buf.st_mode) && stat_buf.st_nlink == 1);
 	mode = ((stat_buf.st_mode & 0777) | 0600);	/* make it writable */
 	(void) chmod(newfile, mode);
 	if ((nfp = LYReopenTemp(newfile)) == NULL) {
@@ -845,7 +848,7 @@ int select_menu_multi_bookmarks(void)
 	MBM_tmp_count = 0;
 	for (c = MBM_from; c <= MBM_to; c++) {
 	    LYmove(3 + MBM_tmp_count, 5);
-	    LYaddch(LYindex2MBM(c));
+	    LYaddch((chtype) LYindex2MBM(c));
 	    LYaddstr(" : ");
 	    if (MBM_A_subdescript[c])
 		LYaddstr(MBM_A_subdescript[c]);
diff --git a/src/LYCgi.c b/src/LYCgi.c
index 45ec8ee6..2274234c 100644
--- a/src/LYCgi.c
+++ b/src/LYCgi.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYCgi.c,v 1.53 2008/12/07 22:13:52 tom Exp $
+ * $LynxId: LYCgi.c,v 1.54 2009/01/01 22:39:06 tom Exp $
  *                   Lynx CGI support                              LYCgi.c
  *                   ================
  *
@@ -54,8 +54,8 @@ struct _HTStream {
 };
 
 static char **env = NULL;	/* Environment variables */
-static int envc_size = 0;	/* Slots in environment array */
-static int envc = 0;		/* Slots used so far */
+static unsigned envc_size = 0;	/* Slots in environment array */
+static unsigned envc = 0;	/* Slots used so far */
 static HTList *alloced = NULL;
 
 #ifdef LYNXCGI_LINKS
@@ -449,7 +449,7 @@ static int LYLoadCGI(const char *arg,
 		    remaining = BStrLen(anAnchor->post_data);
 		    while ((written = write(fd1[1],
 					    BStrData(anAnchor->post_data) + total_written,
-					    remaining)) != 0) {
+					    (unsigned) remaining)) != 0) {
 			if (written < 0) {
 #ifdef EINTR
 			    if (errno == EINTR)
@@ -585,7 +585,7 @@ static int LYLoadCGI(const char *arg,
 		    }
 		}
 
-		argv = (char **) malloc(argv_cnt * sizeof(char *));
+		argv = (char **) malloc((unsigned) argv_cnt * sizeof(char *));
 
 		if (argv == NULL) {
 		    outofmem(__FILE__, "LYCgi");
diff --git a/src/LYCharUtils.c b/src/LYCharUtils.c
index 78cfe0d2..c201d69d 100644
--- a/src/LYCharUtils.c
+++ b/src/LYCharUtils.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYCharUtils.c,v 1.93 2008/12/29 21:22:28 tom Exp $
+ * $LynxId: LYCharUtils.c,v 1.94 2009/01/01 22:32:39 tom Exp $
  *
  *  Functions associated with LYCharSets.c and the Lynx version of HTML.c - FM
  *  ==========================================================================
@@ -113,7 +113,10 @@ void LYEntify(char **str,
      * Allocate space and convert.  - FM
      */
     q = typecallocn(char,
-		    (strlen(*str) + (4 * amps) + (3 * lts) + (3 * gts) + 1));
+		    (strlen(*str)
+		     + (unsigned)(4 * amps)
+		     + (unsigned)(3 * lts)
+		     + (unsigned)(3 * gts) + 1));
     if ((cp = q) == NULL)
 	outofmem(__FILE__, "LYEntify");
     for (p = *str; *p; p++) {
@@ -261,7 +264,7 @@ void LYTrimTail(char *str)
     if (isEmpty(str))
 	return;
 
-    i = strlen(str) - 1;
+    i = (int) strlen(str) - 1;
     while (i >= 0) {
 	if (WHITE(str[i]))
 	    str[i] = '\0';
@@ -1532,7 +1535,7 @@ char **LYUCFullyTranslateString(char **str,
 		state = S_recover;
 		break;
 	    } else {
-		code = lcode;
+		code = (UCode_t) lcode;
 		if ((code == 1) ||
 		    (code > 127 && code < 156)) {
 		    /*
@@ -2074,7 +2077,7 @@ char *LYParseTagParam(char *from,
 	}
 	if (strlen(string) < len)
 	    return NULL;
-    } while (strncasecomp(string, name, len) != 0);
+    } while (strncasecomp(string, name, (int) len) != 0);
     string += len;
     while (*string != '\0' && (isspace(UCH(*string)) || *string == '=')) {
 	string++;
diff --git a/src/LYCookie.c b/src/LYCookie.c
index 7527de37..e3ce7976 100644
--- a/src/LYCookie.c
+++ b/src/LYCookie.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYCookie.c,v 1.94 2008/12/14 19:38:59 tom Exp $
+ * $LynxId: LYCookie.c,v 1.95 2009/01/01 22:28:57 tom Exp $
  *
  *			       Lynx Cookie Support		   LYCookie.c
  *			       ===================
@@ -131,7 +131,7 @@ static void MemAllocCopy(char **dest,
 	return;
     }
 
-    temp = typecallocn(char, (end - start) + 1);
+    temp = typecallocn(char, (unsigned)(end - start) + 1);
     if (temp == NULL)
 	outofmem(__FILE__, "MemAllocCopy");
     LYstrncpy(temp, start, (end - start));
@@ -220,7 +220,7 @@ static BOOLEAN host_matches(const char *A,
      * in Section 2 of draft-ietf-http-state-man-mec-10.txt.
      */
     if (*B == '.' && B[1] != '\0' && B[1] != '.' && *A != '.') {
-	int diff = (strlen(A) - strlen(B));
+	int diff = (int) (strlen(A) - strlen(B));
 
 	if (diff > 0) {
 	    if (!strcasecomp((A + diff), B))
@@ -263,7 +263,7 @@ static BOOLEAN port_matches(int port,
  */
 static int ignore_trailing_slash(const char *a)
 {
-    int len = strlen(a);
+    int len = (int) strlen(a);
 
     while (len > 1 && a[len - 1] == '/')
 	--len;
@@ -282,7 +282,7 @@ static BOOL is_prefix(const char *a, const char *b)
     if (len_a > len_b) {
 	return FALSE;
     } else {
-	if (strncmp(a, b, len_a) != 0) {
+	if (strncmp(a, b, (unsigned) len_a) != 0) {
 	    return FALSE;
 	}
 	if (len_a < len_b && (len_a > 1 || a[0] != '/')) {
@@ -741,7 +741,7 @@ static char *scan_cookie_sublist(char *hostname,
 		     * goes before the first cookie.
 		     */
 		    HTSprintf0(&header, "$Version=\"%d\"; ", co->version);
-		    len += strlen(header);
+		    len += (int) strlen(header);
 		}
 	    } else {
 		/*
@@ -787,7 +787,7 @@ static char *scan_cookie_sublist(char *hostname,
 		StrAllocCat(header, "\"");
 		len++;
 	    }
-	    len += (strlen(co->name) + strlen(co->value) + 1);
+	    len += (int) (strlen(co->name) + strlen(co->value) + 1);
 	    /*
 	     * For Version 1 (or greater) cookies, add $PATH, $PORT and/or
 	     * $DOMAIN attributes for the cookie if they were specified via a
@@ -801,7 +801,7 @@ static char *scan_cookie_sublist(char *hostname,
 		    StrAllocCat(header, "; $Path=\"");
 		    StrAllocCat(header, co->path);
 		    StrAllocCat(header, "\"");
-		    len += (strlen(co->path) + 10);
+		    len += (int) (strlen(co->path) + 10);
 		}
 		if (co->PortList && isdigit(UCH(*co->PortList))) {
 		    /*
@@ -810,7 +810,7 @@ static char *scan_cookie_sublist(char *hostname,
 		    StrAllocCat(header, "; $Port=\"");
 		    StrAllocCat(header, co->PortList);
 		    StrAllocCat(header, "\"");
-		    len += (strlen(co->PortList) + 10);
+		    len += (int) (strlen(co->PortList) + 10);
 		}
 		if (co->domain && (co->flags & COOKIE_FLAG_DOMAIN_SET)) {
 		    /*
@@ -819,7 +819,7 @@ static char *scan_cookie_sublist(char *hostname,
 		    StrAllocCat(header, "; $Domain=\"");
 		    StrAllocCat(header, co->domain);
 		    StrAllocCat(header, "\"");
-		    len += (strlen(co->domain) + 12);
+		    len += (int) (strlen(co->domain) + 12);
 		}
 	    }
 	}
@@ -844,7 +844,7 @@ static char *alloc_attr_value(const char *value_start,
 	if (value_len > max_cookies_buffer) {
 	    value_len = max_cookies_buffer;
 	}
-	value = typecallocn(char, value_len + 1);
+	value = typecallocn(char, (unsigned) value_len + 1);
 
 	if (value == NULL)
 	    outofmem(__FILE__, "LYProcessSetCookies");
@@ -907,7 +907,7 @@ static unsigned parse_attribute(unsigned flags,
 	 */
 	    cur_cookie->comment == NULL) {
 	    StrAllocCopy(cur_cookie->comment, value);
-	    *cookie_len += strlen(cur_cookie->comment);
+	    *cookie_len += (int) strlen(cur_cookie->comment);
 	}
     } else if (is_attr("commentURL", 10)) {
 	known_attr = YES;
@@ -929,7 +929,7 @@ static unsigned parse_attribute(unsigned flags,
 	    if ((url_type = is_url(cur_cookie->commentURL)) &&
 		(url_type == HTTP_URL_TYPE ||
 		 url_type == HTTPS_URL_TYPE)) {
-		*cookie_len += strlen(cur_cookie->commentURL);
+		*cookie_len += (int) strlen(cur_cookie->commentURL);
 	    } else {
 		CTrace((tfp,
 			"LYProcessSetCookies: Rejecting commentURL value '%s'\n",
@@ -944,7 +944,7 @@ static unsigned parse_attribute(unsigned flags,
 	 * Don't process a repeat domain.  - FM
 	 */
 	    !(cur_cookie->flags & COOKIE_FLAG_DOMAIN_SET)) {
-	    *cookie_len -= strlen(cur_cookie->domain);
+	    *cookie_len -= (int) strlen(cur_cookie->domain);
 	    /*
 	     * If the value does not have a lead dot, but does have an embedded
 	     * dot, and is not an exact match to the hostname, nor is a numeric
@@ -975,7 +975,7 @@ static unsigned parse_attribute(unsigned flags,
 	    } else {
 		StrAllocCopy(cur_cookie->domain, value);
 	    }
-	    *cookie_len += strlen(cur_cookie->domain);
+	    *cookie_len += (int) strlen(cur_cookie->domain);
 	    cur_cookie->flags |= COOKIE_FLAG_DOMAIN_SET;
 	}
     } else if (is_attr("path", 4)) {
@@ -985,9 +985,9 @@ static unsigned parse_attribute(unsigned flags,
 	 * Don't process a repeat path.  - FM
 	 */
 	    !(cur_cookie->flags & COOKIE_FLAG_PATH_SET)) {
-	    *cookie_len -= strlen(cur_cookie->path);
+	    *cookie_len -= (int) strlen(cur_cookie->path);
 	    StrAllocCopy(cur_cookie->path, value);
-	    *cookie_len += (cur_cookie->pathlen = strlen(cur_cookie->path));
+	    *cookie_len += (cur_cookie->pathlen = (int) strlen(cur_cookie->path));
 	    cur_cookie->flags |= COOKIE_FLAG_PATH_SET;
 	}
     } else if (is_attr("port", 4)) {
@@ -1008,7 +1008,7 @@ static unsigned parse_attribute(unsigned flags,
 		    flags |= FLAGS_INVALID_PORT;
 		} else {
 		    StrAllocCopy(cur_cookie->PortList, value);
-		    *cookie_len += strlen(cur_cookie->PortList);
+		    *cookie_len += (int) strlen(cur_cookie->PortList);
 		}
 		known_attr = YES;
 	    } else {
@@ -1020,7 +1020,7 @@ static unsigned parse_attribute(unsigned flags,
 	     */
 	    if (cur_cookie->PortList == NULL) {
 		HTSprintf0(&(cur_cookie->PortList), "%d", port);
-		*cookie_len += strlen(cur_cookie->PortList);
+		*cookie_len += (int) strlen(cur_cookie->PortList);
 	    }
 	    known_attr = YES;
 	}
@@ -1368,13 +1368,13 @@ static void LYProcessSetCookies(const char *SetCookie,
 		cookie_len = 0;
 		NumCookies++;
 		MemAllocCopy(&(cur_cookie->name), attr_start, attr_end);
-		cookie_len += strlen(cur_cookie->name);
+		cookie_len += (int) strlen(cur_cookie->name);
 		MemAllocCopy(&(cur_cookie->value), value_start, value_end);
-		cookie_len += strlen(cur_cookie->value);
+		cookie_len += (int) strlen(cur_cookie->value);
 		StrAllocCopy(cur_cookie->domain, hostname);
-		cookie_len += strlen(cur_cookie->domain);
+		cookie_len += (int) strlen(cur_cookie->domain);
 		StrAllocCopy(cur_cookie->path, path);
-		cookie_len += (cur_cookie->pathlen = strlen(cur_cookie->path));
+		cookie_len += (cur_cookie->pathlen = (int) strlen(cur_cookie->path));
 		cur_cookie->port = port;
 		parse_flags = 0;
 		cur_cookie->quoted = TRUE;
@@ -1660,13 +1660,13 @@ static void LYProcessSetCookies(const char *SetCookie,
 		NumCookies++;
 		cookie_len = 0;
 		MemAllocCopy(&(cur_cookie->name), attr_start, attr_end);
-		cookie_len += strlen(cur_cookie->name);
+		cookie_len += (int) strlen(cur_cookie->name);
 		MemAllocCopy(&(cur_cookie->value), value_start, value_end);
-		cookie_len += strlen(cur_cookie->value);
+		cookie_len += (int) strlen(cur_cookie->value);
 		StrAllocCopy(cur_cookie->domain, hostname);
-		cookie_len += strlen(cur_cookie->domain);
+		cookie_len += (int) strlen(cur_cookie->domain);
 		StrAllocCopy(cur_cookie->path, path);
-		cookie_len += (cur_cookie->pathlen = strlen(cur_cookie->path));
+		cookie_len += (cur_cookie->pathlen = (int) strlen(cur_cookie->path));
 		cur_cookie->port = port;
 		parse_flags = 0;
 		cur_cookie->quoted = Quoted;
@@ -1935,7 +1935,7 @@ void LYLoadCookies(char *cookie_file)
 		    tok_loop, (int) (tok_out - buf), tok_out));
 	    LYstrncpy(tok_values[tok_loop].s,
 		      tok_out,
-		      tok_values[tok_loop].n);
+		      (int) tok_values[tok_loop].n);
 	    /*
 	     * It looks like strtok ignores a leading delimiter,
 	     * which makes things a bit more interesting.  Something
@@ -1967,7 +1967,7 @@ void LYLoadCookies(char *cookie_file)
 	} else {
 	    StrAllocCopy(moo->value, value);
 	}
-	moo->pathlen = strlen(moo->path);
+	moo->pathlen = (int) strlen(moo->path);
 	/*
 	 *  Justification for following flags:
 	 *  COOKIE_FLAG_FROM_FILE    So we know were it comes from.
@@ -2393,7 +2393,7 @@ static int LYHandleCookies(const char *arg,
      * Load HTML strings into buf and pass buf to the target for parsing and
      * rendering.  - FM
      */
-#define PUTS(buf)    (*target->isa->put_block)(target, buf, strlen(buf))
+#define PUTS(buf)    (*target->isa->put_block)(target, buf, (int) strlen(buf))
 
     HTSprintf0(&buf,
 	       "<html>\n<head>\n<title>%s</title>\n</head>\n<body>\n",
diff --git a/src/LYExtern.c b/src/LYExtern.c
index d3453a0d..0e5783c8 100644
--- a/src/LYExtern.c
+++ b/src/LYExtern.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYExtern.c,v 1.41 2008/12/29 01:34:31 tom Exp $
+ * $LynxId: LYExtern.c,v 1.42 2009/01/01 22:07:00 tom Exp $
  *
  External application support.
  This feature allows lynx to pass a given URL to an external program.
@@ -269,7 +269,7 @@ static char *lookup_external(char *param,
 	}
 	if (length > 1) {
 	    if (pass == 0) {
-		choices = typecallocn(char *, length + 1);
+		choices = typecallocn(char *, (unsigned) length + 1);
 	    } else {
 		choices[num_choices] = 0;
 	    }
diff --git a/src/LYForms.c b/src/LYForms.c
index 30db75fb..1e3b5af8 100644
--- a/src/LYForms.c
+++ b/src/LYForms.c
@@ -1,4 +1,4 @@
-/* $LynxId: LYForms.c,v 1.79 2008/09/06 14:40:45 tom Exp $ */
+/* $LynxId: LYForms.c,v 1.80 2009/01/01 23:21:07 tom Exp $ */
 #include <HTUtils.h>
 #include <HTCJK.h>
 #include <HTTP.h>
@@ -372,7 +372,7 @@ static int form_getstr(int cur,
     char *value = form->value;
     int ch;
     int far_col;
-    int max_length;
+    unsigned max_length;
     int startcol, startline;
     BOOL HaveMaxlength = FALSE;
     int action, repeat;
@@ -398,10 +398,10 @@ static int form_getstr(int cur,
      * Make sure the form field value does not exceed our buffer.  - FM
      */
     max_length = ((form->maxlength > 0 &&
-		   form->maxlength < sizeof(MyEdit.buffer)) ?
-		  form->maxlength :
-		  (sizeof(MyEdit.buffer) - 1));
-    if (strlen(form->value) > (size_t) max_length) {
+		   form->maxlength < sizeof(MyEdit.buffer))
+		  ? form->maxlength
+		  : (sizeof(MyEdit.buffer) - 1));
+    if (strlen(form->value) > max_length) {
 	/*
 	 * We can't fit the entire value into the editing buffer, so enter as
 	 * much of the tail as fits.  - FM
@@ -421,7 +421,7 @@ static int form_getstr(int cur,
     /*
      * Print panned line
      */
-    LYSetupEdit(&MyEdit, value, max_length, (far_col - startcol));
+    LYSetupEdit(&MyEdit, value, (int) max_length, (far_col - startcol));
     MyEdit.pad = '_';
     MyEdit.hidden = (BOOL) (form->type == F_PASSWORD_TYPE);
     if (use_last_tfpos && LastTFPos >= 0 && LastTFPos < MyEdit.strlen) {
@@ -603,7 +603,7 @@ static int form_getstr(int cur,
 
 	    if (!s)
 		break;
-	    len = strlen((const char *) s);
+	    len = (int) strlen((const char *) s);
 	    e = s + len;
 
 	    if (len > 0) {
@@ -630,10 +630,10 @@ static int form_getstr(int cur,
 		if (e1 + 1 < e && *e1 == '\n')
 		    StrAllocCopy(buf, (char *) e1 + 1);		/* Survive _release() */
 		get_clip_release();
-		if (MyEdit.strlen >= max_length) {
+		if (MyEdit.strlen >= (int) max_length) {
 		    HaveMaxlength = TRUE;
 		} else if (HaveMaxlength &&
-			   MyEdit.strlen < max_length) {
+			   MyEdit.strlen < (int) max_length) {
 		    HaveMaxlength = FALSE;
 		    _statusline(ENTER_TEXT_ARROWS_OR_TAB);
 		}
@@ -781,10 +781,10 @@ static int form_getstr(int cur,
 		}
 #endif /* SUPPORT_MULTIBYTE_EDIT */
 	    }
-	    if (MyEdit.strlen >= max_length) {
+	    if (MyEdit.strlen >= (int) max_length) {
 		HaveMaxlength = TRUE;
 	    } else if (HaveMaxlength &&
-		       MyEdit.strlen < max_length) {
+		       MyEdit.strlen < (int) max_length) {
 		HaveMaxlength = FALSE;
 		_statusline(ENTER_TEXT_ARROWS_OR_TAB);
 	    }
@@ -811,8 +811,8 @@ static int form_getstr(int cur,
 	     */
 	    StrAllocCopy(form->value, MyEdit.buffer);
 	} else {
-	    int old_len = strlen(form->value);
-	    int new_len = strlen(value);
+	    int old_len = (int) strlen(form->value);
+	    int new_len = (int) strlen(value);
 
 	    /*
 	     * Combine the modified tail with the unmodified head.  - FM
diff --git a/src/LYHistory.c b/src/LYHistory.c
index 46ec5637..8c88b753 100644
--- a/src/LYHistory.c
+++ b/src/LYHistory.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYHistory.c,v 1.72 2008/09/10 23:09:21 tom Exp $
+ * $LynxId: LYHistory.c,v 1.73 2009/01/01 23:22:12 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTTP.h>
@@ -344,7 +344,7 @@ void LYAllocHistory(int entries)
 	int save = size_history;
 
 	size_history = (entries + 2) * 2;
-	want = size_history * sizeof(*history);
+	want = (unsigned) size_history * sizeof(*history);
 	if (history == 0) {
 	    history = (HistInfo *) malloc(want);
 	} else {
@@ -1092,7 +1092,7 @@ static int LYLoadMESSAGES(const char *arg GCC_UNUSED,
     }
     anAnchor->no_cache = TRUE;
 
-#define PUTS(buf)    (*target->isa->put_block)(target, buf, strlen(buf))
+#define PUTS(buf)    (*target->isa->put_block)(target, buf, (int) strlen(buf))
 
     HTSprintf0(&buf, "<html>\n<head>\n");
     PUTS(buf);
diff --git a/src/LYJump.c b/src/LYJump.c
index 79aacd4f..22ceccbf 100644
--- a/src/LYJump.c
+++ b/src/LYJump.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYJump.c,v 1.33 2008/12/07 22:13:37 tom Exp $
+ * $LynxId: LYJump.c,v 1.34 2009/01/01 22:41:04 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTAlert.h>
@@ -383,7 +383,7 @@ static unsigned LYRead_Jumpfile(struct JumpTable *jtp)
     }
 
     /* allocate storage to read entire file */
-    if ((mp = typecallocn(char, st.st_size + 1)) == NULL) {
+    if ((mp = typecallocn(char, (size_t) st.st_size + 1)) == NULL) {
 	HTAlert(OUTOF_MEM_FOR_JUMP_FILE);
 	return 0;
     }
@@ -409,7 +409,7 @@ static unsigned LYRead_Jumpfile(struct JumpTable *jtp)
     if (IsStream_LF) {
     /** Handle as a stream. **/
 #endif /* VMS */
-	if (read(fd, mp, st.st_size) < st.st_size) {
+	if (read(fd, mp, (size_t) st.st_size) < st.st_size) {
 	    HTAlert(ERROR_READING_JUMP_FILE);
 	    FREE(mp);
 	    return 0;
diff --git a/src/LYJump.h b/src/LYJump.h
index 24b5222e..159bdd68 100644
--- a/src/LYJump.h
+++ b/src/LYJump.h
@@ -1,3 +1,4 @@
+/* $LynxId: LYJump.h,v 1.8 2009/01/01 22:41:42 tom Exp $ */
 #ifndef LYJUMP_H
 #define LYJUMP_H
 
@@ -13,7 +14,7 @@ extern "C" {
 
     struct JumpTable {
 	int key;
-	int nel;
+	unsigned nel;
 	char *msg;
 	char *file;
 	char *shortcut;
diff --git a/src/LYKeymap.c b/src/LYKeymap.c
index 1b7f7256..8e7baecb 100644
--- a/src/LYKeymap.c
+++ b/src/LYKeymap.c
@@ -1,4 +1,4 @@
-/* $LynxId: LYKeymap.c,v 1.65 2008/01/08 00:19:25 tom Exp $ */
+/* $LynxId: LYKeymap.c,v 1.66 2009/01/01 23:09:11 tom Exp $ */
 #include <HTUtils.h>
 #include <LYUtils.h>
 #include <LYGlobalDefs.h>
@@ -17,7 +17,7 @@
 #include <rot13_kb.h>
 #endif
 
-#define PUTS(buf)    (*target->isa->put_block)(target, buf, strlen(buf))
+#define PUTS(buf)    (*target->isa->put_block)(target, buf, (int) strlen(buf))
 
 #ifdef EXP_KEYBOARD_LAYOUT
 int current_layout = 0;		/* Index into LYKbLayouts[]   */
@@ -1139,7 +1139,7 @@ Kcmd *LYStringToKcmd(const char *name)
 		result = revmap + j;
 		break;
 	    } else if (!exact
-		       && !strncasecomp(revmap[j].name, name, need)) {
+		       && !strncasecomp(revmap[j].name, name, (int) need)) {
 		if (maybe == 0) {
 		    maybe = revmap + j;
 		} else {
@@ -1193,7 +1193,7 @@ int LYStringToKeycode(char *src)
 {
     unsigned n;
     int key = -1;
-    int len = strlen(src);
+    int len = (int) strlen(src);
 
     if (len == 1) {
 	key = *src;
@@ -1254,8 +1254,8 @@ static char *pretty_html(int c)
 		if (c == table[n].code) {
 		    found = TRUE;
 		    strcpy(dst, table[n].name);
-		    adj += strlen(dst) - 1;
-		    dst += strlen(dst);
+		    adj += (int) strlen(dst) - 1;
+		    dst += (int) strlen(dst);
 		    break;
 		}
 	    }
diff --git a/src/LYLocal.c b/src/LYLocal.c
index 3aa2a1ee..4860a69b 100644
--- a/src/LYLocal.c
+++ b/src/LYLocal.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYLocal.c,v 1.84 2008/12/07 22:13:37 tom Exp $
+ * $LynxId: LYLocal.c,v 1.86 2009/01/01 21:52:45 tom Exp $
  *
  *  Routines to manipulate the local filesystem.
  *  Written by: Rick Mallett, Carleton University
@@ -731,7 +731,7 @@ static int modify_tagged(char *testpath)
 	 */
 	dev = dir_info.st_dev;
 	inode = dir_info.st_ino;
-	owner = dir_info.st_uid;
+	owner = (int) dir_info.st_uid;
 
 	/*
 	 * Replace ~/ references to the home directory.
@@ -938,7 +938,7 @@ static int modify_location(char *testpath)
 	 */
 	dev = dir_info.st_dev;
 	inode = dir_info.st_ino;
-	owner = dir_info.st_uid;
+	owner = (int) dir_info.st_uid;
 	if (!ok_stat(newpath, &dir_info)) {
 	    code = 0;
 	}
@@ -1227,7 +1227,7 @@ int local_remove(DocInfo *doc)
 	strcpy(testpath, tp);
 	FREE(tp);
 
-	if ((i = strlen(testpath)) && testpath[i - 1] == '/')
+	if ((i = (int) strlen(testpath)) && testpath[i - 1] == '/')
 	    testpath[(i - 1)] = '\0';
 
 	if (remove_single(testpath)) {
@@ -1315,7 +1315,7 @@ static int permit_location(char *destpath,
 	LYLocalFileToURL(newpath, tempfile);
 	LYRegisterUIPage(*newpath, UIP_PERMIT_OPTIONS);
 
-	group_name = HTAA_GidToName(dir_info.st_gid);
+	group_name = HTAA_GidToName((int) dir_info.st_gid);
 	LYstrncpy(LYValidPermitFile,
 		  srcpath,
 		  (sizeof(LYValidPermitFile) - 1));
@@ -1624,7 +1624,7 @@ static char *LYonedot(char *line)
 static char *match_op(const char *prefix,
 		      char *data)
 {
-    int len = strlen(prefix);
+    int len = (int) strlen(prefix);
 
     if (!strncmp("LYNXDIRED://", data, 12)
 	&& !strncmp(prefix, data + 12, (unsigned) len)) {
@@ -1644,7 +1644,7 @@ static char *match_op(const char *prefix,
  * references to avoid spoofing the shell.
  */
 static char *build_command(char *line,
-			   char *dirname,
+			   char *dirName,
 			   char *arg)
 {
     char *buffer = NULL;
@@ -1680,8 +1680,8 @@ static char *build_command(char *line,
 	if ((arg = match_op("UNTAR_GZ", line)) != 0) {
 #define FMT_UNTAR_GZ "cd %s; %s -qdc %s |  %s %s %s"
 	    if ((program = HTGetProgramPath(ppGZIP)) != NULL) {
-		dirname = DirectoryOf(arg);
-		HTAddParam(&buffer, FMT_UNTAR_GZ, 1, dirname);
+		dirName = DirectoryOf(arg);
+		HTAddParam(&buffer, FMT_UNTAR_GZ, 1, dirName);
 		HTAddParam(&buffer, FMT_UNTAR_GZ, 2, program);
 		HTAddParam(&buffer, FMT_UNTAR_GZ, 3, arg);
 		HTAddParam(&buffer, FMT_UNTAR_GZ, 4, tar_path);
@@ -1695,8 +1695,8 @@ static char *build_command(char *line,
 	if ((arg = match_op("UNTAR_Z", line)) != 0) {
 #define FMT_UNTAR_Z "cd %s; %s %s |  %s %s %s"
 	    if ((program = HTGetProgramPath(ppZCAT)) != NULL) {
-		dirname = DirectoryOf(arg);
-		HTAddParam(&buffer, FMT_UNTAR_Z, 1, dirname);
+		dirName = DirectoryOf(arg);
+		HTAddParam(&buffer, FMT_UNTAR_Z, 1, dirName);
 		HTAddParam(&buffer, FMT_UNTAR_Z, 2, program);
 		HTAddParam(&buffer, FMT_UNTAR_Z, 3, arg);
 		HTAddParam(&buffer, FMT_UNTAR_Z, 4, tar_path);
@@ -1708,8 +1708,8 @@ static char *build_command(char *line,
 	}
 	if ((arg = match_op("UNTAR", line)) != 0) {
 #define FMT_UNTAR "cd %s; %s %s %s"
-	    dirname = DirectoryOf(arg);
-	    HTAddParam(&buffer, FMT_UNTAR, 1, dirname);
+	    dirName = DirectoryOf(arg);
+	    HTAddParam(&buffer, FMT_UNTAR, 1, dirName);
 	    HTAddParam(&buffer, FMT_UNTAR, 2, tar_path);
 	    HTAddToCmd(&buffer, FMT_UNTAR, 3, TAR_DOWN_OPTIONS);
 	    HTAddParam(&buffer, FMT_UNTAR, 4, arg);
@@ -1722,8 +1722,8 @@ static char *build_command(char *line,
 	if ((arg = match_op("TAR_GZ", line)) != 0) {
 #define FMT_TAR_GZ "cd %s; %s %s %s %s | %s -qc >%s%s"
 	    if ((program = HTGetProgramPath(ppGZIP)) != NULL) {
-		dirname = DirectoryOf(arg);
-		HTAddParam(&buffer, FMT_TAR_GZ, 1, dirname);
+		dirName = DirectoryOf(arg);
+		HTAddParam(&buffer, FMT_TAR_GZ, 1, dirName);
 		HTAddParam(&buffer, FMT_TAR_GZ, 2, tar_path);
 		HTAddToCmd(&buffer, FMT_TAR_GZ, 3, TAR_UP_OPTIONS);
 		HTAddToCmd(&buffer, FMT_TAR_GZ, 4, TAR_PIPE_OPTIONS);
@@ -1740,8 +1740,8 @@ static char *build_command(char *line,
 	if ((arg = match_op("TAR_Z", line)) != 0) {
 #define FMT_TAR_Z "cd %s; %s %s %s %s | %s >%s%s"
 	    if ((program = HTGetProgramPath(ppCOMPRESS)) != NULL) {
-		dirname = DirectoryOf(arg);
-		HTAddParam(&buffer, FMT_TAR_Z, 1, dirname);
+		dirName = DirectoryOf(arg);
+		HTAddParam(&buffer, FMT_TAR_Z, 1, dirName);
 		HTAddParam(&buffer, FMT_TAR_Z, 2, tar_path);
 		HTAddToCmd(&buffer, FMT_TAR_Z, 3, TAR_UP_OPTIONS);
 		HTAddToCmd(&buffer, FMT_TAR_Z, 4, TAR_PIPE_OPTIONS);
@@ -1756,8 +1756,8 @@ static char *build_command(char *line,
 
 	if ((arg = match_op("TAR", line)) != 0) {
 #define FMT_TAR "cd %s; %s %s %s %s.tar %s"
-	    dirname = DirectoryOf(arg);
-	    HTAddParam(&buffer, FMT_TAR, 1, dirname);
+	    dirName = DirectoryOf(arg);
+	    HTAddParam(&buffer, FMT_TAR, 1, dirName);
 	    HTAddParam(&buffer, FMT_TAR, 2, tar_path);
 	    HTAddToCmd(&buffer, FMT_TAR, 3, TAR_UP_OPTIONS);
 	    HTAddToCmd(&buffer, FMT_TAR, 4, TAR_FILE_OPTIONS);
@@ -1796,8 +1796,8 @@ static char *build_command(char *line,
     if ((arg = match_op("ZIP", line)) != 0) {
 #define FMT_ZIP "cd %s; %s -rq %s.zip %s"
 	if ((program = HTGetProgramPath(ppZIP)) != NULL) {
-	    dirname = DirectoryOf(arg);
-	    HTAddParam(&buffer, FMT_ZIP, 1, dirname);
+	    dirName = DirectoryOf(arg);
+	    HTAddParam(&buffer, FMT_ZIP, 1, dirName);
 	    HTAddParam(&buffer, FMT_ZIP, 2, program);
 	    HTAddParam(&buffer, FMT_ZIP, 3, LYonedot(LYPathLeaf(arg)));
 	    HTAddParam(&buffer, FMT_ZIP, 4, LYPathLeaf(arg));
@@ -1809,8 +1809,8 @@ static char *build_command(char *line,
     if ((arg = match_op("UNZIP", line)) != 0) {
 #define FMT_UNZIP "cd %s; %s -q %s"
 	if ((program = HTGetProgramPath(ppUNZIP)) != NULL) {
-	    dirname = DirectoryOf(arg);
-	    HTAddParam(&buffer, FMT_UNZIP, 1, dirname);
+	    dirName = DirectoryOf(arg);
+	    HTAddParam(&buffer, FMT_UNZIP, 1, dirName);
 	    HTAddParam(&buffer, FMT_UNZIP, 2, program);
 	    HTAddParam(&buffer, FMT_UNZIP, 3, arg);
 	    HTEndParam(&buffer, FMT_UNZIP, 3);
@@ -1850,7 +1850,7 @@ int local_dired(DocInfo *doc)
     char *tp = NULL;
     char *tmpbuf = NULL;
     char *buffer = NULL;
-    char *dirname = NULL;
+    char *dirName = NULL;
     BOOL do_pop_doc = TRUE;
 
     line_url = doc->address;
@@ -1935,7 +1935,7 @@ int local_dired(DocInfo *doc)
 	    return 0;
 	}
 
-	buffer = build_command(line, dirname, arg);
+	buffer = build_command(line, dirName, arg);
 
 	if (buffer != 0) {
 	    if ((int) strlen(buffer) < LYcolLimit - 14) {
@@ -1956,7 +1956,7 @@ int local_dired(DocInfo *doc)
 	}
     }
 
-    FREE(dirname);
+    FREE(dirName);
     FREE(tmpbuf);
     FREE(buffer);
     FREE(line);
diff --git a/src/LYMain.c b/src/LYMain.c
index e0d617c3..e1f772ba 100644
--- a/src/LYMain.c
+++ b/src/LYMain.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYMain.c,v 1.194 2008/12/30 01:01:34 Paul.Gilmartin Exp $
+ * $LynxId: LYMain.c,v 1.195 2009/01/01 17:12:48 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTTP.h>
@@ -1837,14 +1837,14 @@ int main(int argc,
      * Check the -popup command line toggle.  - FM
      */
     if (LYUseDefSelPop == FALSE) {
-	LYSelectPopups = !LYSelectPopups;
+	LYSelectPopups = (BOOLEAN) !LYSelectPopups;
     }
 
     /*
      * Check the -show_cursor command line toggle.  - FM
      */
     if (LYUseDefShoCur == FALSE) {
-	LYShowCursor = !LYShowCursor;
+	LYShowCursor = (BOOLEAN) !LYShowCursor;
     }
 
     /*
diff --git a/src/LYMainLoop.c b/src/LYMainLoop.c
index c2e21255..542b127d 100644
--- a/src/LYMainLoop.c
+++ b/src/LYMainLoop.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYMainLoop.c,v 1.158 2008/12/26 17:41:19 tom Exp $
+ * $LynxId: LYMainLoop.c,v 1.159 2009/01/01 17:49:53 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTAccess.h>
@@ -364,7 +364,7 @@ void LYCloseTracelog(void)
 void handle_LYK_TRACE_TOGGLE(void)
 {
 #ifndef NO_LYNX_TRACE
-    WWW_TraceFlag = !WWW_TraceFlag;
+    WWW_TraceFlag = (BOOLEAN) !WWW_TraceFlag;
     if (LYOpenTraceLog())
 	HTUserMsg(WWW_TraceFlag ? TRACE_ON : TRACE_OFF);
 #else
@@ -882,7 +882,7 @@ static int find_link_near_col(int col,
 		const char *text = LYGetHiliteStr(i, 0);
 
 		if (text != NULL)
-		    cx += strlen(text) / 2;
+		    cx += (int) strlen(text) / 2;
 		cx -= col;
 		if (cx < 0)
 		    cx = -cx;
@@ -1698,7 +1698,7 @@ static void handle_LYK_CLEAR_AUTH(int *old_c,
 
 static int handle_LYK_COMMAND(char *user_input_buffer)
 {
-    int ch;
+    LYKeymapCode ch;
     Kcmd *mp;
     char *src, *tmp;
 
@@ -2288,7 +2288,7 @@ static void handle_LYK_DOWN_LINK(int *follow_col,
 	    *follow_col = links[curdoc.link].lx;
 
 	    if (text != NULL)
-		*follow_col += strlen(text) / 2;
+		*follow_col += (int) strlen(text) / 2;
 	}
 
 	newlink = find_link_near_col(*follow_col, 1);
@@ -2695,7 +2695,7 @@ static BOOLEAN handle_LYK_FASTBACKW_LINK(int *cmd,
 {
     int samepage = 0, nextlink = curdoc.link;
     int res;
-    int code = FALSE;
+    BOOLEAN code = FALSE;
 
     if (nlinks > 1) {
 
@@ -3112,7 +3112,7 @@ static void handle_LYK_HISTORICAL(void)
 #ifdef USE_SOURCE_CACHE
     }				/* end if no bypass */
 #endif
-    historical_comments = !historical_comments;
+    historical_comments = (BOOLEAN) !historical_comments;
     if (minimal_comments) {
 	HTAlert(historical_comments ?
 		HISTORICAL_ON_MINIMAL_OFF : HISTORICAL_OFF_MINIMAL_ON);
@@ -3172,7 +3172,7 @@ static BOOLEAN handle_LYK_HISTORY(BOOLEAN ForcePush)
 
 static BOOLEAN handle_LYK_IMAGE_TOGGLE(int *cmd)
 {
-    clickable_images = !clickable_images;
+    clickable_images = (BOOLEAN) !clickable_images;
 
     HTUserMsg(clickable_images ?
 	      CLICKABLE_IMAGES_ON : CLICKABLE_IMAGES_OFF);
@@ -3320,7 +3320,7 @@ static BOOLEAN handle_LYK_INFO(int *cmd)
 
 static BOOLEAN handle_LYK_INLINE_TOGGLE(int *cmd)
 {
-    pseudo_inline_alts = !pseudo_inline_alts;
+    pseudo_inline_alts = (BOOLEAN) !pseudo_inline_alts;
 
     HTUserMsg(pseudo_inline_alts ?
 	      PSEUDO_INLINE_ALTS_ON : PSEUDO_INLINE_ALTS_OFF);
@@ -3604,7 +3604,7 @@ static void handle_LYK_MINIMAL(void)
 	}			/* end if no bypass */
 #endif
     }
-    minimal_comments = !minimal_comments;
+    minimal_comments = (BOOLEAN) !minimal_comments;
     if (!historical_comments) {
 	HTAlert(minimal_comments ?
 		MINIMAL_ON_IN_EFFECT : MINIMAL_OFF_VALID_ON);
@@ -3646,7 +3646,7 @@ static void handle_LYK_MODIFY(BOOLEAN *refresh_screen)
 #ifdef EXP_NESTED_TABLES
 static BOOLEAN handle_LYK_NESTED_TABLES(int *cmd)
 {
-    nested_tables = !nested_tables;
+    nested_tables = (BOOLEAN) !nested_tables;
     HTUserMsg(nested_tables ? NESTED_TABLES_ON : NESTED_TABLES_OFF);
     return reparse_or_reload(cmd);
 }
@@ -4249,7 +4249,7 @@ static void handle_LYK_SOFT_DQUOTES(void)
 #ifdef USE_SOURCE_CACHE
     }				/* end if no bypass */
 #endif
-    soft_dquotes = !soft_dquotes;
+    soft_dquotes = (BOOLEAN) !soft_dquotes;
     HTUserMsg(soft_dquotes ?
 	      SOFT_DOUBLE_QUOTE_ON : SOFT_DOUBLE_QUOTE_OFF);
 #ifdef USE_SOURCE_CACHE
@@ -4647,7 +4647,7 @@ static void handle_LYK_UP_LINK(int *follow_col,
 	    *follow_col = links[curdoc.link].lx;
 
 	    if (text != NULL)
-		*follow_col += strlen(text) / 2;
+		*follow_col += (int) strlen(text) / 2;
 	}
 
 	newlink = find_link_near_col(*follow_col, -1);
@@ -6376,14 +6376,15 @@ int mainloop(void)
 
 	}
 
-	curlink_is_editable =
+	curlink_is_editable = (BOOLEAN)
 	    (nlinks > 0 &&
-	     links[curdoc.link].type == WWW_FORM_LINK_TYPE &&
+	     (links[curdoc.link].type == WWW_FORM_LINK_TYPE) &&
 	     F_TEXTLIKE(links[curdoc.link].l_form->type));
 
-	use_last_tfpos = (curlink_is_editable &&
-			  (real_cmd == LYK_LPOS_PREV_LINK ||
-			   real_cmd == LYK_LPOS_NEXT_LINK));
+	use_last_tfpos = (BOOLEAN)
+	    (curlink_is_editable &&
+	     (real_cmd == LYK_LPOS_PREV_LINK ||
+	      real_cmd == LYK_LPOS_NEXT_LINK));
 
 #ifdef TEXTFIELDS_MAY_NEED_ACTIVATION
 	if (!textfields_need_activation)
@@ -6954,7 +6955,7 @@ int mainloop(void)
 
 		if (!s)
 		    break;
-		len2 = strlen((const char *) s);
+		len2 = (int) strlen((const char *) s);
 		e = s + len2;
 		while (s < e && strchr(" \t\n\r", *s))
 		    s++;
@@ -6970,11 +6971,11 @@ int mainloop(void)
 		    HTInfoMsg(gettext("No URL in the clipboard."));
 		    break;
 		}
-		len = e - s + 1;
+		len = (unsigned) (e - s + 1);
 		if (len < MAX_LINE)
 		    len = MAX_LINE;	/* Required for do_check_goto_URL() */
 		buf = (char *) malloc(len);
-		strncpy(buf, (const char *) s, e - s);
+		strncpy(buf, (const char *) s, (unsigned) (e - s));
 		buf[e - s] = '\0';
 		t = (unsigned char *) buf;
 
@@ -7640,7 +7641,7 @@ static void show_main_statusline(const LinkInfo curlink,
 	if (is_www_index) {
 	    const char *indx = gettext("-index-");
 
-	    LYmove(LYlines - 1, LYcolLimit - strlen(indx));
+	    LYmove(LYlines - 1, LYcolLimit - (int) strlen(indx));
 	    lynx_start_reverse();
 	    LYaddstr(indx);
 	    lynx_stop_reverse();
@@ -7803,15 +7804,15 @@ static void status_link(char *curlink_name,
 	sprintf(format, "%.*s ",
 		(int) (sizeof(format) - 2),
 		gettext("-more-"));
-	prefix = strlen(format);
+	prefix = (int) strlen(format);
     }
     if (show_indx) {
 	sprintf(format + prefix, "%.*s ",
-		(int) (sizeof(format) - prefix - 2),
+		((int) sizeof(format) - prefix - 2),
 		gettext("-index-"));
     }
-    prefix = strlen(format);
-    length = strlen(curlink_name);
+    prefix = (int) strlen(format);
+    length = (int) strlen(curlink_name);
 
     if (prefix > MAX_STATUS || prefix >= MAX_LINE - 1) {
 	_user_message("%s", format);	/* no room for url */
diff --git a/src/LYMap.c b/src/LYMap.c
index e9eef794..edca37eb 100644
--- a/src/LYMap.c
+++ b/src/LYMap.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYMap.c,v 1.36 2008/12/27 15:15:28 tom Exp $
+ * $LynxId: LYMap.c,v 1.37 2009/01/01 22:30:15 tom Exp $
  *			Lynx Client-side Image MAP Support	       LYMap.c
  *			==================================
  *
@@ -555,7 +555,7 @@ static int LYLoadIMGmap(const char *arg,
 	LYEntify(&MapTitle, TRUE);
     }
 
-#define PUTS(buf)    (*target->isa->put_block)(target, buf, strlen(buf))
+#define PUTS(buf)    (*target->isa->put_block)(target, buf, (int) strlen(buf))
 
     HTSprintf0(&buf, "<html>\n<head>\n");
     PUTS(buf);
@@ -617,7 +617,7 @@ static int LYLoadIMGmap(const char *arg,
 void LYPrintImgMaps(FILE *fp)
 {
     const char *only = HTLoadedDocumentURL();
-    int only_len = strlen(only);
+    unsigned only_len = strlen(only);
     HTList *outer = LynxMaps;
     HTList *inner;
     LYImageMap *map;
diff --git a/src/LYNews.c b/src/LYNews.c
index e4b435df..afebe0ee 100644
--- a/src/LYNews.c
+++ b/src/LYNews.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYNews.c,v 1.53 2008/12/07 22:13:37 tom Exp $
+ * $LynxId: LYNews.c,v 1.54 2009/01/01 23:09:57 tom Exp $
  */
 #include <HTUtils.h>
 #ifndef DISABLE_NEWS
@@ -237,8 +237,8 @@ char *LYNewsPost(char *newsgroups,
 	if (strncasecomp(kp, "Re:", 3)) {
 	    strcat(user_input, "Re: ");
 	}
-	len = strlen(user_input);
-	LYstrncpy(user_input + len, kp, sizeof(user_input) - len - 1);
+	len = (int) strlen(user_input);
+	LYstrncpy(user_input + len, kp, (int) sizeof(user_input) - len - 1);
     }
     cp = NULL;
     if (LYgetstr(user_input, VISIBLE,
diff --git a/src/LYOptions.c b/src/LYOptions.c
index 3629bd0d..ba45925a 100644
--- a/src/LYOptions.c
+++ b/src/LYOptions.c
@@ -1,4 +1,4 @@
-/* $LynxId: LYOptions.c,v 1.125 2008/12/29 19:37:13 tom Exp $ */
+/* $LynxId: LYOptions.c,v 1.126 2009/01/01 22:02:02 tom Exp $ */
 #include <HTUtils.h>
 #include <HTFTP.h>
 #include <HTTP.h>		/* 'reloading' flag */
@@ -131,6 +131,9 @@ static int boolean_choice(int status,
 			  const char **choices);
 
 #define LYChooseBoolean(status, line, column, choices) \
+	(BOOLEAN) boolean_choice(status, line, column, (const char **)choices)
+
+#define LYChooseEnum(status, line, column, choices) \
 	boolean_choice(status, line, column, (const char **)choices)
 
 #define MAXCHOICES 10
@@ -739,9 +742,9 @@ void LYoptions(void)
 		break;
 	    }
 	    if (!LYSelectPopups) {
-		LYMultiBookmarks = LYChooseBoolean(LYMultiBookmarks,
-						   L_HOME, C_MULTI,
-						   mbm_choices);
+		LYMultiBookmarks = LYChooseEnum(LYMultiBookmarks,
+						L_HOME, C_MULTI,
+						mbm_choices);
 	    } else {
 		LYMultiBookmarks = LYChoosePopup(LYMultiBookmarks,
 						 L_HOME, (C_MULTI - 1),
@@ -834,9 +837,9 @@ void LYoptions(void)
 
 	case 'F':		/* Change ftp directory sorting. */
 	    if (!LYSelectPopups) {
-		HTfileSortMethod = LYChooseBoolean(HTfileSortMethod,
-						   L_FTPSTYPE, -1,
-						   fileSort_choices);
+		HTfileSortMethod = LYChooseEnum(HTfileSortMethod,
+						L_FTPSTYPE, -1,
+						fileSort_choices);
 	    } else {
 		HTfileSortMethod = LYChoosePopup(HTfileSortMethod,
 						 L_FTPSTYPE, -1,
@@ -903,7 +906,8 @@ void LYoptions(void)
 	    if (use_assume_charset) {
 		int i, curval;
 		const char **assume_list;
-		assume_list = typecallocn(const char *, (LYNumCharsets + 1));
+		assume_list = typecallocn(const char *, (unsigned)
+					  (LYNumCharsets + 1));
 
 		if (!assume_list) {
 		    outofmem(__FILE__, "options");
@@ -920,16 +924,16 @@ void LYoptions(void)
 		if (!LYSelectPopups) {
 #ifndef ALL_CHARSETS_IN_O_MENU_SCREEN
 		    UCLYhndl_for_unspec =
-			assumed_doc_charset_map[(LYChooseBoolean(charset_subsets[curval].assumed_idx,
-								 L_ASSUME_CHARSET, -1,
-								 assumed_charset_choices)
+			assumed_doc_charset_map[(LYChooseEnum(charset_subsets[curval].assumed_idx,
+							      L_ASSUME_CHARSET, -1,
+							      assumed_charset_choices)
 						 ? 1
 						 : 0)];
 #else
 		    UCLYhndl_for_unspec =
-			LYChooseBoolean(curval,
-					L_ASSUME_CHARSET, -1,
-					assume_list);
+			LYChooseEnum(curval,
+				     L_ASSUME_CHARSET, -1,
+				     assume_list);
 #endif
 		} else {
 #ifndef ALL_CHARSETS_IN_O_MENU_SCREEN
@@ -996,14 +1000,14 @@ void LYoptions(void)
 	case 'C':		/* Change display charset setting. */
 	    if (!LYSelectPopups) {
 #ifndef ALL_CHARSETS_IN_O_MENU_SCREEN
-		displayed_display_charset_idx = LYChooseBoolean(displayed_display_charset_idx,
-								L_Charset, -1,
-								display_charset_choices);
+		displayed_display_charset_idx = LYChooseEnum(displayed_display_charset_idx,
+							     L_Charset, -1,
+							     display_charset_choices);
 		current_char_set = display_charset_map[displayed_display_charset_idx];
 #else
-		current_char_set = LYChooseBoolean(current_char_set,
-						   L_Charset, -1,
-						   LYchar_set_names);
+		current_char_set = LYChooseEnum(current_char_set,
+						L_Charset, -1,
+						LYchar_set_names);
 #endif
 	    } else {
 #ifndef ALL_CHARSETS_IN_O_MENU_SCREEN
@@ -1200,10 +1204,10 @@ void LYoptions(void)
 		    break;
 		}
 #endif
-		LYShowColor = LYChooseBoolean((LYShowColor - 1),
-					      L_Color,
-					      C_COLOR,
-					      bool_choices);
+		LYShowColor = LYChooseEnum((LYShowColor - 1),
+					   L_Color,
+					   C_COLOR,
+					   bool_choices);
 		if (LYShowColor == 0) {
 		    LYShowColor = SHOW_COLOR_OFF;
 		} else {
@@ -1232,10 +1236,10 @@ void LYoptions(void)
 		choices[4] = NULL;
 		do {
 		    if (!LYSelectPopups) {
-			chosen = LYChooseBoolean(LYChosenShowColor,
-						 L_Color,
-						 C_COLOR,
-						 choices);
+			chosen = LYChooseEnum(LYChosenShowColor,
+					      L_Color,
+					      C_COLOR,
+					      choices);
 		    } else {
 			chosen = LYChoosePopup(LYChosenShowColor,
 					       L_Color,
@@ -1296,9 +1300,9 @@ void LYoptions(void)
 
 	case 'K':		/* Change keypad mode. */
 	    if (!LYSelectPopups) {
-		keypad_mode = LYChooseBoolean(keypad_mode,
-					      L_Keypad, -1,
-					      keypad_choices);
+		keypad_mode = LYChooseEnum(keypad_mode,
+					   L_Keypad, -1,
+					   keypad_choices);
 	    } else {
 		keypad_mode = LYChoosePopup(keypad_mode,
 					    L_Keypad, -1,
@@ -1323,9 +1327,9 @@ void LYoptions(void)
 
 	case 'N':		/* Change line editor key bindings. */
 	    if (!LYSelectPopups) {
-		current_lineedit = LYChooseBoolean(current_lineedit,
-						   L_Lineed, -1,
-						   LYLineeditNames);
+		current_lineedit = LYChooseEnum(current_lineedit,
+						L_Lineed, -1,
+						LYLineeditNames);
 	    } else {
 		current_lineedit = LYChoosePopup(current_lineedit,
 						 L_Lineed, -1,
@@ -1346,9 +1350,9 @@ void LYoptions(void)
 #ifdef EXP_KEYBOARD_LAYOUT
 	case 'Y':		/* Change keyboard layout */
 	    if (!LYSelectPopups) {
-		current_layout = LYChooseBoolean(current_layout,
-						 L_Layout, -1,
-						 LYKbLayoutNames);
+		current_layout = LYChooseEnum(current_layout,
+					      L_Layout, -1,
+					      LYKbLayoutNames);
 	    } else {
 		current_layout = LYChoosePopup(current_layout,
 					       L_Layout, -1,
@@ -1370,9 +1374,9 @@ void LYoptions(void)
 #ifdef DIRED_SUPPORT
 	case 'I':		/* Change local directory sorting. */
 	    if (!LYSelectPopups) {
-		dir_list_style = LYChooseBoolean(dir_list_style,
-						 L_Dired, -1,
-						 dirList_choices);
+		dir_list_style = LYChooseEnum(dir_list_style,
+					      L_Dired, -1,
+					      dirList_choices);
 	    } else {
 		dir_list_style = LYChoosePopup(dir_list_style,
 					       L_Dired, -1,
@@ -1393,9 +1397,9 @@ void LYoptions(void)
 
 	case 'U':		/* Change user mode. */
 	    if (!LYSelectPopups) {
-		user_mode = LYChooseBoolean(user_mode,
-					    L_User_Mode, -1,
-					    userMode_choices);
+		user_mode = LYChooseEnum(user_mode,
+					 L_User_Mode, -1,
+					 userMode_choices);
 		use_assume_charset = (BOOL) (user_mode >= 2);
 	    } else {
 		user_mode = LYChoosePopup(user_mode,
@@ -1425,11 +1429,11 @@ void LYoptions(void)
 					      C_VERBOSE_IMAGES,
 					      bool_choices);
 	    } else {
-		verbose_img = LYChoosePopup(verbose_img,
-					    L_VERBOSE_IMAGES,
-					    C_VERBOSE_IMAGES,
-					    bool_choices,
-					    2, FALSE, FALSE);
+		verbose_img = (BOOLEAN) LYChoosePopup(verbose_img,
+						      L_VERBOSE_IMAGES,
+						      C_VERBOSE_IMAGES,
+						      bool_choices,
+						      2, FALSE, FALSE);
 	    }
 	    response = ' ';
 	    if (LYSelectPopups) {
@@ -1503,9 +1507,9 @@ void LYoptions(void)
 		}
 	    }
 	    if (!LYSelectPopups) {
-		itmp = LYChooseBoolean(itmp,
-				       L_Exec, -1,
-				       exec_choices);
+		itmp = LYChooseEnum(itmp,
+				    L_Exec, -1,
+				    exec_choices);
 	    } else {
 		itmp = LYChoosePopup(itmp,
 				     L_Exec, -1,
@@ -1583,7 +1587,7 @@ static int widest_choice(const char **choices)
     int n, width = 0;
 
     for (n = 0; choices[n] != NULL; ++n) {
-	int len = strlen(choices[n]);
+	int len = (int) strlen(choices[n]);
 
 	if (width < len)
 	    width = len;
@@ -1594,7 +1598,7 @@ static int widest_choice(const char **choices)
 static void show_choice(const char *choice,
 			int width)
 {
-    int len = strlen(choice);
+    int len = (int) strlen(choice);
 
     LYaddstr(choice);
     while (len++ < width)
@@ -2543,7 +2547,7 @@ static PostPair *break_data(bstring *data)
 	 * Like I said, screw efficiency.  Sides, realloc is fast on
 	 * Linux ;->
 	 */
-	q = typeRealloc(PostPair, q, count + 1);
+	q = typeRealloc(PostPair, q, (unsigned) (count + 1));
 	if (q == NULL)
 	    outofmem(__FILE__, "break_data(realloc)");
 	q[count].tag = NULL;
@@ -2559,7 +2563,7 @@ static BOOL isLynxOptionsPage(const char *address, const char *portion)
 	unsigned len = strlen(portion);
 
 	address += LEN_LYNXOPTIONS;
-	if (!strncasecomp(address, portion, len)
+	if (!strncasecomp(address, portion, (int) len)
 	    && (address[len] == '\0' || LYIsHtmlSep(address[len]))) {
 	    result = TRUE;
 	}
@@ -2757,9 +2761,9 @@ int postoptions(DocInfo *newdoc)
 	if (!strcmp(data[i].tag, exec_links_string)
 	    && GetOptValues(exec_links_values, data[i].value, &code)) {
 #ifndef NEVER_ALLOW_REMOTE_EXEC
-	    local_exec = (code == EXEC_ALWAYS);
+	    local_exec = (BOOLEAN) (code == EXEC_ALWAYS);
 #endif /* !NEVER_ALLOW_REMOTE_EXEC */
-	    local_exec_on_local_files = (code == EXEC_LOCAL);
+	    local_exec_on_local_files = (BOOLEAN) (code == EXEC_LOCAL);
 	}
 #endif /* ENABLE_OPTS_CHANGE_EXEC */
 
@@ -3302,7 +3306,7 @@ static char *NewSecureValue(void)
 static void PutLabel(FILE *fp, const char *name,
 		     const char *value)
 {
-    int have = strlen(name);
+    int have = (int) strlen(name);
     int want = LABEL_LEN;
     int need = LYstrExtent(name, have, want);
 
@@ -3407,9 +3411,9 @@ static int gen_options(char **newfile)
     BOOLEAN disable_all = FALSE;
     FILE *fp0;
     size_t cset_len = 0;
-    size_t text_len = ((LYcolLimit > 45)
-		       ? LYcolLimit - (LABEL_LEN + 2 + MARGIN_LEN)
-		       : 7);	/* cf: PutLabel */
+    size_t text_len = (size_t) ((LYcolLimit > 45)
+				? LYcolLimit - (LABEL_LEN + 2 + MARGIN_LEN)
+				: 7);	/* cf: PutLabel */
 
     if ((fp0 = InternalPageFP(tempfile, TRUE)) == 0)
 	return (NOT_FOUND);
diff --git a/src/LYPrettySrc.c b/src/LYPrettySrc.c
index 09918dab..c2228745 100644
--- a/src/LYPrettySrc.c
+++ b/src/LYPrettySrc.c
@@ -1,7 +1,10 @@
-/* HTML source syntax highlighting
-   by Vlad Harchev <hvv@hippo.ru>
-   March 1999
-*/
+/*
+ * $LynxId: LYPrettySrc.c,v 1.19 2009/01/01 22:20:25 tom Exp $
+ *
+ * HTML source syntax highlighting
+ * by Vlad Harchev <hvv@hippo.ru>
+ * March 1999
+ */
 #include <HTUtils.h>
 #include <LYHash.h>
 #include <LYPrettySrc.h>
@@ -107,8 +110,8 @@ static void append_close_tag(char *tagname,
 
     subj = typecalloc(HT_tagspec);
     subj->element = (HTMLElement) idx;
-    subj->present = typecallocn(BOOL, nattr);
-    subj->value = typecallocn(char *, nattr);
+    subj->present = typecallocn(BOOL, (unsigned) nattr);
+    subj->value = typecallocn(char *, (unsigned) nattr);
 
     subj->start = FALSE;
 #ifdef USE_COLOR_STYLE
diff --git a/src/LYReadCFG.c b/src/LYReadCFG.c
index 2b998a70..7deeb875 100644
--- a/src/LYReadCFG.c
+++ b/src/LYReadCFG.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYReadCFG.c,v 1.133 2008/12/26 18:26:52 tom Exp $
+ * $LynxId: LYReadCFG.c,v 1.135 2009/01/01 23:29:54 tom Exp $
  */
 #ifndef NO_RULES
 #include <HTRules.h>
@@ -191,7 +191,7 @@ static void add_item_to_list(char *buffer,
 	/*
 	 * Process name field
 	 */
-	cur_item->name = typecallocn(char, colon - buffer + 1);
+	cur_item->name = typecallocn(char, (unsigned) (colon - buffer + 1));
 
 	if (cur_item->name == NULL)
 	    outofmem(__FILE__, "read_cfg");
@@ -208,7 +208,7 @@ static void add_item_to_list(char *buffer,
 	    next_colon = colon + strlen(colon);
 	}
 	if (next_colon - (colon + 1) > 0) {
-	    cur_item->command = typecallocn(char, next_colon - colon);
+	    cur_item->command = typecallocn(char, (unsigned) (next_colon - colon));
 
 	    if (cur_item->command == NULL)
 		outofmem(__FILE__, "read_cfg");
@@ -249,7 +249,7 @@ int match_item_by_name(lynx_list_item_type *ptr, char *name,
 {
     return
 	(ptr->command != 0
-	 && !strncasecomp(ptr->name, name, strlen(ptr->name))
+	 && !strncasecomp(ptr->name, name, (int) strlen(ptr->name))
 	 && (only_overriders ? ptr->override_primary_action : 1));
 }
 
@@ -1060,7 +1060,7 @@ static int parse_charset_choice(char *p,
     LYTrimTail(p);
     CTRACE((tfp, "parsing charset choice for %s:\"%s\"",
 	    (display_charset ? "display charset" : "assumed doc charset"), p));
-    len = strlen(p);
+    len = (int) strlen(p);
     if (!len) {
 	CTRACE((tfp, " - EMPTY STRING\n"));
 	return 1;
@@ -1640,11 +1640,11 @@ void free_lynx_cfg(void)
 #ifdef VMS
 		    Define_VMSLogical(name, NULL);
 #else
-# ifdef HAVE_UNSETENV
-		    unsetenv(name);
-# else
+# ifdef HAVE_UNPUTENV
 		    if (putenv(name))
 			break;
+# else
+		    unsetenv(name);
 # endif
 #endif
 		}
@@ -1748,7 +1748,7 @@ typedef BOOL (optidx_set_t)[NOPTS_];
     {\
 	unsigned i1;\
 	for (i1 = 0; i1 < NOPTS_; ++i1) \
-	    (r)[i1]= (a)[i1] || (b)[i1]; \
+	    (r)[i1]= (BOOLEAN) ((a)[i1] || (b)[i1]); \
     }
 
 /*
diff --git a/src/LYSearch.c b/src/LYSearch.c
index 01fdc8ac..421a40f0 100644
--- a/src/LYSearch.c
+++ b/src/LYSearch.c
@@ -1,3 +1,6 @@
+/*
+ * $LynxId: LYSearch.c,v 1.23 2009/01/01 23:28:39 tom Exp $
+ */
 #include <HTUtils.h>
 #include <HTAlert.h>
 #include <LYUtils.h>
@@ -191,7 +194,8 @@ BOOL textsearch(DocInfo *cur_doc, char *prev_target,
 	 */
 	_statusline(ENTER_WHEREIS_QUERY);
 
-	if ((ch = LYgetstr(prev_target, VISIBLE, target_size, recall)) < 0) {
+	ch = LYgetstr(prev_target, VISIBLE, (unsigned) target_size, recall);
+	if (ch < 0) {
 	    /*
 	     * User cancelled the search via ^G.  Restore prev_target and
 	     * return.  - FM
@@ -255,7 +259,8 @@ BOOL textsearch(DocInfo *cur_doc, char *prev_target,
 	    } else {
 		_statusline(EDIT_A_PREV_QUERY);
 	    }
-	    if ((ch = LYgetstr(prev_target, VISIBLE, target_size, recall)) < 0) {
+	    ch = LYgetstr(prev_target, VISIBLE, (unsigned) target_size, recall);
+	    if (ch < 0) {
 		/*
 		 * User canceled the search via ^G.  Restore prev_target and
 		 * return.  - FM
@@ -306,7 +311,8 @@ BOOL textsearch(DocInfo *cur_doc, char *prev_target,
 	    } else {
 		_statusline(EDIT_A_PREV_QUERY);
 	    }
-	    if ((ch = LYgetstr(prev_target, VISIBLE, target_size, recall)) < 0) {
+	    ch = LYgetstr(prev_target, VISIBLE, (unsigned) target_size, recall);
+	    if (ch < 0) {
 		/*
 		 * User cancelled the search via ^G.  Restore prev_target and
 		 * return.  - FM
diff --git a/src/LYStrings.c b/src/LYStrings.c
index 3d45773f..303ce922 100644
--- a/src/LYStrings.c
+++ b/src/LYStrings.c
@@ -1,4 +1,4 @@
-/* $LynxId: LYStrings.c,v 1.159 2008/12/26 16:46:43 tom Exp $ */
+/* $LynxId: LYStrings.c,v 1.160 2009/01/01 21:50:59 tom Exp $ */
 #include <HTUtils.h>
 #include <HTCJK.h>
 #include <UCAux.h>
@@ -479,7 +479,7 @@ static int set_clicked_link(int x,
 		if (is_text)
 		    len = links[i].l_form->size;
 		else
-		    len = strlen(text);
+		    len = (int) strlen(text);
 		cur_err = XYdist(x, y, links[i].lx, links[i].ly, len);
 		/* Check the second line */
 		while (cur_err > 0
@@ -488,7 +488,7 @@ static int set_clicked_link(int x,
 		    int cur_err_2 = XYdist(x, y,
 					   LYGetHilitePos(i, count),
 					   links[i].ly + count,
-					   strlen(text));
+					   (int) strlen(text));
 
 		    cur_err = HTMIN(cur_err, cur_err_2);
 		}
@@ -578,12 +578,12 @@ char *LYstrncpy(char *dst,
 
     if (src == 0)
 	src = "";
-    len = strlen(src);
+    len = (int) strlen(src);
 
     if (n < 0)
 	n = 0;
 
-    val = strncpy(dst, src, n);
+    val = strncpy(dst, src, (unsigned) n);
     if (len < n)
 	*(dst + len) = '\0';
     else
@@ -1060,14 +1060,17 @@ static const char *expand_tichar(const char *first, char **result, char *final)
     if (name != 0) {
 	(void) expand_tiname(name, strlen(name), result, final);
     } else {
-	**result = value;
+	**result = (char) value;
 	(*result) += 1;
     }
 
     return first;
 }
 
-static int expand_substring(char *dst, const char *first, const char *last, char *final)
+static BOOLEAN expand_substring(char *dst,
+				const char *first,
+				const char *last,
+				char *final)
 {
     int ch;
 
@@ -1084,15 +1087,15 @@ static int expand_substring(char *dst, const char *first, const char *last, char
 
 		if (s == 0)
 		    s = first + strlen(first);
-		first = expand_tiname(first, s - first, &dst, final);
+		first = expand_tiname(first, (unsigned) (s - first), &dst, final);
 		if (dst == was)
-		    return 0;
+		    return FALSE;
 		if (*first)
 		    first++;
 	    } else if (ch == '?') {	/* ASCII delete? */
 		*dst++ = 127;
 	    } else if ((ch & 0x3f) < 0x20) {	/* ASCII control char? */
-		*dst++ = (ch & 0x1f);
+		*dst++ = (char) (ch & 0x1f);
 	    } else {
 		*dst++ = '^';
 		first--;	/* not legal... */
@@ -1102,12 +1105,12 @@ static int expand_substring(char *dst, const char *first, const char *last, char
 	    ch = 0200;
 	    /* FALLTHRU */
 	default:
-	    *dst++ = ch;
+	    *dst++ = (char) ch;
 	    break;
 	}
     }
     *dst = '\0';
-    return 1;
+    return TRUE;
 }
 #endif
 
@@ -1132,7 +1135,7 @@ static BOOLEAN unescape_string(char *src, char *dst, char *final)
 
 	unescaped_char(src, &keysym);
 	if (keysym >= 0) {
-	    dst[0] = keysym;
+	    dst[0] = (char) keysym;
 	    dst[1] = '\0';
 	    ok = TRUE;
 	}
@@ -1157,7 +1160,7 @@ int map_string_to_keysym(const char *str, int *keysym)
 	    char buf[BUFSIZ];
 
 	    if (othersym >= 0 && other - str - 4 < BUFSIZ) {
-		strncpy(buf, str + 4, other - str - 4);
+		strncpy(buf, str + 4, (unsigned) (other - str - 4));
 		buf[other - str - 4] = '\0';
 		*keysym = lacname_to_lac(buf);
 		if (*keysym >= 0) {
@@ -2766,7 +2769,7 @@ char *LYElideString(char *str,
     int len;
 
     LYstrncpy(buff, str, sizeof(buff) - 1);
-    len = strlen(buff);
+    len = (int) strlen(buff);
     if (len > (LYcolLimit - 9)) {
 	buff[cut_pos] = '.';
 	buff[cut_pos + 1] = '.';
@@ -2873,7 +2876,7 @@ void LYSetupEdit(EDREC * edit, char *old,
     MaxLen = maxstr;
     DspWdth = maxdsp;
     Margin = 0;
-    Pos = strlen(old);
+    Pos = (int) strlen(old);
 #ifdef ENHANCED_LINEEDIT
     Mark = -1;			/* pos=0, but do not show it yet */
 #endif
@@ -2894,7 +2897,7 @@ void LYSetupEdit(EDREC * edit, char *old,
     }
 
     LYstrncpy(Buf, old, maxstr);
-    StrLen = strlen(Buf);
+    StrLen = (int) strlen(Buf);
 }
 
 #ifdef SUPPORT_MULTIBYTE_EDIT
@@ -2968,7 +2971,7 @@ static int mbcs_skip(char *s, int pos)
 static int cell2char(char *s, int cells)
 {
     int result = 0;
-    int len = strlen(s);
+    int len = (int) strlen(s);
     int pos;
     int have;
 
@@ -3002,7 +3005,7 @@ int LYEditInsert(EDREC * edit, unsigned const char *s,
 		 int map GCC_UNUSED,
 		 BOOL maxMessage)
 {
-    int length = strlen(Buf);
+    int length = (int) strlen(Buf);
     int remains = MaxLen - (length + len);
     int edited = 0, overflow = 0;
 
@@ -3032,13 +3035,13 @@ int LYEditInsert(EDREC * edit, unsigned const char *s,
 	    char utfbuf[8];
 	    int l = 1;
 
-	    utfbuf[0] = *s;
+	    utfbuf[0] = (char) *s;
 	    if (*s < 128 && LYKbLayouts[current_layout][*s]) {
 		UCode_t ucode = LYKbLayouts[current_layout][*s];
 
 		if (ucode > 127) {
 		    if (UCConvertUniToUtf8(ucode, utfbuf)) {
-			l = strlen(utfbuf);
+			l = (int) strlen(utfbuf);
 			remains -= l - 1;
 			if (remains < 0) {
 			    if (tail)
@@ -3053,9 +3056,9 @@ int LYEditInsert(EDREC * edit, unsigned const char *s,
 		    } else
 			utfbuf[0] = '?';
 		} else
-		    utfbuf[0] = UCH(ucode);
+		    utfbuf[0] = (char) ucode;
 	    }
-	    strncpy(Buf + off, utfbuf, l);
+	    strncpy(Buf + off, utfbuf, (unsigned) l);
 	    edited = 1;
 	    off += l;
 	    s++;
@@ -3085,7 +3088,7 @@ int LYEditInsert(EDREC * edit, unsigned const char *s,
     } else
 #endif /* defined EXP_KEYBOARD_LAYOUT */
     {
-	strncpy(Buf + Pos, (const char *) s, len);
+	strncpy(Buf + Pos, (const char *) s, (unsigned) len);
 	edited = 1;
     }
 
@@ -3123,7 +3126,7 @@ int LYEdit1(EDREC * edit, int ch,
     if (MaxLen <= 0)
 	return (0);		/* Be defensive */
 
-    length = strlen(&Buf[0]);
+    length = (int) strlen(&Buf[0]);
     StrLen = length;
 
     switch (action) {
@@ -3177,7 +3180,7 @@ int LYEdit1(EDREC * edit, int ch,
 	    for (i = length; i >= Pos; i--)	/* Make room */
 		Buf[i + 1] = Buf[i];
 	    Buf[length + 1] = '\0';
-	    Buf[Pos] = UCH(ch);
+	    Buf[Pos] = (char) ch;
 	    Pos++;
 	} else {
 	    if (maxMessage) {
@@ -3473,7 +3476,7 @@ int LYEdit1(EDREC * edit, int ch,
 	    Mark = -1 - Pos;
 	    return (0);
 	} {
-	    int yanklen = strlen(killbuffer);
+	    int yanklen = (int) strlen(killbuffer);
 
 	    if (Pos + yanklen <= (MaxLen) && StrLen + yanklen <= (MaxLen)) {
 		Mark = -1 - Pos;
@@ -3481,7 +3484,7 @@ int LYEdit1(EDREC * edit, int ch,
 		for (i = length; i >= Pos; i--)		/* Make room */
 		    Buf[i + yanklen] = Buf[i];
 		for (i = 0; i < yanklen; i++)
-		    Buf[Pos++] = UCH(killbuffer[i]);
+		    Buf[Pos++] = killbuffer[i];
 
 	    } else if (maxMessage) {
 		_statusline(MAXLEN_REACHED_DEL_OR_MOV);
@@ -3503,7 +3506,7 @@ int LYEdit1(EDREC * edit, int ch,
 	return (ch);
     }
     IsDirty = TRUE;
-    StrLen = strlen(&Buf[0]);
+    StrLen = (int) strlen(&Buf[0]);
     return (0);
 }
 
@@ -3656,7 +3659,7 @@ void LYRefreshEdit(EDREC * edit)
 
     IsDirty = FALSE;
 
-    all_bytes = strlen(&Buf[0]);
+    all_bytes = (int) strlen(&Buf[0]);
     StrLen = all_bytes;
 
     all_cells = LYstrCells(Buf);
@@ -3914,7 +3917,7 @@ static int normalCmpList(const void *a,
 
 static char **sortedList(HTList *list, BOOL ignorecase)
 {
-    unsigned count = HTList_count(list);
+    unsigned count = (unsigned) HTList_count(list);
     unsigned j = 0;
     unsigned k, jk;
     char **result = typecallocn(char *, count + 1);
@@ -3965,7 +3968,7 @@ int LYarrayWidth(const char **list)
     int check;
 
     while (*list != 0) {
-	check = strlen(*list++);
+	check = (int) strlen(*list++);
 	if (check > result)
 	    result = check;
     }
@@ -4064,7 +4067,7 @@ int LYhandlePopupList(int cur_choice,
 		      int disabled,
 		      BOOLEAN for_mouse)
 {
-    BOOLEAN numbered = (keypad_mode != NUMBERS_AS_ARROWS);
+    BOOLEAN numbered = (BOOLEAN) (keypad_mode != NUMBERS_AS_ARROWS);
     int c = 0, cmd = 0, i = 0, j = 0, rel = 0;
     int orig_choice;
     WINDOW *form_window;
@@ -4121,10 +4124,10 @@ int LYhandlePopupList(int cur_choice,
      */
     num_choices = LYarrayLength(choices) - 1;
     if (width <= 0)
-	width = options_width(choices);
+	width = (int) options_width(choices);
     if (numbered) {
 	sprintf(Cnum, "%d: ", num_choices);
-	Lnum = strlen(Cnum);
+	Lnum = (int) strlen(Cnum);
 	max_choices = num_choices;
     } else {
 	Lnum = 0;
@@ -5004,8 +5007,9 @@ int LYgetstr(char *inputline,
 #endif /* SUPPORT_MULTIBYTE_EDIT */
 
     LYGetYX(y, x);		/* Use screen from cursor position to eol */
-    MaxStringSize = (bufsize < sizeof(MyEdit.buffer)) ?
-	(bufsize - 1) : (sizeof(MyEdit.buffer) - 1);
+    MaxStringSize = (int) ((bufsize < sizeof(MyEdit.buffer))
+			   ? (bufsize - 1)
+			   : (sizeof(MyEdit.buffer) - 1));
     LYSetupEdit(&MyEdit, inputline, MaxStringSize, LYcolLimit - x);
     MyEdit.hidden = (BOOL) hidden;
 
@@ -5156,7 +5160,7 @@ int LYgetstr(char *inputline,
 
 		if (!s)
 		    break;
-		len = strlen((const char *) s);
+		len = (int) strlen((const char *) s);
 		e = s + len;
 
 		if (len > 0) {
@@ -5267,9 +5271,9 @@ const char *LYLineeditHelpURL(void)
     if (LYLineeditHelpURLs[current_lineedit] &&
 	strlen(LYLineeditHelpURLs[current_lineedit]) &&
 	(strlen(LYLineeditHelpURLs[current_lineedit]) <=
-	 sizeof(helpbuf) - (phelp - helpbuf))) {
+	 sizeof(helpbuf) - (unsigned) (phelp - helpbuf))) {
 	LYstrncpy(phelp, LYLineeditHelpURLs[current_lineedit],
-		  sizeof(helpbuf) - (phelp - helpbuf) - 1);
+		  (int) (sizeof(helpbuf) - (unsigned) (phelp - helpbuf) - 1));
 	lasthelp_lineedit = current_lineedit;
 	return (&helpbuf[0]);
     }
@@ -5306,7 +5310,7 @@ char *LYstrsep(char **stringp,
 char *LYstrstr(char *chptr,
 	       const char *tarptr)
 {
-    int len = strlen(tarptr);
+    int len = (int) strlen(tarptr);
 
     for (; *chptr != '\0'; chptr++) {
 	if (0 == UPPER8(*chptr, *tarptr)) {
@@ -5752,13 +5756,13 @@ char *SNACopy(char **dest,
 {
     FREE(*dest);
     if (src) {
-	*dest = typeMallocn(char, n + 1);
+	*dest = typeMallocn(char, (unsigned) n + 1);
 
 	if (*dest == NULL) {
 	    CTRACE((tfp, "Tried to malloc %d bytes\n", n));
 	    outofmem(__FILE__, "SNACopy");
 	}
-	strncpy(*dest, src, n);
+	strncpy(*dest, src, (unsigned) n);
 	*(*dest + n) = '\0';	/* terminate */
     }
     return *dest;
@@ -5773,19 +5777,19 @@ char *SNACat(char **dest,
 {
     if (non_empty(src)) {
 	if (*dest) {
-	    int length = strlen(*dest);
+	    int length = (int) strlen(*dest);
 
-	    *dest = (char *) realloc(*dest, length + n + 1);
+	    *dest = (char *) realloc(*dest, (unsigned) (length + n + 1));
 	    if (*dest == NULL)
 		outofmem(__FILE__, "SNACat");
-	    strncpy(*dest + length, src, n);
+	    strncpy(*dest + length, src, (unsigned) n);
 	    *(*dest + length + n) = '\0';	/* terminate */
 	} else {
-	    *dest = typeMallocn(char, n + 1);
+	    *dest = typeMallocn(char, (unsigned) n + 1);
 
 	    if (*dest == NULL)
 		outofmem(__FILE__, "SNACat");
-	    memcpy(*dest, src, n);
+	    memcpy(*dest, src, (unsigned) n);
 	    (*dest)[n] = '\0';	/* terminate */
 	}
     }
@@ -5963,7 +5967,7 @@ int LYReadCmdKey(int mode)
 	    LYTrimTrailing(buffer);
 	    src = LYSkipBlanks(buffer);
 	    tmp = LYSkipNonBlanks(src);
-	    switch (len = (tmp - src)) {
+	    switch (len = (unsigned) (tmp - src)) {
 	    case 4:
 		if (!strncasecomp(src, "exit", 4))
 		    exit_immediately(0);
diff --git a/src/LYStrings.h b/src/LYStrings.h
index a9992a49..9b9804c7 100644
--- a/src/LYStrings.h
+++ b/src/LYStrings.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYStrings.h,v 1.69 2008/09/07 22:59:14 tom Exp $
+ * $LynxId: LYStrings.h,v 1.70 2009/01/01 21:36:55 tom Exp $
  */
 #ifndef LYSTRINGS_H
 #define LYSTRINGS_H
@@ -16,10 +16,10 @@ extern "C" {
 	,RECALL_MAIL
     } RecallType;
 
-#define IS_UTF8_TTY (LYCharSet_UC[current_char_set].enc == UCT_ENC_UTF8)
-#define IS_CJK_TTY  (HTCJK != NOCJK)
+#define IS_UTF8_TTY (BOOLEAN) (LYCharSet_UC[current_char_set].enc == UCT_ENC_UTF8)
+#define IS_CJK_TTY  (BOOLEAN) (HTCJK != NOCJK)
 
-#define is8bits(ch) (UCH(ch) >= 128)	/* isascii(ch) is not POSIX */
+#define is8bits(ch) (BOOLEAN) (UCH(ch) >= 128)	/* isascii(ch) is not POSIX */
 
 /*  UPPER8(ch1,ch2) is an extension of (TOUPPER(ch1) - TOUPPER(ch2))  */
     extern int UPPER8(int ch1,
diff --git a/src/LYStructs.h b/src/LYStructs.h
index bfc446a7..889dd35b 100644
--- a/src/LYStructs.h
+++ b/src/LYStructs.h
@@ -1,3 +1,6 @@
+/*
+ * $LynxId: LYStructs.h,v 1.28 2009/01/01 21:34:17 tom Exp $
+ */
 #ifndef LYSTRUCTS_H
 #define LYSTRUCTS_H
 
@@ -148,9 +151,11 @@ extern "C" {
     } ParseUnion;
 
 #ifdef	PARSE_DEBUG
-#define ParseUnionPtr Config_Type *
-#define ParseUnionOf(tbl) tbl
-#define ParseData ParseUnionMembers
+
+#define ParseUnionPtr      Config_Type *
+#define ParseUnionOf(tbl)  tbl
+#define ParseData          ParseUnionMembers
+
 #define UNION_ADD(v) &v,  0,  0,  0,  0,  0,  0
 #define UNION_SET(v)  0, &v,  0,  0,  0,  0,  0
 #define UNION_INT(v)  0,  0, &v,  0,  0,  0,  0
@@ -159,18 +164,24 @@ extern "C" {
 #define UNION_FUN(v)  0,  0,  0,  0,  v,  0,  0
 #define UNION_DEF(v)  0,  0,  0,  0,  0,  v,  0
 #define UNION_LST(v)  0,  0,  0,  0,  0,  0, &v
+
 #else
-#define ParseUnionPtr ParseUnion *
+
+    typedef void *ParseType;
+
+#define ParseUnionPtr      ParseUnion *
 #define ParseUnionOf(tbl) (ParseUnionPtr)(&(tbl->value))
-#define ParseData long value
-#define UNION_ADD(v) (long)&(v)
-#define UNION_SET(v) (long)&(v)
-#define UNION_INT(v) (long)&(v)
-#define UNION_STR(v) (long)&(v)
-#define UNION_ENV(v) (long) (v)
-#define UNION_FUN(v) (long) (v)
-#define UNION_DEF(v) (long) (v)
-#define UNION_LST(v) (long)&(v)
+#define ParseData          ParseType value
+
+#define UNION_ADD(v) (ParseType)&(v)
+#define UNION_SET(v) (ParseType)&(v)
+#define UNION_INT(v) (ParseType)&(v)
+#define UNION_STR(v) (ParseType)&(v)
+#define UNION_ENV(v) (ParseType) (v)
+#define UNION_FUN(v) (ParseType) (v)
+#define UNION_DEF(v) (ParseType) (v)
+#define UNION_LST(v) (ParseType)&(v)
+
 #endif
 
 #ifdef __cplusplus
diff --git a/src/LYStyle.c b/src/LYStyle.c
index 749655f4..137f40c4 100644
--- a/src/LYStyle.c
+++ b/src/LYStyle.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYStyle.c,v 1.62 2008/08/31 16:00:10 tom Exp $
+ * $LynxId: LYStyle.c,v 1.64 2009/01/01 23:06:42 tom Exp $
  *
  * character level styles for Lynx
  * (c) 1996 Rob Partington -- donated to the Lyncei (if they want it :-)
@@ -138,7 +138,7 @@ static void parse_either(char *attrs,
 
     while (*attrs != '\0') {
 	char *next = strchr(attrs, '+');
-	char save = (next != NULL) ? *next : '\0';
+	char save = (char) ((next != NULL) ? *next : '\0');
 
 	if (next == NULL)
 	    next = attrs + strlen(attrs);
@@ -232,7 +232,7 @@ static void parse_attributes(char *mono,
 	    } else {
 		curPair = ++colorPairs;
 		init_pair((short) curPair, (short) fA, (short) bA);
-		our_pairs[iBold][iBlink][iFg][iBg] = curPair;
+		our_pairs[iBold][iBlink][iFg][iBg] = UCH(curPair);
 	    }
 	}
 	CTRACE2(TRACE_STYLE, (tfp, "CSS(CURPAIR):%d\n", curPair));
@@ -637,7 +637,7 @@ static int style_readFromFileREC(char *lss_filename,
 	LYTrimHead(buffer);
 	if (!strncasecomp(buffer, "include:", 8))
 	    style_readFromFileREC(LYSkipBlanks(buffer + 8), lss_filename);
-	else if (buffer[0] != '#' && (len = strlen(buffer)) > 0)
+	else if (buffer[0] != '#' && (len = (int) strlen(buffer)) > 0)
 	    HStyle_addStyle(buffer);
     }
 
@@ -685,7 +685,7 @@ void TrimColorClass(const char *tagname,
  * It assumes that tag_name is present in stylename! -HV
  */
 void FastTrimColorClass(const char *tag_name,
-			int name_len,
+			unsigned name_len,
 			char *stylename,
 			char **pstylename_end,	/*will be modified */
 			int *phcode)	/*will be modified */
@@ -698,7 +698,7 @@ void FastTrimColorClass(const char *tag_name,
 	     tag_name, stylename));
     while (tag_start >= stylename) {
 	for (; (tag_start >= stylename) && (*tag_start != ';'); --tag_start) ;
-	if (!strncasecomp(tag_start + 1, tag_name, name_len)) {
+	if (!strncasecomp(tag_start + 1, tag_name, (int) name_len)) {
 	    found = TRUE;
 	    break;
 	}
@@ -727,7 +727,7 @@ void cache_tag_styles(void)
     }
 }
 
-#define SIZEOF_CACHED_STYLES (cached_styles_rows * cached_styles_cols)
+#define SIZEOF_CACHED_STYLES (unsigned) (cached_styles_rows * cached_styles_cols)
 
 static unsigned *RefCachedStyle(int y, int x)
 {
@@ -749,7 +749,7 @@ static unsigned *RefCachedStyle(int y, int x)
 
 BOOL ValidCachedStyle(int y, int x)
 {
-    return (RefCachedStyle(y, x) != 0);
+    return (BOOL) (RefCachedStyle(y, x) != 0);
 }
 
 unsigned GetCachedStyle(int y, int x)
diff --git a/src/LYStyle.h b/src/LYStyle.h
index d1cf9db1..93ff1193 100644
--- a/src/LYStyle.h
+++ b/src/LYStyle.h
@@ -1,4 +1,4 @@
-/* $LynxId: LYStyle.h,v 1.15 2007/07/23 19:21:54 tom Exp $ */
+/* $LynxId: LYStyle.h,v 1.16 2009/01/01 23:06:08 tom Exp $ */
 #ifndef LYSTYLE_H
 #define LYSTYLE_H
 
@@ -59,7 +59,7 @@ extern "C" {
  * during last invokation of TrimColorClass.
  */
     extern void FastTrimColorClass(const char *tag_name,
-				   int name_len,
+				   unsigned name_len,
 				   char *stylename,
 				   char **pstylename_end,
 				   int *hcode);
diff --git a/src/LYTraversal.c b/src/LYTraversal.c
index b6690a01..02d516d3 100644
--- a/src/LYTraversal.c
+++ b/src/LYTraversal.c
@@ -1,3 +1,6 @@
+/*
+ * $LynxId: LYTraversal.c,v 1.27 2009/01/01 22:37:06 tom Exp $
+ */
 #include <HTUtils.h>
 #include <LYGlobalDefs.h>
 #include <LYUtils.h>
@@ -144,7 +147,7 @@ BOOLEAN lookup_reject(char *target)
     FILE *ifp;
     char *buffer = NULL;
     char *line = NULL;
-    int len;
+    unsigned len;
     int result = FALSE;
 
     if ((ifp = fopen(TRAVERSE_REJECT_FILE, TXT_R)) == NULL) {
@@ -156,7 +159,7 @@ BOOLEAN lookup_reject(char *target)
     while (LYSafeGets(&buffer, ifp) != NULL && !result) {
 	LYTrimTrailing(buffer);
 	len = strlen(buffer);
-	if (len > 0) {		/* if not an empty line */
+	if (len != 0) {		/* if not an empty line */
 	    if (buffer[len - 1] == '*') {
 		/* if last char is * and the rest of the chars match */
 		if ((len == 1) || (strncmp(line, buffer, len - 1) == 0)) {
diff --git a/src/LYUtils.c b/src/LYUtils.c
index ceaf77a2..e5253db9 100644
--- a/src/LYUtils.c
+++ b/src/LYUtils.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYUtils.c,v 1.180 2008/12/31 16:35:14 tom Exp $
+ * $LynxId: LYUtils.c,v 1.182 2009/01/01 23:59:34 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTTCP.h>
@@ -314,7 +314,7 @@ void LYSetHilite(int cur,
 		 const char *text)
 {
     links[cur].list.hl_base.hl_text = (char *) text;
-    links[cur].list.hl_len = (text != NULL) ? 1 : 0;
+    links[cur].list.hl_len = (short) ((text != NULL) ? 1 : 0);
     FREE(links[cur].list.hl_info);
 }
 
@@ -327,8 +327,8 @@ void LYAddHilite(int cur,
 {
     HiliteList *list = &(links[cur].list);
     HiliteInfo *have = list->hl_info;
-    unsigned need = (list->hl_len - 1);
-    unsigned want = (list->hl_len += 1);
+    unsigned need = (unsigned) (list->hl_len - 1);
+    unsigned want = (unsigned) (list->hl_len += 1);
 
     if (have != NULL) {
 	have = typeRealloc(HiliteInfo, have, want);
@@ -337,7 +337,7 @@ void LYAddHilite(int cur,
     }
     list->hl_info = have;
     have[need].hl_text = text;
-    have[need].hl_x = x;
+    have[need].hl_x = (short) x;
 }
 
 /*
@@ -425,7 +425,7 @@ static BOOL show_whereis_targets(int flag,
 				      target)) {
 	int itmp, written, len, y, offset;
 	const char *data;
-	int tlen = strlen(target);
+	int tlen = (int) strlen(target);
 	int hlen, hLen;
 	int hLine = LYP + count;
 	int hoffset = LYGetHilitePos(cur, count);
@@ -440,7 +440,7 @@ static BOOL show_whereis_targets(int flag,
 		      (sizeof(buffer) - 1),
 		      (LYcolLimit - LYGetHilitePos(cur, count)),
 		      utf_flag);
-	hlen = strlen(buffer);
+	hlen = (int) strlen(buffer);
 	hLen = ((IS_CJK_TTY || utf_flag) ?
 		LYmbcsstrlen(buffer, utf_flag, YES) : hlen);
 
@@ -492,8 +492,8 @@ static BOOL show_whereis_targets(int flag,
 		tmp[0] = data[itmp];
 		utf_extra = utf8_length(utf_flag, data + itmp);
 		if (utf_extra) {
-		    LYstrncpy(&tmp[1], &data[itmp + 1], utf_extra);
-		    itmp += utf_extra;
+		    LYstrncpy(&tmp[1], &data[itmp + 1], (int) utf_extra);
+		    itmp += (int) utf_extra;
 		    /*
 		     * Start emphasis immediately if we are making the link
 		     * non-current.  -FM
@@ -506,7 +506,7 @@ static BOOL show_whereis_targets(int flag,
 			LYmove(hLine, (offset + 1));
 		    }
 		    tmp[1] = '\0';
-		    written += (utf_extra + 1);
+		    written += (int) (utf_extra + 1);
 		    utf_extra = 0;
 		} else if (IS_CJK_TTY && is8bits(tmp[0])) {
 		    /*
@@ -564,8 +564,8 @@ static BOOL show_whereis_targets(int flag,
 		     */
 		    utf_extra = utf8_length(utf_flag, data + itmp);
 		    if (utf_extra) {
-			LYstrncpy(&tmp[1], &data[itmp + 1], utf_extra);
-			itmp += utf_extra;
+			LYstrncpy(&tmp[1], &data[itmp + 1], (int) utf_extra);
+			itmp += (int) utf_extra;
 			/*
 			 * Make sure we don't restore emphasis to the last
 			 * character of hightext if we are making the link
@@ -580,7 +580,7 @@ static BOOL show_whereis_targets(int flag,
 			    LYaddstr(tmp);
 			}
 			tmp[1] = '\0';
-			written += (utf_extra + 1);
+			written += (int) (utf_extra + 1);
 			utf_extra = 0;
 		    } else if (IS_CJK_TTY && is8bits(tmp[0])) {
 			/*
@@ -691,8 +691,8 @@ static BOOL show_whereis_targets(int flag,
 		tmp[0] = data[itmp];
 		utf_extra = utf8_length(utf_flag, data + itmp);
 		if (utf_extra) {
-		    LYstrncpy(&tmp[1], &data[itmp + 1], utf_extra);
-		    itmp += utf_extra;
+		    LYstrncpy(&tmp[1], &data[itmp + 1], (int) utf_extra);
+		    itmp += (int) utf_extra;
 		    /*
 		     * Start emphasis immediately if we are making the link
 		     * non-current, or we are making it current but this is not
@@ -707,7 +707,7 @@ static BOOL show_whereis_targets(int flag,
 			LYmove(hLine, (offset + 1));
 		    }
 		    tmp[1] = '\0';
-		    written += (utf_extra + 1);
+		    written += (int) (utf_extra + 1);
 		    utf_extra = 0;
 		} else if (IS_CJK_TTY && is8bits(tmp[0])) {
 		    /*
@@ -766,8 +766,8 @@ static BOOL show_whereis_targets(int flag,
 		     */
 		    utf_extra = utf8_length(utf_flag, data + itmp);
 		    if (utf_extra) {
-			LYstrncpy(&tmp[1], &data[itmp + 1], utf_extra);
-			itmp += utf_extra;
+			LYstrncpy(&tmp[1], &data[itmp + 1], (int) utf_extra);
+			itmp += (int) utf_extra;
 			/*
 			 * Make sure we don't restore emphasis to the last
 			 * character of hightext if we are making the link
@@ -782,7 +782,7 @@ static BOOL show_whereis_targets(int flag,
 			    LYaddstr(tmp);
 			}
 			tmp[1] = '\0';
-			written += (utf_extra + 1);
+			written += (int) (utf_extra + 1);
 			utf_extra = 0;
 		    } else if (IS_CJK_TTY && is8bits(tmp[0])) {
 			/*
@@ -869,7 +869,7 @@ static BOOL show_whereis_targets(int flag,
 			LYmove(hLine, offset);
 			itmp = 0;
 			written = 0;
-			len = strlen(data);
+			len = (int) strlen(data);
 
 			/*
 			 * Turn the emphasis back on.  -FM
@@ -887,8 +887,8 @@ static BOOL show_whereis_targets(int flag,
 			     */
 			    utf_extra = utf8_length(utf_flag, data + itmp);
 			    if (utf_extra) {
-				LYstrncpy(&tmp[1], &data[itmp + 1], utf_extra);
-				itmp += utf_extra;
+				LYstrncpy(&tmp[1], &data[itmp + 1], (int) utf_extra);
+				itmp += (int) utf_extra;
 				/*
 				 * Make sure we don't restore emphasis to the
 				 * last character of hightext if we are making
@@ -903,7 +903,7 @@ static BOOL show_whereis_targets(int flag,
 				    LYaddstr(tmp);
 				}
 				tmp[1] = '\0';
-				written += (utf_extra + 1);
+				written += (int) (utf_extra + 1);
 				utf_extra = 0;
 			    } else if (IS_CJK_TTY && is8bits(tmp[0])) {
 				/*
@@ -989,12 +989,12 @@ static int find_cached_style(int cur,
 	    CTRACE2(TRACE_STYLE,
 		    (tfp, "STYLE.highlight.off: cached style @(%d,%d): ",
 		     LYP, LXP));
-	    s = GetCachedStyle(LYP, LXP);
+	    s = (int) GetCachedStyle(LYP, LXP);
 	    if (s == 0) {
 		for (x = LXP - 1; x >= 0; x--) {
-		    s = GetCachedStyle(LYP, x);
+		    s = (int) GetCachedStyle(LYP, x);
 		    if (s != 0) {
-			SetCachedStyle(LYP, LXP, s);
+			SetCachedStyle(LYP, LXP, (unsigned) s);
 			CTRACE2(TRACE_STYLE,
 				(tfp, "found %d, x_offset=%d.\n", s, x - LXP));
 			break;
@@ -1108,7 +1108,7 @@ void LYhighlight(int flag,
 
 	    gllen = LYmbcsstrlen(text, utf_flag, YES);
 	    len = LYmbcs_skip_cells(text, avail_space, utf_flag) - text;
-	    LYwaddnstr(LYwin, text, len);
+	    LYwaddnstr(LYwin, text, (unsigned) len);
 	    while (gllen++ < avail_space)
 		LYaddch('_');
 
@@ -1276,7 +1276,7 @@ char *strip_trailing_slash(char *dirname)
 {
     int i;
 
-    i = strlen(dirname) - 1;
+    i = (int) strlen(dirname) - 1;
     while (i >= 0 && dirname[i] == '/')
 	dirname[i--] = '\0';
     return (dirname);
@@ -1287,8 +1287,8 @@ char *strip_trailing_slash(char *dirname)
  */
 static void remove_most_blanks(char *buffer)
 {
-    int length = strlen(buffer);
-    BOOL trailing = (length != 0) && (buffer[length - 1] == ' ');
+    int length = (int) strlen(buffer);
+    BOOL trailing = (BOOL) ((length != 0) && (buffer[length - 1] == ' '));
 
     LYReduceBlanks(buffer);
     if (trailing)
@@ -1365,7 +1365,7 @@ void statusline(const char *text)
 	} else {
 	    for (i = 0, j = 0; text_buff[i]; i++) {
 		if (text_buff[i] != CH_ESC) {	/* S/390 -- gil -- 2119 */
-		    temp[j++] = text_buff[i];
+		    temp[j++] = UCH(text_buff[i]);
 		}
 	    }
 	    temp[j] = '\0';
@@ -1383,14 +1383,14 @@ void statusline(const char *text)
 	for (i = 0, j = 0, len = 0, k = '\0';
 	     temp[i] != '\0' && len < max_length; i++) {
 	    if (k != '\0') {
-		buffer[j++] = k;
-		buffer[j++] = temp[i];
+		buffer[j++] = (char) k;
+		buffer[j++] = (char) temp[i];
 		k = '\0';
 		len += 2;
 	    } else if ((temp[i] & 0200) != 0) {
 		k = temp[i];
 	    } else {
-		buffer[j++] = temp[i];
+		buffer[j++] = (char) temp[i];
 		len++;
 	    }
 	}
@@ -1490,9 +1490,9 @@ void statusline(const char *text)
 	    if (!(lynx_has_color && LYShowColor >= SHOW_COLOR_ON))
 		wbkgdset(LYwin, A_NORMAL | ' ');
 	    else if (s_normal != NOSTYLE)
-		wbkgdset(LYwin, hashStyles[s_normal].color | ' ');
+		wbkgdset(LYwin, (chtype) (hashStyles[s_normal].color | ' '));
 	    else
-		wbkgdset(LYwin, displayStyles[DSTYLE_NORMAL].color | ' ');
+		wbkgdset(LYwin, (chtype) (displayStyles[DSTYLE_NORMAL].color | ' '));
 	    LynxChangeStyle(a, STACK_OFF);
 	}
 #endif
@@ -1940,11 +1940,11 @@ BOOLEAN LYisAbsPath(const char *path)
 	result = TRUE;
 #else
 #if defined(USE_DOS_DRIVES)
-	result = (BOOL) (LYIsPathSep(path[0])
-			 || (LYIsDosDrive(path)
-			     && LYIsPathSep(path[2])));
+	result = (BOOLEAN) (LYIsPathSep(path[0])
+			    || (LYIsDosDrive(path)
+				&& LYIsPathSep(path[2])));
 #else
-	result = (LYIsPathSep(path[0]));
+	result = (BOOLEAN) (LYIsPathSep(path[0]));
 #endif /* USE_DOS_DRIVES */
 #endif
     }
@@ -2187,7 +2187,7 @@ static BOOLEAN compare_type(char *tst,
 			    const char *cmp,
 			    size_t len)
 {
-    if (!strncasecomp(tst, cmp, len)) {
+    if (!strncasecomp(tst, cmp, (int) len)) {
 	if (strncmp(tst, cmp, len)) {
 	    size_t i;
 
@@ -2222,7 +2222,6 @@ UrlTypes is_url(char *filename)
     char *cp = filename;
     char *cp1;
     UrlTypes result = NOT_A_URL_TYPE;
-    int len;
     int limit;
 
     /*
@@ -2252,7 +2251,7 @@ UrlTypes is_url(char *filename)
 	result = NOT_A_URL_TYPE;
 
     } else {
-	limit = strlen(cp);
+	limit = (int) strlen(cp);
 	switch (*cp) {
 	case 'L':
 	case 'l':
@@ -2416,10 +2415,10 @@ UrlTypes is_url(char *filename)
 
 	case 'F':
 	case 'f':
-	    if (compare_type(cp, STR_FILE_URL, len = LEN_FILE_URL)) {
+	    if (compare_type(cp, STR_FILE_URL, LEN_FILE_URL)) {
 		if (LYisLocalFile(cp)) {
 		    result = FILE_URL_TYPE;
-		} else if (DoubleHtmlSep(cp + len)) {
+		} else if (DoubleHtmlSep(cp + LEN_FILE_URL)) {
 		    result = FTP_URL_TYPE;
 		}
 	    }
@@ -2788,7 +2787,7 @@ void remove_backslashes(char *buf)
  */
 BOOLEAN inlocaldomain(void)
 {
-    int result = TRUE;
+    BOOLEAN result = TRUE;
 
 #ifdef HAVE_UTMP
     int n;
@@ -2803,7 +2802,7 @@ BOOLEAN inlocaldomain(void)
     if (mytty && (fp = fopen(UTMP_FILE, "r")) != NULL) {
 	mytty++;
 	do {
-	    n = fread((char *) &me, sizeof(struct utmp), 1, fp);
+	    n = (int) fread((char *) &me, sizeof(struct utmp), 1, fp);
 	} while (n > 0 && !STREQ(me.ut_line, mytty));
 	(void) LYCloseInput(fp);
 
@@ -3411,10 +3410,10 @@ static int fmt_tempname(char *result,
 	do {
 	    counter %= MAX_TEMPNAME;
 	    offset = counter / BITS_PER_CHAR;
-	    mask = 1 << (counter % BITS_PER_CHAR);
+	    mask = (unsigned) (1 << (counter % BITS_PER_CHAR));
 	    if ((used_tempname[offset] & mask) == 0) {
 		names_used++;
-		used_tempname[offset] |= mask;
+		used_tempname[offset] |= UCH(mask);
 		break;
 	    }
 	} while ((used_tempname[offset] & mask) == 0);
@@ -3655,9 +3654,9 @@ BOOL strn_dash_equ(const char *p1,
  * Returns the inx'th name from the restrictions table, or null if inx is
  * out of range.
  */
-const char *index_to_restriction(int inx)
+const char *index_to_restriction(unsigned inx)
 {
-    if (inx >= 0 && inx < (int) TABLESIZE(restrictions))
+    if (inx < TABLESIZE(restrictions))
 	return restrictions[inx].name;
     return NULL;
 }
@@ -3672,7 +3671,7 @@ int find_restriction(const char *name,
     unsigned i;
 
     if (len < 0)
-	len = strlen(name);
+	len = (int) strlen(name);
     for (i = 0; i < TABLESIZE(restrictions); i++) {
 	if (RESTRICT_NM_EQU(name, restrictions[i].name, len)) {
 	    return (*restrictions[i].flag);
@@ -3709,7 +3708,7 @@ void parse_restrictions(const char *s)
 	    for (i = N_SPECIAL_RESTRICT_OPTIONS;
 		 i < TABLESIZE(restrictions);
 		 i++)
-		*(restrictions[i].flag) = !restrictions[i].can;
+		*(restrictions[i].flag) = (BOOLEAN) !restrictions[i].can;
 	} else {
 	    for (i = 0; i < TABLESIZE(restrictions); i++) {
 		if (RESTRICT_NM_EQU(word, restrictions[i].name, p - word)) {
@@ -3895,7 +3894,7 @@ void LYCheckMail(void)
 	else if (lastsize == 0)
 	    HTUserMsg(HAVE_MAIL_MSG);
     }
-    lastsize = st.st_size;
+    lastsize = (long) st.st_size;
     lasttime = st.st_mtime;
     return;
 }
@@ -5472,14 +5471,14 @@ void LYAddPathToHome(char *fbuffer,
 	 */
 	StrAllocCopy(home, NO_HOMEPATH);
 
-    len = fbuffer_size - (strlen(home) + 1);
+    len = (int) fbuffer_size - ((int) strlen(home) + 1);
     if (len <= 0) {
 	/*
 	 * Buffer is smaller than or only big enough for the home path.  Load
 	 * what fits of the home path and return.  This will fail, but we need
 	 * something in the buffer.  - FM
 	 */
-	LYstrncpy(fbuffer, home, (fbuffer_size - 1));
+	LYstrncpy(fbuffer, home, (int) (fbuffer_size - 1));
 	FREE(home);
 	return;
     }
@@ -5654,11 +5653,12 @@ static BOOL IsOurSymlink(const char *name)
     BOOL result = FALSE;
     int size = LY_MAXPATH;
     int used;
-    char *buffer = typeMallocn(char, size);
+    char *buffer = typeMallocn(char, (unsigned) size);
 
     if (buffer != 0) {
-	while ((used = readlink(name, buffer, size - 1)) == size - 1) {
-	    buffer = typeRealloc(char, buffer, size *= 2);
+	while ((used = readlink(name, buffer, (unsigned) (size - 1))) == size
+	       - 1) {
+	    buffer = typeRealloc(char, buffer, (unsigned) (size *= 2));
 
 	    if (buffer == 0)
 		break;
@@ -5757,7 +5757,7 @@ BOOL IsOurFile(const char *name)
 	} while (leaf != path);
 	FREE(path);
 #endif
-	result = !linked;
+	result = (BOOLEAN) !linked;
     }
     CTRACE2(TRACE_CFG, (tfp, "IsOurFile(%s) %d\n", name, result));
     return result;
@@ -5770,7 +5770,7 @@ static FILE *OpenHiddenFile(const char *name, const char *mode)
 {
     FILE *fp = 0;
     struct stat data;
-    BOOLEAN binary = strchr(mode, 'b') != 0;
+    BOOLEAN binary = (BOOLEAN) (strchr(mode, 'b') != 0);
 
 #if defined(O_CREAT) && defined(O_EXCL)		/* we have fcntl.h or kindred? */
     /*
@@ -5979,7 +5979,7 @@ FILE *LYOpenTemp(char *result,
 	    CTRACE((tfp, "lynx_temp_space is not a directory %s\n", lynx_temp_space));
 	}
 	if (make_it) {
-	    int old_mask = umask(HIDE_UMASK);
+	    mode_t old_mask = umask(HIDE_UMASK);
 
 	    StrAllocCat(lynx_temp_space, "lynxXXXXXXXXXX");
 	    if (mkdtemp(lynx_temp_space) == 0) {
@@ -6029,7 +6029,7 @@ FILE *LYOpenTemp(char *result,
 	p->next = ly_temp;
 	StrAllocCopy((p->name), result);
 	p->file = fp;
-	p->outs = (wrt != 'r');
+	p->outs = (BOOLEAN) (wrt != 'r');
 	ly_temp = p;
     } else {
 	outofmem(__FILE__, "LYOpenTemp");
@@ -6368,7 +6368,7 @@ void LYCheckBibHost(void)
     bibhostIcon.safe = FALSE;
     saveFlag = traversal;
     traversal = TRUE;		/* Hack to force error response. */
-    BibP_bibhost_available = HTLoadAbsolute(&bibhostIcon) == YES;
+    BibP_bibhost_available = (BOOLEAN) (HTLoadAbsolute(&bibhostIcon) == YES);
     traversal = saveFlag;
     BibP_bibhost_checked = TRUE;
 }
@@ -6925,13 +6925,13 @@ int LYCopyFile(char *src,
     } else {
 	FILE *fin, *fout;
 	unsigned char buff[BUFSIZ];
-	int len;
+	unsigned len;
 
 	code = EOF;
 	if ((fin = fopen(src, BIN_R)) != 0) {
 	    if ((fout = fopen(dst, BIN_W)) != 0) {
 		code = 0;
-		while ((len = fread(buff, 1, sizeof(buff), fin)) > 0) {
+		while ((len = fread(buff, 1, sizeof(buff), fin)) != 0) {
 		    fwrite(buff, 1, len, fout);
 		    if (ferror(fout)) {
 			code = EOF;
@@ -7448,7 +7448,7 @@ static int clip_grab(void)
 char *get_clip_grab(void)
 {
     int len;
-    int size = PASTE_BUFFER;
+    unsigned size = PASTE_BUFFER;
     int off = 0;
 
     if (!clip_grab())
@@ -7459,7 +7459,7 @@ char *get_clip_grab(void)
 	FREE(paste_buf);
     paste_buf = (char *) malloc(PASTE_BUFFER);
     while (1) {
-	len = fread(paste_buf + off, 1, PASTE_BUFFER - 1, paste_handle);
+	len = (int) fread(paste_buf + off, 1, PASTE_BUFFER - 1, paste_handle);
 	paste_buf[off + len] = '\0';
 	if (len < PASTE_BUFFER - 1)
 	    break;
@@ -7477,7 +7477,7 @@ int put_clip(const char *s)
 {
     char *cmd = LYGetEnv("RL_CLCOPY_CMD");
     FILE *fh;
-    int l = strlen(s), res;
+    unsigned l = strlen(s), res;
 
     if (!cmd)
 	return -1;
@@ -7504,7 +7504,7 @@ void LYmsec_delay(unsigned msec)
     Sleep(msec);
 
 #elif defined(HAVE_NAPMS)
-    napms(msec);
+    napms((int) msec);
 
 #elif defined(DJGPP) || defined(HAVE_USLEEP)
     usleep(1000 * msec);
diff --git a/src/LYUtils.h b/src/LYUtils.h
index 2cdf0cc5..83ba6636 100644
--- a/src/LYUtils.h
+++ b/src/LYUtils.h
@@ -1,4 +1,4 @@
-/* $LynxId: LYUtils.h,v 1.78 2008/12/29 01:33:26 tom Exp $ */
+/* $LynxId: LYUtils.h,v 1.79 2009/01/01 17:10:40 tom Exp $ */
 #ifndef LYUTILS_H
 #define LYUTILS_H
 
@@ -141,7 +141,7 @@ extern "C" {
     extern const char *Home_Dir(void);
     extern const char *LYGetHiliteStr(int cur, int count);
     extern const char *LYSysShell(void);
-    extern const char *index_to_restriction(int inx);
+    extern const char *index_to_restriction(unsigned inx);
     extern const char *wwwName(const char *pathname);
     extern int HTCheckForInterrupt(void);
     extern int LYConsoleInputFD(BOOLEAN need_selectable);
diff --git a/src/LYrcFile.c b/src/LYrcFile.c
index 73c86230..789d8305 100644
--- a/src/LYrcFile.c
+++ b/src/LYrcFile.c
@@ -1,4 +1,4 @@
-/* $LynxId: LYrcFile.c,v 1.74 2008/08/31 23:28:15 tom Exp $ */
+/* $LynxId: LYrcFile.c,v 1.75 2009/01/01 23:10:59 tom Exp $ */
 #include <HTUtils.h>
 #include <HTFTP.h>
 #include <LYUtils.h>
@@ -179,7 +179,7 @@ BOOL LYgetEnum(Config_Enum * table, char *name,
 
     if (len != 0) {
 	while (table->name != 0) {
-	    if (!strncasecomp(table->name, name, len)) {
+	    if (!strncasecomp(table->name, name, (int) len)) {
 		found = table;
 		if (!strcasecomp(table->name, name)) {
 		    match = 1;
@@ -683,7 +683,7 @@ void read_rc(FILE *fp)
 	if (tbl->name == 0) {
 	    const char *special = RC_MULTI_BOOKMARK;
 
-	    if (!strncasecomp(name, special, strlen(special))) {
+	    if (!strncasecomp(name, special, (int) strlen(special))) {
 		tbl = lookup_config(special);
 	    }
 	    /* lynx ignores unknown keywords */
@@ -1006,7 +1006,7 @@ BOOL will_save_rc(const char *name)
 {
     Config_Type *tbl = lookup_config(name);
 
-    return tbl->name != 0;
+    return (BOOL) (tbl->name != 0);
 }
 
 int enable_lynxrc(char *value)
diff --git a/src/TRSTable.c b/src/TRSTable.c
index f20b17bd..37bbca86 100644
--- a/src/TRSTable.c
+++ b/src/TRSTable.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: TRSTable.c,v 1.23 2008/02/27 01:58:47 tom Exp $
+ * $LynxId: TRSTable.c,v 1.24 2009/01/01 22:15:35 tom Exp $
  *		Simple table object
  *		===================
  * Authors
@@ -451,10 +451,10 @@ static int Stbl_addCellToRow(STable_rowinfo *me, STable_cellinfo *colinfo, int n
 	    growby += CELLS_GROWBY;
 	if (growby) {
 	    if (me->allocated == 0 && !me->cells) {
-		cells = typecallocn(STable_cellinfo, growby);
+		cells = typecallocn(STable_cellinfo, (unsigned) growby);
 	    } else {
 		cells = typeRealloc(STable_cellinfo, me->cells,
-				      (me->allocated + growby));
+				      (unsigned) (me->allocated + growby));
 
 		for (i = 0; cells && i < growby; i++) {
 		    cells[me->allocated + i].alignment = HT_ALIGN_NONE;
@@ -522,7 +522,7 @@ static int Stbl_reserveCellsInRow(STable_rowinfo *me, int icell,
 	     icell, colspan));
     if (growby > 0) {
 	cells = typeRealloc(STable_cellinfo, me->cells,
-			      (me->allocated + growby));
+			      (unsigned) (me->allocated + growby));
 
 	if (cells) {
 	    for (i = 0; i < growby; i++) {
@@ -983,7 +983,7 @@ static int Stbl_reserveCellsInTable(STable_info *me, int icell,
     if (rowspan == 0) {
 	if (!me->rowspans2eog.cells) {
 	    me->rowspans2eog.cells = typecallocn(STable_cellinfo,
-						 HTMAX(1, icell + colspan));
+						   (unsigned) HTMAX(1, icell + colspan));
 
 	    if (!me->rowspans2eog.cells)
 		return 0;	/* fail silently */
@@ -996,7 +996,7 @@ static int Stbl_reserveCellsInTable(STable_info *me, int icell,
     growby = me->nrows + rowspan - 1 - me->allocated_rows;
     if (growby > 0) {
 	rows = typeRealloc(STable_rowinfo, me->rows,
-			     (me->allocated_rows + growby));
+			     (unsigned) (me->allocated_rows + growby));
 
 	if (!rows)
 	    return 0;		/* ignore silently, no free memory, may be recoverable */
@@ -1009,12 +1009,12 @@ static int Stbl_reserveCellsInTable(STable_info *me, int icell,
 		row->cells = NULL;
 	    } else {
 		row->cells = typecallocn(STable_cellinfo,
-					 me->rowspans2eog.allocated);
+					   (unsigned) me->rowspans2eog.allocated);
 
 		if (row->cells) {
 		    row->allocated = me->rowspans2eog.allocated;
 		    memcpy(row->cells, me->rowspans2eog.cells,
-			   row->allocated * sizeof(STable_cellinfo));
+			   ((unsigned) row->allocated * sizeof(STable_cellinfo)));
 		}
 	    }
 	    row->ncells = 0;
@@ -1028,7 +1028,10 @@ static int Stbl_reserveCellsInTable(STable_info *me, int icell,
 	 i < (rowspan == 0 ? me->allocated_rows : me->nrows + rowspan - 1);
 	 i++) {
 	if (!me->rows[i].allocated) {
-	    me->rows[i].cells = typecallocn(STable_cellinfo, HTMAX(1, icell + colspan));
+	    me->rows[i].cells = typecallocn(STable_cellinfo, (unsigned)
+									      HTMAX(1,
+									      icell
+									      + colspan));
 
 	    if (!me->rows[i].cells)
 		return 0;	/* fail silently */
@@ -1091,10 +1094,10 @@ int Stbl_addRowToTable(STable_info *me, int alignment,
 	    growby += ROWS_GROWBY;
 	if (growby) {
 	    if (me->allocated_rows == 0 && !me->rows) {
-		rows = typecallocn(STable_rowinfo, growby);
+		rows = typecallocn(STable_rowinfo, (unsigned) growby);
 	    } else {
 		rows = typeRealloc(STable_rowinfo, me->rows,
-				     (me->allocated_rows + growby));
+				     (unsigned) (me->allocated_rows + growby));
 
 		for (i = 0; rows && i < growby; i++) {
 		    row = rows + me->allocated_rows + i;
@@ -1103,12 +1106,12 @@ int Stbl_addRowToTable(STable_info *me, int alignment,
 			row->cells = NULL;
 		    } else {
 			row->cells = typecallocn(STable_cellinfo,
-						 me->rowspans2eog.allocated);
+						   (unsigned) me->rowspans2eog.allocated);
 
 			if (row->cells) {
 			    row->allocated = me->rowspans2eog.allocated;
 			    memcpy(row->cells, me->rowspans2eog.cells,
-				   row->allocated * sizeof(STable_cellinfo));
+				   (unsigned) row->allocated * sizeof(STable_cellinfo));
 			} else {
 			    FREE(rows);
 			    break;
@@ -1351,7 +1354,8 @@ static int Stbl_fakeFinishCellInTable(STable_info *me,
 	       the reservation structure when we fake new logical lines.  */
 	    int prev_row_n = prev_row - me->rows;
 	    STable_rowinfo *rows = typeRealloc(STable_rowinfo, me->rows,
-					       (me->allocated_rows + 1));
+					       (unsigned) (me->allocated_rows
+							   + 1));
 	    int need_cells = prev_reserved_last + 1;
 	    int n;
 
@@ -1373,7 +1377,7 @@ static int Stbl_fakeFinishCellInTable(STable_info *me,
 	    lastrow->allocated = 0;
 	    lastrow->cells = 0;
 	    if (need_cells) {
-		lastrow->cells = typecallocn(STable_cellinfo, need_cells);
+		lastrow->cells = typecallocn(STable_cellinfo, (unsigned) need_cells);
 
 		/* ignore silently, no free memory, may be recoverable */
 		if (!lastrow->cells) {
@@ -1381,7 +1385,7 @@ static int Stbl_fakeFinishCellInTable(STable_info *me,
 		}
 		lastrow->allocated = need_cells;
 		memcpy(lastrow->cells, prev_row->cells,
-		       lastrow->allocated * sizeof(STable_cellinfo));
+		       (unsigned) lastrow->allocated * sizeof(STable_cellinfo));
 
 		i = -1;
 		while (++i < ncells) {
@@ -1495,10 +1499,10 @@ int Stbl_addCellToTable(STable_info *me, int colspan,
 	    growby += CELLS_GROWBY;
 	if (growby) {
 	    if (me->allocated_sumcols == 0 && !me->sumcols) {
-		sumcols = typecallocn(STable_cellinfo, growby);
+		sumcols = typecallocn(STable_cellinfo, (unsigned) growby);
 	    } else {
 		sumcols = typeRealloc(STable_cellinfo, me->sumcols,
-				        (me->allocated_sumcols + growby));
+				        (unsigned) (me->allocated_sumcols + growby));
 
 		for (i = 0; sumcols && i < growby; i++) {
 		    sumcol = sumcols + me->allocated_sumcols + i;
@@ -1687,10 +1691,10 @@ int Stbl_addColInfo(STable_info *me, int colspan,
 	    growby += CELLS_GROWBY;
 	if (growby) {
 	    if (me->allocated_sumcols == 0) {
-		sumcols = typecallocn(STable_cellinfo, growby);
+		sumcols = typecallocn(STable_cellinfo, (unsigned) growby);
 	    } else {
 		sumcols = typeRealloc(STable_cellinfo, me->sumcols,
-				        (me->allocated_sumcols + growby));
+				        (unsigned) (me->allocated_sumcols + growby));
 
 		for (i = 0; sumcols && i < growby; i++) {
 		    sumcol = sumcols + me->allocated_sumcols + i;
diff --git a/src/UCAuto.c b/src/UCAuto.c
index 66e541db..18eb4a97 100644
--- a/src/UCAuto.c
+++ b/src/UCAuto.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: UCAuto.c,v 1.38 2008/07/05 11:42:34 tom Exp $
+ * $LynxId: UCAuto.c,v 1.39 2009/01/01 22:07:18 tom Exp $
  *
  *  This file contains code for changing the Linux console mode.
  *  Currently some names for font files are hardwired in here.
@@ -104,7 +104,7 @@ static BOOL isSetFont(void)
     const char *slash = strrchr(program, '/');
     const char *leaf = (slash ? slash + 1 : program);
 
-    return !strcmp(leaf, "setfont");
+    return (BOOL) !strcmp(leaf, "setfont");
 }
 
 /*
diff --git a/src/UCdomap.c b/src/UCdomap.c
index 1d7d1a99..33a6a6b4 100644
--- a/src/UCdomap.c
+++ b/src/UCdomap.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: UCdomap.c,v 1.72 2009/01/01 00:46:30 tom Exp $
+ * $LynxId: UCdomap.c,v 1.73 2009/01/01 22:10:53 tom Exp $
  *
  *  UCdomap.c
  *  =========
@@ -942,7 +942,7 @@ int UCTransUniCharStr(char *outbuf,
 	}
 	rc = conv_uni_to_str(outbuf, buflen, unicode, 0);
 	if (rc >= 0)
-	    return (strlen(outbuf));
+	    return (int) strlen(outbuf);
     }
     if (trydefault && chk_single_flag) {
 	src = conv_uni_to_pc(unicode, 1);
@@ -961,12 +961,13 @@ int UCTransUniCharStr(char *outbuf,
 	    size_t inleft, outleft;
 	    char *tocode = NULL;
 
-	    str[0] = unicode >> 8;
-	    str[1] = unicode & 0xFF;
+	    str[0] = (char) (unicode >> 8);
+	    str[1] = (char) (unicode & 0xFF);
 	    str[2] = 0;
 	    pin = str;
 	    inleft = 2;
-	    pout = outbuf, outleft = buflen;
+	    pout = outbuf;
+	    outleft = (size_t) buflen;
 	    /*
 	     * Try TRANSLIT first, since it is an extension which can provide
 	     * translations when there is no available exact translation to
@@ -990,24 +991,26 @@ int UCTransUniCharStr(char *outbuf,
 	    FREE(tocode);
 
 	    if (cd != (iconv_t) - 1) {
-		rc = iconv(cd, (ICONV_CONST char **) &pin, &inleft, &pout, &outleft);
+		rc = (int) iconv(cd, (ICONV_CONST char **) &pin, &inleft,
+				 &pout, &outleft);
 		iconv_close(cd);
 		if ((pout - outbuf) == 3) {
 		    CTRACE((tfp,
 			    "It seems to be a JIS X 0201 code(%ld). Not supported.\n", unicode));
 		    pin = str;
 		    inleft = 2;
-		    pout = outbuf, outleft = buflen;
+		    pout = outbuf;
+		    outleft = (size_t) buflen;
 		} else if (rc >= 0) {
 		    *pout = '\0';
-		    return (strlen(outbuf));
+		    return (int) strlen(outbuf);
 		}
 	    }
 	}
 #endif
 	rc = conv_uni_to_str(outbuf, buflen, unicode, 1);
 	if (rc >= 0)
-	    return (strlen(outbuf));
+	    return (int) strlen(outbuf);
     }
     if (rc == ucNotFound) {
 	if (!isdefault)
@@ -1015,7 +1018,7 @@ int UCTransUniCharStr(char *outbuf,
 	if ((rc == ucNotFound) && (isdefault || trydefault))
 	    rc = conv_uni_to_str(outbuf, buflen, 0xfffd, 1);
 	if (rc >= 0)
-	    return (strlen(outbuf));
+	    return (int) strlen(outbuf);
     }
     if (chk_single_flag && src == ucNotFound) {
 	if (!isdefault)
@@ -1152,7 +1155,7 @@ long int UCTransJPToUni(char *inbuf,
     pin = inbuf;
     pout = outbuf;
     ilen = 2;
-    olen = buflen;
+    olen = (size_t) buflen;
 
     cd = iconv_open("UTF-16BE", LYCharSet_UC[charset_in].MIMEname);
     rc = iconv(cd, (ICONV_CONST char **) &pin, &ilen, &pout, &olen);
@@ -1192,7 +1195,7 @@ long int UCTransToUni(char ch_in,
 	    unsigned need;
 	    char *ptr;
 
-	    buffer[inx++] = ch_iu;
+	    buffer[inx++] = (char) ch_iu;
 	    buffer[inx] = '\0';
 	    need = utf8_length(TRUE, buffer);
 	    if (need && (need + 1) == inx) {
@@ -1426,7 +1429,7 @@ int UCTransCharStr(char *outbuf,
 	}
 	rc = conv_uni_to_str(outbuf, buflen, unicode, 0);
 	if (rc >= 0)
-	    return (strlen(outbuf));
+	    return (int) strlen(outbuf);
     }
     if (trydefault && chk_single_flag) {
 	src = conv_uni_to_pc(unicode, 1);
@@ -1439,7 +1442,7 @@ int UCTransCharStr(char *outbuf,
     if (isdefault || trydefault) {
 	rc = conv_uni_to_str(outbuf, buflen, unicode, 1);
 	if (rc >= 0)
-	    return (strlen(outbuf));
+	    return (int) strlen(outbuf);
     }
     if (rc == -4) {
 	if (!isdefault)
@@ -1447,7 +1450,7 @@ int UCTransCharStr(char *outbuf,
 	if ((rc == -4) && (isdefault || trydefault))
 	    rc = conv_uni_to_str(outbuf, buflen, 0xfffd, 1);
 	if (rc >= 0)
-	    return (strlen(outbuf));
+	    return (int) strlen(outbuf);
     }
     if (chk_single_flag && src == -4) {
 	if (!isdefault)
@@ -1819,7 +1822,7 @@ static const char **UC_setup_LYCharSets_repl(int UC_charset_in_hndl,
 		     */
 		    static char dummy[2];	/* one char dummy string */
 
-		    dummy[0] = ti[UCH(*s8) - 160];
+		    dummy[0] = (char) ti[UCH(*s8) - 160];
 		    *p = HTAtom_name(HTAtom_for(dummy));
 		}
 		changed = 1;
@@ -1921,7 +1924,7 @@ static int UC_Register_with_LYCharSets(int s,
     }
 
     if (!found && LYhndl > 0) {
-	repl = UC_setup_LYCharSets_repl(s, UCInfo[s].lowest_eight);
+	repl = UC_setup_LYCharSets_repl(s, (unsigned) UCInfo[s].lowest_eight);
 	if (repl) {
 	    LYCharSets[LYhndl] = repl;
 	    /*
diff --git a/src/chrtrans/makeuctb.c b/src/chrtrans/makeuctb.c
index c98adb4c..e36b8902 100644
--- a/src/chrtrans/makeuctb.c
+++ b/src/chrtrans/makeuctb.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: makeuctb.c,v 1.38 2008/12/31 22:04:03 tom Exp $
+ * $LynxId: makeuctb.c,v 1.39 2009/01/01 17:01:15 tom Exp $
  *
  *  makeuctb.c, derived from conmakehash.c   - kw
  *
@@ -153,7 +153,6 @@ static const char *hdrname;
 static int RawOrEnc = 0;
 static int Raw_found = 0;	/* whether explicit R directive found */
 static int CodePage = 0;
-static int CodePage_found = 0;	/* whether explicit C directive found */
 
 #define MAX_UNIPAIRS 4500
 
@@ -503,7 +502,6 @@ int main(int argc, char **argv)
 		p++;
 	    }
 	    CodePage = strtol(p, 0, 10);
-	    CodePage_found = 1;
 	    continue;
 	}
 
diff --git a/src/parsdate.c b/src/parsdate.c
index 0549a6e3..97578ef3 100644
--- a/src/parsdate.c
+++ b/src/parsdate.c
@@ -33,7 +33,7 @@ static int yygrowstack(void);
 #define YYPREFIX "yy"
 #line 2 "./parsdate.y"
 /*
- *  $LynxId: parsdate.c,v 1.7 2008/12/27 01:03:28 tom Exp $
+ *  $LynxId: parsdate.c,v 1.8 2009/01/01 22:12:42 tom Exp $
  *
  *  This module is adapted and extended from tin, to use for LYmktime().
  *
@@ -842,7 +842,7 @@ date_lex(void)
 		 (c = *yyInput++) != '\0' && CTYPE(isdigit, c);
 		 ) {
 		if (p < &buff[sizeof buff - 1])
-		    *p++ = c;
+		    *p++ = (char) c;
 	    }
 	    *p = '\0';
 	    i = atoi(buff);
@@ -858,7 +858,7 @@ date_lex(void)
 		 (c = *yyInput++) == '.' || CTYPE(isalpha, c);
 		 ) {
 		if (p < &buff[sizeof buff - 1])
-		    *p++ = CTYPE(isupper, c) ? tolower(c) : c;
+		    *p++ = (char) (CTYPE(isupper, c) ? tolower(c) : c);
 	    }
 	    *p = '\0';
 	    yyInput--;
diff --git a/src/parsdate.y b/src/parsdate.y
index fdfdbad2..3466fc65 100644
--- a/src/parsdate.y
+++ b/src/parsdate.y
@@ -1,6 +1,6 @@
 %{
 /*
- *  $LynxId: parsdate.y,v 1.11 2008/12/27 00:45:40 tom Exp $
+ *  $LynxId: parsdate.y,v 1.12 2009/01/01 22:12:25 tom Exp $
  *
  *  This module is adapted and extended from tin, to use for LYmktime().
  *
@@ -817,7 +817,7 @@ date_lex(void)
 		 (c = *yyInput++) != '\0' && CTYPE(isdigit, c);
 		 ) {
 		if (p < &buff[sizeof buff - 1])
-		    *p++ = c;
+		    *p++ = (char) c;
 	    }
 	    *p = '\0';
 	    i = atoi(buff);
@@ -833,7 +833,7 @@ date_lex(void)
 		 (c = *yyInput++) == '.' || CTYPE(isalpha, c);
 		 ) {
 		if (p < &buff[sizeof buff - 1])
-		    *p++ = CTYPE(isupper, c) ? tolower(c) : c;
+		    *p++ = (char) (CTYPE(isupper, c) ? tolower(c) : c);
 	    }
 	    *p = '\0';
 	    yyInput--;