[pkg-lynx-commits] [lynx-cur] 01/04: New upstream version 2.8.9dev13

Axel Beckert abe at deuxchevaux.org
Sun Apr 30 13:37:44 UTC 2017


This is an automated email from the git hooks/post-receive script.

abe pushed a commit to branch master
in repository lynx-cur.

commit 2fe7d3d8e427b214ee25913f7f3f1d89fe74d597
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Sat Apr 29 18:56:45 2017 +0200

    New upstream version 2.8.9dev13
---
 CHANGES                                      |   52 +-
 COPYHEADER                                   |    4 +-
 COPYHEADER.asc                               |    6 +-
 PACKAGE/debian/changelog                     |    4 +-
 PACKAGE/debian/copyright                     |    2 +-
 PACKAGE/lynx-newssl.iss                      |   11 +
 PACKAGE/lynx-oldssl.iss                      |   11 +
 PACKAGE/lynx.iss                             |    4 +-
 PACKAGE/lynx.nsi                             |    8 +-
 PACKAGE/lynx.spec                            |    4 +-
 PACKAGE/version.iss                          |    2 +-
 WWW/Library/Implementation/HTAABrow.c        |  126 +-
 WWW/Library/Implementation/HTAABrow.h        |    7 +-
 WWW/Library/Implementation/HTAAProt.c        |    6 +-
 WWW/Library/Implementation/HTAAUtil.c        |    4 +-
 WWW/Library/Implementation/HTAccess.c        |    4 +-
 WWW/Library/Implementation/HTAnchor.c        |   12 +-
 WWW/Library/Implementation/HTAnchor.h        |    3 +-
 WWW/Library/Implementation/HTAssoc.c         |    4 +-
 WWW/Library/Implementation/HTAtom.c          |    6 +-
 WWW/Library/Implementation/HTBTree.c         |    7 -
 WWW/Library/Implementation/HTChunk.c         |    6 +-
 WWW/Library/Implementation/HTFTP.c           |   11 +-
 WWW/Library/Implementation/HTFile.c          |    8 +-
 WWW/Library/Implementation/HTFormat.c        |    7 +-
 WWW/Library/Implementation/HTGopher.c        |   14 +-
 WWW/Library/Implementation/HTGroup.c         |    8 -
 WWW/Library/Implementation/HTList.c          |    8 +-
 WWW/Library/Implementation/HTMIME.c          |   21 +-
 WWW/Library/Implementation/HTMLGen.c         |    6 +-
 WWW/Library/Implementation/HTNews.c          |    4 +-
 WWW/Library/Implementation/HTParse.c         |   40 +-
 WWW/Library/Implementation/HTParse.h         |    7 +-
 WWW/Library/Implementation/HTPlain.c         |    4 +-
 WWW/Library/Implementation/HTRules.c         |    4 +-
 WWW/Library/Implementation/HTString.c        |   19 +-
 WWW/Library/Implementation/HTTCP.c           |    5 +-
 WWW/Library/Implementation/HTTP.c            |   46 +-
 WWW/Library/Implementation/HTUtils.h         |    3 +-
 WWW/Library/Implementation/HTWSRC.c          |    4 +-
 WWW/Library/Implementation/SGML.c            |   38 +-
 aclocal.m4                                   |  109 +-
 config.guess                                 |  133 +-
 config.sub                                   |   38 +-
 configure                                    | 8508 ++++++++++++++------------
 configure.in                                 |    8 +-
 lynx.cfg                                     |   23 +-
 lynx.hlp                                     |  409 +-
 lynx.man                                     |  146 +-
 lynx_help/Lynx_users_guide.html              |  867 +--
 lynx_help/keystrokes/alt_edit_help.html      |   24 +-
 lynx_help/keystrokes/bashlike_edit_help.html |   58 +-
 lynx_help/keystrokes/bookmark_help.html      |   37 +-
 lynx_help/keystrokes/cookie_help.html        |   36 +-
 lynx_help/keystrokes/dired_help.html         |   26 +-
 lynx_help/keystrokes/edit_help.html          |   28 +-
 lynx_help/keystrokes/environments.html       |  235 +-
 lynx_help/keystrokes/follow_help.html        |  127 +-
 lynx_help/keystrokes/gopher_types_help.html  |   11 +-
 lynx_help/keystrokes/history_help.html       |   18 +-
 lynx_help/keystrokes/keystroke_help.html     |  255 +-
 lynx_help/keystrokes/movement_help.html      |   14 +-
 lynx_help/keystrokes/option_help.html        |  336 +-
 lynx_help/keystrokes/other_help.html         |   17 +-
 lynx_help/keystrokes/print_help.html         |   15 +-
 lynx_help/keystrokes/scrolling_help.html     |   35 +-
 lynx_help/keystrokes/test_display.html       |   30 +-
 lynx_help/keystrokes/visited_help.html       |   37 +-
 lynx_help/keystrokes/xterm_help.html         |   16 +-
 lynx_help/lynx-dev.html                      |   10 +-
 lynx_help/lynx_url_support.html              |   84 +-
 makefile.in                                  |    4 +-
 makefile.msc                                 |    8 +-
 po/ca.po                                     | 1558 ++---
 src/GridText.c                               |   78 +-
 src/HTAlert.c                                |   20 +-
 src/HTAlert.h                                |    4 +-
 src/HTFWriter.c                              |  100 +-
 src/HTInit.c                                 |   10 +-
 src/HTML.c                                   |    7 +-
 src/LYCgi.c                                  |    6 +-
 src/LYCharUtils.c                            |    4 +-
 src/LYCookie.c                               |   12 +-
 src/LYCurses.c                               |   20 +-
 src/LYGetFile.c                              |    4 +-
 src/LYHistory.c                              |    8 +-
 src/LYIcon.rc                                |   12 +-
 src/LYJump.c                                 |    6 +-
 src/LYKeymap.c                               |    4 +-
 src/LYLeaks.c                                |   10 +-
 src/LYLocal.c                                |    6 +-
 src/LYMain.c                                 |    8 +-
 src/LYMainLoop.c                             |    4 +-
 src/LYMap.c                                  |    4 +-
 src/LYOptions.c                              |   10 +-
 src/LYOptions.h                              |    6 +-
 src/LYReadCFG.c                              |   14 +-
 src/LYStrings.c                              |   22 +-
 src/LYUtils.c                                |    4 +-
 src/LYrcFile.c                               |    3 +-
 src/TRSTable.c                               |   68 +-
 src/UCAuto.c                                 |    4 +-
 src/UCdomap.c                                |   44 +-
 src/tidy_tls.c                               |    8 +-
 userdefs.h                                   |    8 +-
 105 files changed, 7763 insertions(+), 6565 deletions(-)

diff --git a/CHANGES b/CHANGES
index 5ce6305..1118826 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,8 +1,58 @@
--- $LynxId: CHANGES,v 1.862 2016/11/16 00:35:39 tom Exp $
+-- $LynxId: CHANGES,v 1.889 2017/04/29 14:43:40 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
 
+2017-04-29 (2.8.9dev.13)
+* amend fix for Debian #841155, adding check for special case where the
+  expected number of cells is zero (report by Larry Hynes) -TD
+
+2017-04-28 (2.8.9dev.12)
+* correct logic in cell2char(), which gave up too early in determining the
+  number of cells needed for a multibyte string in the editable text-fields
+  (Debian #841155) -TD
+* improve manual page discussion of environment variables, prompted by
+  comments in Debian #791452, which overlooked the fact that details of proxy
+  behavior are found in the user guide -TD
+* cleanup some of the user's guide formatting, e.g., for quote-characters -TD
+* consistently use "_" in command-line options table and manual page, to work
+  with program logic that treats "-" as "_", but not the reverse (report by
+  Larry Hynes) -TD
+* improved several configure macros:  CF_ADD_CFLAGS, CF_CC_ENV_FLAGS,
+  CF_GNU_SOURCE, CF_LARGEFILE, CF_MATH_LIB, CF_PROG_LINT, CF_SRAND,
+  CF_XOPEN_SOURCE -TD
+* modify Windows makefile to allow SSL_LIBS and SSL_DEFS to be overridden,
+  reflecting naming-incompatibility in recent OpenSSL development -TD
+* modify ncurses-specific code to allow its TERMINAL struct to be opaque -TD 
+* refine special case of server Content-Type from 2.8.7dev.11 changes to
+  decompress files offered for download when the server has gzip'd them
+  (report by TH) -TD
+* amend comparision from 2.8.8dev.10 changes to handle slang specially
+  (report/testcase by TH) -TD
+* minor cleanup of UCDomap.c -TD
+* build-fix for color-style with leak-checking -TD
+* amend merge/fixes from
+	http://en.sourceforge.jp/project/lynx-win32-pata
+  as well as problem introduced by 2.8.8dev.6 cleanup -TH
+* update ca.po, from
+    http://translationproject.org/latest/lynx
+* tidy whitespace in lynx.cfg (report by David Niklas)
+* fix two more typos in the list of ENABLE_LYNXRC in lynx.cfg -TD
+* remove a repeated item for SEND_USERAGENT from lynx.cfg (Larry Hynes)
+* accept userinfo in a URL, subject to override by -auth option or -pauth
+  options.  According to RFC-3986, this is deprecated, but testing shows other
+  clients support it -TD
+* fix several minor warnings reported by Coverity -TD
+* remove redundant asserts which follow a check that leads to outofmem(),
+  added in 2.8.8dev.4 to appease clang 2.6, since clang 3.x understands
+  no-return function declarations -TD
+* when converting host+params to idna, temporarily separate the params to
+  avoid a warning from idna_to_ascii_8z() -TD
+* improve warning messages from 2.8.9dev.11 fixes when stripping user/password,
+  dropping an unnecessary message and fixing a case where all-punctuation
+  user name was not logged (report by Axel Beckert) -TD
+* update config.guess (2017-03-05), config.sub (2017-02-07)
+
 2016-11-15 (2.8.9dev.11)
 * amend fix for stripping user/password to ensure that the stripped value is
   used when connecting to the host (prompted by discussion of CVE-2016-9179
diff --git a/COPYHEADER b/COPYHEADER
index 849034c..5ce13a4 100644
--- a/COPYHEADER
+++ b/COPYHEADER
@@ -1,4 +1,4 @@
-Copyright 1997-2015,2016 Thomas E. Dickey
+Copyright 1997-2016,2017 Thomas E. Dickey
 
 This copyright notice must be included in all copies or substantial
 portions of Lynx.  It outlines rights and restrictions for Lynx which
@@ -80,5 +80,5 @@ For reference, below is the original copyright notice for Lynx (2.4.2).
 */
 ------------------------------------------------------------------------------
 -- vile:txtmode fc=72 noti
--- $LynxId: COPYHEADER,v 1.14 2016/04/11 00:41:05 tom Exp $
+-- $LynxId: COPYHEADER,v 1.15 2017/01/01 17:00:00 tom Exp $
 ------------------------------------------------------------------------------
diff --git a/COPYHEADER.asc b/COPYHEADER.asc
index 4e0089b..41af11a 100644
--- a/COPYHEADER.asc
+++ b/COPYHEADER.asc
@@ -2,7 +2,7 @@
 Version: GnuPG v1.4.12 (GNU/Linux)
 Comment: See http://invisible-island.net/public/public.html for info
 
-iEYEABECAAYFAlcK82QACgkQcCNT4PfkjttIuwCeOsxrhAi9MzzRMZdbuGdBgJ2o
-3fUAnjxUoC/JPkmGCvDtvumSH/10zquP
-=ge/N
+iEYEABECAAYFAlhpP/MACgkQcCNT4PfkjtuGHACgj9vomskwuqiP0vUMjTpy2w9Y
+Z10An2eosmBJQi+vBdtTxieiG5M/BD+f
+=tp9v
 -----END PGP SIGNATURE-----
diff --git a/PACKAGE/debian/changelog b/PACKAGE/debian/changelog
index 0818a58..1878851 100644
--- a/PACKAGE/debian/changelog
+++ b/PACKAGE/debian/changelog
@@ -1,8 +1,8 @@
-lynx-dev (2.8.9dev.11) unstable; urgency=low
+lynx-dev (2.8.9dev.13) unstable; urgency=low
 
   * maintenance updates
 
- -- Thomas E. Dickey <dickey at invisible-island.net>  Tue, 15 Nov 2016 04:04:25 -0500
+ -- Thomas E. Dickey <dickey at invisible-island.net>  Sat, 29 Apr 2017 08:47:15 -0400
 
 lynx-dev (2.8.8dev.16) unstable; urgency=high
 
diff --git a/PACKAGE/debian/copyright b/PACKAGE/debian/copyright
index 609f49b..5eb37df 100644
--- a/PACKAGE/debian/copyright
+++ b/PACKAGE/debian/copyright
@@ -47,7 +47,7 @@ For reference, below is the original copyright notice for Lynx (2.4.2).
 
 Files: aclocal.m4
 License: other-BSD
-Copyright: 1997-2015,2016 by Thomas E. Dickey
+Copyright: 1997-2016,2017 by Thomas E. Dickey
     Permission to use, copy, modify, and distribute this software and its
     documentation for any purpose and without fee is hereby granted,
     provided that the above copyright notice appear in all copies and that
diff --git a/PACKAGE/lynx-newssl.iss b/PACKAGE/lynx-newssl.iss
new file mode 100644
index 0000000..965a542
--- /dev/null
+++ b/PACKAGE/lynx-newssl.iss
@@ -0,0 +1,11 @@
+; $LynxId: lynx-newssl.iss,v 1.1 2017/04/27 00:19:42 tom Exp $
+;
+; This is an installer for Lynx built with "new" OpenSSL (1.1.x).
+;
+; The script assumes environment variables have been set, e.g., to point to
+; data which is used by the installer (see "lynx.lss" for details).
+
+#define SetupBaseName "lynx-newssl"
+#define SourceExeName "lynx-newssl.exe"
+
+#include "lynx.iss"
diff --git a/PACKAGE/lynx-oldssl.iss b/PACKAGE/lynx-oldssl.iss
new file mode 100644
index 0000000..6c18ef8
--- /dev/null
+++ b/PACKAGE/lynx-oldssl.iss
@@ -0,0 +1,11 @@
+; $LynxId: lynx-oldssl.iss,v 1.1 2017/04/27 00:20:10 tom Exp $
+;
+; This is an installer for Lynx built with "old" OpenSSL (before 1.1.x).
+;
+; The script assumes environment variables have been set, e.g., to point to
+; data which is used by the installer (see "lynx.lss" for details).
+
+#define SetupBaseName "lynx-oldssl"
+#define SourceExeName "lynx-oldssl.exe"
+
+#include "lynx.iss"
diff --git a/PACKAGE/lynx.iss b/PACKAGE/lynx.iss
index acb43c0..d5c44b8 100644
--- a/PACKAGE/lynx.iss
+++ b/PACKAGE/lynx.iss
@@ -1,4 +1,4 @@
-; $LynxId: lynx.iss,v 1.16 2016/04/11 00:42:33 tom Exp $
+; $LynxId: lynx.iss,v 1.17 2017/01/02 02:22:38 tom Exp $
 ; vile:ts=2 sw=2 notabinsert
 ;
 ; This is the BASE script for different flavors of the installer for Lynx.
@@ -90,7 +90,7 @@ AppName={#MyAppName}
 #emit 'VersionInfoVersion=' + LYNX_TARGET1
 AppVerName={#MyAppVerName}
 AppPublisher={#MyAppPublisher}
-AppCopyright=� 1997-2015,2016, Thomas E. Dickey
+AppCopyright=� 1997-2016,2017, Thomas E. Dickey
 AppPublisherURL={#MyAppURL}
 AppSupportURL={#MyAppURL}
 AppUpdatesURL={#MyAppURL}
diff --git a/PACKAGE/lynx.nsi b/PACKAGE/lynx.nsi
index 192f7d1..08cb9c9 100644
--- a/PACKAGE/lynx.nsi
+++ b/PACKAGE/lynx.nsi
@@ -1,4 +1,4 @@
-; $LynxId: lynx.nsi,v 1.31 2016/11/15 09:04:25 tom Exp $
+; $LynxId: lynx.nsi,v 1.34 2017/04/29 12:47:15 tom Exp $
 ; Script originally generated with the Venis Install Wizard, but customized.
 ; The Inno Setup script is preferred; but this can be built via cross-compiling.
 
@@ -9,8 +9,8 @@
 !define VERSION_EPOCH "2"
 !define VERSION_MAJOR "8"
 !define VERSION_MINOR "9"
-!define VERSION_LEVEL "1011"
-!define VERSION_PATCH "dev.11"
+!define VERSION_LEVEL "1013"
+!define VERSION_PATCH "dev.13"
 
 !define SUBKEY "Lynx"
 
@@ -28,7 +28,7 @@ SetCompressor /SOLID lzma
 
 VIAddVersionKey ProductName "${SUBKEY}"
 VIAddVersionKey CompanyName "http://invisible-island.net/lynx"
-VIAddVersionKey LegalCopyright "� 1997-2015,2016, Thomas E. Dickey"
+VIAddVersionKey LegalCopyright "� 1997-2016,2017, Thomas E. Dickey"
 VIAddVersionKey FileDescription "Lynx Installer (MinGW)"
 VIAddVersionKey FileVersion "${VERSION}"
 VIAddVersionKey ProductVersion "${VERSION}"
diff --git a/PACKAGE/lynx.spec b/PACKAGE/lynx.spec
index a93c497..1445aeb 100644
--- a/PACKAGE/lynx.spec
+++ b/PACKAGE/lynx.spec
@@ -1,8 +1,8 @@
-# $LynxId: lynx.spec,v 1.38 2016/11/15 09:04:25 tom Exp $
+# $LynxId: lynx.spec,v 1.40 2017/04/29 12:47:15 tom Exp $
 Summary: A text-based Web browser
 Name: lynx
 Version: 2.8.9
-Release: dev.11
+Release: dev.13
 License: GPLv2
 Group: Applications/Internet
 Source: lynx%{version}%{release}.tgz
diff --git a/PACKAGE/version.iss b/PACKAGE/version.iss
index 281ab3c..a2b5727 100644
--- a/PACKAGE/version.iss
+++ b/PACKAGE/version.iss
@@ -1,7 +1,7 @@
 ; version used for Inno Setup files.
 
 ; $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$
-#define LYNX_VERSION "2.8.9dev.11"
+#define LYNX_VERSION "2.8.9dev.13"
 
 ; most-recent full release and target
 #define LYNX_RELEASE "2.8.9"
diff --git a/WWW/Library/Implementation/HTAABrow.c b/WWW/Library/Implementation/HTAABrow.c
index f1d3c31..4bc1add 100644
--- a/WWW/Library/Implementation/HTAABrow.c
+++ b/WWW/Library/Implementation/HTAABrow.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTAABrow.c,v 1.40 2013/11/28 11:11:05 tom Exp $
+ * $LynxId: HTAABrow.c,v 1.42 2016/11/24 23:57:57 tom Exp $
  *
  * MODULE							HTAABrow.c
  *		BROWSER SIDE ACCESS AUTHORIZATION MODULE
@@ -150,8 +150,6 @@ void HTAAForwardAuth_set(const char *scheme_name,
     if ((HTAAForwardAuth = typecallocn(char, len)) == 0)
 	  outofmem(__FILE__, "HTAAForwardAuth_set");
 
-    assert(HTAAForwardAuth != 0);
-
     strcpy(HTAAForwardAuth, "Authorization: ");
     if (scheme_name) {
 	strcat(HTAAForwardAuth, scheme_name);
@@ -196,8 +194,6 @@ static HTAAServer *HTAAServer_new(const char *hostname,
     if ((server = typecalloc(HTAAServer)) == 0)
 	  outofmem(__FILE__, "HTAAServer_new");
 
-    assert(server != NULL);
-
     server->hostname = NULL;
     server->portnumber = (portnumber > 0 ? portnumber : 80);
     server->IsProxy = (BOOLEAN) IsProxy;
@@ -399,8 +395,6 @@ static HTAASetup *HTAASetup_new(HTAAServer *server, char *ctemplate,
     if ((setup = typecalloc(HTAASetup)) == 0)
 	outofmem(__FILE__, "HTAASetup_new");
 
-    assert(setup != NULL);
-
     setup->retry = NO;
     setup->server = server;
     setup->ctemplate = NULL;
@@ -523,8 +517,6 @@ static HTAARealm *HTAARealm_new(HTList *realm_table,
 	if ((realm = typecalloc(HTAARealm)) == 0)
 	      outofmem(__FILE__, "HTAARealm_new");
 
-	assert(realm != NULL);
-
 	realm->realmname = NULL;
 	realm->username = NULL;
 	realm->password = NULL;
@@ -540,6 +532,72 @@ static HTAARealm *HTAARealm_new(HTList *realm_table,
     return realm;
 }
 
+BOOL HTAA_HaveUserinfo(const char *hostname)
+{
+    int gen_delims = 0;
+    char *my_info = NULL;
+    char *at_sign = HTSkipToAt(StrAllocCopy(my_info, hostname), &gen_delims);
+
+    free(my_info);
+    return (at_sign != NULL && gen_delims == 0) ? TRUE : FALSE;
+}
+
+/*
+ * If there is userinfo in the hostname string, update the realm to use that
+ * information.  The command-line "-auth" option will override this.
+ */
+static void fill_in_userinfo(HTAARealm *realm, const char *hostname)
+{
+    int gen_delims = 0;
+    char *my_info = NULL;
+    char *at_sign = HTSkipToAt(StrAllocCopy(my_info, hostname), &gen_delims);
+
+    if (at_sign != NULL && gen_delims == 0) {
+	char *colon;
+
+	*at_sign = '\0';
+	if ((colon = StrChr(my_info, ':')) != 0) {
+	    *colon++ = '\0';
+	}
+	if (non_empty(my_info)) {
+	    char *msg;
+	    BOOL prior = non_empty(realm->username);
+
+	    if (prior && strcmp(realm->username, my_info)) {
+		msg = 0;
+		HTSprintf0(&msg,
+			   gettext("username for realm %s changed from %s to %s"),
+			   realm->realmname,
+			   realm->username,
+			   my_info);
+		HTAlert(msg);
+		free(msg);
+		FREE(realm->username);
+		StrAllocCopy(realm->username, my_info);
+	    } else if (!prior) {
+		StrAllocCopy(realm->username, my_info);
+	    }
+	    if (non_empty(colon)) {
+		prior = non_empty(realm->password);
+		if (prior && strcmp(realm->password, colon)) {
+		    msg = 0;
+		    HTSprintf0(&msg,
+			       gettext("password for realm %s user %s changed"),
+			       realm->realmname,
+			       realm->username);
+		    HTAlert(msg);
+		    free(msg);
+		    FREE(realm->password);
+		    StrAllocCopy(realm->password, colon);
+		} else if (!prior) {
+		    StrAllocCopy(realm->password, colon);
+		}
+	    }
+	}
+    }
+    free(my_info);
+}
+
 /***************** Basic and Pubkey Authentication ************************/
 
 /* static						compose_auth_string()
@@ -548,6 +606,7 @@ static HTAARealm *HTAARealm_new(HTList *realm_table,
  *		PROMPTS FOR USERNAME AND PASSWORD IF NEEDED
  *
  * ON ENTRY:
+ *	hostname	may include user- and password information
  *	scheme		is either HTAA_BASIC or HTAA_PUBKEY.
  *	setup		is the current server setup.
  *	IsProxy		should be TRUE if this is a proxy.
@@ -563,7 +622,10 @@ static HTAARealm *HTAARealm_new(HTList *realm_table,
  *	returned by AA package needs to (or should) be freed.
  *
  */
-static char *compose_auth_string(HTAAScheme scheme, HTAASetup * setup, int IsProxy)
+static char *compose_auth_string(const char *hostname,
+				 HTAAScheme scheme,
+				 HTAASetup * setup,
+				 int IsProxy)
 {
     char *cleartext = NULL;	/* Cleartext presentation */
     char *ciphertext = NULL;	/* Encrypted presentation */
@@ -581,9 +643,12 @@ static char *compose_auth_string(HTAAScheme scheme, HTAASetup * setup, int IsPro
 
     FREE(compose_auth_stringResult);	/* From previous call */
 
-    if ((scheme != HTAA_BASIC && scheme != HTAA_PUBKEY) || !setup ||
-	!setup->scheme_specifics || !setup->scheme_specifics[scheme] ||
-	!setup->server || !setup->server->realms)
+    if ((scheme != HTAA_BASIC && scheme != HTAA_PUBKEY) ||
+	!(setup &&
+	  setup->scheme_specifics &&
+	  setup->scheme_specifics[scheme] &&
+	  setup->server &&
+	  setup->server->realms))
 	return NULL;
 
     realmname = HTAssocList_lookup(setup->scheme_specifics[scheme], "realm");
@@ -591,9 +656,11 @@ static char *compose_auth_string(HTAAScheme scheme, HTAASetup * setup, int IsPro
 	return NULL;
 
     realm = HTAARealm_lookup(setup->server->realms, realmname);
+    setup->retry |= HTAA_HaveUserinfo(hostname);
+
     if (!(realm &&
-	  realm->username && *realm->username &&
-	  realm->password) || setup->retry) {
+	  non_empty(realm->username) &&
+	  non_empty(realm->password)) || setup->retry) {
 	if (!realm) {
 	    CTRACE((tfp, "%s `%s' %s\n",
 		    "compose_auth_string: realm:", realmname,
@@ -601,6 +668,7 @@ static char *compose_auth_string(HTAAScheme scheme, HTAASetup * setup, int IsPro
 	    realm = HTAARealm_new(setup->server->realms,
 				  realmname, NULL, NULL);
 	}
+	fill_in_userinfo(realm, hostname);
 	/*
 	 * The template should be either the '*' global for everything on the
 	 * server (always true for proxy authorization setups), or a path for
@@ -625,12 +693,7 @@ static char *compose_auth_string(HTAAScheme scheme, HTAASetup * setup, int IsPro
 	    setup->server->portnumber != 80) {
 	    HTSprintf0(&thePort, ":%d", setup->server->portnumber);
 	}
-	/*
-	 * Set up the message for the username prompt, and then issue the
-	 * prompt.  The default username is included in the call to the
-	 * prompting function, but the password is NULL-ed and always replaced. 
-	 * - FM
-	 */
+
 	HTSprintf0(&msg, gettext("Username for '%s' at %s '%s%s':"),
 		   realm->realmname,
 		   (IsProxy ? "proxy" : "server"),
@@ -638,13 +701,18 @@ static char *compose_auth_string(HTAAScheme scheme, HTAASetup * setup, int IsPro
 		   NonNull(thePort));
 	FREE(proxiedHost);
 	FREE(thePort);
-	StrAllocCopy(username, realm->username);
-	password = NULL;
+	if (non_empty(realm->username)) {
+	    StrAllocCopy(username, realm->username);
+	}
+	if (non_empty(realm->password)) {
+	    StrAllocCopy(password, realm->password);
+	}
 	HTPromptUsernameAndPassword(msg, &username, &password, IsProxy);
 
 	FREE(msg);
 	FREE(realm->username);
 	FREE(realm->password);
+
 	realm->username = username;
 	realm->password = password;
 
@@ -679,8 +747,6 @@ static char *compose_auth_string(HTAAScheme scheme, HTAASetup * setup, int IsPro
     if ((cleartext = typecallocn(char, len)) == 0)
 	  outofmem(__FILE__, "compose_auth_string");
 
-    assert(cleartext != NULL);
-
     if (realm->username)
 	strcpy(cleartext, realm->username);
     else
@@ -892,7 +958,7 @@ char *HTAA_composeAuth(const char *hostname,
 	switch (scheme = HTAA_selectScheme(proxy_setup)) {
 	case HTAA_BASIC:
 	case HTAA_PUBKEY:
-	    auth_string = compose_auth_string(scheme, proxy_setup, IsProxy);
+	    auth_string = compose_auth_string(hostname, scheme, proxy_setup, IsProxy);
 	    break;
 	case HTAA_KERBEROS_V4:
 	    /* OTHER AUTHENTICATION ROUTINES ARE CALLED HERE */
@@ -927,8 +993,6 @@ char *HTAA_composeAuth(const char *hostname,
 	if ((HTAA_composeAuthResult = typecallocn(char, len)) == 0)
 	      outofmem(__FILE__, "HTAA_composeAuth");
 
-	assert(HTAA_composeAuthResult != NULL);
-
 	strcpy(HTAA_composeAuthResult, "Proxy-Authorization: ");
 
     } else {
@@ -971,7 +1035,7 @@ char *HTAA_composeAuth(const char *hostname,
 	switch (scheme = HTAA_selectScheme(current_setup)) {
 	case HTAA_BASIC:
 	case HTAA_PUBKEY:
-	    auth_string = compose_auth_string(scheme, current_setup, IsProxy);
+	    auth_string = compose_auth_string(hostname, scheme, current_setup, IsProxy);
 	    break;
 	case HTAA_KERBEROS_V4:
 	    /* OTHER AUTHENTICATION ROUTINES ARE CALLED HERE */
@@ -1007,8 +1071,6 @@ char *HTAA_composeAuth(const char *hostname,
 	if ((HTAA_composeAuthResult = typecallocn(char, len)) == 0)
 	      outofmem(__FILE__, "HTAA_composeAuth");
 
-	assert(HTAA_composeAuthResult != NULL);
-
 	strcpy(HTAA_composeAuthResult, "Authorization: ");
     }
 
@@ -1109,8 +1171,6 @@ BOOL HTAA_shouldRetryWithAuth(char *start_of_headers,
 			if (!scheme_specifics)
 			    outofmem(__FILE__, "HTAA_shouldRetryWithAuth");
 
-			assert(scheme_specifics != NULL);
-
 			for (i = 0; i < HTAA_MAX_SCHEMES; i++)
 			    scheme_specifics[i] = NULL;
 		    }
diff --git a/WWW/Library/Implementation/HTAABrow.h b/WWW/Library/Implementation/HTAABrow.h
index 064f11e..f151deb 100644
--- a/WWW/Library/Implementation/HTAABrow.h
+++ b/WWW/Library/Implementation/HTAABrow.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTAABrow.h,v 1.16 2010/10/27 00:13:53 tom Exp $
+ * $LynxId: HTAABrow.h,v 1.17 2016/11/24 23:32:22 tom Exp $
  *
  *                          BROWSER SIDE ACCESS AUTHORIZATION MODULE
 
@@ -117,6 +117,11 @@ extern "C" {
     extern void HTClearHTTPAuthInfo(void);
 
 /*
+ * Check if a hostname-string contains user information.
+ */
+    extern BOOL HTAA_HaveUserinfo(const char *hostname);
+
+/*
 
 Enabling Gateway httpds to Forward Authorization
 
diff --git a/WWW/Library/Implementation/HTAAProt.c b/WWW/Library/Implementation/HTAAProt.c
index 0324381..d5117f1 100644
--- a/WWW/Library/Implementation/HTAAProt.c
+++ b/WWW/Library/Implementation/HTAAProt.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTAAProt.c,v 1.33 2013/11/28 11:11:05 tom Exp $
+ * $LynxId: HTAAProt.c,v 1.34 2016/11/24 15:29:50 tom Exp $
  *
  * MODULE							HTAAProt.c
  *		PROTECTION FILE PARSING MODULE
@@ -346,8 +346,6 @@ static HTAAProt *HTAAProt_new(const char *cur_docname,
 	if ((prot = typecalloc(HTAAProt)) == 0)
 	      outofmem(__FILE__, "HTAAProt_new");
 
-	assert(prot != NULL);
-
 	prot->ctemplate = NULL;
 	prot->filename = NULL;
 	prot->uid_name = NULL;
@@ -362,8 +360,6 @@ static HTAAProt *HTAAProt_new(const char *cur_docname,
 	    if ((cache_item = typecalloc(HTAAProtCache)) == 0)
 		outofmem(__FILE__, "HTAAProt_new");
 
-	    assert(cache_item != NULL);
-
 	    cache_item->prot = prot;
 	    cache_item->prot_filename = NULL;
 	    StrAllocCopy(cache_item->prot_filename, prot_filename);
diff --git a/WWW/Library/Implementation/HTAAUtil.c b/WWW/Library/Implementation/HTAAUtil.c
index f7ed67c..1be26f9 100644
--- a/WWW/Library/Implementation/HTAAUtil.c
+++ b/WWW/Library/Implementation/HTAAUtil.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTAAUtil.c,v 1.35 2013/05/03 20:32:37 tom Exp $
+ * $LynxId: HTAAUtil.c,v 1.36 2016/11/24 15:29:50 tom Exp $
  *
  * MODULE							HTAAUtil.c
  *		COMMON PARTS OF ACCESS AUTHORIZATION MODULE
@@ -488,8 +488,6 @@ void HTAA_setupReader(char *start_of_headers,
     if (buffer == NULL)
 	outofmem(__FILE__, "HTAA_setupReader");
 
-    assert(buffer != NULL);
-
 #ifdef LY_FIND_LEAKS
     atexit(FreeHTAAUtil);
 #endif
diff --git a/WWW/Library/Implementation/HTAccess.c b/WWW/Library/Implementation/HTAccess.c
index be142e8..4c2c1be 100644
--- a/WWW/Library/Implementation/HTAccess.c
+++ b/WWW/Library/Implementation/HTAccess.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTAccess.c,v 1.79 2013/11/28 11:11:05 tom Exp $
+ * $LynxId: HTAccess.c,v 1.80 2016/11/24 15:29:50 tom Exp $
  *
  *		Access Manager					HTAccess.c
  *		==============
@@ -1283,8 +1283,6 @@ BOOL HTSearch(const char *keywords,
     if (escaped == NULL)
 	outofmem(__FILE__, "HTSearch");
 
-    assert(escaped != NULL);
-
     StrAllocCopy(address, here->isIndexAction);
 
     /*
diff --git a/WWW/Library/Implementation/HTAnchor.c b/WWW/Library/Implementation/HTAnchor.c
index 616b69c..ee0a008 100644
--- a/WWW/Library/Implementation/HTAnchor.c
+++ b/WWW/Library/Implementation/HTAnchor.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTAnchor.c,v 1.76 2013/11/28 11:34:24 tom Exp $
+ * $LynxId: HTAnchor.c,v 1.77 2016/11/24 15:29:50 tom Exp $
  *
  *	Hypertext "Anchor" Object				HTAnchor.c
  *	==========================
@@ -86,8 +86,6 @@ static HTParentAnchor0 *HTParentAnchor0_new(const char *address,
     if (newAnchor == NULL)
 	outofmem(__FILE__, "HTParentAnchor0_new");
 
-    assert(newAnchor != NULL);
-
     newAnchor->parent = newAnchor;	/* self */
     StrAllocCopy(newAnchor->address, address);
     newAnchor->adult_hash = (HASH_TYPE) hash;
@@ -102,8 +100,6 @@ static HTParentAnchor *HTParentAnchor_new(HTParentAnchor0 *parent)
     if (newAnchor == NULL)
 	outofmem(__FILE__, "HTParentAnchor_new");
 
-    assert(newAnchor != NULL);
-
     newAnchor->parent = parent;	/* cross reference */
     parent->info = newAnchor;	/* cross reference */
     newAnchor->address = parent->address;	/* copy pointer */
@@ -124,8 +120,6 @@ static HTChildAnchor *HTChildAnchor_new(HTParentAnchor0 *parent)
     if (p == NULL)
 	outofmem(__FILE__, "HTChildAnchor_new");
 
-    assert(p != NULL);
-
     p->parent = parent;		/* parent reference */
     return p;
 }
@@ -138,8 +132,6 @@ static HTChildAnchor *HText_pool_ChildAnchor_new(HTParentAnchor *parent)
     if (p == NULL)
 	outofmem(__FILE__, "HText_pool_ChildAnchor_new");
 
-    assert(p != NULL);
-
     p->parent = parent->parent;	/* parent reference */
     return p;
 }
@@ -1315,8 +1307,6 @@ LYUCcharset *HTAnchor_getUCInfoStage(HTParentAnchor *me,
 	    if (stages == NULL)
 		outofmem(__FILE__, "HTAnchor_getUCInfoStage");
 
-	    assert(stages != NULL);
-
 	    for (i = 0; i < UCT_STAGEMAX; i++) {
 		stages->s[i].C.MIMEname = "";
 		stages->s[i].LYhndl = -1;
diff --git a/WWW/Library/Implementation/HTAnchor.h b/WWW/Library/Implementation/HTAnchor.h
index c804aff..e06ed01 100644
--- a/WWW/Library/Implementation/HTAnchor.h
+++ b/WWW/Library/Implementation/HTAnchor.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTAnchor.h,v 1.37 2013/10/02 23:21:55 tom Exp $
+ * $LynxId: HTAnchor.h,v 1.38 2017/02/10 22:26:48 tom Exp $
  *
  *	Hypertext "Anchor" Object				     HTAnchor.h
  *	==========================
@@ -104,6 +104,7 @@ extern "C" {
 #ifdef EXP_HTTP_HEADERS
 	HTChunk http_headers;
 #endif
+	BOOL no_content_encoding;	/* server did not use C-T? */
 	char *content_type_params;	/* Content-Type (with parameters if any) */
 	char *content_type;	/* Content-Type */
 	char *content_language;	/* Content-Language */
diff --git a/WWW/Library/Implementation/HTAssoc.c b/WWW/Library/Implementation/HTAssoc.c
index 22c1126..831b196 100644
--- a/WWW/Library/Implementation/HTAssoc.c
+++ b/WWW/Library/Implementation/HTAssoc.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTAssoc.c,v 1.10 2010/04/29 09:34:03 tom Exp $
+ * $LynxId: HTAssoc.c,v 1.11 2016/11/24 15:29:50 tom Exp $
  *
  * MODULE							HTAssoc.c
  *	    ASSOCIATION LIST FOR STORING NAME-VALUE PAIRS.
@@ -55,8 +55,6 @@ void HTAssocList_add(HTAssocList *alist,
 	if (!(assoc = (HTAssoc *) malloc(sizeof(HTAssoc))))
 	      outofmem(__FILE__, "HTAssoc_add");
 
-	assert(assoc != NULL);
-
 	assoc->name = NULL;
 	assoc->value = NULL;
 
diff --git a/WWW/Library/Implementation/HTAtom.c b/WWW/Library/Implementation/HTAtom.c
index 3a96ba4..914a7f3 100644
--- a/WWW/Library/Implementation/HTAtom.c
+++ b/WWW/Library/Implementation/HTAtom.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTAtom.c,v 1.19 2013/11/28 11:11:05 tom Exp $
+ * $LynxId: HTAtom.c,v 1.20 2016/11/24 15:29:50 tom Exp $
  *
  *			Atoms: Names to numbers			HTAtom.c
  *			=======================
@@ -82,14 +82,10 @@ HTAtom *HTAtom_for(const char *string)
     if (a == NULL)
 	outofmem(__FILE__, "HTAtom_for");
 
-    assert(a != NULL);
-
     a->name = (char *) malloc(strlen(string) + 1);
     if (a->name == NULL)
 	outofmem(__FILE__, "HTAtom_for");
 
-    assert(a->name != NULL);
-
     strcpy(a->name, string);
     a->next = hash_table[hash];	/* Put onto the head of list */
     hash_table[hash] = a;
diff --git a/WWW/Library/Implementation/HTBTree.c b/WWW/Library/Implementation/HTBTree.c
index 3a76550..f595bae 100644
--- a/WWW/Library/Implementation/HTBTree.c
+++ b/WWW/Library/Implementation/HTBTree.c
@@ -24,8 +24,6 @@ HTBTree *HTBTree_new(HTComparer comp)
     if (tree == NULL)
 	outofmem(__FILE__, "HTBTree_new");
 
-    assert(tree != NULL);
-
     tree->compare = comp;
     tree->top = NULL;
 
@@ -146,8 +144,6 @@ void HTBTree_add(HTBTree *tree,
 	if (tree->top == NULL)
 	    outofmem(__FILE__, "HTBTree_add");
 
-	assert(tree->top != NULL);
-
 	tree->top->up = NULL;
 	tree->top->object = object;
 	tree->top->left = NULL;
@@ -173,8 +169,6 @@ void HTBTree_add(HTBTree *tree,
 		    if (father_of_element->left == NULL)
 			outofmem(__FILE__, "HTBTree_add");
 
-		    assert(father_of_element->left != NULL);
-
 		    added_element = father_of_element->left;
 		    added_element->up = father_of_element;
 		    added_element->object = object;
@@ -192,7 +186,6 @@ void HTBTree_add(HTBTree *tree,
 
 		    if (father_of_element->right == NULL)
 			outofmem(__FILE__, "HTBTree_add");
-		    assert(father_of_element->right != NULL);
 
 		    added_element = father_of_element->right;
 		    added_element->up = father_of_element;
diff --git a/WWW/Library/Implementation/HTChunk.c b/WWW/Library/Implementation/HTChunk.c
index 2ea36c8..6b67011 100644
--- a/WWW/Library/Implementation/HTChunk.c
+++ b/WWW/Library/Implementation/HTChunk.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTChunk.c,v 1.27 2012/02/07 11:28:44 tom Exp $
+ * $LynxId: HTChunk.c,v 1.28 2016/11/24 15:29:50 tom Exp $
  *
  *		Chunk handling:	Flexible arrays
  *		===============================
@@ -48,8 +48,6 @@ HTChunk *HTChunkCreateMayFail(int grow, int failok)
 	}
     }
 
-    assert(ch != NULL);
-
     HTChunkInit(ch, grow);
     ch->failok = failok;
     return ch;
@@ -65,8 +63,6 @@ HTChunk *HTChunkCreate2(int grow, size_t needed)
     if (ch == NULL)
 	outofmem(__FILE__, "HTChunkCreate2");
 
-    assert(ch != NULL);
-
     HTChunkInit(ch, grow);
     if (needed-- > 0) {
 	/* Round up */
diff --git a/WWW/Library/Implementation/HTFTP.c b/WWW/Library/Implementation/HTFTP.c
index 49af182..03781a6 100644
--- a/WWW/Library/Implementation/HTFTP.c
+++ b/WWW/Library/Implementation/HTFTP.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTFTP.c,v 1.126 2014/07/24 22:08:24 tom Exp $
+ * $LynxId: HTFTP.c,v 1.128 2016/11/24 23:43:55 tom Exp $
  *
  *			File Transfer Protocol (FTP) Client
  *			for a WorldWideWeb browser
@@ -309,9 +309,6 @@ char *HTVMS_name(const char *nn,
     if (!filename || !nodename)
 	outofmem(__FILE__, "HTVMSname");
 
-    assert(filename != NULL);
-    assert(nodename != NULL);
-
     strcpy(filename, fn);
     strcpy(nodename, "");	/* On same node?  Yes if node names match */
     if (StrNCmp(nn, "localhost", 9)) {
@@ -823,8 +820,6 @@ static int get_connection(const char *arg,
 	con = typecalloc(connection);
 	if (con == NULL)
 	    outofmem(__FILE__, "get_connection");
-
-	assert(con != NULL);
     }
     con->socket = -1;
 
@@ -875,7 +870,7 @@ static int get_connection(const char *arg,
 		    HTSprintf0(&tmp, gettext("Enter password for user %s@%s:"),
 			       username, p1);
 		    FREE(user_entered_password);
-		    user_entered_password = HTPromptPassword(tmp);
+		    user_entered_password = HTPromptPassword(tmp, NULL);
 
 		}		/* else we already know the password */
 		password = user_entered_password;
@@ -2283,8 +2278,6 @@ static EntryInfo *parse_dir_entry(char *entry,
     if (entry_info == NULL)
 	outofmem(__FILE__, "parse_dir_entry");
 
-    assert(entry_info != NULL);
-
     entry_info->display = TRUE;
 
     switch (server_type) {
diff --git a/WWW/Library/Implementation/HTFile.c b/WWW/Library/Implementation/HTFile.c
index 1da1d19..ffb2332 100644
--- a/WWW/Library/Implementation/HTFile.c
+++ b/WWW/Library/Implementation/HTFile.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTFile.c,v 1.144 2014/12/08 01:38:05 tom Exp $
+ * $LynxId: HTFile.c,v 1.146 2017/04/27 20:51:05 tom Exp $
  *
  *			File Access				HTFile.c
  *			===========
@@ -556,8 +556,6 @@ void HTSetSuffix5(const char *suffix,
 	    if (suff == NULL)
 		outofmem(__FILE__, "HTSetSuffix");
 
-	    assert(suff != NULL);
-
 	    if (!HTSuffixes) {
 		HTSuffixes = HTList_new();
 #ifdef LY_FIND_LEAKS
@@ -2505,7 +2503,7 @@ static int decompressAndParse(HTParentAnchor *anchor,
 		    gzfp = gzopen(localname, BIN_R);
 
 		    CTRACE((tfp, "HTLoadFile: gzopen of `%s' gives %p\n",
-			    localname, gzfp));
+			    localname, (void *) gzfp));
 		}
 		internal_decompress = cftGzip;
 	    } else if (isDOWNLOAD(cftDeflate)) {
@@ -2584,7 +2582,7 @@ static int decompressAndParse(HTParentAnchor *anchor,
 			gzfp = gzopen(localname, BIN_R);
 
 			CTRACE((tfp, "HTLoadFile: gzopen of `%s' gives %p\n",
-				localname, gzfp));
+				localname, (void *) gzfp));
 		    }
 		    internal_decompress = cftGzip;
 		}
diff --git a/WWW/Library/Implementation/HTFormat.c b/WWW/Library/Implementation/HTFormat.c
index 5485041..1ba5f19 100644
--- a/WWW/Library/Implementation/HTFormat.c
+++ b/WWW/Library/Implementation/HTFormat.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTFormat.c,v 1.84 2016/04/26 09:11:03 tom Exp $
+ * $LynxId: HTFormat.c,v 1.85 2016/11/24 15:29:50 tom Exp $
  *
  *		Manage different file formats			HTFormat.c
  *		=============================
@@ -96,7 +96,6 @@ void HTSetPresentation(const char *representation,
     if (pres == NULL)
 	outofmem(__FILE__, "HTSetPresentation");
 
-    assert(pres != NULL);
     assert(representation != NULL);
 
     CTRACE2(TRACE_CFG,
@@ -159,8 +158,6 @@ void HTSetConversion(const char *representation_in,
     if (pres == NULL)
 	outofmem(__FILE__, "HTSetConversion");
 
-    assert(pres != NULL);
-
     CTRACE2(TRACE_CFG,
 	    (tfp,
 	     "HTSetConversion rep_in=%s, rep_out=%s, qual=%f\n",
@@ -1874,8 +1871,6 @@ HTStream *HTNetToText(HTStream *sink)
     if (me == NULL)
 	outofmem(__FILE__, "NetToText");
 
-    assert(me != NULL);
-
     me->isa = &NetToTextClass;
 
     me->had_cr = NO;
diff --git a/WWW/Library/Implementation/HTGopher.c b/WWW/Library/Implementation/HTGopher.c
index a8c8c43..4828a78 100644
--- a/WWW/Library/Implementation/HTGopher.c
+++ b/WWW/Library/Implementation/HTGopher.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTGopher.c,v 1.63 2016/10/15 01:11:44 tom Exp $
+ * $LynxId: HTGopher.c,v 1.65 2016/11/24 16:38:54 tom Exp $
  *
  *			GOPHER ACCESS				HTGopher.c
  *			=============
@@ -692,8 +692,6 @@ static void de_escape(char *command, const char *selector)
     if (command == NULL)
 	outofmem(__FILE__, "HTLoadGopher");
 
-    assert(command != NULL);
-
     q = command;
     while (*p) {		/* Decode hex */
 	if (*p == HEX_ESCAPE) {
@@ -1030,8 +1028,6 @@ static int parse_cso_fields(char *buf,
 			    outofmem(__FILE__, "HTLoadCSO");
 			}
 
-			assert(newf != NULL);
-
 			if (last)
 			    last->next = newf;
 			else
@@ -1517,7 +1513,7 @@ static int HTLoadCSO(const char *arg,
     Target = HTStreamStack(format_in,
 			   format_out,
 			   sink, anAnchor);
-    if (!Target || Target == NULL) {
+    if (Target == NULL) {
 	char *temp = 0;
 
 	HTSprintf0(&temp, CANNOT_CONVERT_I_TO_O,
@@ -1803,8 +1799,6 @@ static int HTLoadGopher(const char *arg,
 	    if (command == NULL)
 		outofmem(__FILE__, "HTLoadGopher");
 
-	    assert(command != NULL);
-
 	    de_escape(command, selector);	/* Bug fix TBL 921208 */
 
 	    strcat(command, "\t");
@@ -1839,8 +1833,6 @@ static int HTLoadGopher(const char *arg,
 	    if (command == NULL)
 		outofmem(__FILE__, "HTLoadGopher");
 
-	    assert(command != NULL);
-
 	    de_escape(command, selector);	/* Bug fix TBL 921208 */
 
 	    strcpy(command, "query ");
@@ -1860,8 +1852,6 @@ static int HTLoadGopher(const char *arg,
 	    if (command == NULL)
 		outofmem(__FILE__, "HTLoadGopher");
 
-	    assert(command != NULL);
-
 	    de_escape(command, selector);
 	}
 	FREE(p1);
diff --git a/WWW/Library/Implementation/HTGroup.c b/WWW/Library/Implementation/HTGroup.c
index e2e3979..c1172f0 100644
--- a/WWW/Library/Implementation/HTGroup.c
+++ b/WWW/Library/Implementation/HTGroup.c
@@ -108,8 +108,6 @@ static AddressDefList *parse_address_part(FILE *fp)
 	if (ref == NULL)
 	    outofmem(__FILE__, "parse_address_part");
 
-	assert(ref != NULL);
-
 	ref->name = NULL;
 	ref->translation = NULL;
 	StrAllocCopy(ref->name, HTlex_buffer);
@@ -167,8 +165,6 @@ static UserDefList *parse_user_part(FILE *fp)
 	if (ref == NULL)
 	    outofmem(__FILE__, "parse_user_part");
 
-	assert(ref != NULL);
-
 	ref->name = NULL;
 	ref->translation = NULL;
 	StrAllocCopy(ref->name, HTlex_buffer);
@@ -243,8 +239,6 @@ static Item *parse_item(FILE *fp)
     if (item == NULL)
 	outofmem(__FILE__, "parse_item");
 
-    assert(item != NULL);
-
     item->user_def_list = user_def_list;
     item->address_def_list = address_def_list;
     return item;
@@ -293,8 +287,6 @@ GroupDef *HTAA_parseGroupDef(FILE *fp)
     if (group_def == NULL)
 	outofmem(__FILE__, "HTAA_parseGroupDef");
 
-    assert(group_def != NULL);
-
     group_def->group_name = NULL;
     group_def->item_list = item_list;
 
diff --git a/WWW/Library/Implementation/HTList.c b/WWW/Library/Implementation/HTList.c
index 996bea3..d12cd38 100644
--- a/WWW/Library/Implementation/HTList.c
+++ b/WWW/Library/Implementation/HTList.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTList.c,v 1.19 2013/01/04 00:31:27 tom Exp $
+ * $LynxId: HTList.c,v 1.20 2016/11/24 15:29:50 tom Exp $
  *
  *	A small List class					      HTList.c
  *	==================
@@ -23,8 +23,6 @@ HTList *HTList_new(void)
     if ((newList = typeMalloc(HTList)) == NULL)
 	  outofmem(__FILE__, "HTList_new");
 
-    assert(newList != NULL);
-
     newList->object = NULL;
     newList->next = NULL;
 
@@ -134,8 +132,6 @@ void HTList_addObject(HTList *me, void *newObject)
 	if ((newNode = typeMalloc(HTList)) == NULL)
 	      outofmem(__FILE__, "HTList_addObject");
 
-	assert(newNode != NULL);
-
 	newNode->object = newObject;
 	newNode->next = me->next;
 	me->next = newNode;
@@ -192,8 +188,6 @@ void HTList_insertObjectAt(HTList *me, void *newObject,
 	    if ((newNode = typeMalloc(HTList)) == NULL)
 		  outofmem(__FILE__, "HTList_addObjectAt");
 
-	    assert(newNode != NULL);
-
 	    newNode->object = newObject;
 	    newNode->next = temp;
 	    if (prevNode)
diff --git a/WWW/Library/Implementation/HTMIME.c b/WWW/Library/Implementation/HTMIME.c
index 6f6391c..909fbb5 100644
--- a/WWW/Library/Implementation/HTMIME.c
+++ b/WWW/Library/Implementation/HTMIME.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTMIME.c,v 1.90 2015/12/16 01:13:50 tom Exp $
+ * $LynxId: HTMIME.c,v 1.93 2017/02/10 22:27:42 tom Exp $
  *
  *			MIME Message Parse			HTMIME.c
  *			==================
@@ -261,6 +261,8 @@ static int pumpData(HTStream *me)
      */
     CTRACE((tfp, "...address{%s}\n", me->anchor->address));
     method = HTContentTypeToCompressType(me->anchor->content_type_params);
+    if (isEmpty(me->anchor->content_encoding))
+	me->anchor->no_content_encoding = TRUE;
     if ((method != cftNone)
 	&& isEmpty(me->anchor->content_encoding)
 	&& (new_content = UncompressedContentType(me, method)) != 0) {
@@ -1081,12 +1083,7 @@ static void HTMIME_put_character(HTStream *me, int c)
       begin_transparent:
     case MIME_TRANSPARENT:
 	me->anchor->actual_length += 1;
-	if (me->anchor->content_length == 0 ||
-	    (me->anchor->content_length >= me->anchor->actual_length)) {
-	    (me->targetClass.put_character) (me->target, c);
-	} else {
-	    (me->targetClass.put_character) (me->target, c);
-	}
+	(me->targetClass.put_character) (me->target, c);
 	return;
 
 	/* RFC-2616 describes chunked transfer coding */
@@ -2170,8 +2167,6 @@ HTStream *HTMIMEConvert(HTPresentation *pres,
     if (me == NULL)
 	outofmem(__FILE__, "HTMIMEConvert");
 
-    assert(me != NULL);
-
     me->isa = &HTMIME;
     me->sink = sink;
     me->anchor = anchor;
@@ -2319,8 +2314,6 @@ static void HTmmdec_base64(char **t,
     if ((buf = typeMallocn(char, strlen(s) * 3 + 1)) == 0)
 	  outofmem(__FILE__, "HTmmdec_base64");
 
-    assert(buf != NULL);
-
     for (bp = buf; *s; s += 4) {
 	val = 0;
 	if (s[2] == '=')
@@ -2363,8 +2356,6 @@ static void HTmmdec_quote(char **t,
     if ((buf = typeMallocn(char, strlen(s) + 1)) == 0)
 	  outofmem(__FILE__, "HTmmdec_quote");
 
-    assert(buf != NULL);
-
     for (bp = buf; *s;) {
 	if (*s == '=') {
 	    cval = 0;
@@ -2409,8 +2400,6 @@ void HTmmdecode(char **target,
     if ((buf = typeMallocn(char, strlen(source) + 1)) == 0)
 	  outofmem(__FILE__, "HTmmdecode");
 
-    assert(buf != NULL);
-
     for (s = source, u = buf; *s;) {
 	if (!strncasecomp(s, "=?ISO-2022-JP?B?", 16)) {
 	    base64 = 1;
@@ -2486,8 +2475,6 @@ int HTrjis(char **t,
     if ((buf = typeMallocn(char, strlen(s) * 2 + 1)) == 0)
 	  outofmem(__FILE__, "HTrjis");
 
-    assert(buf != NULL);
-
     for (p = buf; *s;) {
 	if (!kanji && s[0] == '$' && (s[1] == '@' || s[1] == 'B')) {
 	    if (HTmaybekanji((int) s[2], (int) s[3])) {
diff --git a/WWW/Library/Implementation/HTMLGen.c b/WWW/Library/Implementation/HTMLGen.c
index 60d7746..361ad69 100644
--- a/WWW/Library/Implementation/HTMLGen.c
+++ b/WWW/Library/Implementation/HTMLGen.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTMLGen.c,v 1.40 2013/11/28 11:13:46 tom Exp $
+ * $LynxId: HTMLGen.c,v 1.41 2016/11/24 15:29:50 tom Exp $
  *
  *		HTML Generator
  *		==============
@@ -630,8 +630,6 @@ HTStructured *HTMLGenerator(HTStream *output)
     if (me == NULL)
 	outofmem(__FILE__, "HTMLGenerator");
 
-    assert(me != NULL);
-
     me->isa = &HTMLGeneration;
 
     me->target = output;
@@ -715,8 +713,6 @@ HTStream *HTPlainToHTML(HTPresentation *pres GCC_UNUSED,
     if (me == NULL)
 	outofmem(__FILE__, "PlainToHTML");
 
-    assert(me != NULL);
-
     me->isa = (const HTStructuredClass *) &PlainToHTMLConversion;
 
     /*
diff --git a/WWW/Library/Implementation/HTNews.c b/WWW/Library/Implementation/HTNews.c
index 669f3a9..6e38b51 100644
--- a/WWW/Library/Implementation/HTNews.c
+++ b/WWW/Library/Implementation/HTNews.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTNews.c,v 1.70 2013/11/28 11:13:46 tom Exp $
+ * $LynxId: HTNews.c,v 1.71 2016/11/24 23:43:38 tom Exp $
  *
  *			NEWS ACCESS				HTNews.c
  *			===========
@@ -501,7 +501,7 @@ static NNTPAuthResult HTHandleAuthInfo(char *host)
 	while (tries) {
 	    if (PassWord == NULL) {
 		HTSprintf0(&msg, gettext("Password for news host '%s':"), host);
-		PassWord = HTPromptPassword(msg);
+		PassWord = HTPromptPassword(msg, NULL);
 		FREE(msg);
 		if (!(PassWord && *PassWord)) {
 		    FREE(PassWord);
diff --git a/WWW/Library/Implementation/HTParse.c b/WWW/Library/Implementation/HTParse.c
index 3483380..c5d947f 100644
--- a/WWW/Library/Implementation/HTParse.c
+++ b/WWW/Library/Implementation/HTParse.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTParse.c,v 1.75 2014/02/12 23:15:42 tom Exp $
+ * $LynxId: HTParse.c,v 1.78 2016/11/24 15:29:50 tom Exp $
  *
  *		Parse HyperText Document Address		HTParse.c
  *		================================
@@ -265,17 +265,23 @@ static void convert_to_idna(char *host)
     size_t length = strlen(host);
     char *endhost = host + length;
     char *buffer = malloc(length + 1);
+    char *params = malloc(length + 1);
     char *output = NULL;
     char *src, *dst;
     int code;
     int hi, lo;
 
-    if (buffer != 0) {
+    if (buffer != NULL && params != NULL) {
 	code = TRUE;
+	*params = '\0';
 	for (dst = buffer, src = host; src < endhost; ++dst) {
 	    int ch = *src++;
 
-	    if (ch == HEX_ESCAPE) {
+	    if (RFC_3986_GEN_DELIMS(ch)) {
+		strcpy(params, src - 1);
+		*dst = '\0';
+		break;
+	    } else if (ch == HEX_ESCAPE) {
 		if ((src + 1) < endhost
 		    && (hi = hex_decode(src[0])) >= 0
 		    && (lo = hex_decode(src[1])) >= 0) {
@@ -296,16 +302,18 @@ static void convert_to_idna(char *host)
 	    code = idna_to_ascii_8z(buffer, &output, IDNA_USE_STD3_ASCII_RULES);
 	    if (code == IDNA_SUCCESS) {
 		strcpy(host, output);
+		strcat(host, params);
 	    } else {
 		CTRACE((tfp, "convert_to_idna: `%s': %s\n",
 			buffer,
 			idna_strerror((Idna_rc) code)));
 	    }
 	    if (output)
-		idn_free (output);
+		idn_free(output);
 	}
-	free(buffer);
     }
+    free(buffer);
+    free(params);
 }
 #define MIN_PARSE 80
 #else
@@ -378,8 +386,6 @@ char *HTParse(const char *aName,
     result = tail = (char *) LYalloca(need);
     if (result == NULL) {
 	outofmem(__FILE__, "HTParse");
-
-	assert(result != NULL);
     }
     *result = '\0';
     name = result + len;
@@ -473,8 +479,6 @@ char *HTParse(const char *aName,
 		*tail++ = '/';
 	    }
 	    strcpy(tail, given.host ? given.host : related.host);
-#define CLEAN_URLS
-#ifdef CLEAN_URLS
 	    /*
 	     * Ignore default port numbers, and trailing dots on FQDNs, which
 	     * will only cause identical addresses to look different.  (related
@@ -483,9 +487,12 @@ char *HTParse(const char *aName,
 	    {
 		char *p2, *h;
 		int portnumber;
+		int gen_delims = 0;
 
-		if ((p2 = StrChr(result, '@')) != NULL)
+		if ((p2 = HTSkipToAt(result, &gen_delims)) != NULL
+		    && gen_delims == 0) {
 		    tail = (p2 + 1);
+		}
 		p2 = HTParsePort(result, &portnumber);
 		if (p2 != NULL && acc_method != NULL) {
 		    /*
@@ -539,7 +546,6 @@ char *HTParse(const char *aName,
 	     */
 	    convert_to_idna(tail);
 #endif
-#endif /* CLEAN_URLS */
 	}
     }
 
@@ -777,8 +783,6 @@ const char *HTParseAnchor(const char *aName)
 
 	    if (name == NULL) {
 		outofmem(__FILE__, "HTParseAnchor");
-
-		assert(name != NULL);
 	    }
 	    strcpy(name, aName);
 	    scan(name, &given);
@@ -1000,8 +1004,6 @@ char *HTRelative(const char *aName,
 	if (result == NULL)
 	    outofmem(__FILE__, "HTRelative");
 
-	assert(result != NULL);
-
 	result[0] = '\0';
 	for (; levels; levels--)
 	    strcat(result, "../");
@@ -1062,8 +1064,6 @@ char *HTEscape(const char *str,
     if (result == NULL)
 	outofmem(__FILE__, "HTEscape");
 
-    assert(result != NULL);
-
     for (q = result, p = str; *p; p++) {
 	unsigned char a = UCH(TOASCII(*p));
 
@@ -1105,8 +1105,6 @@ char *HTEscapeUnsafe(const char *str)
     if (result == NULL)
 	outofmem(__FILE__, "HTEscapeUnsafe");
 
-    assert(result != NULL);
-
     for (q = result, p = str; *p; p++) {
 	unsigned char a = UCH(TOASCII(*p));
 
@@ -1148,8 +1146,6 @@ char *HTEscapeSP(const char *str,
     if (result == NULL)
 	outofmem(__FILE__, "HTEscape");
 
-    assert(result != NULL);
-
     for (q = result, p = str; *p; p++) {
 	unsigned char a = UCH(TOASCII(*p));
 
@@ -1318,8 +1314,6 @@ void HTMake822Word(char **str,
     if (result == NULL)
 	outofmem(__FILE__, "HTMake822Word");
 
-    assert(result != NULL);
-
     q = result;
     if (quoted)
 	*q++ = '"';
diff --git a/WWW/Library/Implementation/HTParse.h b/WWW/Library/Implementation/HTParse.h
index 3f427c4..ce1bff6 100644
--- a/WWW/Library/Implementation/HTParse.h
+++ b/WWW/Library/Implementation/HTParse.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTParse.h,v 1.21 2010/09/24 22:45:23 tom Exp $
+ * $LynxId: HTParse.h,v 1.22 2016/11/23 21:06:50 tom Exp $
  *				HTParse:  URL parsing in the WWW Library
  *				HTPARSE
  *
@@ -17,6 +17,11 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+#define RFC_3986_UNRESERVED(c) (isalnum(UCH(c)) || strchr("-._~", UCH(c)) != 0)
+#define RFC_3986_GEN_DELIMS(c) ((c) != 0 && strchr(":/?#[]@", UCH(c)) != 0)
+#define RFC_3986_SUB_DELIMS(c) ((c) != 0 && strchr("!$&'()*+,;=", UCH(c)) != 0)
+
 /*
  *  The following are flag bits which may be ORed together to form
  *  a number to give the 'wanted' argument to HTParse.
diff --git a/WWW/Library/Implementation/HTPlain.c b/WWW/Library/Implementation/HTPlain.c
index 57ca237..1dc63b4 100644
--- a/WWW/Library/Implementation/HTPlain.c
+++ b/WWW/Library/Implementation/HTPlain.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTPlain.c,v 1.59 2014/12/08 01:11:15 tom Exp $
+ * $LynxId: HTPlain.c,v 1.60 2016/11/24 15:29:50 tom Exp $
  *
  *		Plain text object		HTWrite.c
  *		=================
@@ -577,8 +577,6 @@ HTStream *HTPlainPresent(HTPresentation *pres GCC_UNUSED, HTParentAnchor *anchor
     if (me == NULL)
 	outofmem(__FILE__, "HTPlain_new");
 
-    assert(me != NULL);
-
     me->isa = &HTPlain;
 
     HTPlain_lastraw = -1;
diff --git a/WWW/Library/Implementation/HTRules.c b/WWW/Library/Implementation/HTRules.c
index a9b6e9d..b1e263b 100644
--- a/WWW/Library/Implementation/HTRules.c
+++ b/WWW/Library/Implementation/HTRules.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTRules.c,v 1.45 2013/11/28 11:14:29 tom Exp $
+ * $LynxId: HTRules.c,v 1.46 2016/11/24 15:29:50 tom Exp $
  *
  *	Configuration manager for Hypertext Daemon		HTRules.c
  *	==========================================
@@ -91,8 +91,6 @@ int HTAddRule(HTRuleOp op, const char *pattern,
     if (temp == NULL)
 	outofmem(__FILE__, "HTAddRule");
 
-    assert(temp != NULL);
-
     if (equiv) {		/* Two operands */
 	char *pEquiv = NULL;
 
diff --git a/WWW/Library/Implementation/HTString.c b/WWW/Library/Implementation/HTString.c
index 3eb94a1..187f1b1 100644
--- a/WWW/Library/Implementation/HTString.c
+++ b/WWW/Library/Implementation/HTString.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTString.c,v 1.72 2013/11/28 11:14:49 tom Exp $
+ * $LynxId: HTString.c,v 1.73 2016/11/24 15:29:50 tom Exp $
  *
  *	Case-independent string comparison		HTString.c
  *
@@ -306,7 +306,6 @@ char *HTSACopy(char **dest,
 	    *dest = (char *) malloc(size);
 	    if (*dest == NULL)
 		outofmem(__FILE__, "HTSACopy");
-	    assert(*dest != NULL);
 	    MemCpy(*dest, src, size);
 	}
     } else {
@@ -327,13 +326,11 @@ char *HTSACat(char **dest,
 	    *dest = (char *) realloc(*dest, length + strlen(src) + 1);
 	    if (*dest == NULL)
 		outofmem(__FILE__, "HTSACat");
-	    assert(*dest != NULL);
 	    strcpy(*dest + length, src);
 	} else {
 	    *dest = (char *) malloc(strlen(src) + 1);
 	    if (*dest == NULL)
 		outofmem(__FILE__, "HTSACat");
-	    assert(*dest != NULL);
 	    strcpy(*dest, src);
 	}
     }
@@ -367,7 +364,6 @@ char *HTSACopy_extra(char **dest,
 	    *dest = (char *) malloc(size + EXTRA_SIZE);
 	    if (*dest == NULL)
 		outofmem(__FILE__, "HTSACopy_extra");
-	    assert(*dest != NULL);
 	    *(EXTRA_TYPE *) (void *) (*dest) = size;
 	    *dest += EXTRA_SIZE;
 	}
@@ -587,7 +583,6 @@ static char *HTAlloc(char *ptr, size_t length)
 	ptr = (char *) malloc(length);
     if (ptr == 0)
 	outofmem(__FILE__, "HTAlloc");
-    assert(ptr != NULL);
     return ptr;
 }
 
@@ -699,8 +694,6 @@ PUBLIC_IF_FIND_LEAKS char *StrAllocVsprintf(char **pstr,
     if ((fmt_ptr = malloc(need * NUM_WIDTH)) == 0
 	|| (tmp_ptr = malloc(tmp_len)) == 0) {
 	outofmem(__FILE__, "StrAllocVsprintf");
-	assert(fmt_ptr != NULL);
-	assert(tmp_ptr != NULL);
     }
 #endif /* SAVE_TIME_NOT_SPACE */
 
@@ -973,8 +966,6 @@ char *HTQuoteParameter(const char *parameter)
     if (result == NULL)
 	outofmem(__FILE__, "HTQuoteParameter");
 
-    assert(result != NULL);
-
     n = 0;
 #if (USE_QUOTED_PARAMETER == 1)
     /*
@@ -1232,13 +1223,9 @@ void HTSABCopy(bstring **dest, const char *src,
 	if ((t = (bstring *) malloc(sizeof(bstring))) == NULL)
 	      outofmem(__FILE__, "HTSABCopy");
 
-	assert(t != NULL);
-
 	if ((t->str = typeMallocn(char, need)) == NULL)
 	      outofmem(__FILE__, "HTSABCopy");
 
-	assert(t->str != NULL);
-
 	MemCpy(t->str, src, len);
 	t->len = len;
 	t->str[t->len] = '\0';
@@ -1286,15 +1273,11 @@ void HTSABCat(bstring **dest, const char *src,
 	    if ((t = typecalloc(bstring)) == NULL)
 		  outofmem(__FILE__, "HTSACat");
 
-	    assert(t != NULL);
-
 	    t->str = typeMallocn(char, need);
 	}
 	if (t->str == NULL)
 	    outofmem(__FILE__, "HTSACat");
 
-	assert(t->str != NULL);
-
 	MemCpy(t->str + t->len, src, len);
 	t->len += len;
 	t->str[t->len] = '\0';
diff --git a/WWW/Library/Implementation/HTTCP.c b/WWW/Library/Implementation/HTTCP.c
index 5449195..f164871 100644
--- a/WWW/Library/Implementation/HTTCP.c
+++ b/WWW/Library/Implementation/HTTCP.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTTCP.c,v 1.135 2016/11/15 09:31:58 tom Exp $
+ * $LynxId: HTTCP.c,v 1.137 2017/01/02 02:11:14 tom Exp $
  *
  *			Generic Communication Code		HTTCP.c
  *			==========================
@@ -1562,7 +1562,7 @@ static void really_getaddrinfo(const char *host,
 			       STATUSES * statuses,
 			       void **result)
 {
-    LYNX_ADDRINFO hints, *res;
+    LYNX_ADDRINFO hints, *res = 0;
     int error;
 
     memset(&hints, 0, sizeof(hints));
@@ -1593,6 +1593,7 @@ static void really_getaddrinfo(const char *host,
 	    statuses->h_length = (int) (((LYNX_ADDRINFO *) (*result))->ai_addrlen);
 	}
     }
+    free(res);
 }
 #endif /* NSL_FORK */
 
diff --git a/WWW/Library/Implementation/HTTP.c b/WWW/Library/Implementation/HTTP.c
index 08ed0c0..581cb5e 100644
--- a/WWW/Library/Implementation/HTTP.c
+++ b/WWW/Library/Implementation/HTTP.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTTP.c,v 1.160 2016/11/15 09:31:41 tom Exp $
+ * $LynxId: HTTP.c,v 1.163 2016/11/24 23:56:50 tom Exp $
  *
  * HyperText Tranfer Protocol	- Client implementation		HTTP.c
  * ==========================
@@ -528,11 +528,7 @@ int ws_netread(int fd, char *buf, int len)
  *     host          = IP-literal / IPv4address / reg-name
  *     reg-name      = *( unreserved / pct-encoded / sub-delims )
  */
-#define RFC_3986_UNRESERVED(c) (isalnum(UCH(c)) || strchr("-._~", UCH(c)) != 0)
-#define RFC_3986_GEN_DELIMS(c) ((c) != 0 && strchr(":/?#[]@", UCH(c)) != 0)
-#define RFC_3986_SUB_DELIMS(c) ((c) != 0 && strchr("!$&'()*+,;=", UCH(c)) != 0)
-
-static char *skip_user_passwd(char *host)
+char *HTSkipToAt(char *host, int *gen_delims)
 {
     char *result = 0;
     char *s = host;
@@ -540,10 +536,9 @@ static char *skip_user_passwd(char *host)
     int ch;
     int last = -1;
 
+    *gen_delims = 0;
     while ((ch = UCH(*s)) != '\0') {
-	if (ch == '\0') {
-	    break;
-	} else if (ch == ':') {
+	if (ch == ':') {
 	    if (pass++)
 		break;
 	} else if (ch == '@') {
@@ -551,6 +546,7 @@ static char *skip_user_passwd(char *host)
 		result = s;
 	    break;
 	} else if (RFC_3986_GEN_DELIMS(ch)) {
+	    *gen_delims += 1;
 	    if (!RFC_3986_GEN_DELIMS(s[1]))
 		break;
 	} else if (ch == '%') {
@@ -584,16 +580,15 @@ static char *fake_hostname(char *auth)
  */
 void strip_userid(char *host, int parse_only)
 {
+    int gen_delims = 0;
     char *p1 = host;
-    char *p2 = skip_user_passwd(host);
+    char *p2 = HTSkipToAt(host, &gen_delims);
 
     if (p2 != 0) {
 	char *msg = NULL;
 	char *auth = NULL;
-	char *save = NULL;
 	char *fake = NULL;
 	char *p3 = p2;
-	int gen_delims = 0;
 	int sub_delims = 0;
 	int my_delimit = UCH(*p2);
 	int do_trimming = (my_delimit == '@');
@@ -606,7 +601,6 @@ void strip_userid(char *host, int parse_only)
 	 * Trailing "gen-delims" demonstrates that there is no user/password.
 	 */
 	while ((p3 != host) && RFC_3986_GEN_DELIMS(p3[-1])) {
-	    ++gen_delims;
 	    *(--p3) = '\0';
 	}
 	/*
@@ -616,15 +610,21 @@ void strip_userid(char *host, int parse_only)
 	    ++sub_delims;
 	    *(--p3) = '\0';
 	}
-	CTRACE((tfp, "trimmed:%s\n", host));
-	StrAllocCopy(save, host);
+	/*
+	 * Trim trailing "gen-delims" from the real hostname.
+	 */
+	for (p3 = p2; *p3 != '\0'; ++p3) {
+	    if (RFC_3986_GEN_DELIMS(*p3)) {
+		*p3 = '\0';
+		break;
+	    }
+	}
+	CTRACE((tfp, "trim auth:    result:`%s'\n", host));
 
-	if (gen_delims || strcmp(save, auth)) {
-	    HTSprintf0(&msg,
-		       gettext("User/password may appear to be a hostname: '%s' (e.g, '%s')"),
-		       auth, save);
+	if (gen_delims || strcmp(host, auth)) {
 	    do_trimming = !gen_delims;
-	} else if (*host == '\0' && sub_delims) {
+	}
+	if (*host == '\0' && sub_delims) {
 	    HTSprintf0(&msg,
 		       gettext("User/password contains only punctuation: %s"),
 		       auth);
@@ -639,9 +639,9 @@ void strip_userid(char *host, int parse_only)
 	    while ((*p1++ = *p2++) != '\0') {
 		;
 	    }
+	    CTRACE((tfp, "trim host:    result:`%s'\n", host));
 	}
 	FREE(fake);
-	FREE(save);
 	FREE(auth);
 	FREE(msg);
     }
@@ -2308,7 +2308,9 @@ static int HTLoadHTTP(const char *arg,
 						 length, s, NO)) {
 
 			HTTP_NETCLOSE(s, handle);
-			if (dump_output_immediately && !authentication_info[0]) {
+			if (dump_output_immediately &&
+			    !HTAA_HaveUserinfo(HTParse(arg, "", PARSE_HOST)) &&
+			    !authentication_info[0]) {
 			    fprintf(stderr,
 				    "HTTP: Access authorization required.\n");
 			    fprintf(stderr,
diff --git a/WWW/Library/Implementation/HTUtils.h b/WWW/Library/Implementation/HTUtils.h
index 5c221cc..744557a 100644
--- a/WWW/Library/Implementation/HTUtils.h
+++ b/WWW/Library/Implementation/HTUtils.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTUtils.h,v 1.121 2016/11/15 09:26:37 tom Exp $
+ * $LynxId: HTUtils.h,v 1.122 2016/11/23 22:16:51 tom Exp $
  *
  * Utility macros for the W3 code library
  * MACROS FOR GENERAL USE
@@ -801,6 +801,7 @@ extern "C" {
 
     extern FILE *TraceFP(void);
 
+    extern char *HTSkipToAt(char *host, int *gen_delims);
     extern void strip_userid(char *host, int warn);
 
 #ifdef USE_SSL
diff --git a/WWW/Library/Implementation/HTWSRC.c b/WWW/Library/Implementation/HTWSRC.c
index 1136da0..fe42a65 100644
--- a/WWW/Library/Implementation/HTWSRC.c
+++ b/WWW/Library/Implementation/HTWSRC.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTWSRC.c,v 1.29 2013/05/01 22:32:59 tom Exp $
+ * $LynxId: HTWSRC.c,v 1.30 2016/11/24 15:29:50 tom Exp $
  *
  *			Parse WAIS Source file			HTWSRC.c
  *			======================
@@ -470,8 +470,6 @@ HTStream *HTWSRCConvert(HTPresentation *pres, HTParentAnchor *anchor,
     if (!me)
 	outofmem(__FILE__, "HTWSRCConvert");
 
-    assert(me != NULL);
-
     me->isa = &WSRCParserClass;
     me->target = HTML_new(anchor, pres->rep_out, sink);
 
diff --git a/WWW/Library/Implementation/SGML.c b/WWW/Library/Implementation/SGML.c
index 962d794..138ce33 100644
--- a/WWW/Library/Implementation/SGML.c
+++ b/WWW/Library/Implementation/SGML.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: SGML.c,v 1.155 2014/12/10 09:48:35 tom Exp $
+ * $LynxId: SGML.c,v 1.160 2017/01/01 00:56:18 Takeshi.Hataguchi Exp $
  *
  *			General SGML Parser code		SGML.c
  *			========================
@@ -19,9 +19,6 @@
 #include <SGML.h>
 #include <HTMLDTD.h>
 #include <HTAccess.h>
-#include <HTCJK.h>		/* FIXME: this doesn't belong in SGML.c */
-#include <UCMap.h>
-#include <UCDefs.h>
 #include <UCAux.h>
 
 #include <HTChunk.h>
@@ -1365,8 +1362,6 @@ static void start_element(HTStream *me)
 	if (N == NULL)
 	    outofmem(__FILE__, "start_element");
 
-	assert(N != NULL);
-
 	N->next = me->element_stack;
 	N->tag = new_tag;
 	me->element_stack = N;
@@ -3214,8 +3209,8 @@ static void SGML_character(HTStream *me, int c_in)
 		HTPassEightBitRaw &&
 		saved_char_in >=
 		LYlowest_eightbit[me->outUCLYhndl]) {
-		HTChunkPutUtf8Char(string,
-				   (UCode_t) (0xf000 | saved_char_in));
+		orig_HTChunkPutUtf8Char(string,
+					(UCode_t) (0xf000 | saved_char_in));
 	    } else {
 		HTChunkPutUtf8Char(string, clong);
 	    }
@@ -3624,8 +3619,8 @@ static void SGML_character(HTStream *me, int c_in)
 		HTPassEightBitRaw &&
 		saved_char_in >=
 		LYlowest_eightbit[me->outUCLYhndl]) {
-		HTChunkPutUtf8Char(string,
-				   (UCode_t) (0xf000 | saved_char_in));
+		orig_HTChunkPutUtf8Char(string,
+					(UCode_t) (0xf000 | saved_char_in));
 	    } else {
 		HTChunkPutUtf8Char(string, clong);
 	    }
@@ -3664,8 +3659,8 @@ static void SGML_character(HTStream *me, int c_in)
 		HTPassEightBitRaw &&
 		saved_char_in >=
 		LYlowest_eightbit[me->outUCLYhndl]) {
-		HTChunkPutUtf8Char(string,
-				   (UCode_t) (0xf000 | saved_char_in));
+		orig_HTChunkPutUtf8Char(string,
+					(UCode_t) (0xf000 | saved_char_in));
 	    } else {
 		HTChunkPutUtf8Char(string, clong);
 	    }
@@ -3708,8 +3703,8 @@ static void SGML_character(HTStream *me, int c_in)
 		HTPassEightBitRaw &&
 		saved_char_in >=
 		LYlowest_eightbit[me->outUCLYhndl]) {
-		HTChunkPutUtf8Char(string,
-				   (UCode_t) (0xf000 | saved_char_in));
+		orig_HTChunkPutUtf8Char(string,
+					(UCode_t) (0xf000 | saved_char_in));
 	    } else {
 		HTChunkPutUtf8Char(string, clong);
 	    }
@@ -4320,8 +4315,6 @@ HTStream *SGML_new(const SGML_dtd * dtd,
     if (!me)
 	outofmem(__FILE__, "SGML_begin");
 
-    assert(me != NULL);
-
     me->isa = &SGMLParser;
     me->string = HTChunkCreate(128);	/* Grow by this much */
     me->dtd = dtd;
@@ -4572,15 +4565,15 @@ unsigned char *EUC_TO_SJIS1(unsigned HI,
 			    unsigned LO,
 			    unsigned char *SJCODE)
 {
-    if (HI == 0x8E) {
-	unsigned char HI_data[2];
-	unsigned char LO_data[2];
+    unsigned char HI_data[2];
+    unsigned char LO_data[2];
 
-	HI_data[0] = UCH(HI);
-	LO_data[0] = UCH(LO);
+    HI_data[0] = UCH(HI);
+    LO_data[0] = UCH(LO);
+    if (HI == 0x8E) {
 	JISx0201TO0208_EUC(HI, LO, HI_data, LO_data);
     }
-    JIS_TO_SJIS1(UCH(HI & 0x7F), UCH(LO & 0x7F), SJCODE);
+    JIS_TO_SJIS1(UCH(HI_data[0] & 0x7F), UCH(LO_data[0] & 0x7F), SJCODE);
     return SJCODE;
 }
 
@@ -4872,7 +4865,6 @@ void TO_JIS(const unsigned char *arg,
 	outofmem(__FILE__, "TO_JIS");
 #endif
     TO_EUC(arg, euc);
-    is_EUC_JP(euc);
     EUC_TO_JIS(euc, jis, TO_KANJI, TO_ASCII);
 
     free(euc);
diff --git a/aclocal.m4 b/aclocal.m4
index e9e4a81..f76517c 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-dnl $LynxId: aclocal.m4,v 1.233 2016/04/16 00:48:40 tom Exp $
+dnl $LynxId: aclocal.m4,v 1.235 2017/04/27 09:15:35 tom Exp $
 dnl Macros for auto-configure script.
 dnl by Thomas E. Dickey <dickey at invisible-island.net>
 dnl and Jim Spath <jspath at mail.bcpl.lib.md.us>
@@ -12,7 +12,7 @@ dnl http://invisible-island.net/autoconf/autoconf.html
 dnl
 dnl ---------------------------------------------------------------------------
 dnl
-dnl Copyright 1997-2015,2016 by Thomas E. Dickey
+dnl Copyright 1997-2016,2017 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,
@@ -623,7 +623,7 @@ define([CF_ACVERSION_COMPARE],
 [ifelse([$8], , ,[$8])],
 [ifelse([$9], , ,[$9])])])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_ADD_CFLAGS version: 12 updated: 2015/04/12 15:39:00
+dnl CF_ADD_CFLAGS version: 13 updated: 2017/02/25 18:57:40
 dnl -------------
 dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS
 dnl The second parameter if given makes this macro verbose.
@@ -653,10 +653,10 @@ case $cf_fix_cppflags in
 				&& cf_fix_cppflags=yes
 
 			if test $cf_fix_cppflags = yes ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+				CF_APPEND_TEXT(cf_new_extra_cppflags,$cf_add_cflags)
 				continue
 			elif test "${cf_tst_cflags}" = "\"'" ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+				CF_APPEND_TEXT(cf_new_extra_cppflags,$cf_add_cflags)
 				continue
 			fi
 			;;
@@ -671,17 +671,17 @@ case $cf_fix_cppflags in
 				CF_REMOVE_DEFINE(CPPFLAGS,$CPPFLAGS,$cf_tst_cppflags)
 				;;
 			esac
-			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+			CF_APPEND_TEXT(cf_new_cppflags,$cf_add_cflags)
 			;;
 		esac
 		;;
 	(*)
-		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+		CF_APPEND_TEXT(cf_new_cflags,$cf_add_cflags)
 		;;
 	esac
 	;;
 (yes)
-	cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+	CF_APPEND_TEXT(cf_new_extra_cppflags,$cf_add_cflags)
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[[^"]]*"'\''//'`
 
@@ -694,17 +694,17 @@ done
 
 if test -n "$cf_new_cflags" ; then
 	ifelse([$2],,,[CF_VERBOSE(add to \$CFLAGS $cf_new_cflags)])
-	CFLAGS="$CFLAGS $cf_new_cflags"
+	CF_APPEND_TEXT(CFLAGS,$cf_new_cflags)
 fi
 
 if test -n "$cf_new_cppflags" ; then
 	ifelse([$2],,,[CF_VERBOSE(add to \$CPPFLAGS $cf_new_cppflags)])
-	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+	CF_APPEND_TEXT(CPPFLAGS,$cf_new_cppflags)
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 	ifelse([$2],,,[CF_VERBOSE(add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags)])
-	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+	CF_APPEND_TEXT(EXTRA_CPPFLAGS,$cf_new_extra_cppflags)
 fi
 
 AC_SUBST(EXTRA_CPPFLAGS)
@@ -1019,6 +1019,16 @@ You have the following choices:
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
+dnl CF_APPEND_TEXT version: 1 updated: 2017/02/25 18:58:55
+dnl --------------
+dnl use this macro for appending text without introducing an extra blank at
+dnl the beginning
+define([CF_APPEND_TEXT],
+[
+	test -n "[$]$1" && $1="[$]$1 "
+	$1="[$]{$1}$2"
+])dnl
+dnl ---------------------------------------------------------------------------
 dnl CF_ARG_DISABLE version: 3 updated: 1999/03/30 17:24:31
 dnl --------------
 dnl Allow user to disable a normally-on option.
@@ -1352,11 +1362,18 @@ if test "$USE_INCLUDED_LIBINTL" = yes ; then
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CC_ENV_FLAGS version: 2 updated: 2015/04/12 15:39:00
+dnl CF_CC_ENV_FLAGS version: 7 updated: 2017/02/25 18:57:40
 dnl ---------------
 dnl Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content
-dnl into CC.  This will not help with broken scripts that wrap the compiler with
-dnl options, but eliminates a more common category of user confusion.
+dnl into CC.  This will not help with broken scripts that wrap the compiler
+dnl with options, but eliminates a more common category of user confusion.
+dnl
+dnl In particular, it addresses the problem of being able to run the C
+dnl preprocessor in a consistent manner.
+dnl
+dnl Caveat: this also disallows blanks in the pathname for the compiler, but
+dnl the nuisance of having inconsistent settings for compiler and preprocessor
+dnl outweighs that limitation.
 AC_DEFUN([CF_CC_ENV_FLAGS],
 [
 # This should have been defined by AC_PROG_CC
@@ -1364,13 +1381,27 @@ AC_DEFUN([CF_CC_ENV_FLAGS],
 
 AC_MSG_CHECKING(\$CC variable)
 case "$CC" in
-(*[[\ \	]]-[[IUD]]*)
+(*[[\ \	]]-*)
 	AC_MSG_RESULT(broken)
 	AC_MSG_WARN(your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options)
 	# humor him...
-	cf_flags=`echo "$CC" | sed -e 's/^[[^ 	]]*[[ 	]]//'`
-	CC=`echo "$CC" | sed -e 's/[[ 	]].*//'`
-	CF_ADD_CFLAGS($cf_flags)
+	cf_prog=`echo "$CC" | sed -e 's/	/ /g' -e 's/[[ ]]* / /g' -e 's/[[ ]]*[[ ]]-[[^ ]].*//'`
+	cf_flags=`echo "$CC" | ${AWK:-awk} -v prog="$cf_prog" '{ printf("%s", substr([$]0,1+length(prog))); }'`
+	CC="$cf_prog"
+	for cf_arg in $cf_flags
+	do
+		case "x$cf_arg" in
+		(x-[[IUDfgOW]]*)
+			CF_ADD_CFLAGS($cf_arg)
+			;;
+		(*)
+			CC="$CC $cf_arg"
+			;;
+		esac
+	done
+	CF_VERBOSE(resulting CC: '$CC')
+	CF_VERBOSE(resulting CFLAGS: '$CFLAGS')
+	CF_VERBOSE(resulting CPPFLAGS: '$CPPFLAGS')
 	;;
 (*)
 	AC_MSG_RESULT(ok)
@@ -3077,7 +3108,7 @@ rm -rf conftest*
 AC_SUBST(EXTRA_CFLAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_GNUTLS version: 24 updated: 2015/04/15 19:08:48
+dnl CF_GNUTLS version: 25 updated: 2016/04/15 20:48:40
 dnl ---------
 dnl Check for gnutls library (TLS "is" SSL)
 dnl $1 = the [optional] directory in which the library may be found
@@ -3191,7 +3222,7 @@ AC_DEFUN([CF_GNUTLS],[
 	fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_GNU_SOURCE version: 6 updated: 2005/07/09 13:23:07
+dnl CF_GNU_SOURCE version: 7 updated: 2016/08/05 05:15:37
 dnl -------------
 dnl Check if we must define _GNU_SOURCE to get a reasonable value for
 dnl _XOPEN_SOURCE, upon which many POSIX definitions depend.  This is a defect
@@ -3218,7 +3249,20 @@ make an error
 	CPPFLAGS="$cf_save"
 	])
 ])
-test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
+
+if test "$cf_cv_gnu_source" = yes
+then
+AC_CACHE_CHECK(if we should also define _DEFAULT_SOURCE,cf_cv_default_source,[
+CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
+	AC_TRY_COMPILE([#include <sys/types.h>],[
+#ifdef _DEFAULT_SOURCE
+make an error
+#endif],
+		[cf_cv_default_source=no],
+		[cf_cv_default_source=yes])
+	])
+test "$cf_cv_default_source" = yes && CPPFLAGS="$CPPFLAGS -D_DEFAULT_SOURCE"
+fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_HEADER_PATH version: 13 updated: 2015/04/15 19:08:48
@@ -3358,7 +3402,7 @@ cf_save_CFLAGS="$cf_save_CFLAGS -we147"
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_LARGEFILE version: 9 updated: 2015/04/18 08:56:57
+dnl CF_LARGEFILE version: 10 updated: 2017/01/21 11:06:25
 dnl ------------
 dnl Add checks for large file support.
 AC_DEFUN([CF_LARGEFILE],[
@@ -3380,6 +3424,7 @@ ifdef([AC_FUNC_FSEEKO],[
 
 	AC_CACHE_CHECK(whether to use struct dirent64, cf_cv_struct_dirent64,[
 		AC_TRY_COMPILE([
+#pragma GCC diagnostic error "-Wincompatible-pointer-types"
 #include <sys/types.h>
 #include <dirent.h>
 		],[
@@ -3601,7 +3646,7 @@ AC_SUBST(MAKE_UPPER_TAGS)
 AC_SUBST(MAKE_LOWER_TAGS)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_MATH_LIB version: 8 updated: 2010/05/29 16:31:02
+dnl CF_MATH_LIB version: 9 updated: 2017/01/21 11:06:25
 dnl -----------
 dnl Checks for libraries.  At least one UNIX system, Apple Macintosh
 dnl Rhapsody 5.5, does not have -lm.  We cannot use the simpler
@@ -3612,6 +3657,7 @@ AC_CACHE_CHECK(if -lm needed for math functions,
 	cf_cv_need_libm,[
 	AC_TRY_LINK([
 	#include <stdio.h>
+	#include <stdlib.h>
 	#include <math.h>
 	],
 	[double x = rand(); printf("result = %g\n", ]ifelse([$2],,sin(x),$2)[)],
@@ -4665,11 +4711,11 @@ AC_SUBST(PROG_EXT)
 test -n "$PROG_EXT" && AC_DEFINE_UNQUOTED(PROG_EXT,"$PROG_EXT",[Define to the program extension (normally blank)])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_PROG_LINT version: 2 updated: 2009/08/12 04:43:14
+dnl CF_PROG_LINT version: 3 updated: 2016/05/22 15:25:54
 dnl ------------
 AC_DEFUN([CF_PROG_LINT],
 [
-AC_CHECK_PROGS(LINT, tdlint lint alint splint lclint)
+AC_CHECK_PROGS(LINT, lint cppcheck splint)
 AC_SUBST(LINT_OPTS)
 ])dnl
 dnl ---------------------------------------------------------------------------
@@ -5252,7 +5298,7 @@ AC_MSG_RESULT($cf_use_socks5p_h)
 test "$cf_use_socks5p_h" = yes && AC_DEFINE(INCLUDE_PROTOTYPES,1,[Define to 1 if needed to declare prototypes in socks headers])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_SRAND version: 12 updated: 2015/04/15 19:08:48
+dnl CF_SRAND version: 13 updated: 2016/09/05 12:39:46
 dnl --------
 dnl Check for functions similar to srand() and rand().  lrand48() and random()
 dnl return a 31-bit value, while rand() returns a value less than RAND_MAX
@@ -5307,7 +5353,7 @@ if test "$cf_cv_srand_func" != unknown ; then
 #include <limits.h>
 #endif
 		],[long x = $cf_cv_rand_max],,
-		[cf_cv_rand_max="(1L<<$cf_rand_max)-1"])
+		[cf_cv_rand_max="(1UL<<$cf_rand_max)-1"])
 	])
 
 	case $cf_cv_srand_func in
@@ -6540,7 +6586,7 @@ esac
 
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_XOPEN_SOURCE version: 50 updated: 2015/10/17 19:03:33
+dnl CF_XOPEN_SOURCE version: 52 updated: 2016/08/27 12:21:42
 dnl ---------------
 dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
 dnl or adapt to the vendor's definitions to get equivalent functionality,
@@ -6560,7 +6606,7 @@ case $host_os in
 (aix[[4-7]]*)
 	cf_xopen_source="-D_ALL_SOURCE"
 	;;
-(cygwin|msys)
+(msys)
 	cf_XOPEN_SOURCE=600
 	;;
 (darwin[[0-8]].*)
@@ -6588,7 +6634,7 @@ case $host_os in
 	cf_xopen_source="-D_SGI_SOURCE"
 	cf_XOPEN_SOURCE=
 	;;
-(linux*|gnu*|mint*|k*bsd*-gnu)
+(linux*|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin)
 	CF_GNU_SOURCE
 	;;
 (minix*)
@@ -6610,9 +6656,6 @@ case $host_os in
 (openbsd*)
 	# setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
 	;;
-(os2*)
-	cf_XOPEN_SOURCE=
-	;;
 (osf[[45]]*)
 	cf_xopen_source="-D_OSF_SOURCE"
 	;;
diff --git a/config.guess b/config.guess
index dcd5149..69ed3e5 100755
--- a/config.guess
+++ b/config.guess
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright 1992-2016 Free Software Foundation, Inc.
+#   Copyright 1992-2017 Free Software Foundation, Inc.
 
-timestamp='2016-01-01'
+timestamp='2017-03-05'
 
 # 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
@@ -50,7 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright 1992-2016 Free Software Foundation, Inc.
+Copyright 1992-2017 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -186,9 +186,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
 	esac
 	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
+	# to ELF recently (or will in the future) and ABI.
 	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax)
+	    earm*)
+		os=netbsdelf
+		;;
+	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
 			| grep -q __ELF__
@@ -237,6 +240,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
 	exit ;;
+    *:LibertyBSD:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
+	exit ;;
     *:ekkoBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
 	exit ;;
@@ -268,42 +275,42 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
 	case "$ALPHA_CPU_TYPE" in
 	    "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	    "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	    "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
+		UNAME_MACHINE=alpha ;;
 	    "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
+		UNAME_MACHINE=alphaev5 ;;
 	    "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
+		UNAME_MACHINE=alphaev56 ;;
 	    "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
+		UNAME_MACHINE=alphapca56 ;;
 	    "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
+		UNAME_MACHINE=alphapca57 ;;
 	    "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
+		UNAME_MACHINE=alphaev6 ;;
 	    "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
+		UNAME_MACHINE=alphaev67 ;;
 	    "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	    "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	    "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
+		UNAME_MACHINE=alphaev68 ;;
 	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
+		UNAME_MACHINE=alphaev69 ;;
 	    "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
+		UNAME_MACHINE=alphaev7 ;;
 	    "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
+		UNAME_MACHINE=alphaev79 ;;
 	esac
 	# A Pn.n version is a patched version.
 	# A Vn.n version is a released version.
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
 	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
 	exitcode=$?
 	trap '' 0
@@ -376,16 +383,16 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 	eval $set_cc_for_build
-	SUN_ARCH="i386"
+	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 [ "$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) | \
+		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
 		grep IS_64BIT_ARCH >/dev/null
 	    then
-		SUN_ARCH="x86_64"
+		SUN_ARCH=x86_64
 	    fi
 	fi
 	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
@@ -410,7 +417,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	exit ;;
     sun*:*:4.2BSD:*)
 	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+	test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3
 	case "`/bin/arch`" in
 	    sun3)
 		echo m68k-sun-sunos${UNAME_RELEASE}
@@ -635,13 +642,13 @@ EOF
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
 		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
 		    case "${sc_cpu_version}" in
-		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
 		      532)                      # CPU_PA_RISC2_0
 			case "${sc_kernel_bits}" in
-			  32) HP_ARCH="hppa2.0n" ;;
-			  64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+			  32) HP_ARCH=hppa2.0n ;;
+			  64) HP_ARCH=hppa2.0w ;;
+			  '') HP_ARCH=hppa2.0 ;;   # HP-UX 10.20
 			esac ;;
 		    esac
 		fi
@@ -680,11 +687,11 @@ EOF
 		    exit (0);
 		}
 EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		    (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
 		fi ;;
 	esac
-	if [ ${HP_ARCH} = "hppa2.0w" ]
+	if [ ${HP_ARCH} = hppa2.0w ]
 	then
 	    eval $set_cc_for_build
 
@@ -697,12 +704,12 @@ EOF
 	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
 	    # => hppa64-hp-hpux11.23
 
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+	    if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
 		grep -q __LP64__
 	    then
-		HP_ARCH="hppa2.0w"
+		HP_ARCH=hppa2.0w
 	    else
-		HP_ARCH="hppa64"
+		HP_ARCH=hppa64
 	    fi
 	fi
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
@@ -807,14 +814,14 @@ EOF
 	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
 	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
 	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
     5000:UNIX_System_V:4.*:*)
-	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
 	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
@@ -830,10 +837,11 @@ EOF
 	UNAME_PROCESSOR=`/usr/bin/uname -p`
 	case ${UNAME_PROCESSOR} in
 	    amd64)
-		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    *)
-		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+		UNAME_PROCESSOR=x86_64 ;;
+	    i386)
+		UNAME_PROCESSOR=i586 ;;
 	esac
+	echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
@@ -896,7 +904,7 @@ EOF
 	exit ;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
 	exit ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
@@ -919,7 +927,7 @@ EOF
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
 	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     arc:Linux:*:* | arceb:Linux:*:*)
@@ -993,6 +1001,9 @@ EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 	;;
+    mips64el:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     openrisc*:Linux:*:*)
 	echo or1k-unknown-linux-${LIBC}
 	exit ;;
@@ -1025,6 +1036,9 @@ EOF
     ppcle:Linux:*:*)
 	echo powerpcle-unknown-linux-${LIBC}
 	exit ;;
+    riscv32:Linux:*:* | riscv64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
 	exit ;;
@@ -1272,6 +1286,9 @@ EOF
     SX-8R:SUPER-UX:*:*)
 	echo sx8r-nec-superux${UNAME_RELEASE}
 	exit ;;
+    SX-ACE:SUPER-UX:*:*)
+	echo sxace-nec-superux${UNAME_RELEASE}
+	exit ;;
     Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 	exit ;;
@@ -1285,9 +1302,9 @@ EOF
 	    UNAME_PROCESSOR=powerpc
 	fi
 	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
-	    if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
 		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		    (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		    (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
 		    grep IS_64BIT_ARCH >/dev/null
 		then
 		    case $UNAME_PROCESSOR in
@@ -1309,7 +1326,7 @@ EOF
 	exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
 	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
+	if test "$UNAME_PROCESSOR" = x86; then
 		UNAME_PROCESSOR=i386
 		UNAME_MACHINE=pc
 	fi
@@ -1327,6 +1344,9 @@ EOF
     NSR-?:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
 	exit ;;
+    NSX-?:NONSTOP_KERNEL:*:*)
+	echo nsx-tandem-nsk${UNAME_RELEASE}
+	exit ;;
     *:NonStop-UX:*:*)
 	echo mips-compaq-nonstopux
 	exit ;;
@@ -1340,7 +1360,7 @@ EOF
 	# "uname -m" is not consistent, so use $cputype instead. 386
 	# is converted to i386 for consistency with other x86
 	# operating systems.
-	if test "$cputype" = "386"; then
+	if test "$cputype" = 386; then
 	    UNAME_MACHINE=i386
 	else
 	    UNAME_MACHINE="$cputype"
@@ -1382,7 +1402,7 @@ EOF
 	echo i386-pc-xenix
 	exit ;;
     i*86:skyos:*:*)
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'`
 	exit ;;
     i*86:rdos:*:*)
 	echo ${UNAME_MACHINE}-pc-rdos
@@ -1401,18 +1421,17 @@ esac
 cat >&2 <<EOF
 $0: unable to guess system type
 
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
+This script (version $timestamp), has failed to recognize the
+operating system you are using. If your script is old, overwrite
+config.guess and config.sub with the latest versions from:
 
   http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
 and
   http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
 
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches at gnu.org> in order to provide the needed
-information to handle your system.
+If $0 has already been updated, send the following data and any
+information you think might be pertinent to config-patches at gnu.org to
+provide the necessary information to handle your system.
 
 config.guess timestamp = $timestamp
 
diff --git a/config.sub b/config.sub
index da6d1b6..87abeab 100755
--- a/config.sub
+++ b/config.sub
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright 1992-2016 Free Software Foundation, Inc.
+#   Copyright 1992-2017 Free Software Foundation, Inc.
 
-timestamp='2016-01-01'
+timestamp='2017-02-07'
 
 # 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
@@ -67,7 +67,7 @@ Report bugs and patches to <config-patches at gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright 1992-2016 Free Software Foundation, Inc.
+Copyright 1992-2017 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -117,7 +117,7 @@ case $maybe_os in
   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
   linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
   knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
-  kopensolaris*-gnu* | \
+  kopensolaris*-gnu* | cloudabi*-eabi* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@@ -301,6 +301,7 @@ case $basic_machine in
 	| open8 | or1k | or1knd | or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
+	| pru \
 	| pyramid \
 	| riscv32 | riscv64 \
 	| rl78 | rx \
@@ -428,6 +429,7 @@ case $basic_machine in
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+	| pru-* \
 	| pyramid-* \
 	| riscv32-* | riscv64-* \
 	| rl78-* | romp-* | rs6000-* | rx-* \
@@ -643,6 +645,14 @@ case $basic_machine in
 		basic_machine=m68k-bull
 		os=-sysv3
 		;;
+	e500v[12])
+		basic_machine=powerpc-unknown
+		os=$os"spe"
+		;;
+	e500v[12]-*)
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=$os"spe"
+		;;
 	ebmon29k)
 		basic_machine=a29k-amd
 		os=-ebmon
@@ -938,6 +948,9 @@ case $basic_machine in
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
+	nsx-tandem)
+		basic_machine=nsx-tandem
+		;;
 	op50n-* | op60c-*)
 		basic_machine=hppa1.1-oki
 		os=-proelf
@@ -1022,7 +1035,7 @@ case $basic_machine in
 	ppc-* | ppcbe-*)
 		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
+	ppcle | powerpclittle)
 		basic_machine=powerpcle-unknown
 		;;
 	ppcle-* | powerpclittle-*)
@@ -1032,7 +1045,7 @@ case $basic_machine in
 		;;
 	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+	ppc64le | powerpc64little)
 		basic_machine=powerpc64le-unknown
 		;;
 	ppc64le-* | powerpc64little-*)
@@ -1382,14 +1395,14 @@ case $os in
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -bitrig* | -openbsd* | -solidbsd* \
+	      | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* | -cegcc* \
+	      | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
 	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+	      | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
 	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
@@ -1399,7 +1412,7 @@ case $os in
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
 	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
-	      | -onefs* | -tirtos*)
+	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1531,6 +1544,8 @@ case $os in
 		;;
 	-nacl*)
 		;;
+	-ios)
+		;;
 	-none)
 		;;
 	*)
@@ -1626,6 +1641,9 @@ case $basic_machine in
 	sparc-* | *-sun)
 		os=-sunos4.1.1
 		;;
+	pru-*)
+		os=-elf
+		;;
 	*-be)
 		os=-beos
 		;;
diff --git a/configure b/configure
index d8468ba..e1d071d 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in 2.8.9dev.9.
+# From configure.in 2.8.9dev.13.
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by Autoconf 2.52.20150926.
 #
@@ -1274,7 +1274,7 @@ rm conftest.sed
 
 PACKAGE=lynx
 # $Format: "VERSION=$ProjectVersion$"$
-VERSION=2.8.9dev.11
+VERSION=2.8.9dev.13
 
 echo "$as_me:1279: checking for DESTDIR" >&5
 echo $ECHO_N "checking for DESTDIR... $ECHO_C" >&6
@@ -2136,21 +2136,26 @@ esac
 echo "$as_me:2136: checking \$CC variable" >&5
 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
 case "$CC" in
-(*[\ \	]-[IUD]*)
+(*[\ \	]-*)
 	echo "$as_me:2140: result: broken" >&5
 echo "${ECHO_T}broken" >&6
 	{ echo "$as_me:2142: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
 echo "$as_me: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;}
 	# humor him...
-	cf_flags=`echo "$CC" | sed -e 's/^[^ 	]*[ 	]//'`
-	CC=`echo "$CC" | sed -e 's/[ 	].*//'`
+	cf_prog=`echo "$CC" | sed -e 's/	/ /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'`
+	cf_flags=`echo "$CC" | ${AWK:-awk} -v prog="$cf_prog" '{ printf("%s", substr($0,1+length(prog))); }'`
+	CC="$cf_prog"
+	for cf_arg in $cf_flags
+	do
+		case "x$cf_arg" in
+		(x-[IUDfgOW]*)
 
 cf_fix_cppflags=no
 cf_new_cflags=
 cf_new_cppflags=
 cf_new_extra_cppflags=
 
-for cf_add_cflags in $cf_flags
+for cf_add_cflags in $cf_arg
 do
 case $cf_fix_cppflags in
 (no)
@@ -2165,10 +2170,16 @@ case $cf_fix_cppflags in
 				&& cf_fix_cppflags=yes
 
 			if test $cf_fix_cppflags = yes ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			elif test "${cf_tst_cflags}" = "\"'" ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			fi
 			;;
@@ -2187,17 +2198,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
 				;;
 			esac
-			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+	cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+
 			;;
 		esac
 		;;
 	(*)
-		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+	test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+	cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+
 		;;
 	esac
 	;;
 (yes)
-	cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
@@ -2210,22 +2229,46 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
-	CFLAGS="$CFLAGS $cf_new_cflags"
+	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+	CFLAGS="${CFLAGS}$cf_new_cflags"
+
 fi
 
 if test -n "$cf_new_cppflags" ; then
 
-	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
-	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+
 fi
 
+			;;
+		(*)
+			CC="$CC $cf_arg"
+			;;
+		esac
+	done
+	test -n "$verbose" && echo "	resulting CC: '$CC'" 1>&6
+
+echo "${as_me:-configure}:2259: testing resulting CC: '$CC' ..." 1>&5
+
+	test -n "$verbose" && echo "	resulting CFLAGS: '$CFLAGS'" 1>&6
+
+echo "${as_me:-configure}:2263: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+
+	test -n "$verbose" && echo "	resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
+
+echo "${as_me:-configure}:2267: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+
 	;;
 (*)
-	echo "$as_me:2228: result: ok" >&5
+	echo "$as_me:2271: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
@@ -2236,7 +2279,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return=return
-echo "$as_me:2239: checking how to run the C preprocessor" >&5
+echo "$as_me:2282: checking how to run the C preprocessor" >&5
 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
@@ -2257,18 +2300,18 @@ do
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
-#line 2260 "configure"
+#line 2303 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2265: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2308: \"$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:2271: \$? = $ac_status" >&5
+  echo "$as_me:2314: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2291,17 +2334,17 @@ rm -f conftest.err conftest.$ac_ext
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
-#line 2294 "configure"
+#line 2337 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2298: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2341: \"$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:2304: \$? = $ac_status" >&5
+  echo "$as_me:2347: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2338,7 +2381,7 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:2341: result: $CPP" >&5
+echo "$as_me:2384: result: $CPP" >&5
 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -2348,18 +2391,18 @@ do
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
-#line 2351 "configure"
+#line 2394 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2356: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2399: \"$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:2362: \$? = $ac_status" >&5
+  echo "$as_me:2405: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2382,17 +2425,17 @@ rm -f conftest.err conftest.$ac_ext
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
-#line 2385 "configure"
+#line 2428 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2389: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2432: \"$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:2395: \$? = $ac_status" >&5
+  echo "$as_me:2438: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2420,7 +2463,7 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:2423: error: C preprocessor \"$CPP\" fails sanity check" >&5
+  { { echo "$as_me:2466: error: C preprocessor \"$CPP\" fails sanity check" >&5
 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -2432,27 +2475,27 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_main_return=return
 
-echo "$as_me:2435: checking whether ln -s works" >&5
+echo "$as_me:2478: checking whether ln -s works" >&5
 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  echo "$as_me:2439: result: yes" >&5
+  echo "$as_me:2482: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:2442: result: no, using $LN_S" >&5
+  echo "$as_me:2485: result: no, using $LN_S" >&5
 echo "${ECHO_T}no, using $LN_S" >&6
 fi
 
 case $host_os in
 (mingw*)
 LN_S="cp -p"
-echo "$as_me:2449: result: Override: No symbolic links in mingw." >&5
+echo "$as_me:2492: result: Override: No symbolic links in mingw." >&5
 echo "${ECHO_T}Override: No symbolic links in mingw." >&6
 	;;
 (*)
 	;;
 esac
-echo "$as_me:2455: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:2498: checking whether ${MAKE-make} sets \${MAKE}" >&5
 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
@@ -2472,11 +2515,11 @@ fi
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:2475: result: yes" >&5
+  echo "$as_me:2518: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$as_me:2479: result: no" >&5
+  echo "$as_me:2522: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
@@ -2493,7 +2536,7 @@ fi
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:2496: checking for a BSD compatible install" >&5
+echo "$as_me:2539: checking for a BSD compatible install" >&5
 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
@@ -2542,7 +2585,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:2545: result: $INSTALL" >&5
+echo "$as_me:2588: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -2557,7 +2600,7 @@ for ac_prog in 'bison -y' byacc
 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:2560: checking for $ac_word" >&5
+echo "$as_me:2603: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_YACC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2572,7 +2615,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_YACC="$ac_prog"
-echo "$as_me:2575: found $ac_dir/$ac_word" >&5
+echo "$as_me:2618: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2580,10 +2623,10 @@ fi
 fi
 YACC=$ac_cv_prog_YACC
 if test -n "$YACC"; then
-  echo "$as_me:2583: result: $YACC" >&5
+  echo "$as_me:2626: result: $YACC" >&5
 echo "${ECHO_T}$YACC" >&6
 else
-  echo "$as_me:2586: result: no" >&5
+  echo "$as_me:2629: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2591,11 +2634,11 @@ fi
 done
 test -n "$YACC" || YACC="yacc"
 
-for ac_prog in tdlint lint alint splint lclint
+for ac_prog in lint cppcheck splint
 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:2598: checking for $ac_word" >&5
+echo "$as_me:2641: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_LINT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2610,7 +2653,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_LINT="$ac_prog"
-echo "$as_me:2613: found $ac_dir/$ac_word" >&5
+echo "$as_me:2656: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2618,17 +2661,17 @@ fi
 fi
 LINT=$ac_cv_prog_LINT
 if test -n "$LINT"; then
-  echo "$as_me:2621: result: $LINT" >&5
+  echo "$as_me:2664: result: $LINT" >&5
 echo "${ECHO_T}$LINT" >&6
 else
-  echo "$as_me:2624: result: no" >&5
+  echo "$as_me:2667: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
   test -n "$LINT" && break
 done
 
-echo "$as_me:2631: checking for makeflags variable" >&5
+echo "$as_me:2674: checking for makeflags variable" >&5
 echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6
 if test "${cf_cv_makeflags+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2662,10 +2705,10 @@ CF_EOF
 	rm -f cf_makeflags.tmp
 
 fi
-echo "$as_me:2665: result: $cf_cv_makeflags" >&5
+echo "$as_me:2708: result: $cf_cv_makeflags" >&5
 echo "${ECHO_T}$cf_cv_makeflags" >&6
 
-echo "$as_me:2668: checking if filesystem supports mixed-case filenames" >&5
+echo "$as_me:2711: checking if filesystem supports mixed-case filenames" >&5
 echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6
 if test "${cf_cv_mixedcase+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2692,7 +2735,7 @@ else
 fi
 
 fi
-echo "$as_me:2695: result: $cf_cv_mixedcase" >&5
+echo "$as_me:2738: result: $cf_cv_mixedcase" >&5
 echo "${ECHO_T}$cf_cv_mixedcase" >&6
 test "$cf_cv_mixedcase" = yes &&
 cat >>confdefs.h <<\EOF
@@ -2703,7 +2746,7 @@ for ac_prog in exctags ctags
 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:2706: checking for $ac_word" >&5
+echo "$as_me:2749: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CTAGS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2718,7 +2761,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_CTAGS="$ac_prog"
-echo "$as_me:2721: found $ac_dir/$ac_word" >&5
+echo "$as_me:2764: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2726,10 +2769,10 @@ fi
 fi
 CTAGS=$ac_cv_prog_CTAGS
 if test -n "$CTAGS"; then
-  echo "$as_me:2729: result: $CTAGS" >&5
+  echo "$as_me:2772: result: $CTAGS" >&5
 echo "${ECHO_T}$CTAGS" >&6
 else
-  echo "$as_me:2732: result: no" >&5
+  echo "$as_me:2775: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2740,7 +2783,7 @@ for ac_prog in exetags etags
 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:2743: checking for $ac_word" >&5
+echo "$as_me:2786: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ETAGS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2755,7 +2798,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_ETAGS="$ac_prog"
-echo "$as_me:2758: found $ac_dir/$ac_word" >&5
+echo "$as_me:2801: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2763,10 +2806,10 @@ fi
 fi
 ETAGS=$ac_cv_prog_ETAGS
 if test -n "$ETAGS"; then
-  echo "$as_me:2766: result: $ETAGS" >&5
+  echo "$as_me:2809: result: $ETAGS" >&5
 echo "${ECHO_T}$ETAGS" >&6
 else
-  echo "$as_me:2769: result: no" >&5
+  echo "$as_me:2812: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2775,7 +2818,7 @@ done
 
 # Extract the first word of "${CTAGS:-ctags}", so it can be a program name with args.
 set dummy ${CTAGS:-ctags}; ac_word=$2
-echo "$as_me:2778: checking for $ac_word" >&5
+echo "$as_me:2821: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2790,7 +2833,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_MAKE_LOWER_TAGS="yes"
-echo "$as_me:2793: found $ac_dir/$ac_word" >&5
+echo "$as_me:2836: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2799,17 +2842,17 @@ fi
 fi
 MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
 if test -n "$MAKE_LOWER_TAGS"; then
-  echo "$as_me:2802: result: $MAKE_LOWER_TAGS" >&5
+  echo "$as_me:2845: result: $MAKE_LOWER_TAGS" >&5
 echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
 else
-  echo "$as_me:2805: result: no" >&5
+  echo "$as_me:2848: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 if test "$cf_cv_mixedcase" = yes ; then
 	# Extract the first word of "${ETAGS:-etags}", so it can be a program name with args.
 set dummy ${ETAGS:-etags}; ac_word=$2
-echo "$as_me:2812: checking for $ac_word" >&5
+echo "$as_me:2855: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2824,7 +2867,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_MAKE_UPPER_TAGS="yes"
-echo "$as_me:2827: found $ac_dir/$ac_word" >&5
+echo "$as_me:2870: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2833,10 +2876,10 @@ fi
 fi
 MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
 if test -n "$MAKE_UPPER_TAGS"; then
-  echo "$as_me:2836: result: $MAKE_UPPER_TAGS" >&5
+  echo "$as_me:2879: result: $MAKE_UPPER_TAGS" >&5
 echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
 else
-  echo "$as_me:2839: result: no" >&5
+  echo "$as_me:2882: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2859,7 +2902,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
 set dummy ${ac_tool_prefix}windres; ac_word=$2
-echo "$as_me:2862: checking for $ac_word" >&5
+echo "$as_me:2905: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_WINDRES+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2876,7 +2919,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_WINDRES="$ac_dir/$ac_word"
-   echo "$as_me:2879: found $ac_dir/$ac_word" >&5
+   echo "$as_me:2922: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -2887,10 +2930,10 @@ fi
 WINDRES=$ac_cv_path_WINDRES
 
 if test -n "$WINDRES"; then
-  echo "$as_me:2890: result: $WINDRES" >&5
+  echo "$as_me:2933: result: $WINDRES" >&5
 echo "${ECHO_T}$WINDRES" >&6
 else
-  echo "$as_me:2893: result: no" >&5
+  echo "$as_me:2936: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2899,7 +2942,7 @@ if test -z "$ac_cv_path_WINDRES"; then
   ac_pt_WINDRES=$WINDRES
   # Extract the first word of "windres", so it can be a program name with args.
 set dummy windres; ac_word=$2
-echo "$as_me:2902: checking for $ac_word" >&5
+echo "$as_me:2945: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_ac_pt_WINDRES+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2916,7 +2959,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_ac_pt_WINDRES="$ac_dir/$ac_word"
-   echo "$as_me:2919: found $ac_dir/$ac_word" >&5
+   echo "$as_me:2962: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -2928,10 +2971,10 @@ fi
 ac_pt_WINDRES=$ac_cv_path_ac_pt_WINDRES
 
 if test -n "$ac_pt_WINDRES"; then
-  echo "$as_me:2931: result: $ac_pt_WINDRES" >&5
+  echo "$as_me:2974: result: $ac_pt_WINDRES" >&5
 echo "${ECHO_T}$ac_pt_WINDRES" >&6
 else
-  echo "$as_me:2934: result: no" >&5
+  echo "$as_me:2977: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2959,7 +3002,7 @@ else
 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:2962: checking for $ac_word" >&5
+echo "$as_me:3005: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_BUILD_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2974,7 +3017,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_BUILD_CC="$ac_prog"
-echo "$as_me:2977: found $ac_dir/$ac_word" >&5
+echo "$as_me:3020: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2982,10 +3025,10 @@ fi
 fi
 BUILD_CC=$ac_cv_prog_BUILD_CC
 if test -n "$BUILD_CC"; then
-  echo "$as_me:2985: result: $BUILD_CC" >&5
+  echo "$as_me:3028: result: $BUILD_CC" >&5
 echo "${ECHO_T}$BUILD_CC" >&6
 else
-  echo "$as_me:2988: result: no" >&5
+  echo "$as_me:3031: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2993,12 +3036,12 @@ fi
 done
 
 fi;
-	echo "$as_me:2996: checking for native build C compiler" >&5
+	echo "$as_me:3039: checking for native build C compiler" >&5
 echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
-	echo "$as_me:2998: result: $BUILD_CC" >&5
+	echo "$as_me:3041: result: $BUILD_CC" >&5
 echo "${ECHO_T}$BUILD_CC" >&6
 
-	echo "$as_me:3001: checking for native build C preprocessor" >&5
+	echo "$as_me:3044: checking for native build C preprocessor" >&5
 echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6
 
 # Check whether --with-build-cpp or --without-build-cpp was given.
@@ -3008,10 +3051,10 @@ if test "${with_build_cpp+set}" = set; then
 else
   BUILD_CPP='${BUILD_CC} -E'
 fi;
-	echo "$as_me:3011: result: $BUILD_CPP" >&5
+	echo "$as_me:3054: result: $BUILD_CPP" >&5
 echo "${ECHO_T}$BUILD_CPP" >&6
 
-	echo "$as_me:3014: checking for native build C flags" >&5
+	echo "$as_me:3057: checking for native build C flags" >&5
 echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6
 
 # Check whether --with-build-cflags or --without-build-cflags was given.
@@ -3019,10 +3062,10 @@ if test "${with_build_cflags+set}" = set; then
   withval="$with_build_cflags"
   BUILD_CFLAGS="$withval"
 fi;
-	echo "$as_me:3022: result: $BUILD_CFLAGS" >&5
+	echo "$as_me:3065: result: $BUILD_CFLAGS" >&5
 echo "${ECHO_T}$BUILD_CFLAGS" >&6
 
-	echo "$as_me:3025: checking for native build C preprocessor-flags" >&5
+	echo "$as_me:3068: checking for native build C preprocessor-flags" >&5
 echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6
 
 # Check whether --with-build-cppflags or --without-build-cppflags was given.
@@ -3030,10 +3073,10 @@ if test "${with_build_cppflags+set}" = set; then
   withval="$with_build_cppflags"
   BUILD_CPPFLAGS="$withval"
 fi;
-	echo "$as_me:3033: result: $BUILD_CPPFLAGS" >&5
+	echo "$as_me:3076: result: $BUILD_CPPFLAGS" >&5
 echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
 
-	echo "$as_me:3036: checking for native build linker-flags" >&5
+	echo "$as_me:3079: checking for native build linker-flags" >&5
 echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6
 
 # Check whether --with-build-ldflags or --without-build-ldflags was given.
@@ -3041,10 +3084,10 @@ if test "${with_build_ldflags+set}" = set; then
   withval="$with_build_ldflags"
   BUILD_LDFLAGS="$withval"
 fi;
-	echo "$as_me:3044: result: $BUILD_LDFLAGS" >&5
+	echo "$as_me:3087: result: $BUILD_LDFLAGS" >&5
 echo "${ECHO_T}$BUILD_LDFLAGS" >&6
 
-	echo "$as_me:3047: checking for native build linker-libraries" >&5
+	echo "$as_me:3090: checking for native build linker-libraries" >&5
 echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6
 
 # Check whether --with-build-libs or --without-build-libs was given.
@@ -3052,7 +3095,7 @@ if test "${with_build_libs+set}" = set; then
   withval="$with_build_libs"
   BUILD_LIBS="$withval"
 fi;
-	echo "$as_me:3055: result: $BUILD_LIBS" >&5
+	echo "$as_me:3098: result: $BUILD_LIBS" >&5
 echo "${ECHO_T}$BUILD_LIBS" >&6
 
 	# this assumes we're on Unix.
@@ -3062,7 +3105,7 @@ echo "${ECHO_T}$BUILD_LIBS" >&6
 	: ${BUILD_CC:='${CC}'}
 
 	if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then
-		{ { echo "$as_me:3065: error: Cross-build requires two compilers.
+		{ { echo "$as_me:3108: error: Cross-build requires two compilers.
 Use --with-build-cc to specify the native compiler." >&5
 echo "$as_me: error: Cross-build requires two compilers.
 Use --with-build-cc to specify the native compiler." >&2;}
@@ -3083,7 +3126,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:3086: checking for $ac_word" >&5
+echo "$as_me:3129: 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
@@ -3098,7 +3141,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:3101: found $ac_dir/$ac_word" >&5
+echo "$as_me:3144: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3106,10 +3149,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:3109: result: $RANLIB" >&5
+  echo "$as_me:3152: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:3112: result: no" >&5
+  echo "$as_me:3155: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3118,7 +3161,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:3121: checking for $ac_word" >&5
+echo "$as_me:3164: 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
@@ -3133,7 +3176,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:3136: found $ac_dir/$ac_word" >&5
+echo "$as_me:3179: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3142,10 +3185,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:3145: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:3188: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:3148: result: no" >&5
+  echo "$as_me:3191: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3157,7 +3200,7 @@ fi
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:3160: checking for $ac_word" >&5
+echo "$as_me:3203: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_AR+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3172,7 +3215,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_AR="${ac_tool_prefix}ar"
-echo "$as_me:3175: found $ac_dir/$ac_word" >&5
+echo "$as_me:3218: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3180,10 +3223,10 @@ fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:3183: result: $AR" >&5
+  echo "$as_me:3226: result: $AR" >&5
 echo "${ECHO_T}$AR" >&6
 else
-  echo "$as_me:3186: result: no" >&5
+  echo "$as_me:3229: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3192,7 +3235,7 @@ if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-echo "$as_me:3195: checking for $ac_word" >&5
+echo "$as_me:3238: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3207,7 +3250,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_AR="ar"
-echo "$as_me:3210: found $ac_dir/$ac_word" >&5
+echo "$as_me:3253: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3216,10 +3259,10 @@ fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:3219: result: $ac_ct_AR" >&5
+  echo "$as_me:3262: result: $ac_ct_AR" >&5
 echo "${ECHO_T}$ac_ct_AR" >&6
 else
-  echo "$as_me:3222: result: no" >&5
+  echo "$as_me:3265: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3228,7 +3271,7 @@ else
   AR="$ac_cv_prog_AR"
 fi
 
-echo "$as_me:3231: checking for options to update archives" >&5
+echo "$as_me:3274: 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
@@ -3251,13 +3294,13 @@ else
 		rm -f conftest.a
 
 		cat >conftest.$ac_ext <<EOF
-#line 3254 "configure"
+#line 3297 "configure"
 int	testdata[3] = { 123, 456, 789 };
 EOF
-		if { (eval echo "$as_me:3257: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:3300: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3260: \$? = $ac_status" >&5
+  echo "$as_me:3303: \$? = $ac_status" >&5
   (exit $ac_status); } ; then
 			echo "$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext" >&5
 			$AR $ARFLAGS $cf_ar_flags conftest.a conftest.$ac_cv_objext 2>&5 1>/dev/null
@@ -3268,7 +3311,7 @@ EOF
 		else
 			test -n "$verbose" && echo "	cannot compile test-program" 1>&6
 
-echo "${as_me:-configure}:3271: testing cannot compile test-program ..." 1>&5
+echo "${as_me:-configure}:3314: testing cannot compile test-program ..." 1>&5
 
 			break
 		fi
@@ -3276,7 +3319,7 @@ echo "${as_me:-configure}:3271: testing cannot compile test-program ..." 1>&5
 	rm -f conftest.a conftest.$ac_ext conftest.$ac_cv_objext
 
 fi
-echo "$as_me:3279: result: $cf_cv_ar_flags" >&5
+echo "$as_me:3322: result: $cf_cv_ar_flags" >&5
 echo "${ECHO_T}$cf_cv_ar_flags" >&6
 
 if test -n "$ARFLAGS" ; then
@@ -3287,7 +3330,7 @@ else
 	ARFLAGS=$cf_cv_ar_flags
 fi
 
-echo "$as_me:3290: checking if you want to see long compiling messages" >&5
+echo "$as_me:3333: 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.
@@ -3321,7 +3364,7 @@ else
 	ECHO_CC=''
 
 fi;
-echo "$as_me:3324: result: $enableval" >&5
+echo "$as_me:3367: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 # special case for WWW/*
@@ -3331,7 +3374,7 @@ else
 	DONT_ECHO_CC=''
 fi
 
-echo "$as_me:3334: checking if you want to check memory-leaks" >&5
+echo "$as_me:3377: 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.
@@ -3348,7 +3391,7 @@ else
 	with_leak_checks=no
 
 fi;
-echo "$as_me:3351: result: $with_leak_checks" >&5
+echo "$as_me:3394: result: $with_leak_checks" >&5
 echo "${ECHO_T}$with_leak_checks" >&6
 test "$with_leak_checks" = "yes" &&
 cat >>confdefs.h <<\EOF
@@ -3358,7 +3401,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:3361: checking if you want to enable debug-code" >&5
+echo "$as_me:3404: 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.
@@ -3375,7 +3418,7 @@ else
 	with_debug=no
 
 fi;
-echo "$as_me:3378: result: $with_debug" >&5
+echo "$as_me:3421: result: $with_debug" >&5
 echo "${ECHO_T}$with_debug" >&6
 if test "$with_debug" = "yes" ; then
 	case $host_os in
@@ -3400,7 +3443,7 @@ else
 	esac
 fi
 
-echo "$as_me:3403: checking if you want to enable lynx trace code *recommended* " >&5
+echo "$as_me:3446: 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.
@@ -3417,14 +3460,14 @@ else
 	with_trace=yes
 
 fi;
-echo "$as_me:3420: result: $with_trace" >&5
+echo "$as_me:3463: 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:3427: checking if you want verbose trace code" >&5
+echo "$as_me:3470: 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.
@@ -3441,7 +3484,7 @@ else
 	with_vertrace=no
 
 fi;
-echo "$as_me:3444: result: $with_vertrace" >&5
+echo "$as_me:3487: result: $with_vertrace" >&5
 echo "${ECHO_T}$with_vertrace" >&6
 test $with_vertrace = yes &&
 cat >>confdefs.h <<\EOF
@@ -3450,7 +3493,7 @@ EOF
 
 if test -n "$GCC"
 then
-echo "$as_me:3453: checking if you want to turn on gcc warnings" >&5
+echo "$as_me:3496: 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.
@@ -3467,7 +3510,7 @@ else
 	with_warnings=no
 
 fi;
-echo "$as_me:3470: result: $with_warnings" >&5
+echo "$as_me:3513: result: $with_warnings" >&5
 echo "${ECHO_T}$with_warnings" >&6
 if test "$with_warnings" = "yes"
 then
@@ -3490,10 +3533,10 @@ cat > conftest.i <<EOF
 EOF
 if test "$GCC" = yes
 then
-	{ echo "$as_me:3493: checking for $CC __attribute__ directives..." >&5
+	{ echo "$as_me:3536: checking for $CC __attribute__ directives..." >&5
 echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
 cat > conftest.$ac_ext <<EOF
-#line 3496 "${as_me:-configure}"
+#line 3539 "${as_me:-configure}"
 #include "confdefs.h"
 #include "conftest.h"
 #include "conftest.i"
@@ -3542,12 +3585,12 @@ EOF
 			;;
 		esac
 
-		if { (eval echo "$as_me:3545: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:3588: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3548: \$? = $ac_status" >&5
+  echo "$as_me:3591: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-			test -n "$verbose" && echo "$as_me:3550: result: ... $cf_attribute" >&5
+			test -n "$verbose" && echo "$as_me:3593: result: ... $cf_attribute" >&5
 echo "${ECHO_T}... $cf_attribute" >&6
 			cat conftest.h >>confdefs.h
 			case $cf_attribute in
@@ -3611,12 +3654,12 @@ INTEL_COMPILER=no
 if test "$GCC" = yes ; then
 	case $host_os in
 	(linux*|gnu*)
-		echo "$as_me:3614: checking if this is really Intel C compiler" >&5
+		echo "$as_me:3657: 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 3619 "configure"
+#line 3662 "configure"
 #include "confdefs.h"
 
 int
@@ -3633,16 +3676,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3636: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3679: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3639: \$? = $ac_status" >&5
+  echo "$as_me:3682: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3642: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3685: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3645: \$? = $ac_status" >&5
+  echo "$as_me:3688: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   INTEL_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -we147"
@@ -3653,7 +3696,7 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 		CFLAGS="$cf_save_CFLAGS"
-		echo "$as_me:3656: result: $INTEL_COMPILER" >&5
+		echo "$as_me:3699: result: $INTEL_COMPILER" >&5
 echo "${ECHO_T}$INTEL_COMPILER" >&6
 		;;
 	esac
@@ -3662,12 +3705,12 @@ fi
 CLANG_COMPILER=no
 
 if test "$GCC" = yes ; then
-	echo "$as_me:3665: checking if this is really Clang C compiler" >&5
+	echo "$as_me:3708: checking if this is really Clang C compiler" >&5
 echo $ECHO_N "checking if this is really Clang C compiler... $ECHO_C" >&6
 	cf_save_CFLAGS="$CFLAGS"
 	CFLAGS="$CFLAGS -Qunused-arguments"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 3670 "configure"
+#line 3713 "configure"
 #include "confdefs.h"
 
 int
@@ -3684,16 +3727,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:3687: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:3730: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3690: \$? = $ac_status" >&5
+  echo "$as_me:3733: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:3693: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3736: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3696: \$? = $ac_status" >&5
+  echo "$as_me:3739: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   CLANG_COMPILER=yes
 cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
@@ -3704,12 +3747,12 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 	CFLAGS="$cf_save_CFLAGS"
-	echo "$as_me:3707: result: $CLANG_COMPILER" >&5
+	echo "$as_me:3750: result: $CLANG_COMPILER" >&5
 echo "${ECHO_T}$CLANG_COMPILER" >&6
 fi
 
 cat > conftest.$ac_ext <<EOF
-#line 3712 "${as_me:-configure}"
+#line 3755 "${as_me:-configure}"
 int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
 EOF
 
@@ -3726,7 +3769,7 @@ then
 # remark #981: operands are evaluated in unspecified order
 # warning #279: controlling expression is constant
 
-	{ echo "$as_me:3729: checking for $CC warning options..." >&5
+	{ echo "$as_me:3772: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS="-Wall"
@@ -3742,12 +3785,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:3745: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:3788: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3748: \$? = $ac_status" >&5
+  echo "$as_me:3791: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-			test -n "$verbose" && echo "$as_me:3750: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:3793: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -3756,7 +3799,7 @@ echo "${ECHO_T}... -$cf_opt" >&6
 
 elif test "$GCC" = yes
 then
-	{ echo "$as_me:3759: checking for $CC warning options..." >&5
+	{ echo "$as_me:3802: checking for $CC warning options..." >&5
 echo "$as_me: checking for $CC warning options..." >&6;}
 	cf_save_CFLAGS="$CFLAGS"
 	EXTRA_CFLAGS=
@@ -3780,12 +3823,12 @@ echo "$as_me: checking for $CC warning options..." >&6;}
 		Wundef $cf_gcc_warnings $cf_warn_CONST
 	do
 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-		if { (eval echo "$as_me:3783: \"$ac_compile\"") >&5
+		if { (eval echo "$as_me:3826: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3786: \$? = $ac_status" >&5
+  echo "$as_me:3829: \$? = $ac_status" >&5
   (exit $ac_status); }; then
-			test -n "$verbose" && echo "$as_me:3788: result: ... -$cf_opt" >&5
+			test -n "$verbose" && echo "$as_me:3831: result: ... -$cf_opt" >&5
 echo "${ECHO_T}... -$cf_opt" >&6
 			case $cf_opt in
 			(Wcast-qual)
@@ -3796,7 +3839,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}:3799: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:3842: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -3806,7 +3849,7 @@ echo "${as_me:-configure}:3799: testing feature is broken in gcc $GCC_VERSION ..
 				([12].*)
 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
 
-echo "${as_me:-configure}:3809: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
+echo "${as_me:-configure}:3852: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
 
 					continue;;
 				esac
@@ -3822,7 +3865,7 @@ rm -rf conftest*
 fi
 fi
 
-echo "$as_me:3825: checking if you want to use dbmalloc for testing" >&5
+echo "$as_me:3868: 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.
@@ -3839,7 +3882,7 @@ EOF
 else
   with_dbmalloc=
 fi;
-echo "$as_me:3842: result: ${with_dbmalloc:-no}" >&5
+echo "$as_me:3885: result: ${with_dbmalloc:-no}" >&5
 echo "${ECHO_T}${with_dbmalloc:-no}" >&6
 
 case .$with_cflags in
@@ -3869,10 +3912,16 @@ case $cf_fix_cppflags in
 				&& cf_fix_cppflags=yes
 
 			if test $cf_fix_cppflags = yes ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			elif test "${cf_tst_cflags}" = "\"'" ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			fi
 			;;
@@ -3891,17 +3940,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
 				;;
 			esac
-			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+	cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+
 			;;
 		esac
 		;;
 	(*)
-		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+	test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+	cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+
 		;;
 	esac
 	;;
 (yes)
-	cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
@@ -3914,17 +3971,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
-	CFLAGS="$CFLAGS $cf_new_cflags"
+	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+	CFLAGS="${CFLAGS}$cf_new_cflags"
+
 fi
 
 if test -n "$cf_new_cppflags" ; then
 
-	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
-	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+
 fi
 
 		;;
@@ -3933,23 +3996,23 @@ fi
 esac
 
 if test "$with_dbmalloc" = yes ; then
-	echo "$as_me:3936: checking for dbmalloc.h" >&5
+	echo "$as_me:3999: 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 3942 "configure"
+#line 4005 "configure"
 #include "confdefs.h"
 #include <dbmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:3946: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4009: \"$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:3952: \$? = $ac_status" >&5
+  echo "$as_me:4015: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3968,11 +4031,11 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:3971: result: $ac_cv_header_dbmalloc_h" >&5
+echo "$as_me:4034: 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:3975: checking for debug_malloc in -ldbmalloc" >&5
+echo "$as_me:4038: 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
@@ -3980,7 +4043,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldbmalloc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3983 "configure"
+#line 4046 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3999,16 +4062,16 @@ debug_malloc ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4002: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4065: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4005: \$? = $ac_status" >&5
+  echo "$as_me:4068: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4008: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4071: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4011: \$? = $ac_status" >&5
+  echo "$as_me:4074: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dbmalloc_debug_malloc=yes
 else
@@ -4019,7 +4082,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4022: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
+echo "$as_me:4085: 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
@@ -4034,7 +4097,7 @@ fi
 
 fi
 
-echo "$as_me:4037: checking if you want to use dmalloc for testing" >&5
+echo "$as_me:4100: 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.
@@ -4051,7 +4114,7 @@ EOF
 else
   with_dmalloc=
 fi;
-echo "$as_me:4054: result: ${with_dmalloc:-no}" >&5
+echo "$as_me:4117: result: ${with_dmalloc:-no}" >&5
 echo "${ECHO_T}${with_dmalloc:-no}" >&6
 
 case .$with_cflags in
@@ -4081,10 +4144,16 @@ case $cf_fix_cppflags in
 				&& cf_fix_cppflags=yes
 
 			if test $cf_fix_cppflags = yes ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			elif test "${cf_tst_cflags}" = "\"'" ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			fi
 			;;
@@ -4103,17 +4172,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
 				;;
 			esac
-			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+	cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+
 			;;
 		esac
 		;;
 	(*)
-		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+	test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+	cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+
 		;;
 	esac
 	;;
 (yes)
-	cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
@@ -4126,17 +4203,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
-	CFLAGS="$CFLAGS $cf_new_cflags"
+	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+	CFLAGS="${CFLAGS}$cf_new_cflags"
+
 fi
 
 if test -n "$cf_new_cppflags" ; then
 
-	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
-	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+
 fi
 
 		;;
@@ -4145,23 +4228,23 @@ fi
 esac
 
 if test "$with_dmalloc" = yes ; then
-	echo "$as_me:4148: checking for dmalloc.h" >&5
+	echo "$as_me:4231: 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 4154 "configure"
+#line 4237 "configure"
 #include "confdefs.h"
 #include <dmalloc.h>
 _ACEOF
-if { (eval echo "$as_me:4158: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4241: \"$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:4164: \$? = $ac_status" >&5
+  echo "$as_me:4247: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4180,11 +4263,11 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:4183: result: $ac_cv_header_dmalloc_h" >&5
+echo "$as_me:4266: 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:4187: checking for dmalloc_debug in -ldmalloc" >&5
+echo "$as_me:4270: 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
@@ -4192,7 +4275,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 4195 "configure"
+#line 4278 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4211,16 +4294,16 @@ dmalloc_debug ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4214: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4297: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4217: \$? = $ac_status" >&5
+  echo "$as_me:4300: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4220: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4303: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4223: \$? = $ac_status" >&5
+  echo "$as_me:4306: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dmalloc_dmalloc_debug=yes
 else
@@ -4231,7 +4314,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4234: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
+echo "$as_me:4317: 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
@@ -4271,7 +4354,7 @@ case $host_os in
 	# contributed by Alex Matulich (matuli_a at marlin.navsea.navy.mil) also
 	# references -lmalloc and -lbsd.
 
-echo "$as_me:4274: checking for strcmp in -lc_s" >&5
+echo "$as_me:4357: 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
@@ -4279,7 +4362,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc_s  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 4282 "configure"
+#line 4365 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -4298,16 +4381,16 @@ strcmp ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4301: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4384: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4304: \$? = $ac_status" >&5
+  echo "$as_me:4387: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4307: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4390: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4310: \$? = $ac_status" >&5
+  echo "$as_me:4393: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_c_s_strcmp=yes
 else
@@ -4318,7 +4401,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:4321: result: $ac_cv_lib_c_s_strcmp" >&5
+echo "$as_me:4404: 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
@@ -4394,10 +4477,16 @@ case $cf_fix_cppflags in
 				&& cf_fix_cppflags=yes
 
 			if test $cf_fix_cppflags = yes ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			elif test "${cf_tst_cflags}" = "\"'" ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			fi
 			;;
@@ -4416,17 +4505,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
 				;;
 			esac
-			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+	cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+
 			;;
 		esac
 		;;
 	(*)
-		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+	test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+	cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+
 		;;
 	esac
 	;;
 (yes)
-	cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
@@ -4439,17 +4536,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
-	CFLAGS="$CFLAGS $cf_new_cflags"
+	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+	CFLAGS="${CFLAGS}$cf_new_cflags"
+
 fi
 
 if test -n "$cf_new_cppflags" ; then
 
-	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
-	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+
 fi
 
 	EXTRA_OBJS="$EXTRA_OBJS Xsystem\$o"
@@ -4480,14 +4583,14 @@ fi
 	# SCO's cc (which is reported to have broken const/volatile).
 	case "$CC" in
 	(cc|*/cc)
-		{ echo "$as_me:4483: WARNING: You should consider using gcc or rcc if available" >&5
+		{ echo "$as_me:4586: 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:4490: checking for $ac_word" >&5
+echo "$as_me:4593: 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
@@ -4502,7 +4605,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:4505: found $ac_dir/$ac_word" >&5
+echo "$as_me:4608: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4510,10 +4613,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:4513: result: $CC" >&5
+  echo "$as_me:4616: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:4516: result: no" >&5
+  echo "$as_me:4619: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4536,23 +4639,23 @@ test -n "$CC" || CC="$CC"
 for ac_header in jcurses.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:4539: checking for $ac_header" >&5
+echo "$as_me:4642: 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 4545 "configure"
+#line 4648 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:4549: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4652: \"$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:4555: \$? = $ac_status" >&5
+  echo "$as_me:4658: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4571,7 +4674,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:4574: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:4677: 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
@@ -4599,23 +4702,23 @@ done
 for ac_header in cursesX.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:4602: checking for $ac_header" >&5
+echo "$as_me:4705: 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 4608 "configure"
+#line 4711 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:4612: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:4715: \"$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:4618: \$? = $ac_status" >&5
+  echo "$as_me:4721: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -4634,7 +4737,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:4637: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:4740: 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
@@ -4661,24 +4764,29 @@ esac
 # This should have been defined by AC_PROG_CC
 : ${CC:=cc}
 
-echo "$as_me:4664: checking \$CC variable" >&5
+echo "$as_me:4767: checking \$CC variable" >&5
 echo $ECHO_N "checking \$CC variable... $ECHO_C" >&6
 case "$CC" in
-(*[\ \	]-[IUD]*)
-	echo "$as_me:4668: result: broken" >&5
+(*[\ \	]-*)
+	echo "$as_me:4771: result: broken" >&5
 echo "${ECHO_T}broken" >&6
-	{ echo "$as_me:4670: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
+	{ echo "$as_me:4773: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&5
 echo "$as_me: WARNING: your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options" >&2;}
 	# humor him...
-	cf_flags=`echo "$CC" | sed -e 's/^[^ 	]*[ 	]//'`
-	CC=`echo "$CC" | sed -e 's/[ 	].*//'`
+	cf_prog=`echo "$CC" | sed -e 's/	/ /g' -e 's/[ ]* / /g' -e 's/[ ]*[ ]-[^ ].*//'`
+	cf_flags=`echo "$CC" | ${AWK:-awk} -v prog="$cf_prog" '{ printf("%s", substr($0,1+length(prog))); }'`
+	CC="$cf_prog"
+	for cf_arg in $cf_flags
+	do
+		case "x$cf_arg" in
+		(x-[IUDfgOW]*)
 
 cf_fix_cppflags=no
 cf_new_cflags=
 cf_new_cppflags=
 cf_new_extra_cppflags=
 
-for cf_add_cflags in $cf_flags
+for cf_add_cflags in $cf_arg
 do
 case $cf_fix_cppflags in
 (no)
@@ -4693,10 +4801,16 @@ case $cf_fix_cppflags in
 				&& cf_fix_cppflags=yes
 
 			if test $cf_fix_cppflags = yes ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			elif test "${cf_tst_cflags}" = "\"'" ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			fi
 			;;
@@ -4715,17 +4829,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
 				;;
 			esac
-			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+	cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+
 			;;
 		esac
 		;;
 	(*)
-		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+	test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+	cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+
 		;;
 	esac
 	;;
 (yes)
-	cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
@@ -4738,27 +4860,51 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
-	CFLAGS="$CFLAGS $cf_new_cflags"
+	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+	CFLAGS="${CFLAGS}$cf_new_cflags"
+
 fi
 
 if test -n "$cf_new_cppflags" ; then
 
-	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
-	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+
 fi
 
+			;;
+		(*)
+			CC="$CC $cf_arg"
+			;;
+		esac
+	done
+	test -n "$verbose" && echo "	resulting CC: '$CC'" 1>&6
+
+echo "${as_me:-configure}:4890: testing resulting CC: '$CC' ..." 1>&5
+
+	test -n "$verbose" && echo "	resulting CFLAGS: '$CFLAGS'" 1>&6
+
+echo "${as_me:-configure}:4894: testing resulting CFLAGS: '$CFLAGS' ..." 1>&5
+
+	test -n "$verbose" && echo "	resulting CPPFLAGS: '$CPPFLAGS'" 1>&6
+
+echo "${as_me:-configure}:4898: testing resulting CPPFLAGS: '$CPPFLAGS' ..." 1>&5
+
 	;;
 (*)
-	echo "$as_me:4756: result: ok" >&5
+	echo "$as_me:4902: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 	;;
 esac
 
-echo "$as_me:4761: checking for ${CC:-cc} option to accept ANSI C" >&5
+echo "$as_me:4907: 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
@@ -4803,10 +4949,16 @@ case $cf_fix_cppflags in
 				&& cf_fix_cppflags=yes
 
 			if test $cf_fix_cppflags = yes ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			elif test "${cf_tst_cflags}" = "\"'" ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			fi
 			;;
@@ -4825,17 +4977,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
 				;;
 			esac
-			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+	cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+
 			;;
 		esac
 		;;
 	(*)
-		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+	test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+	cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+
 		;;
 	esac
 	;;
 (yes)
-	cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
@@ -4848,21 +5008,27 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
-	CFLAGS="$CFLAGS $cf_new_cflags"
+	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+	CFLAGS="${CFLAGS}$cf_new_cflags"
+
 fi
 
 if test -n "$cf_new_cppflags" ; then
 
-	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
-	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+
 fi
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 4865 "configure"
+#line 5031 "configure"
 #include "confdefs.h"
 
 #ifndef CC_HAS_PROTOS
@@ -4883,16 +5049,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4886: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5052: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4889: \$? = $ac_status" >&5
+  echo "$as_me:5055: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4892: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5058: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4895: \$? = $ac_status" >&5
+  echo "$as_me:5061: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ansi_cc="$cf_arg"; break
 else
@@ -4905,7 +5071,7 @@ CFLAGS="$cf_save_CFLAGS"
 CPPFLAGS="$cf_save_CPPFLAGS"
 
 fi
-echo "$as_me:4908: result: $cf_cv_ansi_cc" >&5
+echo "$as_me:5074: result: $cf_cv_ansi_cc" >&5
 echo "${ECHO_T}$cf_cv_ansi_cc" >&6
 
 if test "$cf_cv_ansi_cc" != "no"; then
@@ -4931,10 +5097,16 @@ case $cf_fix_cppflags in
 				&& cf_fix_cppflags=yes
 
 			if test $cf_fix_cppflags = yes ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			elif test "${cf_tst_cflags}" = "\"'" ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			fi
 			;;
@@ -4953,17 +5125,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
 				;;
 			esac
-			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+	cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+
 			;;
 		esac
 		;;
 	(*)
-		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+	test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+	cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+
 		;;
 	esac
 	;;
 (yes)
-	cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
@@ -4976,17 +5156,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
-	CFLAGS="$CFLAGS $cf_new_cflags"
+	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+	CFLAGS="${CFLAGS}$cf_new_cflags"
+
 fi
 
 if test -n "$cf_new_cppflags" ; then
 
-	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
-	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+
 fi
 
 else
@@ -4999,7 +5185,7 @@ fi
 fi
 
 if test "$cf_cv_ansi_cc" = "no"; then
-	{ { echo "$as_me:5002: error: Your compiler does not appear to recognize prototypes.
+	{ { echo "$as_me:5188: 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
@@ -5019,7 +5205,7 @@ if test "${enable_largefile+set}" = set; then
 fi;
 if test "$enable_largefile" != no; then
 
-  echo "$as_me:5022: checking for special C compiler options needed for large files" >&5
+  echo "$as_me:5208: 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
@@ -5031,7 +5217,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 5034 "configure"
+#line 5220 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -5051,16 +5237,16 @@ main ()
 }
 _ACEOF
      	 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5054: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5240: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5057: \$? = $ac_status" >&5
+  echo "$as_me:5243: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5060: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5246: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5063: \$? = $ac_status" >&5
+  echo "$as_me:5249: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -5070,16 +5256,16 @@ fi
 rm -f conftest.$ac_objext
      	 CC="$CC -n32"
      	 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5073: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5259: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5076: \$? = $ac_status" >&5
+  echo "$as_me:5262: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5079: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5265: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5082: \$? = $ac_status" >&5
+  echo "$as_me:5268: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_largefile_CC=' -n32'; break
 else
@@ -5093,13 +5279,13 @@ rm -f conftest.$ac_objext
        rm -f conftest.$ac_ext
     fi
 fi
-echo "$as_me:5096: result: $ac_cv_sys_largefile_CC" >&5
+echo "$as_me:5282: 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:5102: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+  echo "$as_me:5288: 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
@@ -5107,7 +5293,7 @@ else
   while :; do
   ac_cv_sys_file_offset_bits=no
   cat >conftest.$ac_ext <<_ACEOF
-#line 5110 "configure"
+#line 5296 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -5127,16 +5313,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5130: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5316: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5133: \$? = $ac_status" >&5
+  echo "$as_me:5319: \$? = $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:5322: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5139: \$? = $ac_status" >&5
+  echo "$as_me:5325: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -5145,7 +5331,7 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 5148 "configure"
+#line 5334 "configure"
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
 #include <sys/types.h>
@@ -5166,16 +5352,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5169: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5355: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5172: \$? = $ac_status" >&5
+  echo "$as_me:5358: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5175: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5361: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5178: \$? = $ac_status" >&5
+  echo "$as_me:5364: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_file_offset_bits=64; break
 else
@@ -5186,7 +5372,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
   break
 done
 fi
-echo "$as_me:5189: result: $ac_cv_sys_file_offset_bits" >&5
+echo "$as_me:5375: 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
 
@@ -5196,7 +5382,7 @@ EOF
 
 fi
 rm -rf conftest*
-  echo "$as_me:5199: checking for _LARGE_FILES value needed for large files" >&5
+  echo "$as_me:5385: 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
@@ -5204,7 +5390,7 @@ else
   while :; do
   ac_cv_sys_large_files=no
   cat >conftest.$ac_ext <<_ACEOF
-#line 5207 "configure"
+#line 5393 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
  /* Check that off_t can represent 2**63 - 1 correctly.
@@ -5224,16 +5410,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5227: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5413: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5230: \$? = $ac_status" >&5
+  echo "$as_me:5416: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5233: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5419: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5236: \$? = $ac_status" >&5
+  echo "$as_me:5422: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -5242,7 +5428,7 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 5245 "configure"
+#line 5431 "configure"
 #include "confdefs.h"
 #define _LARGE_FILES 1
 #include <sys/types.h>
@@ -5263,16 +5449,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5266: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5452: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5269: \$? = $ac_status" >&5
+  echo "$as_me:5455: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5272: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5458: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5275: \$? = $ac_status" >&5
+  echo "$as_me:5461: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_large_files=1; break
 else
@@ -5283,7 +5469,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
   break
 done
 fi
-echo "$as_me:5286: result: $ac_cv_sys_large_files" >&5
+echo "$as_me:5472: 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
 
@@ -5296,7 +5482,7 @@ rm -rf conftest*
 fi
 
 	if test "$enable_largefile" != no ; then
-	echo "$as_me:5299: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+	echo "$as_me:5485: 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
@@ -5304,7 +5490,7 @@ else
   while :; do
   ac_cv_sys_largefile_source=no
   cat >conftest.$ac_ext <<_ACEOF
-#line 5307 "configure"
+#line 5493 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -5316,16 +5502,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5319: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5505: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5322: \$? = $ac_status" >&5
+  echo "$as_me:5508: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5325: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5511: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5328: \$? = $ac_status" >&5
+  echo "$as_me:5514: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -5334,7 +5520,7 @@ cat conftest.$ac_ext >&5
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 5337 "configure"
+#line 5523 "configure"
 #include "confdefs.h"
 #define _LARGEFILE_SOURCE 1
 #include <stdio.h>
@@ -5347,16 +5533,16 @@ return !fseeko;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5350: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5536: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5353: \$? = $ac_status" >&5
+  echo "$as_me:5539: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5356: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5542: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5359: \$? = $ac_status" >&5
+  echo "$as_me:5545: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sys_largefile_source=1; break
 else
@@ -5367,7 +5553,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
   break
 done
 fi
-echo "$as_me:5370: result: $ac_cv_sys_largefile_source" >&5
+echo "$as_me:5556: 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
 
@@ -5381,13 +5567,13 @@ rm -rf 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:5384: checking for fseeko" >&5
+echo "$as_me:5570: 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 5390 "configure"
+#line 5576 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -5399,16 +5585,16 @@ return fseeko && fseeko (stdin, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5402: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5588: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5405: \$? = $ac_status" >&5
+  echo "$as_me:5591: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5408: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5594: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5411: \$? = $ac_status" >&5
+  echo "$as_me:5597: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_fseeko=yes
 else
@@ -5418,7 +5604,7 @@ ac_cv_func_fseeko=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:5421: result: $ac_cv_func_fseeko" >&5
+echo "$as_me:5607: result: $ac_cv_func_fseeko" >&5
 echo "${ECHO_T}$ac_cv_func_fseeko" >&6
 if test $ac_cv_func_fseeko = yes; then
 
@@ -5439,16 +5625,17 @@ 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:5442: checking whether to use struct dirent64" >&5
+	echo "$as_me:5628: 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 5449 "configure"
+#line 5635 "configure"
 #include "confdefs.h"
 
+#pragma GCC diagnostic error "-Wincompatible-pointer-types"
 #include <sys/types.h>
 #include <dirent.h>
 
@@ -5467,16 +5654,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5470: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5657: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5473: \$? = $ac_status" >&5
+  echo "$as_me:5660: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5476: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5663: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5479: \$? = $ac_status" >&5
+  echo "$as_me:5666: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_struct_dirent64=yes
 else
@@ -5487,7 +5674,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:5490: result: $cf_cv_struct_dirent64" >&5
+echo "$as_me:5677: result: $cf_cv_struct_dirent64" >&5
 echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
 	test "$cf_cv_struct_dirent64" = yes &&
 cat >>confdefs.h <<\EOF
@@ -5499,20 +5686,20 @@ EOF
 if test -z "$ALL_LINGUAS" ; then
 	ALL_LINGUAS=`test -d $srcdir/po && cd $srcdir/po && echo *.po|sed -e 's/\.po//g' -e 's/*//'`
 
-	echo "$as_me:5502: checking for PATH separator" >&5
+	echo "$as_me:5689: checking for PATH separator" >&5
 echo $ECHO_N "checking for PATH separator... $ECHO_C" >&6
 	case $cf_cv_system_name in
 	(os2*)	PATH_SEPARATOR=';'  ;;
 	(*)	${PATH_SEPARATOR:=':'}  ;;
 	esac
 
-	echo "$as_me:5509: result: $PATH_SEPARATOR" >&5
+	echo "$as_me:5696: result: $PATH_SEPARATOR" >&5
 echo "${ECHO_T}$PATH_SEPARATOR" >&6
 
 # Extract the first word of "msginit", so it can be a program name with args.
 
 set dummy msginit; ac_word=$2
-echo "$as_me:5515: checking for $ac_word" >&5
+echo "$as_me:5702: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_MSGINIT+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -5539,17 +5726,17 @@ esac
 fi
 MSGINIT="$ac_cv_path_MSGINIT"
 if test "$MSGINIT" != ":"; then
-  echo "$as_me:5542: result: $MSGINIT" >&5
+  echo "$as_me:5729: result: $MSGINIT" >&5
 echo "${ECHO_T}$MSGINIT" >&6
 else
-  echo "$as_me:5545: result: no" >&5
+  echo "$as_me:5732: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 	if test "$MSGINIT" != ":" ; then
 		test -n "$verbose" && echo "	adding en.po" 1>&6
 
-echo "${as_me:-configure}:5552: testing adding en.po ..." 1>&5
+echo "${as_me:-configure}:5739: testing adding en.po ..." 1>&5
 
 		ALL_LINGUAS="$ALL_LINGUAS en"
 	fi
@@ -5558,7 +5745,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:5561: checking for $ac_word" >&5
+echo "$as_me:5748: 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
@@ -5573,7 +5760,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:5576: found $ac_dir/$ac_word" >&5
+echo "$as_me:5763: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5581,10 +5768,10 @@ fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:5584: result: $RANLIB" >&5
+  echo "$as_me:5771: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:5587: result: no" >&5
+  echo "$as_me:5774: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5593,7 +5780,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:5596: checking for $ac_word" >&5
+echo "$as_me:5783: 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
@@ -5608,7 +5795,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:5611: found $ac_dir/$ac_word" >&5
+echo "$as_me:5798: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -5617,10 +5804,10 @@ fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:5620: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:5807: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:5623: result: no" >&5
+  echo "$as_me:5810: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5629,13 +5816,13 @@ else
   RANLIB="$ac_cv_prog_RANLIB"
 fi
 
-echo "$as_me:5632: checking for ANSI C header files" >&5
+echo "$as_me:5819: 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 5638 "configure"
+#line 5825 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -5643,13 +5830,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:5646: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:5833: \"$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:5652: \$? = $ac_status" >&5
+  echo "$as_me:5839: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -5671,7 +5858,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 5674 "configure"
+#line 5861 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -5689,7 +5876,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 5692 "configure"
+#line 5879 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -5710,7 +5897,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 5713 "configure"
+#line 5900 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -5736,15 +5923,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:5739: \"$ac_link\"") >&5
+if { (eval echo "$as_me:5926: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5742: \$? = $ac_status" >&5
+  echo "$as_me:5929: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:5744: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5931: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5747: \$? = $ac_status" >&5
+  echo "$as_me:5934: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -5757,7 +5944,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:5760: result: $ac_cv_header_stdc" >&5
+echo "$as_me:5947: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -5767,7 +5954,7 @@ EOF
 
 fi
 
-echo "$as_me:5770: checking for inline" >&5
+echo "$as_me:5957: 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
@@ -5775,7 +5962,7 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >conftest.$ac_ext <<_ACEOF
-#line 5778 "configure"
+#line 5965 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo () {return 0; }
@@ -5784,16 +5971,16 @@ $ac_kw int foo () {return 0; }
 
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5787: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:5974: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5790: \$? = $ac_status" >&5
+  echo "$as_me:5977: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5793: \"$ac_try\"") >&5
+  { (eval echo "$as_me:5980: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5796: \$? = $ac_status" >&5
+  echo "$as_me:5983: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
@@ -5804,7 +5991,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:5807: result: $ac_cv_c_inline" >&5
+echo "$as_me:5994: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -5825,28 +6012,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:5828: checking for $ac_header" >&5
+echo "$as_me:6015: 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 5834 "configure"
+#line 6021 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5840: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6027: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5843: \$? = $ac_status" >&5
+  echo "$as_me:6030: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5846: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6033: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5849: \$? = $ac_status" >&5
+  echo "$as_me:6036: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -5856,7 +6043,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5859: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:6046: 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
@@ -5866,13 +6053,13 @@ EOF
 fi
 done
 
-echo "$as_me:5869: checking for off_t" >&5
+echo "$as_me:6056: 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 5875 "configure"
+#line 6062 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -5887,16 +6074,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5890: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6077: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5893: \$? = $ac_status" >&5
+  echo "$as_me:6080: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5896: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6083: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5899: \$? = $ac_status" >&5
+  echo "$as_me:6086: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -5906,7 +6093,7 @@ ac_cv_type_off_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5909: result: $ac_cv_type_off_t" >&5
+echo "$as_me:6096: 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
   :
@@ -5918,13 +6105,13 @@ EOF
 
 fi
 
-echo "$as_me:5921: checking for size_t" >&5
+echo "$as_me:6108: 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 5927 "configure"
+#line 6114 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -5939,16 +6126,16 @@ if (sizeof (size_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:5942: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6129: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:5945: \$? = $ac_status" >&5
+  echo "$as_me:6132: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:5948: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6135: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:5951: \$? = $ac_status" >&5
+  echo "$as_me:6138: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_size_t=yes
 else
@@ -5958,7 +6145,7 @@ ac_cv_type_size_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:5961: result: $ac_cv_type_size_t" >&5
+echo "$as_me:6148: 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
   :
@@ -5972,13 +6159,13 @@ fi
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo "$as_me:5975: checking for working alloca.h" >&5
+echo "$as_me:6162: 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 5981 "configure"
+#line 6168 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int
@@ -5990,16 +6177,16 @@ char *p = (char *) alloca (2 * sizeof (int));
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:5993: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6180: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:5996: \$? = $ac_status" >&5
+  echo "$as_me:6183: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:5999: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6186: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6002: \$? = $ac_status" >&5
+  echo "$as_me:6189: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_working_alloca_h=yes
 else
@@ -6009,7 +6196,7 @@ ac_cv_working_alloca_h=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6012: result: $ac_cv_working_alloca_h" >&5
+echo "$as_me:6199: 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
 
@@ -6019,13 +6206,13 @@ EOF
 
 fi
 
-echo "$as_me:6022: checking for alloca" >&5
+echo "$as_me:6209: 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 6028 "configure"
+#line 6215 "configure"
 #include "confdefs.h"
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -6057,16 +6244,16 @@ char *p = (char *) alloca (1);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6060: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6247: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6063: \$? = $ac_status" >&5
+  echo "$as_me:6250: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6066: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6253: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6069: \$? = $ac_status" >&5
+  echo "$as_me:6256: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_alloca_works=yes
 else
@@ -6076,7 +6263,7 @@ ac_cv_func_alloca_works=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6079: result: $ac_cv_func_alloca_works" >&5
+echo "$as_me:6266: 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
@@ -6097,13 +6284,13 @@ cat >>confdefs.h <<\EOF
 #define C_ALLOCA 1
 EOF
 
-echo "$as_me:6100: checking whether \`alloca.c' needs Cray hooks" >&5
+echo "$as_me:6287: 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 6106 "configure"
+#line 6293 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -6121,18 +6308,18 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:6124: result: $ac_cv_os_cray" >&5
+echo "$as_me:6311: 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:6129: checking for $ac_func" >&5
+echo "$as_me:6316: 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 6135 "configure"
+#line 6322 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -6163,16 +6350,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6166: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6353: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6169: \$? = $ac_status" >&5
+  echo "$as_me:6356: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6172: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6359: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6175: \$? = $ac_status" >&5
+  echo "$as_me:6362: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -6182,7 +6369,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6185: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:6372: 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
 
@@ -6196,7 +6383,7 @@ fi
   done
 fi
 
-echo "$as_me:6199: checking stack direction for C alloca" >&5
+echo "$as_me:6386: 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
@@ -6205,7 +6392,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6208 "configure"
+#line 6395 "configure"
 #include "confdefs.h"
 int
 find_stack_direction ()
@@ -6228,15 +6415,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:6231: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6418: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6234: \$? = $ac_status" >&5
+  echo "$as_me:6421: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:6236: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6423: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6239: \$? = $ac_status" >&5
+  echo "$as_me:6426: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_stack_direction=1
 else
@@ -6248,7 +6435,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:6251: result: $ac_cv_c_stack_direction" >&5
+echo "$as_me:6438: result: $ac_cv_c_stack_direction" >&5
 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
 cat >>confdefs.h <<EOF
@@ -6260,23 +6447,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:6263: checking for $ac_header" >&5
+echo "$as_me:6450: 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 6269 "configure"
+#line 6456 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:6273: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:6460: \"$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:6279: \$? = $ac_status" >&5
+  echo "$as_me:6466: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6295,7 +6482,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:6298: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:6485: 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
@@ -6308,13 +6495,13 @@ done
 for ac_func in getpagesize
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:6311: checking for $ac_func" >&5
+echo "$as_me:6498: 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 6317 "configure"
+#line 6504 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -6345,16 +6532,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6348: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6535: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6351: \$? = $ac_status" >&5
+  echo "$as_me:6538: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6354: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6541: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6357: \$? = $ac_status" >&5
+  echo "$as_me:6544: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -6364,7 +6551,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6367: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:6554: 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
@@ -6374,7 +6561,7 @@ EOF
 fi
 done
 
-echo "$as_me:6377: checking for working mmap" >&5
+echo "$as_me:6564: 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
@@ -6383,7 +6570,7 @@ else
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6386 "configure"
+#line 6573 "configure"
 #include "confdefs.h"
 $ac_includes_default
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -6510,15 +6697,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:6513: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6700: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6516: \$? = $ac_status" >&5
+  echo "$as_me:6703: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:6518: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6705: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6521: \$? = $ac_status" >&5
+  echo "$as_me:6708: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -6530,7 +6717,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:6533: result: $ac_cv_func_mmap_fixed_mapped" >&5
+echo "$as_me:6720: 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
 
@@ -6541,13 +6728,13 @@ EOF
 fi
 rm -f conftest.mmap
 
-echo "$as_me:6544: checking whether we are using the GNU C Library 2.1 or newer" >&5
+echo "$as_me:6731: 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 6550 "configure"
+#line 6737 "configure"
 #include "confdefs.h"
 
 #include <features.h>
@@ -6567,7 +6754,7 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:6570: result: $ac_cv_gnu_library_2_1" >&5
+echo "$as_me:6757: 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"
@@ -6580,7 +6767,7 @@ test -z "$ALL_LINGUAS" && ALL_LINGUAS=`test -d $srcdir/po && cd $srcdir/po && ec
 : ${CONFIG_H:=config.h}
 
 if test -z "$PACKAGE" ; then
-	{ { echo "$as_me:6583: error: CF_BUNDLED_INTL used without setting PACKAGE variable" >&5
+	{ { echo "$as_me:6770: error: CF_BUNDLED_INTL used without setting PACKAGE variable" >&5
 echo "$as_me: error: CF_BUNDLED_INTL used without setting PACKAGE variable" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -6597,23 +6784,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:6600: checking for $ac_header" >&5
+echo "$as_me:6787: 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 6606 "configure"
+#line 6793 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:6610: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:6797: \"$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:6616: \$? = $ac_status" >&5
+  echo "$as_me:6803: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -6632,7 +6819,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:6635: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:6822: 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
@@ -6647,13 +6834,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:6650: checking for $ac_func" >&5
+echo "$as_me:6837: 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 6656 "configure"
+#line 6843 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -6684,16 +6871,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6687: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6874: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6690: \$? = $ac_status" >&5
+  echo "$as_me:6877: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6693: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6880: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6696: \$? = $ac_status" >&5
+  echo "$as_me:6883: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -6703,7 +6890,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6706: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:6893: 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
@@ -6751,7 +6938,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 6754 "configure"
+#line 6941 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -6763,16 +6950,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6766: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:6953: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6769: \$? = $ac_status" >&5
+  echo "$as_me:6956: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6772: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6959: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6775: \$? = $ac_status" >&5
+  echo "$as_me:6962: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -6789,7 +6976,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}:6792: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:6979: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -6832,7 +7019,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 6835 "configure"
+#line 7022 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -6844,16 +7031,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:6847: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7034: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6850: \$? = $ac_status" >&5
+  echo "$as_me:7037: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:6853: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7040: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6856: \$? = $ac_status" >&5
+  echo "$as_me:7043: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -6870,7 +7057,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}:6873: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:7060: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -6888,7 +7075,7 @@ echo "${as_me:-configure}:6873: testing adding $cf_add_incdir to include-path ..
 fi
 
 	else
-{ { echo "$as_me:6891: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:7078: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -6913,7 +7100,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}:6916: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:7103: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -6942,7 +7129,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}:6945: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:7132: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -6951,7 +7138,7 @@ echo "${as_me:-configure}:6945: testing adding $cf_add_libdir to library-path ..
 fi
 
 	else
-{ { echo "$as_me:6954: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:7141: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -6962,7 +7149,7 @@ esac
 
 fi;
 
-  echo "$as_me:6965: checking for iconv" >&5
+  echo "$as_me:7152: 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
@@ -6973,12 +7160,12 @@ else
 cf_cv_header_path_iconv=
 cf_cv_library_path_iconv=
 
-echo "${as_me:-configure}:6976: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:7163: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 6981 "configure"
+#line 7168 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -6997,16 +7184,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7000: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7187: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7003: \$? = $ac_status" >&5
+  echo "$as_me:7190: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7006: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7193: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7009: \$? = $ac_status" >&5
+  echo "$as_me:7196: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -7020,7 +7207,7 @@ cat conftest.$ac_ext >&5
 LIBS="-liconv  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 7023 "configure"
+#line 7210 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -7039,16 +7226,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7042: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7229: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7045: \$? = $ac_status" >&5
+  echo "$as_me:7232: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7048: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7235: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7051: \$? = $ac_status" >&5
+  echo "$as_me:7238: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -7065,9 +7252,9 @@ cat conftest.$ac_ext >&5
 
 	test -n "$verbose" && echo "	find linkage for iconv library" 1>&6
 
-echo "${as_me:-configure}:7068: testing find linkage for iconv library ..." 1>&5
+echo "${as_me:-configure}:7255: testing find linkage for iconv library ..." 1>&5
 
-echo "${as_me:-configure}:7070: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:7257: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -7158,11 +7345,11 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d $cf_cv_header_path_iconv ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_iconv" 1>&6
 
-echo "${as_me:-configure}:7161: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:7348: 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 7165 "configure"
+#line 7352 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -7181,21 +7368,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7184: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7371: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7187: \$? = $ac_status" >&5
+  echo "$as_me:7374: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7190: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7377: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7193: \$? = $ac_status" >&5
+  echo "$as_me:7380: \$? = $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}:7198: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:7385: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
 
 				cf_cv_find_linkage_iconv=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -7213,7 +7400,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	if test "$cf_cv_find_linkage_iconv" = maybe ; then
 
-echo "${as_me:-configure}:7216: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:7403: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -7288,13 +7475,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}:7291: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:7478: 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 7297 "configure"
+#line 7484 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -7313,21 +7500,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7316: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7503: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7319: \$? = $ac_status" >&5
+  echo "$as_me:7506: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7322: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7509: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7325: \$? = $ac_status" >&5
+  echo "$as_me:7512: \$? = $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}:7330: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:7517: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
 
 					cf_cv_find_linkage_iconv=yes
 					cf_cv_library_file_iconv="-liconv"
@@ -7367,7 +7554,7 @@ am_cv_func_iconv="no, consider installing GNU libiconv"
 fi
 
 fi
-echo "$as_me:7370: result: $am_cv_func_iconv" >&5
+echo "$as_me:7557: result: $am_cv_func_iconv" >&5
 echo "${ECHO_T}$am_cv_func_iconv" >&6
 
   if test "$am_cv_func_iconv" = yes; then
@@ -7376,14 +7563,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_ICONV 1
 EOF
 
-    echo "$as_me:7379: checking if the declaration of iconv() needs const." >&5
+    echo "$as_me:7566: 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 7386 "configure"
+#line 7573 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -7408,16 +7595,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7411: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7598: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7414: \$? = $ac_status" >&5
+  echo "$as_me:7601: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7417: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7604: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7420: \$? = $ac_status" >&5
+  echo "$as_me:7607: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_proto_iconv_const=no
 else
@@ -7427,7 +7614,7 @@ am_cv_proto_iconv_const=yes
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:7430: result: $am_cv_proto_iconv_const" >&5
+echo "$as_me:7617: 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
@@ -7469,7 +7656,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 7472 "configure"
+#line 7659 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -7481,16 +7668,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7484: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:7671: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7487: \$? = $ac_status" >&5
+  echo "$as_me:7674: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7490: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7677: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7493: \$? = $ac_status" >&5
+  echo "$as_me:7680: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -7507,7 +7694,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}:7510: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:7697: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -7546,7 +7733,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}:7549: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:7736: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -7557,13 +7744,13 @@ fi
     fi
   fi
 
-echo "$as_me:7560: checking for nl_langinfo and CODESET" >&5
+echo "$as_me:7747: 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 7566 "configure"
+#line 7753 "configure"
 #include "confdefs.h"
 #include <langinfo.h>
 int
@@ -7575,16 +7762,16 @@ char* cs = nl_langinfo(CODESET);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7578: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7765: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7581: \$? = $ac_status" >&5
+  echo "$as_me:7768: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7584: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7771: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7587: \$? = $ac_status" >&5
+  echo "$as_me:7774: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_langinfo_codeset=yes
 else
@@ -7595,7 +7782,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:7598: result: $am_cv_langinfo_codeset" >&5
+echo "$as_me:7785: result: $am_cv_langinfo_codeset" >&5
 echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
 	if test $am_cv_langinfo_codeset = yes; then
 
@@ -7606,13 +7793,13 @@ EOF
 	fi
 
    if test $ac_cv_header_locale_h = yes; then
-	echo "$as_me:7609: checking for LC_MESSAGES" >&5
+	echo "$as_me:7796: 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 7615 "configure"
+#line 7802 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int
@@ -7624,16 +7811,16 @@ return LC_MESSAGES
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7627: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7814: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7630: \$? = $ac_status" >&5
+  echo "$as_me:7817: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7633: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7820: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7636: \$? = $ac_status" >&5
+  echo "$as_me:7823: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_val_LC_MESSAGES=yes
 else
@@ -7643,7 +7830,7 @@ am_cv_val_LC_MESSAGES=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7646: result: $am_cv_val_LC_MESSAGES" >&5
+echo "$as_me:7833: 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
 
@@ -7653,7 +7840,7 @@ EOF
 
 	fi
 fi
-   echo "$as_me:7656: checking whether NLS is requested" >&5
+   echo "$as_me:7843: 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.
@@ -7663,7 +7850,7 @@ if test "${enable_nls+set}" = set; then
 else
   USE_NLS=no
 fi;
-  echo "$as_me:7666: result: $USE_NLS" >&5
+  echo "$as_me:7853: result: $USE_NLS" >&5
 echo "${ECHO_T}$USE_NLS" >&6
 
   BUILD_INCLUDED_LIBINTL=no
@@ -7676,7 +7863,7 @@ cat >>confdefs.h <<\EOF
 #define ENABLE_NLS 1
 EOF
 
-    echo "$as_me:7679: checking whether included gettext is requested" >&5
+    echo "$as_me:7866: 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.
@@ -7686,7 +7873,7 @@ if test "${with_included_gettext+set}" = set; then
 else
   nls_cv_force_use_gnu_gettext=no
 fi;
-    echo "$as_me:7689: result: $nls_cv_force_use_gnu_gettext" >&5
+    echo "$as_me:7876: 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"
@@ -7711,7 +7898,7 @@ do
 done
 LIBS="$cf_add_libs"
 
-      echo "$as_me:7714: checking for libintl.h and gettext()" >&5
+      echo "$as_me:7901: 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
@@ -7722,12 +7909,12 @@ else
 cf_cv_header_path_intl=
 cf_cv_library_path_intl=
 
-echo "${as_me:-configure}:7725: testing Starting FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me:-configure}:7912: testing Starting FIND_LINKAGE(intl,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 7730 "configure"
+#line 7917 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -7747,16 +7934,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7750: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7937: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7753: \$? = $ac_status" >&5
+  echo "$as_me:7940: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7756: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7943: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7759: \$? = $ac_status" >&5
+  echo "$as_me:7946: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_intl=yes
@@ -7770,7 +7957,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lintl  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 7773 "configure"
+#line 7960 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -7790,16 +7977,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7793: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7980: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7796: \$? = $ac_status" >&5
+  echo "$as_me:7983: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7799: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7986: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7802: \$? = $ac_status" >&5
+  echo "$as_me:7989: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_intl=yes
@@ -7816,9 +8003,9 @@ cat conftest.$ac_ext >&5
 
 	test -n "$verbose" && echo "	find linkage for intl library" 1>&6
 
-echo "${as_me:-configure}:7819: testing find linkage for intl library ..." 1>&5
+echo "${as_me:-configure}:8006: testing find linkage for intl library ..." 1>&5
 
-echo "${as_me:-configure}:7821: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me:-configure}:8008: testing Searching for headers in FIND_LINKAGE(intl,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -7909,11 +8096,11 @@ cf_search="$cf_search $cf_header_path_list"
 		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}:7912: testing ... testing $cf_cv_header_path_intl ..." 1>&5
+echo "${as_me:-configure}:8099: 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 7916 "configure"
+#line 8103 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -7933,21 +8120,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:7936: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8123: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:7939: \$? = $ac_status" >&5
+  echo "$as_me:8126: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:7942: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8129: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7945: \$? = $ac_status" >&5
+  echo "$as_me:8132: \$? = $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}:7950: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5
+echo "${as_me:-configure}:8137: testing ... found intl headers in $cf_cv_header_path_intl ..." 1>&5
 
 				cf_cv_find_linkage_intl=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -7965,7 +8152,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	if test "$cf_cv_find_linkage_intl" = maybe ; then
 
-echo "${as_me:-configure}:7968: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5
+echo "${as_me:-configure}:8155: testing Searching for intl library in FIND_LINKAGE(intl,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -8040,13 +8227,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}:8043: testing ... testing $cf_cv_library_path_intl ..." 1>&5
+echo "${as_me:-configure}:8230: 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 8049 "configure"
+#line 8236 "configure"
 #include "confdefs.h"
 
 #include <libintl.h>
@@ -8066,21 +8253,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8069: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8256: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8072: \$? = $ac_status" >&5
+  echo "$as_me:8259: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8075: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8262: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8078: \$? = $ac_status" >&5
+  echo "$as_me:8265: \$? = $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}:8083: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5
+echo "${as_me:-configure}:8270: testing ... found intl library in $cf_cv_library_path_intl ..." 1>&5
 
 					cf_cv_find_linkage_intl=yes
 					cf_cv_library_file_intl="-lintl"
@@ -8120,7 +8307,7 @@ cf_cv_func_gettext=no
 fi
 
 fi
-echo "$as_me:8123: result: $cf_cv_func_gettext" >&5
+echo "$as_me:8310: result: $cf_cv_func_gettext" >&5
 echo "${ECHO_T}$cf_cv_func_gettext" >&6
       LIBS="$cf_save_LIBS_1"
 
@@ -8160,7 +8347,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 8163 "configure"
+#line 8350 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -8172,16 +8359,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8175: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8362: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8178: \$? = $ac_status" >&5
+  echo "$as_me:8365: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8181: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8368: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8184: \$? = $ac_status" >&5
+  echo "$as_me:8371: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -8198,7 +8385,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}:8201: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:8388: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -8237,7 +8424,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}:8240: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:8427: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				INTLLIBS="-L$cf_add_libdir $INTLLIBS"
 			fi
@@ -8253,13 +8440,13 @@ fi
 for ac_func in dcgettext
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:8256: checking for $ac_func" >&5
+echo "$as_me:8443: 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 8262 "configure"
+#line 8449 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -8290,16 +8477,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:8293: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8480: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8296: \$? = $ac_status" >&5
+  echo "$as_me:8483: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:8299: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8486: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8302: \$? = $ac_status" >&5
+  echo "$as_me:8489: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -8309,7 +8496,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:8312: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:8499: 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
@@ -8324,7 +8511,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:8327: checking for $ac_word" >&5
+echo "$as_me:8514: 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
@@ -8351,16 +8538,16 @@ esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test "$MSGFMT" != ":"; then
-  echo "$as_me:8354: result: $MSGFMT" >&5
+  echo "$as_me:8541: result: $MSGFMT" >&5
 echo "${ECHO_T}$MSGFMT" >&6
 else
-  echo "$as_me:8357: result: no" >&5
+  echo "$as_me:8544: 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:8363: checking for $ac_word" >&5
+echo "$as_me:8550: 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
@@ -8377,7 +8564,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:8380: found $ac_dir/$ac_word" >&5
+   echo "$as_me:8567: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -8389,17 +8576,17 @@ fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 
 if test -n "$GMSGFMT"; then
-  echo "$as_me:8392: result: $GMSGFMT" >&5
+  echo "$as_me:8579: result: $GMSGFMT" >&5
 echo "${ECHO_T}$GMSGFMT" >&6
 else
-  echo "$as_me:8395: result: no" >&5
+  echo "$as_me:8582: 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:8402: checking for $ac_word" >&5
+echo "$as_me:8589: 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
@@ -8426,10 +8613,10 @@ esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test "$XGETTEXT" != ":"; then
-  echo "$as_me:8429: result: $XGETTEXT" >&5
+  echo "$as_me:8616: result: $XGETTEXT" >&5
 echo "${ECHO_T}$XGETTEXT" >&6
 else
-  echo "$as_me:8432: result: no" >&5
+  echo "$as_me:8619: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8444,7 +8631,7 @@ fi
 
     if test "$nls_cv_use_gnu_gettext" = "yes"; then
       if test ! -d $srcdir/intl ; then
-        { { echo "$as_me:8447: error: no NLS library is packaged with this application" >&5
+        { { echo "$as_me:8634: 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
@@ -8452,7 +8639,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:8455: checking for $ac_word" >&5
+echo "$as_me:8642: 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
@@ -8479,16 +8666,16 @@ esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test "$MSGFMT" != ":"; then
-  echo "$as_me:8482: result: $MSGFMT" >&5
+  echo "$as_me:8669: result: $MSGFMT" >&5
 echo "${ECHO_T}$MSGFMT" >&6
 else
-  echo "$as_me:8485: result: no" >&5
+  echo "$as_me:8672: 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:8491: checking for $ac_word" >&5
+echo "$as_me:8678: 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
@@ -8505,7 +8692,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:8508: found $ac_dir/$ac_word" >&5
+   echo "$as_me:8695: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -8517,17 +8704,17 @@ fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 
 if test -n "$GMSGFMT"; then
-  echo "$as_me:8520: result: $GMSGFMT" >&5
+  echo "$as_me:8707: result: $GMSGFMT" >&5
 echo "${ECHO_T}$GMSGFMT" >&6
 else
-  echo "$as_me:8523: result: no" >&5
+  echo "$as_me:8710: 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:8530: checking for $ac_word" >&5
+echo "$as_me:8717: 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
@@ -8554,10 +8741,10 @@ esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test "$XGETTEXT" != ":"; then
-  echo "$as_me:8557: result: $XGETTEXT" >&5
+  echo "$as_me:8744: result: $XGETTEXT" >&5
 echo "${ECHO_T}$XGETTEXT" >&6
 else
-  echo "$as_me:8560: result: no" >&5
+  echo "$as_me:8747: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8572,7 +8759,7 @@ fi
                   if $GMSGFMT --statistics /dev/null >/dev/null 2>&1; then
         : ;
       else
-        echo "$as_me:8575: result: found msgfmt program is not GNU msgfmt; ignore it" >&5
+        echo "$as_me:8762: 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
@@ -8582,7 +8769,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:8585: result: found xgettext program is not GNU xgettext; ignore it" >&5
+        echo "$as_me:8772: 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
@@ -8602,7 +8789,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:8605: checking for $ac_word" >&5
+echo "$as_me:8792: 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
@@ -8617,7 +8804,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:8620: found $ac_dir/$ac_word" >&5
+echo "$as_me:8807: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -8625,10 +8812,10 @@ fi
 fi
 INTLBISON=$ac_cv_prog_INTLBISON
 if test -n "$INTLBISON"; then
-  echo "$as_me:8628: result: $INTLBISON" >&5
+  echo "$as_me:8815: result: $INTLBISON" >&5
 echo "${ECHO_T}$INTLBISON" >&6
 else
-  echo "$as_me:8631: result: no" >&5
+  echo "$as_me:8818: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -8638,7 +8825,7 @@ done
     if test -z "$INTLBISON"; then
       ac_verc_fail=yes
     else
-            echo "$as_me:8641: checking version of bison" >&5
+            echo "$as_me:8828: 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
@@ -8647,7 +8834,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:8650: result: $ac_prog_version" >&5
+    echo "$as_me:8837: result: $ac_prog_version" >&5
 echo "${ECHO_T}$ac_prog_version" >&6
     fi
     if test $ac_verc_fail = yes; then
@@ -8673,7 +8860,7 @@ echo "${ECHO_T}$ac_prog_version" >&6
      if test "x$ALL_LINGUAS" = "x"; then
        LINGUAS=
      else
-       echo "$as_me:8676: checking for catalogs to be installed" >&5
+       echo "$as_me:8863: 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
@@ -8693,7 +8880,7 @@ echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6
          fi
        done
        LINGUAS=$NEW_LINGUAS
-       echo "$as_me:8696: result: $LINGUAS" >&5
+       echo "$as_me:8883: result: $LINGUAS" >&5
 echo "${ECHO_T}$LINGUAS" >&6
      fi
 
@@ -8729,7 +8916,7 @@ cf_makefile=makefile
 use_our_messages=no
 if test "$USE_NLS" = yes ; then
 if test -d $srcdir/po ; then
-echo "$as_me:8732: checking if we should use included message-library" >&5
+echo "$as_me:8919: 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.
@@ -8740,7 +8927,7 @@ else
   use_our_messages=yes
 fi;
 fi
-echo "$as_me:8743: result: $use_our_messages" >&5
+echo "$as_me:8930: result: $use_our_messages" >&5
 echo "${ECHO_T}$use_our_messages" >&6
 fi
 
@@ -8782,23 +8969,23 @@ else
 for ac_header in libintl.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:8785: checking for $ac_header" >&5
+echo "$as_me:8972: 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 8791 "configure"
+#line 8978 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8795: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:8982: \"$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:8801: \$? = $ac_status" >&5
+  echo "$as_me:8988: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8817,7 +9004,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:8820: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:9007: 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
@@ -8903,7 +9090,7 @@ case ".$withval" in
 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:8906: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:9093: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -8912,7 +9099,7 @@ esac
 fi
 eval NLS_DATADIR="$withval"
 
-echo "$as_me:8915: checking if you want full utility pathnames" >&5
+echo "$as_me:9102: 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.
@@ -8929,14 +9116,14 @@ else
 	with_full_paths=yes
 
 fi;
-echo "$as_me:8932: result: $with_full_paths" >&5
+echo "$as_me:9119: 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:8939: checking for system mailer" >&5
+echo "$as_me:9126: 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
@@ -8956,14 +9143,14 @@ else
 
 fi
 
-echo "$as_me:8959: result: $cf_cv_SYSTEM_MAIL" >&5
+echo "$as_me:9146: 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:8966: checking system mail flags" >&5
+echo "$as_me:9153: 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
@@ -8979,7 +9166,7 @@ else
 
 fi
 
-echo "$as_me:8982: result: $cf_cv_system_mail_flags" >&5
+echo "$as_me:9169: result: $cf_cv_system_mail_flags" >&5
 echo "${ECHO_T}$cf_cv_system_mail_flags" >&6
 
 cat >>confdefs.h <<EOF
@@ -9000,7 +9187,7 @@ case $host_os in
 (aix[4-7]*)
 	cf_xopen_source="-D_ALL_SOURCE"
 	;;
-(cygwin|msys)
+(msys)
 	cf_XOPEN_SOURCE=600
 	;;
 (darwin[0-8].*)
@@ -9028,16 +9215,16 @@ case $host_os in
 	cf_xopen_source="-D_SGI_SOURCE"
 	cf_XOPEN_SOURCE=
 	;;
-(linux*|gnu*|mint*|k*bsd*-gnu)
+(linux*|uclinux*|gnu*|mint*|k*bsd*-gnu|cygwin)
 
-echo "$as_me:9033: checking if we must define _GNU_SOURCE" >&5
+echo "$as_me:9220: 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 9040 "configure"
+#line 9227 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -9052,16 +9239,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9055: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9242: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9058: \$? = $ac_status" >&5
+  echo "$as_me:9245: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9061: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9248: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9064: \$? = $ac_status" >&5
+  echo "$as_me:9251: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_gnu_source=no
 else
@@ -9070,7 +9257,7 @@ cat conftest.$ac_ext >&5
 cf_save="$CPPFLAGS"
 	 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 9073 "configure"
+#line 9260 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -9085,16 +9272,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9088: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9275: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9091: \$? = $ac_status" >&5
+  echo "$as_me:9278: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9094: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9281: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9097: \$? = $ac_status" >&5
+  echo "$as_me:9284: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_gnu_source=no
 else
@@ -9109,9 +9296,58 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:9112: result: $cf_cv_gnu_source" >&5
+echo "$as_me:9299: 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"
+
+if test "$cf_cv_gnu_source" = yes
+then
+echo "$as_me:9304: checking if we should also define _DEFAULT_SOURCE" >&5
+echo $ECHO_N "checking if we should also define _DEFAULT_SOURCE... $ECHO_C" >&6
+if test "${cf_cv_default_source+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+
+CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
+	cat >conftest.$ac_ext <<_ACEOF
+#line 9312 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+int
+main ()
+{
+
+#ifdef _DEFAULT_SOURCE
+make an error
+#endif
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:9327: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:9330: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:9333: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:9336: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  cf_cv_default_source=no
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+cf_cv_default_source=yes
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+
+fi
+echo "$as_me:9347: result: $cf_cv_default_source" >&5
+echo "${ECHO_T}$cf_cv_default_source" >&6
+test "$cf_cv_default_source" = yes && CPPFLAGS="$CPPFLAGS -D_DEFAULT_SOURCE"
+fi
 
 	;;
 (minix*)
@@ -9134,16 +9370,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:9137: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:9373: 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}:9143: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:9379: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 9146 "configure"
+#line 9382 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -9158,16 +9394,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9161: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9397: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9164: \$? = $ac_status" >&5
+  echo "$as_me:9400: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9167: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9403: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9170: \$? = $ac_status" >&5
+  echo "$as_me:9406: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -9188,7 +9424,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >conftest.$ac_ext <<_ACEOF
-#line 9191 "configure"
+#line 9427 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -9203,16 +9439,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9206: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9442: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9209: \$? = $ac_status" >&5
+  echo "$as_me:9445: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9212: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9448: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9215: \$? = $ac_status" >&5
+  echo "$as_me:9451: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9223,15 +9459,15 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 	 fi
 
-echo "${as_me:-configure}:9226: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:9462: 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}:9231: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:9467: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 9234 "configure"
+#line 9470 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -9246,16 +9482,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9249: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9485: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9252: \$? = $ac_status" >&5
+  echo "$as_me:9488: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9255: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9491: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9258: \$? = $ac_status" >&5
+  echo "$as_me:9494: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9271,7 +9507,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:9274: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:9510: 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
@@ -9298,10 +9534,16 @@ case $cf_fix_cppflags in
 				&& cf_fix_cppflags=yes
 
 			if test $cf_fix_cppflags = yes ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			elif test "${cf_tst_cflags}" = "\"'" ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			fi
 			;;
@@ -9320,17 +9562,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
 				;;
 			esac
-			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+	cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+
 			;;
 		esac
 		;;
 	(*)
-		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+	test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+	cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+
 		;;
 	esac
 	;;
 (yes)
-	cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
@@ -9343,17 +9593,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
-	CFLAGS="$CFLAGS $cf_new_cflags"
+	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+	CFLAGS="${CFLAGS}$cf_new_cflags"
+
 fi
 
 if test -n "$cf_new_cppflags" ; then
 
-	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
-	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+
 fi
 
 fi
@@ -9370,9 +9626,6 @@ fi
 (openbsd*)
 	# setting _XOPEN_SOURCE breaks xterm on OpenBSD 2.8, is not needed for ncursesw
 	;;
-(os2*)
-	cf_XOPEN_SOURCE=
-	;;
 (osf[45]*)
 	cf_xopen_source="-D_OSF_SOURCE"
 	;;
@@ -9392,14 +9645,14 @@ fi
 	;;
 (*)
 
-echo "$as_me:9395: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:9648: 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 9402 "configure"
+#line 9655 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -9418,16 +9671,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9421: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9674: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9424: \$? = $ac_status" >&5
+  echo "$as_me:9677: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9427: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9680: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9430: \$? = $ac_status" >&5
+  echo "$as_me:9683: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
@@ -9436,7 +9689,7 @@ cat conftest.$ac_ext >&5
 cf_save="$CPPFLAGS"
 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 9439 "configure"
+#line 9692 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -9455,16 +9708,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9458: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9711: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9461: \$? = $ac_status" >&5
+  echo "$as_me:9714: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9464: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9717: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9467: \$? = $ac_status" >&5
+  echo "$as_me:9720: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
@@ -9479,7 +9732,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:9482: result: $cf_cv_xopen_source" >&5
+echo "$as_me:9735: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -9514,10 +9767,16 @@ case $cf_fix_cppflags in
 				&& cf_fix_cppflags=yes
 
 			if test $cf_fix_cppflags = yes ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			elif test "${cf_tst_cflags}" = "\"'" ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			fi
 			;;
@@ -9536,17 +9795,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
 				;;
 			esac
-			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+	cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+
 			;;
 		esac
 		;;
 	(*)
-		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+	test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+	cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+
 		;;
 	esac
 	;;
 (yes)
-	cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
@@ -9559,17 +9826,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
-	CFLAGS="$CFLAGS $cf_new_cflags"
+	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+	CFLAGS="${CFLAGS}$cf_new_cflags"
+
 fi
 
 if test -n "$cf_new_cppflags" ; then
 
-	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
-	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+
 fi
 
 fi
@@ -9587,16 +9860,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:9590: checking if we should define _POSIX_C_SOURCE" >&5
+echo "$as_me:9863: 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}:9596: testing if the symbol is already defined go no further ..." 1>&5
+echo "${as_me:-configure}:9869: testing if the symbol is already defined go no further ..." 1>&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 9599 "configure"
+#line 9872 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -9611,16 +9884,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9614: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9887: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9617: \$? = $ac_status" >&5
+  echo "$as_me:9890: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9620: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9893: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9623: \$? = $ac_status" >&5
+  echo "$as_me:9896: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_posix_c_source=no
 else
@@ -9641,7 +9914,7 @@ cf_want_posix_source=no
 	 esac
 	 if test "$cf_want_posix_source" = yes ; then
 		cat >conftest.$ac_ext <<_ACEOF
-#line 9644 "configure"
+#line 9917 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -9656,16 +9929,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9659: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9932: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9662: \$? = $ac_status" >&5
+  echo "$as_me:9935: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9665: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9938: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9668: \$? = $ac_status" >&5
+  echo "$as_me:9941: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9676,15 +9949,15 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 	 fi
 
-echo "${as_me:-configure}:9679: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
+echo "${as_me:-configure}:9952: 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}:9684: testing if the second compile does not leave our definition intact error ..." 1>&5
+echo "${as_me:-configure}:9957: testing if the second compile does not leave our definition intact error ..." 1>&5
 
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 9687 "configure"
+#line 9960 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int
@@ -9699,16 +9972,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9702: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9975: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9705: \$? = $ac_status" >&5
+  echo "$as_me:9978: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9708: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9981: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9711: \$? = $ac_status" >&5
+  echo "$as_me:9984: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -9724,7 +9997,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:9727: result: $cf_cv_posix_c_source" >&5
+echo "$as_me:10000: 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
@@ -9751,10 +10024,16 @@ case $cf_fix_cppflags in
 				&& cf_fix_cppflags=yes
 
 			if test $cf_fix_cppflags = yes ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			elif test "${cf_tst_cflags}" = "\"'" ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			fi
 			;;
@@ -9773,17 +10052,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
 				;;
 			esac
-			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+	cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+
 			;;
 		esac
 		;;
 	(*)
-		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+	test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+	cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+
 		;;
 	esac
 	;;
 (yes)
-	cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
@@ -9796,17 +10083,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
-	CFLAGS="$CFLAGS $cf_new_cflags"
+	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+	CFLAGS="${CFLAGS}$cf_new_cflags"
+
 fi
 
 if test -n "$cf_new_cppflags" ; then
 
-	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
-	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+
 fi
 
 fi
@@ -9836,10 +10129,16 @@ case $cf_fix_cppflags in
 				&& cf_fix_cppflags=yes
 
 			if test $cf_fix_cppflags = yes ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			elif test "${cf_tst_cflags}" = "\"'" ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			fi
 			;;
@@ -9858,17 +10157,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
 				;;
 			esac
-			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+	cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+
 			;;
 		esac
 		;;
 	(*)
-		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+	test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+	cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+
 		;;
 	esac
 	;;
 (yes)
-	cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
@@ -9882,34 +10189,40 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:9885: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:10192: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+
+	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+	CFLAGS="${CFLAGS}$cf_new_cflags"
 
-	CFLAGS="$CFLAGS $cf_new_cflags"
 fi
 
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:9893: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:10202: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
 
-	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
 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}:9901: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:10212: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+
+	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
 
-	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
 fi
 
 fi
 
 if test -n "$cf_XOPEN_SOURCE" && test -z "$cf_cv_xopen_source" ; then
-	echo "$as_me:9909: checking if _XOPEN_SOURCE really is set" >&5
+	echo "$as_me:10222: checking if _XOPEN_SOURCE really is set" >&5
 echo $ECHO_N "checking if _XOPEN_SOURCE really is set... $ECHO_C" >&6
 	cat >conftest.$ac_ext <<_ACEOF
-#line 9912 "configure"
+#line 10225 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -9924,16 +10237,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9927: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10240: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9930: \$? = $ac_status" >&5
+  echo "$as_me:10243: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9933: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10246: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9936: \$? = $ac_status" >&5
+  echo "$as_me:10249: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_XOPEN_SOURCE_set=yes
 else
@@ -9942,12 +10255,12 @@ cat conftest.$ac_ext >&5
 cf_XOPEN_SOURCE_set=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-	echo "$as_me:9945: result: $cf_XOPEN_SOURCE_set" >&5
+	echo "$as_me:10258: result: $cf_XOPEN_SOURCE_set" >&5
 echo "${ECHO_T}$cf_XOPEN_SOURCE_set" >&6
 	if test $cf_XOPEN_SOURCE_set = yes
 	then
 		cat >conftest.$ac_ext <<_ACEOF
-#line 9950 "configure"
+#line 10263 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 int
@@ -9962,16 +10275,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9965: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10278: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9968: \$? = $ac_status" >&5
+  echo "$as_me:10281: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9971: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10284: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9974: \$? = $ac_status" >&5
+  echo "$as_me:10287: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_XOPEN_SOURCE_set_ok=yes
 else
@@ -9982,19 +10295,19 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 		if test $cf_XOPEN_SOURCE_set_ok = no
 		then
-			{ echo "$as_me:9985: WARNING: _XOPEN_SOURCE is lower than requested" >&5
+			{ echo "$as_me:10298: WARNING: _XOPEN_SOURCE is lower than requested" >&5
 echo "$as_me: WARNING: _XOPEN_SOURCE is lower than requested" >&2;}
 		fi
 	else
 
-echo "$as_me:9990: checking if we should define _XOPEN_SOURCE" >&5
+echo "$as_me:10303: 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 9997 "configure"
+#line 10310 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -10013,16 +10326,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10016: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10329: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10019: \$? = $ac_status" >&5
+  echo "$as_me:10332: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10022: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10335: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10025: \$? = $ac_status" >&5
+  echo "$as_me:10338: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
@@ -10031,7 +10344,7 @@ cat conftest.$ac_ext >&5
 cf_save="$CPPFLAGS"
 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
 	 cat >conftest.$ac_ext <<_ACEOF
-#line 10034 "configure"
+#line 10347 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -10050,16 +10363,16 @@ make an error
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10053: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10366: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10056: \$? = $ac_status" >&5
+  echo "$as_me:10369: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10059: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10372: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10062: \$? = $ac_status" >&5
+  echo "$as_me:10375: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xopen_source=no
 else
@@ -10074,7 +10387,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:10077: result: $cf_cv_xopen_source" >&5
+echo "$as_me:10390: result: $cf_cv_xopen_source" >&5
 echo "${ECHO_T}$cf_cv_xopen_source" >&6
 
 if test "$cf_cv_xopen_source" != no ; then
@@ -10109,10 +10422,16 @@ case $cf_fix_cppflags in
 				&& cf_fix_cppflags=yes
 
 			if test $cf_fix_cppflags = yes ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			elif test "${cf_tst_cflags}" = "\"'" ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			fi
 			;;
@@ -10131,17 +10450,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
 				;;
 			esac
-			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+	cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+
 			;;
 		esac
 		;;
 	(*)
-		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+	test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+	cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+
 		;;
 	esac
 	;;
 (yes)
-	cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
@@ -10154,17 +10481,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
-	CFLAGS="$CFLAGS $cf_new_cflags"
+	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+	CFLAGS="${CFLAGS}$cf_new_cflags"
+
 fi
 
 if test -n "$cf_new_cppflags" ; then
 
-	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
-	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+
 fi
 
 fi
@@ -10172,14 +10505,14 @@ fi
 	fi
 fi
 
-echo "$as_me:10175: checking if SIGWINCH is defined" >&5
+echo "$as_me:10508: 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 10182 "configure"
+#line 10515 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -10194,23 +10527,23 @@ int x = SIGWINCH
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10197: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10530: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10200: \$? = $ac_status" >&5
+  echo "$as_me:10533: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10203: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10536: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10206: \$? = $ac_status" >&5
+  echo "$as_me:10539: \$? = $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 10213 "configure"
+#line 10546 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -10228,16 +10561,16 @@ int x = SIGWINCH
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10231: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10564: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10234: \$? = $ac_status" >&5
+  echo "$as_me:10567: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10237: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10570: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10240: \$? = $ac_status" >&5
+  echo "$as_me:10573: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_define_sigwinch=maybe
 else
@@ -10251,11 +10584,11 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:10254: result: $cf_cv_define_sigwinch" >&5
+echo "$as_me:10587: 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:10258: checking for actual SIGWINCH definition" >&5
+echo "$as_me:10591: 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
@@ -10266,7 +10599,7 @@ cf_sigwinch=32
 while test $cf_sigwinch != 1
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 10269 "configure"
+#line 10602 "configure"
 #include "confdefs.h"
 
 #undef _XOPEN_SOURCE
@@ -10288,16 +10621,16 @@ int x = SIGWINCH
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10291: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10624: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10294: \$? = $ac_status" >&5
+  echo "$as_me:10627: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10297: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10630: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10300: \$? = $ac_status" >&5
+  echo "$as_me:10633: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fixup_sigwinch=$cf_sigwinch
 	 break
@@ -10311,7 +10644,7 @@ cf_sigwinch=`expr $cf_sigwinch - 1`
 done
 
 fi
-echo "$as_me:10314: result: $cf_cv_fixup_sigwinch" >&5
+echo "$as_me:10647: result: $cf_cv_fixup_sigwinch" >&5
 echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
 
 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
@@ -10323,7 +10656,7 @@ if test -n "$TRY_CFLAGS" ; then
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:10326: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:10659: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -10348,10 +10681,16 @@ case $cf_fix_cppflags in
 				&& cf_fix_cppflags=yes
 
 			if test $cf_fix_cppflags = yes ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			elif test "${cf_tst_cflags}" = "\"'" ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			fi
 			;;
@@ -10370,17 +10709,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
 				;;
 			esac
-			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+	cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+
 			;;
 		esac
 		;;
 	(*)
-		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+	test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+	cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+
 		;;
 	esac
 	;;
 (yes)
-	cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
@@ -10394,30 +10741,36 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:10397: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:10744: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+
+	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+	CFLAGS="${CFLAGS}$cf_new_cflags"
 
-	CFLAGS="$CFLAGS $cf_new_cflags"
 fi
 
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:10405: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:10754: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
 
-	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
 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}:10413: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:10764: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+
+	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
 
-	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
 fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 10420 "configure"
+#line 10773 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10429,16 +10782,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10432: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10785: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10435: \$? = $ac_status" >&5
+  echo "$as_me:10788: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10438: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10791: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10441: \$? = $ac_status" >&5
+  echo "$as_me:10794: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -10446,12 +10799,12 @@ else
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:10449: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:10802: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
 
 	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:10454: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:10807: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_flags"
@@ -10463,7 +10816,7 @@ fi
 
 ### Look for network libraries first, since some functions (such as gethostname)
 ### are used in a lot of places.
-echo "$as_me:10466: checking if you want NSS compatible SSL libraries" >&5
+echo "$as_me:10819: 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
@@ -10478,10 +10831,10 @@ else
 fi;
 
 fi
-echo "$as_me:10481: result: $cf_cv_use_libnss_compat" >&5
+echo "$as_me:10834: result: $cf_cv_use_libnss_compat" >&5
 echo "${ECHO_T}$cf_cv_use_libnss_compat" >&6
 
-echo "$as_me:10484: checking if you want ssl library" >&5
+echo "$as_me:10837: 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
@@ -10496,10 +10849,10 @@ else
 fi;
 
 fi
-echo "$as_me:10499: result: $cf_cv_use_libssl" >&5
+echo "$as_me:10852: result: $cf_cv_use_libssl" >&5
 echo "${ECHO_T}$cf_cv_use_libssl" >&6
 
-echo "$as_me:10502: checking if you want gnutls support" >&5
+echo "$as_me:10855: 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
@@ -10514,11 +10867,11 @@ else
 fi;
 
 fi
-echo "$as_me:10517: result: $cf_cv_use_libgnutls" >&5
+echo "$as_me:10870: 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:10521: checking if you want gnutls-openssl compat" >&5
+echo "$as_me:10874: 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
@@ -10533,10 +10886,10 @@ else
 fi;
 
 fi
-echo "$as_me:10536: result: $cf_cv_gnutls_compat" >&5
+echo "$as_me:10889: result: $cf_cv_gnutls_compat" >&5
 echo "${ECHO_T}$cf_cv_gnutls_compat" >&6
 
-echo "$as_me:10539: checking if you want socks library" >&5
+echo "$as_me:10892: 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
@@ -10551,10 +10904,10 @@ else
 fi;
 
 fi
-echo "$as_me:10554: result: $cf_cv_use_libsocks" >&5
+echo "$as_me:10907: result: $cf_cv_use_libsocks" >&5
 echo "${ECHO_T}$cf_cv_use_libsocks" >&6
 
-echo "$as_me:10557: checking if you want socks5 library" >&5
+echo "$as_me:10910: 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
@@ -10569,7 +10922,7 @@ else
 fi;
 
 fi
-echo "$as_me:10572: result: $cf_cv_use_libsocks5" >&5
+echo "$as_me:10925: result: $cf_cv_use_libsocks5" >&5
 echo "${ECHO_T}$cf_cv_use_libsocks5" >&6
 
 if test "x$cf_cv_use_libsocks" != xno ; then
@@ -10608,7 +10961,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 10611 "configure"
+#line 10964 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10620,16 +10973,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10623: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10976: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10626: \$? = $ac_status" >&5
+  echo "$as_me:10979: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10629: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10982: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10632: \$? = $ac_status" >&5
+  echo "$as_me:10985: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -10646,7 +10999,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}:10649: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11002: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -10689,7 +11042,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 10692 "configure"
+#line 11045 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10701,16 +11054,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10704: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11057: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10707: \$? = $ac_status" >&5
+  echo "$as_me:11060: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10710: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11063: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10713: \$? = $ac_status" >&5
+  echo "$as_me:11066: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -10727,7 +11080,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}:10730: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11083: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -10745,7 +11098,7 @@ echo "${as_me:-configure}:10730: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:10748: error: cannot find socks library under $cf_cv_use_libsocks" >&5
+{ { echo "$as_me:11101: 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
@@ -10770,7 +11123,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}:10773: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:11126: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -10799,7 +11152,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}:10802: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:11155: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -10808,7 +11161,7 @@ echo "${as_me:-configure}:10802: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:10811: error: cannot find socks library under $cf_cv_use_libsocks" >&5
+{ { echo "$as_me:11164: 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
@@ -10822,12 +11175,12 @@ esac
 cf_cv_header_path_socks=
 cf_cv_library_path_socks=
 
-echo "${as_me:-configure}:10825: testing Starting FIND_LINKAGE(socks,) ..." 1>&5
+echo "${as_me:-configure}:11178: testing Starting FIND_LINKAGE(socks,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 10830 "configure"
+#line 11183 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -10843,16 +11196,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10846: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11199: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10849: \$? = $ac_status" >&5
+  echo "$as_me:11202: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10852: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11205: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10855: \$? = $ac_status" >&5
+  echo "$as_me:11208: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_socks=yes
@@ -10866,7 +11219,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lsocks  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 10869 "configure"
+#line 11222 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -10882,16 +11235,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10885: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11238: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10888: \$? = $ac_status" >&5
+  echo "$as_me:11241: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10891: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11244: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10894: \$? = $ac_status" >&5
+  echo "$as_me:11247: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_socks=yes
@@ -10908,9 +11261,9 @@ cat conftest.$ac_ext >&5
 
 	test -n "$verbose" && echo "	find linkage for socks library" 1>&6
 
-echo "${as_me:-configure}:10911: testing find linkage for socks library ..." 1>&5
+echo "${as_me:-configure}:11264: testing find linkage for socks library ..." 1>&5
 
-echo "${as_me:-configure}:10913: testing Searching for headers in FIND_LINKAGE(socks,) ..." 1>&5
+echo "${as_me:-configure}:11266: testing Searching for headers in FIND_LINKAGE(socks,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -11001,11 +11354,11 @@ cf_search="$cf_search $cf_header_path_list"
 		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}:11004: testing ... testing $cf_cv_header_path_socks ..." 1>&5
+echo "${as_me:-configure}:11357: 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 11008 "configure"
+#line 11361 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -11021,21 +11374,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11024: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11377: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11027: \$? = $ac_status" >&5
+  echo "$as_me:11380: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11030: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11383: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11033: \$? = $ac_status" >&5
+  echo "$as_me:11386: \$? = $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}:11038: testing ... found socks headers in $cf_cv_header_path_socks ..." 1>&5
+echo "${as_me:-configure}:11391: testing ... found socks headers in $cf_cv_header_path_socks ..." 1>&5
 
 				cf_cv_find_linkage_socks=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -11053,7 +11406,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	if test "$cf_cv_find_linkage_socks" = maybe ; then
 
-echo "${as_me:-configure}:11056: testing Searching for socks library in FIND_LINKAGE(socks,) ..." 1>&5
+echo "${as_me:-configure}:11409: testing Searching for socks library in FIND_LINKAGE(socks,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -11128,13 +11481,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}:11131: testing ... testing $cf_cv_library_path_socks ..." 1>&5
+echo "${as_me:-configure}:11484: 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 11137 "configure"
+#line 11490 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -11150,21 +11503,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11153: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11506: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11156: \$? = $ac_status" >&5
+  echo "$as_me:11509: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11159: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11512: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11162: \$? = $ac_status" >&5
+  echo "$as_me:11515: \$? = $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}:11167: testing ... found socks library in $cf_cv_library_path_socks ..." 1>&5
+echo "${as_me:-configure}:11520: testing ... found socks library in $cf_cv_library_path_socks ..." 1>&5
 
 					cf_cv_find_linkage_socks=yes
 					cf_cv_library_file_socks="-lsocks"
@@ -11223,7 +11576,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 11226 "configure"
+#line 11579 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11235,16 +11588,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11238: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11591: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11241: \$? = $ac_status" >&5
+  echo "$as_me:11594: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11244: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11597: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11247: \$? = $ac_status" >&5
+  echo "$as_me:11600: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -11261,7 +11614,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}:11264: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11617: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -11297,7 +11650,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}:11300: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:11653: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -11322,7 +11675,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:11325: WARNING: Cannot find socks library" >&5
+{ echo "$as_me:11678: WARNING: Cannot find socks library" >&5
 echo "$as_me: WARNING: Cannot find socks library" >&2;}
 fi
 
@@ -11365,7 +11718,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
   else
-    { { echo "$as_me:11368: error: cannot link with socks library" >&5
+    { { echo "$as_me:11721: error: cannot link with socks library" >&5
 echo "$as_me: error: cannot link with socks library" >&2;}
    { (exit 1); exit 1; }; }
   fi
@@ -11406,7 +11759,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 11409 "configure"
+#line 11762 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11418,16 +11771,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11421: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11774: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11424: \$? = $ac_status" >&5
+  echo "$as_me:11777: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11427: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11780: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11430: \$? = $ac_status" >&5
+  echo "$as_me:11783: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -11444,7 +11797,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}:11447: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11800: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -11487,7 +11840,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 11490 "configure"
+#line 11843 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -11499,16 +11852,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11502: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:11855: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11505: \$? = $ac_status" >&5
+  echo "$as_me:11858: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11508: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11861: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11511: \$? = $ac_status" >&5
+  echo "$as_me:11864: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -11525,7 +11878,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}:11528: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:11881: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -11543,7 +11896,7 @@ echo "${as_me:-configure}:11528: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:11546: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5
+{ { echo "$as_me:11899: 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
@@ -11568,7 +11921,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}:11571: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:11924: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -11597,7 +11950,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}:11600: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:11953: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -11606,7 +11959,7 @@ echo "${as_me:-configure}:11600: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:11609: error: cannot find socks5 library under $cf_cv_use_libsocks5" >&5
+{ { echo "$as_me:11962: 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
@@ -11639,11 +11992,11 @@ cat >>confdefs.h <<\EOF
 #define SOCKS 1
 EOF
 
-echo "$as_me:11642: checking if the socks library uses socks4 prefix" >&5
+echo "$as_me:11995: 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 11646 "configure"
+#line 11999 "configure"
 #include "confdefs.h"
 
 #include <socks.h>
@@ -11657,16 +12010,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11660: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12013: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11663: \$? = $ac_status" >&5
+  echo "$as_me:12016: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11666: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12019: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11669: \$? = $ac_status" >&5
+  echo "$as_me:12022: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >>confdefs.h <<\EOF
@@ -11678,7 +12031,7 @@ else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 11681 "configure"
+#line 12034 "configure"
 #include "confdefs.h"
 #include <socks.h>
 int
@@ -11690,29 +12043,29 @@ SOCKSinit((char *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11693: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12046: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11696: \$? = $ac_status" >&5
+  echo "$as_me:12049: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11699: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12052: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11702: \$? = $ac_status" >&5
+  echo "$as_me:12055: \$? = $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:11708: error: Cannot link with socks5 library" >&5
+{ { echo "$as_me:12061: 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:11715: result: $cf_use_socks4" >&5
+echo "$as_me:12068: result: $cf_use_socks4" >&5
 echo "${ECHO_T}$cf_use_socks4" >&6
 
 if test "$cf_use_socks4" = "yes" ; then
@@ -11767,10 +12120,10 @@ EOF
 
 fi
 
-echo "$as_me:11770: checking if socks5p.h is available" >&5
+echo "$as_me:12123: 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 11773 "configure"
+#line 12126 "configure"
 #include "confdefs.h"
 
 #define INCLUDE_PROTOTYPES
@@ -11785,16 +12138,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:11788: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12141: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:11791: \$? = $ac_status" >&5
+  echo "$as_me:12144: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:11794: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12147: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11797: \$? = $ac_status" >&5
+  echo "$as_me:12150: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_use_socks5p_h=yes
 else
@@ -11803,7 +12156,7 @@ cat conftest.$ac_ext >&5
 cf_use_socks5p_h=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:11806: result: $cf_use_socks5p_h" >&5
+echo "$as_me:12159: result: $cf_use_socks5p_h" >&5
 echo "${ECHO_T}$cf_use_socks5p_h" >&6
 
 test "$cf_use_socks5p_h" = yes &&
@@ -11815,14 +12168,14 @@ else
 
 cf_test_netlibs=no
 
-echo "$as_me:11818: checking for network libraries" >&5
+echo "$as_me:12171: 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:11825: result: working..." >&5
+echo "$as_me:12178: result: working..." >&5
 echo "${ECHO_T}working..." >&6
 
 cf_cv_netlibs=""
@@ -11834,23 +12187,23 @@ case $host_os in
 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:11837: checking for $ac_header" >&5
+echo "$as_me:12190: 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 11843 "configure"
+#line 12196 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:11847: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:12200: \"$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:11853: \$? = $ac_status" >&5
+  echo "$as_me:12206: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -11869,7 +12222,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:11872: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:12225: 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
@@ -11904,7 +12257,7 @@ done
 LIBS="$cf_add_libs"
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 11907 "configure"
+#line 12260 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_WINDOWS_H
@@ -11931,22 +12284,22 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11934: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12287: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11937: \$? = $ac_status" >&5
+  echo "$as_me:12290: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11940: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12293: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11943: \$? = $ac_status" >&5
+  echo "$as_me:12296: \$? = $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:11949: error: Cannot link against winsock library" >&5
+{ { echo "$as_me:12302: error: Cannot link against winsock library" >&5
 echo "$as_me: error: Cannot link against winsock library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -11959,13 +12312,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:11962: checking for $ac_func" >&5
+echo "$as_me:12315: 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 11968 "configure"
+#line 12321 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -11996,16 +12349,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11999: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12352: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12002: \$? = $ac_status" >&5
+  echo "$as_me:12355: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12005: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12358: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12008: \$? = $ac_status" >&5
+  echo "$as_me:12361: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -12015,7 +12368,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12018: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:12371: 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
@@ -12024,7 +12377,7 @@ EOF
 
 else
 
-echo "$as_me:12027: checking for gethostname in -lnsl" >&5
+echo "$as_me:12380: 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
@@ -12032,7 +12385,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12035 "configure"
+#line 12388 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12051,16 +12404,16 @@ gethostname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12054: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12407: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12057: \$? = $ac_status" >&5
+  echo "$as_me:12410: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12060: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12413: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12063: \$? = $ac_status" >&5
+  echo "$as_me:12416: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostname=yes
 else
@@ -12071,7 +12424,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12074: result: $ac_cv_lib_nsl_gethostname" >&5
+echo "$as_me:12427: 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
 
@@ -12088,7 +12441,7 @@ else
 	ac_cv_func_gethostname=unknown
 	unset ac_cv_func_gethostname 2>/dev/null
 
-echo "$as_me:12091: checking for gethostname in -lsocket" >&5
+echo "$as_me:12444: 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
@@ -12096,7 +12449,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12099 "configure"
+#line 12452 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12115,16 +12468,16 @@ gethostname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12118: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12471: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12121: \$? = $ac_status" >&5
+  echo "$as_me:12474: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12124: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12477: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12127: \$? = $ac_status" >&5
+  echo "$as_me:12480: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_gethostname=yes
 else
@@ -12135,7 +12488,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12138: result: $ac_cv_lib_socket_gethostname" >&5
+echo "$as_me:12491: 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
 
@@ -12159,7 +12512,7 @@ fi
 fi
 done
 
-	echo "$as_me:12162: checking for main in -linet" >&5
+	echo "$as_me:12515: 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
@@ -12167,7 +12520,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-linet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12170 "configure"
+#line 12523 "configure"
 #include "confdefs.h"
 
 int
@@ -12179,16 +12532,16 @@ main ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12182: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12535: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12185: \$? = $ac_status" >&5
+  echo "$as_me:12538: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12188: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12541: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12191: \$? = $ac_status" >&5
+  echo "$as_me:12544: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_inet_main=yes
 else
@@ -12199,7 +12552,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12202: result: $ac_cv_lib_inet_main" >&5
+echo "$as_me:12555: 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"
@@ -12210,13 +12563,13 @@ fi
 for ac_func in socket
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:12213: checking for $ac_func" >&5
+echo "$as_me:12566: 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 12219 "configure"
+#line 12572 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -12247,16 +12600,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12250: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12603: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12253: \$? = $ac_status" >&5
+  echo "$as_me:12606: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12256: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12609: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12259: \$? = $ac_status" >&5
+  echo "$as_me:12612: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -12266,7 +12619,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12269: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:12622: 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
@@ -12275,7 +12628,7 @@ EOF
 
 else
 
-echo "$as_me:12278: checking for socket in -lsocket" >&5
+echo "$as_me:12631: 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
@@ -12283,7 +12636,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12286 "configure"
+#line 12639 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12302,16 +12655,16 @@ socket ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12305: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12658: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12308: \$? = $ac_status" >&5
+  echo "$as_me:12661: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12311: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12664: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12314: \$? = $ac_status" >&5
+  echo "$as_me:12667: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_socket=yes
 else
@@ -12322,7 +12675,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12325: result: $ac_cv_lib_socket_socket" >&5
+echo "$as_me:12678: 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
 
@@ -12339,7 +12692,7 @@ else
 	ac_cv_func_socket=unknown
 	unset ac_cv_func_socket 2>/dev/null
 
-echo "$as_me:12342: checking for socket in -lbsd" >&5
+echo "$as_me:12695: 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
@@ -12347,7 +12700,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12350 "configure"
+#line 12703 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12366,16 +12719,16 @@ socket ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12369: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12722: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12372: \$? = $ac_status" >&5
+  echo "$as_me:12725: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12375: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12728: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12378: \$? = $ac_status" >&5
+  echo "$as_me:12731: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_bsd_socket=yes
 else
@@ -12386,7 +12739,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12389: result: $ac_cv_lib_bsd_socket" >&5
+echo "$as_me:12742: 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
 
@@ -12415,13 +12768,13 @@ done
 for ac_func in gethostbyname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:12418: checking for $ac_func" >&5
+echo "$as_me:12771: 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 12424 "configure"
+#line 12777 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -12452,16 +12805,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12455: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12808: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12458: \$? = $ac_status" >&5
+  echo "$as_me:12811: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12461: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12814: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12464: \$? = $ac_status" >&5
+  echo "$as_me:12817: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -12471,7 +12824,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12474: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:12827: 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
@@ -12480,7 +12833,7 @@ EOF
 
 else
 
-echo "$as_me:12483: checking for gethostbyname in -lnsl" >&5
+echo "$as_me:12836: 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
@@ -12488,7 +12841,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12491 "configure"
+#line 12844 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12507,16 +12860,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12510: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12863: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12513: \$? = $ac_status" >&5
+  echo "$as_me:12866: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12516: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12869: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12519: \$? = $ac_status" >&5
+  echo "$as_me:12872: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -12527,7 +12880,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12530: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:12883: 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
 
@@ -12552,13 +12905,13 @@ done
 for ac_func in inet_ntoa
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:12555: checking for $ac_func" >&5
+echo "$as_me:12908: 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 12561 "configure"
+#line 12914 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -12589,16 +12942,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12592: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12945: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12595: \$? = $ac_status" >&5
+  echo "$as_me:12948: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12598: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12951: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12601: \$? = $ac_status" >&5
+  echo "$as_me:12954: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -12608,7 +12961,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12611: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:12964: 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
@@ -12617,7 +12970,7 @@ EOF
 
 else
 
-echo "$as_me:12620: checking for inet_ntoa in -lnsl" >&5
+echo "$as_me:12973: checking for inet_ntoa in -lnsl" >&5
 echo $ECHO_N "checking for inet_ntoa in -lnsl... $ECHO_C" >&6
 if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12625,7 +12978,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12628 "configure"
+#line 12981 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12644,16 +12997,16 @@ inet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12647: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13000: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12650: \$? = $ac_status" >&5
+  echo "$as_me:13003: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12653: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13006: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12656: \$? = $ac_status" >&5
+  echo "$as_me:13009: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_inet_ntoa=yes
 else
@@ -12664,7 +13017,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12667: result: $ac_cv_lib_nsl_inet_ntoa" >&5
+echo "$as_me:13020: result: $ac_cv_lib_nsl_inet_ntoa" >&5
 echo "${ECHO_T}$ac_cv_lib_nsl_inet_ntoa" >&6
 if test $ac_cv_lib_nsl_inet_ntoa = yes; then
 
@@ -12689,13 +13042,13 @@ done
 for ac_func in gethostbyname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:12692: checking for $ac_func" >&5
+echo "$as_me:13045: 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 12698 "configure"
+#line 13051 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -12726,16 +13079,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12729: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13082: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12732: \$? = $ac_status" >&5
+  echo "$as_me:13085: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12735: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13088: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12738: \$? = $ac_status" >&5
+  echo "$as_me:13091: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -12745,7 +13098,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12748: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:13101: 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
@@ -12754,7 +13107,7 @@ EOF
 
 else
 
-echo "$as_me:12757: checking for gethostbyname in -lnetwork" >&5
+echo "$as_me:13110: checking for gethostbyname in -lnetwork" >&5
 echo $ECHO_N "checking for gethostbyname in -lnetwork... $ECHO_C" >&6
 if test "${ac_cv_lib_network_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12762,7 +13115,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnetwork $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12765 "configure"
+#line 13118 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12781,16 +13134,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12784: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13137: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12787: \$? = $ac_status" >&5
+  echo "$as_me:13140: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12790: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13143: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12793: \$? = $ac_status" >&5
+  echo "$as_me:13146: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_network_gethostbyname=yes
 else
@@ -12801,7 +13154,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12804: result: $ac_cv_lib_network_gethostbyname" >&5
+echo "$as_me:13157: result: $ac_cv_lib_network_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_lib_network_gethostbyname" >&6
 if test $ac_cv_lib_network_gethostbyname = yes; then
 
@@ -12826,13 +13179,13 @@ done
 for ac_func in strcasecmp
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:12829: checking for $ac_func" >&5
+echo "$as_me:13182: 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 12835 "configure"
+#line 13188 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -12863,16 +13216,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12866: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13219: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12869: \$? = $ac_status" >&5
+  echo "$as_me:13222: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12872: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13225: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12875: \$? = $ac_status" >&5
+  echo "$as_me:13228: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -12882,7 +13235,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12885: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:13238: 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
@@ -12891,7 +13244,7 @@ EOF
 
 else
 
-echo "$as_me:12894: checking for strcasecmp in -lresolv" >&5
+echo "$as_me:13247: 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
@@ -12899,7 +13252,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv $cf_cv_netlibs $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12902 "configure"
+#line 13255 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12918,16 +13271,16 @@ strcasecmp ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12921: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13274: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12924: \$? = $ac_status" >&5
+  echo "$as_me:13277: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12927: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13280: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12930: \$? = $ac_status" >&5
+  echo "$as_me:13283: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_resolv_strcasecmp=yes
 else
@@ -12938,7 +13291,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12941: result: $ac_cv_lib_resolv_strcasecmp" >&5
+echo "$as_me:13294: 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
 
@@ -12995,14 +13348,14 @@ test $cf_test_netlibs = no && echo "$cf_cv_netlibs" >&6
 
 fi
 
-echo "$as_me:12998: checking for inet_aton function" >&5
+echo "$as_me:13351: 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 13005 "configure"
+#line 13358 "configure"
 #include "confdefs.h"
 
 #if defined(__MINGW32__)
@@ -13037,16 +13390,16 @@ inet_aton(0, (struct in_addr *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13040: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13393: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13043: \$? = $ac_status" >&5
+  echo "$as_me:13396: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13046: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13399: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13049: \$? = $ac_status" >&5
+  echo "$as_me:13402: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_inet_aton=yes
 else
@@ -13056,7 +13409,7 @@ cf_cv_have_inet_aton=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:13059: result: $cf_cv_have_inet_aton" >&5
+echo "$as_me:13412: 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
 
@@ -13065,14 +13418,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-    echo "$as_me:13068: checking for inet_addr function" >&5
+    echo "$as_me:13421: 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 13075 "configure"
+#line 13428 "configure"
 #include "confdefs.h"
 
 #if defined(__MINGW32__)
@@ -13107,16 +13460,16 @@ inet_addr(0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13110: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13463: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13113: \$? = $ac_status" >&5
+  echo "$as_me:13466: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13116: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13469: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13119: \$? = $ac_status" >&5
+  echo "$as_me:13472: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_inet_addr=yes
 else
@@ -13126,10 +13479,10 @@ cf_cv_have_inet_addr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:13129: result: $cf_cv_have_inet_addr" >&5
+echo "$as_me:13482: 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:13132: checking for library with inet_addr" >&5
+	echo "$as_me:13485: 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
@@ -13140,7 +13493,7 @@ else
 	    do
 		LIBS="$cf_save_LIBS $cf_inetlib"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 13143 "configure"
+#line 13496 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -13156,16 +13509,16 @@ inet_addr(0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13159: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13512: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13162: \$? = $ac_status" >&5
+  echo "$as_me:13515: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13165: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13518: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13168: \$? = $ac_status" >&5
+  echo "$as_me:13521: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_lib_inet_addr=$cf_inetlib
 else
@@ -13179,7 +13532,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	    done
 
 fi
-echo "$as_me:13182: result: $cf_cv_lib_inet_addr" >&5
+echo "$as_me:13535: 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
 
@@ -13200,13 +13553,13 @@ done
 LIBS="$cf_add_libs"
 
 	else
-	    { echo "$as_me:13203: WARNING: Unable to find library for inet_addr function" >&5
+	    { echo "$as_me:13556: 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:13209: checking if you want to use pkg-config" >&5
+echo "$as_me:13562: 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.
@@ -13216,7 +13569,7 @@ if test "${with_pkg_config+set}" = set; then
 else
   cf_pkg_config=yes
 fi;
-echo "$as_me:13219: result: $cf_pkg_config" >&5
+echo "$as_me:13572: result: $cf_pkg_config" >&5
 echo "${ECHO_T}$cf_pkg_config" >&6
 
 case $cf_pkg_config in
@@ -13228,7 +13581,7 @@ case $cf_pkg_config in
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-echo "$as_me:13231: checking for $ac_word" >&5
+echo "$as_me:13584: 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
@@ -13245,7 +13598,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:13248: found $ac_dir/$ac_word" >&5
+   echo "$as_me:13601: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -13256,10 +13609,10 @@ fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:13259: result: $PKG_CONFIG" >&5
+  echo "$as_me:13612: result: $PKG_CONFIG" >&5
 echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  echo "$as_me:13262: result: no" >&5
+  echo "$as_me:13615: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -13268,7 +13621,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # 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:13271: checking for $ac_word" >&5
+echo "$as_me:13624: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13285,7 +13638,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_ac_pt_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:13288: found $ac_dir/$ac_word" >&5
+   echo "$as_me:13641: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -13297,10 +13650,10 @@ fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 
 if test -n "$ac_pt_PKG_CONFIG"; then
-  echo "$as_me:13300: result: $ac_pt_PKG_CONFIG" >&5
+  echo "$as_me:13653: result: $ac_pt_PKG_CONFIG" >&5
 echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
 else
-  echo "$as_me:13303: result: no" >&5
+  echo "$as_me:13656: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -13343,14 +13696,14 @@ case ".$PKG_CONFIG" in
 	PKG_CONFIG=`echo $PKG_CONFIG | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:13346: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
+	{ { echo "$as_me:13699: error: expected a pathname, not \"$PKG_CONFIG\"" >&5
 echo "$as_me: error: expected a pathname, not \"$PKG_CONFIG\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
 esac
 
 elif test "x$cf_pkg_config" != xno ; then
-	{ echo "$as_me:13353: WARNING: pkg-config is not installed" >&5
+	{ echo "$as_me:13706: WARNING: pkg-config is not installed" >&5
 echo "$as_me: WARNING: pkg-config is not installed" >&2;}
 fi
 
@@ -13395,7 +13748,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 13398 "configure"
+#line 13751 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13407,16 +13760,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13410: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13763: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13413: \$? = $ac_status" >&5
+  echo "$as_me:13766: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13416: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13769: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13419: \$? = $ac_status" >&5
+  echo "$as_me:13772: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -13433,7 +13786,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}:13436: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:13789: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -13476,7 +13829,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 13479 "configure"
+#line 13832 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -13488,16 +13841,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:13491: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:13844: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:13494: \$? = $ac_status" >&5
+  echo "$as_me:13847: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:13497: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13850: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13500: \$? = $ac_status" >&5
+  echo "$as_me:13853: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -13514,7 +13867,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}:13517: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:13870: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -13532,7 +13885,7 @@ echo "${as_me:-configure}:13517: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:13535: error: cannot find ssl library under $cf_cv_use_libssl" >&5
+{ { echo "$as_me:13888: 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
@@ -13557,7 +13910,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}:13560: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:13913: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -13586,7 +13939,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}:13589: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:13942: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -13595,7 +13948,7 @@ echo "${as_me:-configure}:13589: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:13598: error: cannot find ssl library under $cf_cv_use_libssl" >&5
+{ { echo "$as_me:13951: 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
@@ -13612,15 +13965,15 @@ esac
 			cf_cv_pkg_ssl=
 			for cf_try_package in openssl libssl
 			do
-				echo "$as_me:13615: checking pkg-config for $cf_try_package" >&5
+				echo "$as_me:13968: checking pkg-config for $cf_try_package" >&5
 echo $ECHO_N "checking pkg-config for $cf_try_package... $ECHO_C" >&6
 				if "$PKG_CONFIG" --exists $cf_try_package ; then
 					cf_cv_pkg_ssl=$cf_try_package
-					echo "$as_me:13619: result: yes" >&5
+					echo "$as_me:13972: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 					break
 				else
-					echo "$as_me:13623: result: no" >&5
+					echo "$as_me:13976: result: no" >&5
 echo "${ECHO_T}no" >&6
 				fi
 			done
@@ -13661,10 +14014,16 @@ case $cf_fix_cppflags in
 				&& cf_fix_cppflags=yes
 
 			if test $cf_fix_cppflags = yes ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			elif test "${cf_tst_cflags}" = "\"'" ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			fi
 			;;
@@ -13683,17 +14042,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
 				;;
 			esac
-			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+	cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+
 			;;
 		esac
 		;;
 	(*)
-		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+	test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+	cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+
 		;;
 	esac
 	;;
 (yes)
-	cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
@@ -13706,17 +14073,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
-	CFLAGS="$CFLAGS $cf_new_cflags"
+	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+	CFLAGS="${CFLAGS}$cf_new_cflags"
+
 fi
 
 if test -n "$cf_new_cppflags" ; then
 
-	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
-	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+
 fi
 
 					# workaround for broken openssl package using kerberos
@@ -13744,7 +14117,7 @@ fi
 					esac
 					test -n "$verbose" && echo "	adding $cf_libs_ssl to LIBS" 1>&6
 
-echo "${as_me:-configure}:13747: testing adding $cf_libs_ssl to LIBS ..." 1>&5
+echo "${as_me:-configure}:14120: testing adding $cf_libs_ssl to LIBS ..." 1>&5
 
 cf_add_libs="$cf_libs_ssl"
 # Filter out duplicates - this happens with badly-designed ".pc" files...
@@ -13780,7 +14153,7 @@ LIBS="$cf_add_libs"
 			(*-ldl)
 				;;
 			(*)
-				echo "$as_me:13783: checking for dlsym in -ldl" >&5
+				echo "$as_me:14156: checking for dlsym in -ldl" >&5
 echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6
 if test "${ac_cv_lib_dl_dlsym+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13788,7 +14161,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 13791 "configure"
+#line 14164 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -13807,16 +14180,16 @@ dlsym ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13810: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14183: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13813: \$? = $ac_status" >&5
+  echo "$as_me:14186: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13816: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14189: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13819: \$? = $ac_status" >&5
+  echo "$as_me:14192: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dl_dlsym=yes
 else
@@ -13827,7 +14200,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:13830: result: $ac_cv_lib_dl_dlsym" >&5
+echo "$as_me:14203: result: $ac_cv_lib_dl_dlsym" >&5
 echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6
 if test $ac_cv_lib_dl_dlsym = yes; then
   cf_extra_ssl_libs="$cf_extra_ssl_libs -ldl"
@@ -13843,12 +14216,12 @@ fi
 cf_cv_header_path_ssl=
 cf_cv_library_path_ssl=
 
-echo "${as_me:-configure}:13846: testing Starting FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me:-configure}:14219: testing Starting FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 13851 "configure"
+#line 14224 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -13877,16 +14250,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13880: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14253: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13883: \$? = $ac_status" >&5
+  echo "$as_me:14256: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13886: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14259: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13889: \$? = $ac_status" >&5
+  echo "$as_me:14262: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_ssl=yes
@@ -13900,7 +14273,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lssl $cf_extra_ssl_libs $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 13903 "configure"
+#line 14276 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -13929,16 +14302,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:13932: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14305: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:13935: \$? = $ac_status" >&5
+  echo "$as_me:14308: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:13938: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14311: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:13941: \$? = $ac_status" >&5
+  echo "$as_me:14314: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_ssl=yes
@@ -13955,9 +14328,9 @@ cat conftest.$ac_ext >&5
 
 	test -n "$verbose" && echo "	find linkage for ssl library" 1>&6
 
-echo "${as_me:-configure}:13958: testing find linkage for ssl library ..." 1>&5
+echo "${as_me:-configure}:14331: testing find linkage for ssl library ..." 1>&5
 
-echo "${as_me:-configure}:13960: testing Searching for headers in FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me:-configure}:14333: testing Searching for headers in FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -14048,11 +14421,11 @@ cf_search="$cf_search $cf_header_path_list"
 		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}:14051: testing ... testing $cf_cv_header_path_ssl ..." 1>&5
+echo "${as_me:-configure}:14424: 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 14055 "configure"
+#line 14428 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14081,21 +14454,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14084: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14457: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14087: \$? = $ac_status" >&5
+  echo "$as_me:14460: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14090: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14463: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14093: \$? = $ac_status" >&5
+  echo "$as_me:14466: \$? = $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}:14098: testing ... found ssl headers in $cf_cv_header_path_ssl ..." 1>&5
+echo "${as_me:-configure}:14471: testing ... found ssl headers in $cf_cv_header_path_ssl ..." 1>&5
 
 				cf_cv_find_linkage_ssl=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -14113,7 +14486,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	if test "$cf_cv_find_linkage_ssl" = maybe ; then
 
-echo "${as_me:-configure}:14116: testing Searching for ssl library in FIND_LINKAGE(ssl,openssl) ..." 1>&5
+echo "${as_me:-configure}:14489: testing Searching for ssl library in FIND_LINKAGE(ssl,openssl) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -14121,7 +14494,7 @@ echo "${as_me:-configure}:14116: testing Searching for ssl library in FIND_LINKA
 		CPPFLAGS="$cf_test_CPPFLAGS"
 		LIBS="-lssl $cf_extra_ssl_libs $cf_save_LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 14124 "configure"
+#line 14497 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14150,21 +14523,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14153: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14526: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14156: \$? = $ac_status" >&5
+  echo "$as_me:14529: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14159: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14532: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14162: \$? = $ac_status" >&5
+  echo "$as_me:14535: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 			test -n "$verbose" && echo "	... found ssl library in system" 1>&6
 
-echo "${as_me:-configure}:14167: testing ... found ssl library in system ..." 1>&5
+echo "${as_me:-configure}:14540: testing ... found ssl library in system ..." 1>&5
 
 			cf_cv_find_linkage_ssl=yes
 else
@@ -14245,13 +14618,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}:14248: testing ... testing $cf_cv_library_path_ssl ..." 1>&5
+echo "${as_me:-configure}:14621: testing ... testing $cf_cv_library_path_ssl ..." 1>&5
 
 					CPPFLAGS="$cf_test_CPPFLAGS"
 					LIBS="-lssl $cf_extra_ssl_libs $cf_save_LIBS"
 					LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_ssl"
 					cat >conftest.$ac_ext <<_ACEOF
-#line 14254 "configure"
+#line 14627 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14280,21 +14653,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:14283: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14656: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14286: \$? = $ac_status" >&5
+  echo "$as_me:14659: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14289: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14662: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14292: \$? = $ac_status" >&5
+  echo "$as_me:14665: \$? = $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}:14297: testing ... found ssl library in $cf_cv_library_path_ssl ..." 1>&5
+echo "${as_me:-configure}:14670: testing ... found ssl library in $cf_cv_library_path_ssl ..." 1>&5
 
 					cf_cv_find_linkage_ssl=yes
 					cf_cv_library_file_ssl="-lssl"
@@ -14356,7 +14729,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}:14359: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:14732: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -14412,7 +14785,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 14415 "configure"
+#line 14788 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14424,16 +14797,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14427: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14800: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14430: \$? = $ac_status" >&5
+  echo "$as_me:14803: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14433: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14806: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14436: \$? = $ac_status" >&5
+  echo "$as_me:14809: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -14450,7 +14823,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}:14453: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:14826: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -14483,7 +14856,7 @@ EOF
 		if test -n "$cf_cv_header_path_ssl" ; then
 			test -n "$verbose" && echo "	checking ssl header-path $cf_cv_header_path_ssl" 1>&6
 
-echo "${as_me:-configure}:14486: testing checking ssl header-path $cf_cv_header_path_ssl ..." 1>&5
+echo "${as_me:-configure}:14859: testing checking ssl header-path $cf_cv_header_path_ssl ..." 1>&5
 
 			case $cf_cv_header_path_ssl in
 			(*/openssl)
@@ -14496,10 +14869,10 @@ EOF
 			esac
 		fi
 
-echo "$as_me:14499: checking for X509 support" >&5
+echo "$as_me:14872: checking for X509 support" >&5
 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 14502 "configure"
+#line 14875 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -14528,16 +14901,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:14531: \"$ac_link\"") >&5
+if { (eval echo "$as_me:14904: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:14534: \$? = $ac_status" >&5
+  echo "$as_me:14907: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:14537: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14910: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14540: \$? = $ac_status" >&5
+  echo "$as_me:14913: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_x509_support=yes
 else
@@ -14546,7 +14919,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:14549: result: $cf_x509_support" >&5
+echo "$as_me:14922: result: $cf_x509_support" >&5
 echo "${ECHO_T}$cf_x509_support" >&6
 
 if test "$cf_x509_support" = yes ; then
@@ -14598,7 +14971,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 14601 "configure"
+#line 14974 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14610,16 +14983,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14613: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:14986: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14616: \$? = $ac_status" >&5
+  echo "$as_me:14989: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14619: \"$ac_try\"") >&5
+  { (eval echo "$as_me:14992: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14622: \$? = $ac_status" >&5
+  echo "$as_me:14995: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -14636,7 +15009,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}:14639: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:15012: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -14679,7 +15052,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 14682 "configure"
+#line 15055 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -14691,16 +15064,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:14694: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15067: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:14697: \$? = $ac_status" >&5
+  echo "$as_me:15070: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:14700: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15073: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:14703: \$? = $ac_status" >&5
+  echo "$as_me:15076: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -14717,7 +15090,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}:14720: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:15093: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -14735,7 +15108,7 @@ echo "${as_me:-configure}:14720: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:14738: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:15111: 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
@@ -14760,7 +15133,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}:14763: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:15136: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -14789,7 +15162,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}:14792: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:15165: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -14798,7 +15171,7 @@ echo "${as_me:-configure}:14792: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:14801: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:15174: 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
@@ -14816,12 +15189,12 @@ esac
 		(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}:14819: testing checking pkg-config for $cf_pkg_gnutls ..." 1>&5
+echo "${as_me:-configure}:15192: 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}:14824: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:15197: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_cv_have_gnutls=yes
 				cf_cv_pkg_config_ssl=yes
@@ -14862,10 +15235,16 @@ case $cf_fix_cppflags in
 				&& cf_fix_cppflags=yes
 
 			if test $cf_fix_cppflags = yes ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			elif test "${cf_tst_cflags}" = "\"'" ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			fi
 			;;
@@ -14884,17 +15263,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
 				;;
 			esac
-			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+	cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+
 			;;
 		esac
 		;;
 	(*)
-		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+	test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+	cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+
 		;;
 	esac
 	;;
 (yes)
-	cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
@@ -14907,17 +15294,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
-	CFLAGS="$CFLAGS $cf_new_cflags"
+	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+	CFLAGS="${CFLAGS}$cf_new_cflags"
+
 fi
 
 if test -n "$cf_new_cppflags" ; then
 
-	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
-	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+
 fi
 
 				fi
@@ -14933,7 +15326,7 @@ fi
 					esac
 					test -n "$verbose" && echo "	adding $cf_libs_ssl to LIBS" 1>&6
 
-echo "${as_me:-configure}:14936: testing adding $cf_libs_ssl to LIBS ..." 1>&5
+echo "${as_me:-configure}:15329: testing adding $cf_libs_ssl to LIBS ..." 1>&5
 
 cf_add_libs="$cf_libs_ssl"
 # Filter out duplicates - this happens with badly-designed ".pc" files...
@@ -14955,7 +15348,7 @@ LIBS="$cf_add_libs"
 			else
 				test -n "$verbose" && echo "	... did not find $cf_pkg_gnutls in pkg-config" 1>&6
 
-echo "${as_me:-configure}:14958: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:15351: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_pkg_gnutls=none
 			fi
@@ -14975,12 +15368,12 @@ EOF
 cf_cv_header_path_gnutls=
 cf_cv_library_path_gnutls=
 
-echo "${as_me:-configure}:14978: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:15371: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 14983 "configure"
+#line 15376 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -15009,16 +15402,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15012: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15405: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15015: \$? = $ac_status" >&5
+  echo "$as_me:15408: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15018: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15411: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15021: \$? = $ac_status" >&5
+  echo "$as_me:15414: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -15032,7 +15425,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lgnutls  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 15035 "configure"
+#line 15428 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -15061,16 +15454,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15064: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15457: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15067: \$? = $ac_status" >&5
+  echo "$as_me:15460: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15070: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15463: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15073: \$? = $ac_status" >&5
+  echo "$as_me:15466: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -15087,9 +15480,9 @@ cat conftest.$ac_ext >&5
 
 	test -n "$verbose" && echo "	find linkage for gnutls library" 1>&6
 
-echo "${as_me:-configure}:15090: testing find linkage for gnutls library ..." 1>&5
+echo "${as_me:-configure}:15483: testing find linkage for gnutls library ..." 1>&5
 
-echo "${as_me:-configure}:15092: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:15485: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -15180,11 +15573,11 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d $cf_cv_header_path_gnutls ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_gnutls" 1>&6
 
-echo "${as_me:-configure}:15183: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:15576: 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 15187 "configure"
+#line 15580 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -15213,21 +15606,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15216: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15609: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15219: \$? = $ac_status" >&5
+  echo "$as_me:15612: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15222: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15615: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15225: \$? = $ac_status" >&5
+  echo "$as_me:15618: \$? = $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}:15230: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:15623: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
 
 				cf_cv_find_linkage_gnutls=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -15245,7 +15638,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	if test "$cf_cv_find_linkage_gnutls" = maybe ; then
 
-echo "${as_me:-configure}:15248: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:15641: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -15320,13 +15713,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}:15323: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:15716: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
 
 					CPPFLAGS="$cf_test_CPPFLAGS"
 					LIBS="-lgnutls  $cf_save_LIBS"
 					LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_gnutls"
 					cat >conftest.$ac_ext <<_ACEOF
-#line 15329 "configure"
+#line 15722 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -15355,21 +15748,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15358: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15751: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15361: \$? = $ac_status" >&5
+  echo "$as_me:15754: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15364: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15757: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15367: \$? = $ac_status" >&5
+  echo "$as_me:15760: \$? = $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}:15372: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:15765: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
 
 					cf_cv_find_linkage_gnutls=yes
 					cf_cv_library_file_gnutls="-lgnutls"
@@ -15446,7 +15839,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 15449 "configure"
+#line 15842 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -15458,16 +15851,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15461: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:15854: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15464: \$? = $ac_status" >&5
+  echo "$as_me:15857: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15467: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15860: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15470: \$? = $ac_status" >&5
+  echo "$as_me:15863: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -15484,7 +15877,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}:15487: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:15880: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -15525,7 +15918,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}:15528: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:15921: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -15554,13 +15947,13 @@ LIBS="$cf_add_libs"
 for ac_func in gnutls_protocol_set_priority
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:15557: checking for $ac_func" >&5
+echo "$as_me:15950: 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 15563 "configure"
+#line 15956 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -15591,16 +15984,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15594: \"$ac_link\"") >&5
+if { (eval echo "$as_me:15987: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15597: \$? = $ac_status" >&5
+  echo "$as_me:15990: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15600: \"$ac_try\"") >&5
+  { (eval echo "$as_me:15993: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15603: \$? = $ac_status" >&5
+  echo "$as_me:15996: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -15610,7 +16003,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:15613: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:16006: 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
@@ -15620,13 +16013,13 @@ EOF
 fi
 done
 
-		echo "$as_me:15623: checking for gnutls_rnd" >&5
+		echo "$as_me:16016: checking for gnutls_rnd" >&5
 echo $ECHO_N "checking for gnutls_rnd... $ECHO_C" >&6
 if test "${ac_cv_func_gnutls_rnd+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 15629 "configure"
+#line 16022 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gnutls_rnd (); below.  */
@@ -15657,16 +16050,16 @@ f = gnutls_rnd; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:15660: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16053: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15663: \$? = $ac_status" >&5
+  echo "$as_me:16056: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15666: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16059: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15669: \$? = $ac_status" >&5
+  echo "$as_me:16062: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_gnutls_rnd=yes
 else
@@ -15676,7 +16069,7 @@ ac_cv_func_gnutls_rnd=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:15679: result: $ac_cv_func_gnutls_rnd" >&5
+echo "$as_me:16072: result: $ac_cv_func_gnutls_rnd" >&5
 echo "${ECHO_T}$ac_cv_func_gnutls_rnd" >&6
 if test $ac_cv_func_gnutls_rnd = yes; then
   cat >>confdefs.h <<\EOF
@@ -15705,10 +16098,10 @@ fi
 
 		EXTRA_OBJS="$EXTRA_OBJS tidy_tls\$o"
 
-echo "$as_me:15708: checking for X509 support" >&5
+echo "$as_me:16101: checking for X509 support" >&5
 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 15711 "configure"
+#line 16104 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -15737,16 +16130,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:15740: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16133: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:15743: \$? = $ac_status" >&5
+  echo "$as_me:16136: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:15746: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16139: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15749: \$? = $ac_status" >&5
+  echo "$as_me:16142: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_x509_support=yes
 else
@@ -15755,7 +16148,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:15758: result: $cf_x509_support" >&5
+echo "$as_me:16151: result: $cf_x509_support" >&5
 echo "${ECHO_T}$cf_x509_support" >&6
 
 if test "$cf_x509_support" = yes ; then
@@ -15806,7 +16199,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 15809 "configure"
+#line 16202 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -15818,16 +16211,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15821: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16214: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15824: \$? = $ac_status" >&5
+  echo "$as_me:16217: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15827: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16220: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15830: \$? = $ac_status" >&5
+  echo "$as_me:16223: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -15844,7 +16237,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}:15847: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:16240: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -15887,7 +16280,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 15890 "configure"
+#line 16283 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -15899,16 +16292,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:15902: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16295: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:15905: \$? = $ac_status" >&5
+  echo "$as_me:16298: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:15908: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16301: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:15911: \$? = $ac_status" >&5
+  echo "$as_me:16304: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -15925,7 +16318,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}:15928: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:16321: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -15943,7 +16336,7 @@ echo "${as_me:-configure}:15928: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:15946: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:16339: 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
@@ -15968,7 +16361,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}:15971: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:16364: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -15997,7 +16390,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}:16000: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:16393: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -16006,7 +16399,7 @@ echo "${as_me:-configure}:16000: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:16009: error: cannot find ssl library under $cf_cv_use_libgnutls" >&5
+{ { echo "$as_me:16402: 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
@@ -16024,12 +16417,12 @@ esac
 		(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}:16027: testing checking pkg-config for $cf_pkg_gnutls ..." 1>&5
+echo "${as_me:-configure}:16420: 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}:16032: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:16425: testing ... found $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_cv_have_gnutls=yes
 				cf_cv_pkg_config_ssl=yes
@@ -16070,10 +16463,16 @@ case $cf_fix_cppflags in
 				&& cf_fix_cppflags=yes
 
 			if test $cf_fix_cppflags = yes ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			elif test "${cf_tst_cflags}" = "\"'" ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			fi
 			;;
@@ -16092,17 +16491,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
 				;;
 			esac
-			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+	cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+
 			;;
 		esac
 		;;
 	(*)
-		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+	test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+	cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+
 		;;
 	esac
 	;;
 (yes)
-	cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
@@ -16115,17 +16522,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
-	CFLAGS="$CFLAGS $cf_new_cflags"
+	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+	CFLAGS="${CFLAGS}$cf_new_cflags"
+
 fi
 
 if test -n "$cf_new_cppflags" ; then
 
-	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
-	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+
 fi
 
 				fi
@@ -16141,7 +16554,7 @@ fi
 					esac
 					test -n "$verbose" && echo "	adding $cf_libs_ssl to LIBS" 1>&6
 
-echo "${as_me:-configure}:16144: testing adding $cf_libs_ssl to LIBS ..." 1>&5
+echo "${as_me:-configure}:16557: testing adding $cf_libs_ssl to LIBS ..." 1>&5
 
 cf_add_libs="$cf_libs_ssl"
 # Filter out duplicates - this happens with badly-designed ".pc" files...
@@ -16163,7 +16576,7 @@ LIBS="$cf_add_libs"
 			else
 				test -n "$verbose" && echo "	... did not find $cf_pkg_gnutls in pkg-config" 1>&6
 
-echo "${as_me:-configure}:16166: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
+echo "${as_me:-configure}:16579: testing ... did not find $cf_pkg_gnutls in pkg-config ..." 1>&5
 
 				cf_pkg_gnutls=none
 			fi
@@ -16183,12 +16596,12 @@ EOF
 cf_cv_header_path_gnutls=
 cf_cv_library_path_gnutls=
 
-echo "${as_me:-configure}:16186: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:16599: testing Starting FIND_LINKAGE(gnutls,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 16191 "configure"
+#line 16604 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16217,16 +16630,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16220: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16633: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16223: \$? = $ac_status" >&5
+  echo "$as_me:16636: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16226: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16639: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16229: \$? = $ac_status" >&5
+  echo "$as_me:16642: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -16240,7 +16653,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lgnutls -lgnutls-openssl $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 16243 "configure"
+#line 16656 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16269,16 +16682,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16272: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16685: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16275: \$? = $ac_status" >&5
+  echo "$as_me:16688: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16278: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16691: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16281: \$? = $ac_status" >&5
+  echo "$as_me:16694: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_gnutls=yes
@@ -16295,9 +16708,9 @@ cat conftest.$ac_ext >&5
 
 	test -n "$verbose" && echo "	find linkage for gnutls library" 1>&6
 
-echo "${as_me:-configure}:16298: testing find linkage for gnutls library ..." 1>&5
+echo "${as_me:-configure}:16711: testing find linkage for gnutls library ..." 1>&5
 
-echo "${as_me:-configure}:16300: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:16713: testing Searching for headers in FIND_LINKAGE(gnutls,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -16388,11 +16801,11 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d $cf_cv_header_path_gnutls ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_gnutls" 1>&6
 
-echo "${as_me:-configure}:16391: testing ... testing $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:16804: 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 16395 "configure"
+#line 16808 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16421,21 +16834,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16424: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:16837: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16427: \$? = $ac_status" >&5
+  echo "$as_me:16840: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16430: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16843: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16433: \$? = $ac_status" >&5
+  echo "$as_me:16846: \$? = $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}:16438: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:16851: testing ... found gnutls headers in $cf_cv_header_path_gnutls ..." 1>&5
 
 				cf_cv_find_linkage_gnutls=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -16453,7 +16866,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	if test "$cf_cv_find_linkage_gnutls" = maybe ; then
 
-echo "${as_me:-configure}:16456: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
+echo "${as_me:-configure}:16869: testing Searching for gnutls library in FIND_LINKAGE(gnutls,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -16528,13 +16941,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}:16531: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:16944: testing ... testing $cf_cv_library_path_gnutls ..." 1>&5
 
 					CPPFLAGS="$cf_test_CPPFLAGS"
 					LIBS="-lgnutls -lgnutls-openssl $cf_save_LIBS"
 					LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_gnutls"
 					cat >conftest.$ac_ext <<_ACEOF
-#line 16537 "configure"
+#line 16950 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -16563,21 +16976,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16566: \"$ac_link\"") >&5
+if { (eval echo "$as_me:16979: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16569: \$? = $ac_status" >&5
+  echo "$as_me:16982: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16572: \"$ac_try\"") >&5
+  { (eval echo "$as_me:16985: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16575: \$? = $ac_status" >&5
+  echo "$as_me:16988: \$? = $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}:16580: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
+echo "${as_me:-configure}:16993: testing ... found gnutls library in $cf_cv_library_path_gnutls ..." 1>&5
 
 					cf_cv_find_linkage_gnutls=yes
 					cf_cv_library_file_gnutls="-lgnutls"
@@ -16654,7 +17067,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 16657 "configure"
+#line 17070 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -16666,16 +17079,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:16669: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17082: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:16672: \$? = $ac_status" >&5
+  echo "$as_me:17085: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:16675: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17088: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16678: \$? = $ac_status" >&5
+  echo "$as_me:17091: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -16692,7 +17105,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}:16695: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:17108: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -16733,7 +17146,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}:16736: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:17149: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -16762,13 +17175,13 @@ LIBS="$cf_add_libs"
 for ac_func in gnutls_protocol_set_priority
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:16765: checking for $ac_func" >&5
+echo "$as_me:17178: 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 16771 "configure"
+#line 17184 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -16799,16 +17212,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16802: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17215: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16805: \$? = $ac_status" >&5
+  echo "$as_me:17218: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16808: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17221: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16811: \$? = $ac_status" >&5
+  echo "$as_me:17224: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -16818,7 +17231,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:16821: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:17234: 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
@@ -16828,13 +17241,13 @@ EOF
 fi
 done
 
-		echo "$as_me:16831: checking for gnutls_rnd" >&5
+		echo "$as_me:17244: checking for gnutls_rnd" >&5
 echo $ECHO_N "checking for gnutls_rnd... $ECHO_C" >&6
 if test "${ac_cv_func_gnutls_rnd+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 16837 "configure"
+#line 17250 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gnutls_rnd (); below.  */
@@ -16865,16 +17278,16 @@ f = gnutls_rnd; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16868: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17281: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16871: \$? = $ac_status" >&5
+  echo "$as_me:17284: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16874: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17287: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16877: \$? = $ac_status" >&5
+  echo "$as_me:17290: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_gnutls_rnd=yes
 else
@@ -16884,7 +17297,7 @@ ac_cv_func_gnutls_rnd=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:16887: result: $ac_cv_func_gnutls_rnd" >&5
+echo "$as_me:17300: result: $ac_cv_func_gnutls_rnd" >&5
 echo "${ECHO_T}$ac_cv_func_gnutls_rnd" >&6
 if test $ac_cv_func_gnutls_rnd = yes; then
   cat >>confdefs.h <<\EOF
@@ -16912,7 +17325,7 @@ LIBS="$cf_add_libs"
 fi
 
 		if test "$cf_pkg_gnutls" = none ; then
-				echo "$as_me:16915: checking for SSL_connect in -lgnutls-openssl" >&5
+				echo "$as_me:17328: 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
@@ -16920,7 +17333,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnutls-openssl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 16923 "configure"
+#line 17336 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -16939,16 +17352,16 @@ SSL_connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:16942: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17355: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:16945: \$? = $ac_status" >&5
+  echo "$as_me:17358: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:16948: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17361: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:16951: \$? = $ac_status" >&5
+  echo "$as_me:17364: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gnutls_openssl_SSL_connect=yes
 else
@@ -16959,7 +17372,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:16962: result: $ac_cv_lib_gnutls_openssl_SSL_connect" >&5
+echo "$as_me:17375: 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
 
@@ -16980,7 +17393,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-  echo "$as_me:16983: checking for SSL_connect in -lgnutls-extra" >&5
+  echo "$as_me:17396: 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
@@ -16988,7 +17401,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgnutls-extra  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 16991 "configure"
+#line 17404 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17007,16 +17420,16 @@ SSL_connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17010: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17423: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17013: \$? = $ac_status" >&5
+  echo "$as_me:17426: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17016: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17429: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17019: \$? = $ac_status" >&5
+  echo "$as_me:17432: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gnutls_extra_SSL_connect=yes
 else
@@ -17027,7 +17440,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17030: result: $ac_cv_lib_gnutls_extra_SSL_connect" >&5
+echo "$as_me:17443: 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
 
@@ -17048,7 +17461,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-  { { echo "$as_me:17051: error: cannot find gnutls openssl functions" >&5
+  { { echo "$as_me:17464: error: cannot find gnutls openssl functions" >&5
 echo "$as_me: error: cannot find gnutls openssl functions" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -17057,10 +17470,10 @@ fi
 
 			fi
 
-echo "$as_me:17060: checking for X509 support" >&5
+echo "$as_me:17473: checking for X509 support" >&5
 echo $ECHO_N "checking for X509 support... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 17063 "configure"
+#line 17476 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17089,16 +17502,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:17092: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17505: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17095: \$? = $ac_status" >&5
+  echo "$as_me:17508: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17098: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17511: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17101: \$? = $ac_status" >&5
+  echo "$as_me:17514: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_x509_support=yes
 else
@@ -17107,7 +17520,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:17110: result: $cf_x509_support" >&5
+echo "$as_me:17523: result: $cf_x509_support" >&5
 echo "${ECHO_T}$cf_x509_support" >&6
 
 if test "$cf_x509_support" = yes ; then
@@ -17139,7 +17552,7 @@ case "$cf_cv_use_libnss_compat" in
 	;;
 (yes)
 
-echo "$as_me:17142: checking for SSL_get_version in -lnss_compat_ossl" >&5
+echo "$as_me:17555: 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
@@ -17147,7 +17560,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnss_compat_ossl -lnss_compat_ossl $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 17150 "configure"
+#line 17563 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -17166,16 +17579,16 @@ SSL_get_version ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17169: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17582: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17172: \$? = $ac_status" >&5
+  echo "$as_me:17585: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17175: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17588: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17178: \$? = $ac_status" >&5
+  echo "$as_me:17591: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nss_compat_ossl_SSL_get_version=yes
 else
@@ -17186,7 +17599,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:17189: result: $ac_cv_lib_nss_compat_ossl_SSL_get_version" >&5
+echo "$as_me:17602: 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
@@ -17201,11 +17614,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}:17204: testing assume it is in $cf_ssl_root ..." 1>&5
+echo "${as_me:-configure}:17617: 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:17208: error: cannot find NSS compilant libraries" >&5
+			{ { echo "$as_me:17621: error: cannot find NSS compilant libraries" >&5
 echo "$as_me: error: cannot find NSS compilant libraries" >&2;}
    { (exit 1); exit 1; }; }
 		fi
@@ -17220,13 +17633,13 @@ fi
 		elif test -d $cf_cv_use_libnss_compat/../include ; then
 			cf_ssl_root=$cf_cv_use_libnss_compat/..
 		else
-			{ { echo "$as_me:17223: error: cannot find NSS compilant library under $cf_cv_use_libnss_compat" >&5
+			{ { echo "$as_me:17636: 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:17229: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&5
+		{ echo "$as_me:17642: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&5
 echo "$as_me: WARNING: expected a directory: $cf_cv_use_libnss_compat" >&2;}
 	fi
 	;;
@@ -17276,10 +17689,16 @@ case $cf_fix_cppflags in
 				&& cf_fix_cppflags=yes
 
 			if test $cf_fix_cppflags = yes ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			elif test "${cf_tst_cflags}" = "\"'" ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			fi
 			;;
@@ -17298,17 +17717,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
 				;;
 			esac
-			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+	cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+
 			;;
 		esac
 		;;
 	(*)
-		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+	test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+	cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+
 		;;
 	esac
 	;;
 (yes)
-	cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
@@ -17321,24 +17748,30 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
-	CFLAGS="$CFLAGS $cf_new_cflags"
+	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+	CFLAGS="${CFLAGS}$cf_new_cflags"
+
 fi
 
 if test -n "$cf_new_cppflags" ; then
 
-	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
-	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+
 fi
 
 if test "$cf_ssl_subincs" = yes ; then
-echo "$as_me:17338: checking for NSS compilant include directory" >&5
+echo "$as_me:17771: 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 17341 "configure"
+#line 17774 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17352,16 +17785,16 @@ SSL_shutdown((SSL *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17355: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:17788: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17358: \$? = $ac_status" >&5
+  echo "$as_me:17791: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17361: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17794: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17364: \$? = $ac_status" >&5
+  echo "$as_me:17797: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_ssl_incl=yes
 else
@@ -17370,7 +17803,7 @@ cat conftest.$ac_ext >&5
 cf_ssl_incl=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:17373: result: $cf_ssl_incl" >&5
+echo "$as_me:17806: result: $cf_ssl_incl" >&5
 echo "${ECHO_T}$cf_ssl_incl" >&6
 test "$cf_ssl_incl" = yes &&
 cat >>confdefs.h <<\EOF
@@ -17379,10 +17812,10 @@ EOF
 
 fi
 
-echo "$as_me:17382: checking if we can link to NSS compilant library" >&5
+echo "$as_me:17815: 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 17385 "configure"
+#line 17818 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -17401,16 +17834,16 @@ SSL_shutdown((SSL *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17404: \"$ac_link\"") >&5
+if { (eval echo "$as_me:17837: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17407: \$? = $ac_status" >&5
+  echo "$as_me:17840: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17410: \"$ac_try\"") >&5
+  { (eval echo "$as_me:17843: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17413: \$? = $ac_status" >&5
+  echo "$as_me:17846: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_ssl_library=yes
 else
@@ -17419,7 +17852,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:17422: result: $cf_ssl_library" >&5
+echo "$as_me:17855: result: $cf_ssl_library" >&5
 echo "${ECHO_T}$cf_ssl_library" >&6
 if test "$cf_ssl_library" = yes ; then
 
@@ -17432,7 +17865,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 else
-	{ { echo "$as_me:17435: error: Cannot link with NSS compilant libraries" >&5
+	{ { echo "$as_me:17868: error: Cannot link with NSS compilant libraries" >&5
 echo "$as_me: error: Cannot link with NSS compilant libraries" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -17440,7 +17873,7 @@ fi
 fi
 
 ### check for ipv6 support
-echo "$as_me:17443: checking whether to enable ipv6" >&5
+echo "$as_me:17876: 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.
@@ -17457,11 +17890,11 @@ EOF
 else
   enableval=no
 fi;
-echo "$as_me:17460: result: $enableval" >&5
+echo "$as_me:17893: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 if test "$enableval" = "yes"; then
 
-echo "$as_me:17464: checking ipv6 stack type" >&5
+echo "$as_me:17897: 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
@@ -17482,7 +17915,7 @@ do
 		;;
 	(inria)
 				cat >conftest.$ac_ext <<_ACEOF
-#line 17485 "configure"
+#line 17918 "configure"
 #include "confdefs.h"
 
 #include <netinet/in.h>
@@ -17499,7 +17932,7 @@ rm -rf conftest*
 		;;
 	(kame)
 				cat >conftest.$ac_ext <<_ACEOF
-#line 17502 "configure"
+#line 17935 "configure"
 #include "confdefs.h"
 
 #include <netinet/in.h>
@@ -17516,7 +17949,7 @@ rm -rf conftest*
 		;;
 	(linux-glibc)
 				cat >conftest.$ac_ext <<_ACEOF
-#line 17519 "configure"
+#line 17952 "configure"
 #include "confdefs.h"
 
 #include <features.h>
@@ -17542,7 +17975,7 @@ rm -rf conftest*
 		;;
 	(toshiba)
 		cat >conftest.$ac_ext <<_ACEOF
-#line 17545 "configure"
+#line 17978 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -17559,7 +17992,7 @@ rm -rf conftest*
 		;;
 	(v6d)
 		cat >conftest.$ac_ext <<_ACEOF
-#line 17562 "configure"
+#line 17995 "configure"
 #include "confdefs.h"
 
 #include </usr/local/v6/include/sys/v6config.h>
@@ -17576,7 +18009,7 @@ rm -rf conftest*
 		;;
 	(zeta)
 		cat >conftest.$ac_ext <<_ACEOF
-#line 17579 "configure"
+#line 18012 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -17598,13 +18031,13 @@ rm -rf conftest*
 done
 
 fi
-echo "$as_me:17601: result: $cf_cv_ipv6type" >&5
+echo "$as_me:18034: result: $cf_cv_ipv6type" >&5
 echo "${ECHO_T}$cf_cv_ipv6type" >&6
 
 cf_ipv6lib=none
 cf_ipv6dir=none
 
-echo "$as_me:17607: checking for IPv6 library if required" >&5
+echo "$as_me:18040: checking for IPv6 library if required" >&5
 echo $ECHO_N "checking for IPv6 library if required... $ECHO_C" >&6
 case $cf_cv_ipv6type in
 (solaris)
@@ -17634,13 +18067,13 @@ case $cf_cv_ipv6type in
 	cf_ipv6dir=v6
 	;;
 esac
-echo "$as_me:17637: result: $cf_ipv6lib" >&5
+echo "$as_me:18070: result: $cf_ipv6lib" >&5
 echo "${ECHO_T}$cf_ipv6lib" >&6
 
 if test "$cf_ipv6lib" != "none"; then
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 17643 "configure"
+#line 18076 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -17656,16 +18089,16 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17659: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18092: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17662: \$? = $ac_status" >&5
+  echo "$as_me:18095: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17665: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18098: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17668: \$? = $ac_status" >&5
+  echo "$as_me:18101: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -17783,7 +18216,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 17786 "configure"
+#line 18219 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -17795,16 +18228,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:17798: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18231: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:17801: \$? = $ac_status" >&5
+  echo "$as_me:18234: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:17804: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18237: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17807: \$? = $ac_status" >&5
+  echo "$as_me:18240: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -17821,7 +18254,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}:17824: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:18257: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -17849,13 +18282,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:17852: checking for getaddrinfo" >&5
+	echo "$as_me:18285: 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 17858 "configure"
+#line 18291 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char getaddrinfo (); below.  */
@@ -17886,16 +18319,16 @@ f = getaddrinfo; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17889: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18322: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17892: \$? = $ac_status" >&5
+  echo "$as_me:18325: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17895: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18328: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17898: \$? = $ac_status" >&5
+  echo "$as_me:18331: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_getaddrinfo=yes
 else
@@ -17905,18 +18338,18 @@ ac_cv_func_getaddrinfo=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:17908: result: $ac_cv_func_getaddrinfo" >&5
+echo "$as_me:18341: 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:17915: checking for getaddrinfo in -l$cf_ipv6lib" >&5
+		echo "$as_me:18348: 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 17919 "configure"
+#line 18352 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -17932,25 +18365,25 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:17935: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18368: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:17938: \$? = $ac_status" >&5
+  echo "$as_me:18371: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:17941: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18374: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:17944: \$? = $ac_status" >&5
+  echo "$as_me:18377: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:17946: result: yes" >&5
+  echo "$as_me:18379: 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:17953: result: no" >&5
+echo "$as_me:18386: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -18018,11 +18451,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:18021: checking for -l$cf_ipv6lib in $cf_libdir" >&5
+				echo "$as_me:18454: 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 18025 "configure"
+#line 18458 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -18038,25 +18471,25 @@ getaddrinfo(0, 0, 0, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18041: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18474: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18044: \$? = $ac_status" >&5
+  echo "$as_me:18477: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18047: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18480: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18050: \$? = $ac_status" >&5
+  echo "$as_me:18483: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:18052: result: yes" >&5
+  echo "$as_me:18485: 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:18059: result: no" >&5
+echo "$as_me:18492: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -18071,7 +18504,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_ipv6lib
 
 	if test $cf_found_library = no ; then
-		{ { echo "$as_me:18074: error: No $cf_ipv6lib library found, cannot continue.  You must fetch lib$cf_ipv6lib.a
+		{ { echo "$as_me:18507: 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;}
@@ -18079,7 +18512,7 @@ from an appropriate IPv6 kit and compile beforehand." >&2;}
 	fi
 fi
 
-echo "$as_me:18082: checking working getaddrinfo" >&5
+echo "$as_me:18515: 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
@@ -18089,7 +18522,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_getaddrinfo=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 18092 "configure"
+#line 18525 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -18169,15 +18602,15 @@ int main()
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:18172: \"$ac_link\"") >&5
+if { (eval echo "$as_me:18605: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18175: \$? = $ac_status" >&5
+  echo "$as_me:18608: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:18177: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18610: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18180: \$? = $ac_status" >&5
+  echo "$as_me:18613: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_getaddrinfo=yes
 else
@@ -18190,7 +18623,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:18193: result: $cf_cv_getaddrinfo" >&5
+echo "$as_me:18626: result: $cf_cv_getaddrinfo" >&5
 echo "${ECHO_T}$cf_cv_getaddrinfo" >&6
 if test "$cf_cv_getaddrinfo" = yes ; then
 
@@ -18206,12 +18639,12 @@ fi
 
 if test "$cf_cv_getaddrinfo" != "yes"; then
 	if test "$cf_cv_ipv6type" != "linux"; then
-		{ echo "$as_me:18209: WARNING: You must get working getaddrinfo() function,
+		{ echo "$as_me:18642: 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:18214: WARNING: The getaddrinfo() implementation on your system seems be buggy.
+		{ echo "$as_me:18647: 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.
@@ -18222,7 +18655,7 @@ fi
 
 fi
 
-echo "$as_me:18225: checking for screen type" >&5
+echo "$as_me:18658: 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
@@ -18236,7 +18669,7 @@ case $withval in
 (curses|ncurses*|pdcurses|slang)
 	cf_cv_screen=$withval
 	;;
-(*)	{ { echo "$as_me:18239: error: Unexpected value $withval" >&5
+(*)	{ { echo "$as_me:18672: error: Unexpected value $withval" >&5
 echo "$as_me: error: Unexpected value $withval" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -18245,13 +18678,13 @@ else
   cf_cv_screen=curses
 fi;
 fi
-echo "$as_me:18248: result: $cf_cv_screen" >&5
+echo "$as_me:18681: result: $cf_cv_screen" >&5
 echo "${ECHO_T}$cf_cv_screen" >&6
 
 case $cf_cv_screen in
 (curses|ncurses*)
 
-echo "$as_me:18254: checking for specific curses-directory" >&5
+echo "$as_me:18687: checking for specific curses-directory" >&5
 echo $ECHO_N "checking for specific curses-directory... $ECHO_C" >&6
 
 # Check whether --with-curses-dir or --without-curses-dir was given.
@@ -18261,7 +18694,7 @@ if test "${with_curses_dir+set}" = set; then
 else
   cf_cv_curses_dir=no
 fi;
-echo "$as_me:18264: result: $cf_cv_curses_dir" >&5
+echo "$as_me:18697: result: $cf_cv_curses_dir" >&5
 echo "${ECHO_T}$cf_cv_curses_dir" >&6
 
 if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
@@ -18292,7 +18725,7 @@ case ".$withval" in
 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:18295: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:18728: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -18325,7 +18758,7 @@ if test -n "$cf_cv_curses_dir/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 18328 "configure"
+#line 18761 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -18337,16 +18770,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18340: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18773: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18343: \$? = $ac_status" >&5
+  echo "$as_me:18776: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18346: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18779: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18349: \$? = $ac_status" >&5
+  echo "$as_me:18782: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -18363,7 +18796,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}:18366: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:18799: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -18399,7 +18832,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}:18402: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:18835: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -18418,7 +18851,7 @@ dft_color_style=yes
 case $cf_cv_screen in
 (curses)
 
-echo "$as_me:18421: checking for extra include directories" >&5
+echo "$as_me:18854: 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
@@ -18444,11 +18877,11 @@ case $host_os in
 esac
 
 fi
-echo "$as_me:18447: result: $cf_cv_curses_incdir" >&5
+echo "$as_me:18880: result: $cf_cv_curses_incdir" >&5
 echo "${ECHO_T}$cf_cv_curses_incdir" >&6
 test "$cf_cv_curses_incdir" != no && CPPFLAGS="$CPPFLAGS $cf_cv_curses_incdir"
 
-echo "$as_me:18451: checking if we have identified curses headers" >&5
+echo "$as_me:18884: 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
@@ -18460,7 +18893,7 @@ for cf_header in \
 	curses.h  ncurses/ncurses.h ncurses/curses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 18463 "configure"
+#line 18896 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -18472,16 +18905,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18475: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:18908: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18478: \$? = $ac_status" >&5
+  echo "$as_me:18911: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18481: \"$ac_try\"") >&5
+  { (eval echo "$as_me:18914: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18484: \$? = $ac_status" >&5
+  echo "$as_me:18917: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -18492,11 +18925,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:18495: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:18928: 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:18499: error: No curses header-files found" >&5
+	{ { echo "$as_me:18932: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -18506,23 +18939,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:18509: checking for $ac_header" >&5
+echo "$as_me:18942: 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 18515 "configure"
+#line 18948 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:18519: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:18952: \"$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:18525: \$? = $ac_status" >&5
+  echo "$as_me:18958: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -18541,7 +18974,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:18544: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:18977: 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
@@ -18551,7 +18984,7 @@ EOF
 fi
 done
 
-echo "$as_me:18554: checking for terminfo header" >&5
+echo "$as_me:18987: 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
@@ -18569,7 +19002,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 18572 "configure"
+#line 19005 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -18584,16 +19017,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:18587: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19020: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:18590: \$? = $ac_status" >&5
+  echo "$as_me:19023: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:18593: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19026: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18596: \$? = $ac_status" >&5
+  echo "$as_me:19029: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -18609,7 +19042,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:18612: result: $cf_cv_term_header" >&5
+echo "$as_me:19045: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -18641,7 +19074,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:18644: checking for ncurses version" >&5
+echo "$as_me:19077: 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
@@ -18667,10 +19100,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:18670: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:19103: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:18673: \$? = $ac_status" >&5
+  echo "$as_me:19106: \$? = $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%".*%%'`
@@ -18680,7 +19113,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 18683 "configure"
+#line 19116 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -18705,15 +19138,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:18708: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19141: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18711: \$? = $ac_status" >&5
+  echo "$as_me:19144: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:18713: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19146: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18716: \$? = $ac_status" >&5
+  echo "$as_me:19149: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -18727,17 +19160,17 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:18730: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:19163: 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:18737: checking if we have identified curses libraries" >&5
+echo "$as_me:19170: 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 18740 "configure"
+#line 19173 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -18749,16 +19182,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18752: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19185: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18755: \$? = $ac_status" >&5
+  echo "$as_me:19188: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18758: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19191: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18761: \$? = $ac_status" >&5
+  echo "$as_me:19194: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -18767,13 +19200,13 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:18770: result: $cf_result" >&5
+echo "$as_me:19203: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 
 if test "$cf_result" = no ; then
 case $host_os in
 (freebsd*)
-	echo "$as_me:18776: checking for tgoto in -lmytinfo" >&5
+	echo "$as_me:19209: 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
@@ -18781,7 +19214,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 18784 "configure"
+#line 19217 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18800,16 +19233,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18803: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19236: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18806: \$? = $ac_status" >&5
+  echo "$as_me:19239: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18809: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19242: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18812: \$? = $ac_status" >&5
+  echo "$as_me:19245: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -18820,7 +19253,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18823: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:19256: 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
 
@@ -18850,7 +19283,7 @@ fi
 	# term.h) for cur_colr
 	if test "x$cf_cv_screen" = "xcurses_colr"
 	then
-		echo "$as_me:18853: checking for initscr in -lcur_colr" >&5
+		echo "$as_me:19286: 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
@@ -18858,7 +19291,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcur_colr  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 18861 "configure"
+#line 19294 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18877,16 +19310,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18880: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19313: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18883: \$? = $ac_status" >&5
+  echo "$as_me:19316: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18886: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19319: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18889: \$? = $ac_status" >&5
+  echo "$as_me:19322: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_cur_colr_initscr=yes
 else
@@ -18897,7 +19330,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18900: result: $ac_cv_lib_cur_colr_initscr" >&5
+echo "$as_me:19333: 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
 
@@ -18921,7 +19354,7 @@ LIBS="$cf_add_libs"
 
 else
 
-		echo "$as_me:18924: checking for initscr in -lHcurses" >&5
+		echo "$as_me:19357: 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
@@ -18929,7 +19362,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lHcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 18932 "configure"
+#line 19365 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -18948,16 +19381,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:18951: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19384: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:18954: \$? = $ac_status" >&5
+  echo "$as_me:19387: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:18957: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19390: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:18960: \$? = $ac_status" >&5
+  echo "$as_me:19393: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Hcurses_initscr=yes
 else
@@ -18968,7 +19401,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:18971: result: $ac_cv_lib_Hcurses_initscr" >&5
+echo "$as_me:19404: 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
 
@@ -19024,7 +19457,7 @@ if test -n "/lib64" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:19027: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:19460: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -19053,7 +19486,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}:19056: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:19489: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -19084,7 +19517,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}:19087: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:19520: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -19119,7 +19552,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}:19122: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:19555: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -19163,13 +19596,13 @@ if test ".$ac_cv_func_initscr" != .yes ; then
 	# because it may be needed to link the test-case for initscr.
 	if test "x$cf_term_lib" = x
 	then
-		echo "$as_me:19166: checking for tgoto" >&5
+		echo "$as_me:19599: 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 19172 "configure"
+#line 19605 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char tgoto (); below.  */
@@ -19200,16 +19633,16 @@ f = tgoto; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19203: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19636: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19206: \$? = $ac_status" >&5
+  echo "$as_me:19639: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19209: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19642: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19212: \$? = $ac_status" >&5
+  echo "$as_me:19645: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_tgoto=yes
 else
@@ -19219,7 +19652,7 @@ ac_cv_func_tgoto=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:19222: result: $ac_cv_func_tgoto" >&5
+echo "$as_me:19655: 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
@@ -19228,7 +19661,7 @@ else
 			for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown
 			do
 				as_ac_Lib=`echo "ac_cv_lib_$cf_term_lib''_tgoto" | $as_tr_sh`
-echo "$as_me:19231: checking for tgoto in -l$cf_term_lib" >&5
+echo "$as_me:19664: 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
@@ -19236,7 +19669,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_term_lib  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 19239 "configure"
+#line 19672 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19255,16 +19688,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19258: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19691: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19261: \$? = $ac_status" >&5
+  echo "$as_me:19694: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19264: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19697: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19267: \$? = $ac_status" >&5
+  echo "$as_me:19700: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -19275,7 +19708,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19278: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:19711: 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
@@ -19294,7 +19727,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:19297: checking for initscr in -l$cf_curs_lib" >&5
+echo "$as_me:19730: 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
@@ -19302,7 +19735,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$cf_curs_lib  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 19305 "configure"
+#line 19738 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -19321,16 +19754,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19324: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19757: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19327: \$? = $ac_status" >&5
+  echo "$as_me:19760: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19330: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19763: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19333: \$? = $ac_status" >&5
+  echo "$as_me:19766: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Lib=yes"
 else
@@ -19341,7 +19774,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:19344: result: `eval echo '${'$as_ac_Lib'}'`" >&5
+echo "$as_me:19777: 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
@@ -19349,16 +19782,16 @@ fi
 
 		done
 	fi
-	test $cf_curs_lib = unknown && { { echo "$as_me:19352: error: no curses library found" >&5
+	test $cf_curs_lib = unknown && { { echo "$as_me:19785: 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:19358: checking if we can link with $cf_curs_lib library" >&5
+		echo "$as_me:19791: 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 19361 "configure"
+#line 19794 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -19370,16 +19803,16 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19373: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19806: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19376: \$? = $ac_status" >&5
+  echo "$as_me:19809: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19379: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19812: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19382: \$? = $ac_status" >&5
+  echo "$as_me:19815: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -19388,18 +19821,18 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-		echo "$as_me:19391: result: $cf_result" >&5
+		echo "$as_me:19824: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
-		test $cf_result = no && { { echo "$as_me:19393: error: Cannot link curses library" >&5
+		test $cf_result = no && { { echo "$as_me:19826: 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:19399: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
+		echo "$as_me:19832: 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 19402 "configure"
+#line 19835 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -19411,16 +19844,16 @@ initscr(); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19414: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19847: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19417: \$? = $ac_status" >&5
+  echo "$as_me:19850: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19420: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19853: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19423: \$? = $ac_status" >&5
+  echo "$as_me:19856: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=no
 else
@@ -19429,7 +19862,7 @@ cat conftest.$ac_ext >&5
 
 			LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
 			cat >conftest.$ac_ext <<_ACEOF
-#line 19432 "configure"
+#line 19865 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -19441,16 +19874,16 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19444: \"$ac_link\"") >&5
+if { (eval echo "$as_me:19877: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19447: \$? = $ac_status" >&5
+  echo "$as_me:19880: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19450: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19883: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19453: \$? = $ac_status" >&5
+  echo "$as_me:19886: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -19462,13 +19895,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:19465: result: $cf_result" >&5
+		echo "$as_me:19898: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	fi
 fi
 fi
 
-echo "$as_me:19471: checking for curses performance tradeoff" >&5
+echo "$as_me:19904: 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
@@ -19476,7 +19909,7 @@ else
 
     cf_cv_curs_performance=no
     cat >conftest.$ac_ext <<_ACEOF
-#line 19479 "configure"
+#line 19912 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19495,20 +19928,20 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19498: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19931: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19501: \$? = $ac_status" >&5
+  echo "$as_me:19934: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19504: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19937: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19507: \$? = $ac_status" >&5
+  echo "$as_me:19940: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 19511 "configure"
+#line 19944 "configure"
 #include "confdefs.h"
 
 #define CURS_PERFORMANCE
@@ -19528,16 +19961,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19531: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:19964: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19534: \$? = $ac_status" >&5
+  echo "$as_me:19967: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19537: \"$ac_try\"") >&5
+  { (eval echo "$as_me:19970: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19540: \$? = $ac_status" >&5
+  echo "$as_me:19973: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_curs_performance=yes
 else
@@ -19552,21 +19985,21 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:19555: result: $cf_cv_curs_performance" >&5
+echo "$as_me:19988: 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:19562: checking for curses touchline function" >&5
+echo "$as_me:19995: 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 19569 "configure"
+#line 20002 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19579,23 +20012,23 @@ touchline(stdscr, 1,2,3);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19582: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20015: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19585: \$? = $ac_status" >&5
+  echo "$as_me:20018: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19588: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20021: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19591: \$? = $ac_status" >&5
+  echo "$as_me:20024: \$? = $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 19598 "configure"
+#line 20031 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -19608,16 +20041,16 @@ touchline(stdscr, 1,2);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19611: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20044: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19614: \$? = $ac_status" >&5
+  echo "$as_me:20047: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19617: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20050: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19620: \$? = $ac_status" >&5
+  echo "$as_me:20053: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_curs_touchline=sysv
 else
@@ -19629,7 +20062,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:19632: result: $cf_cv_curs_touchline" >&5
+echo "$as_me:20065: result: $cf_cv_curs_touchline" >&5
 echo "${ECHO_T}$cf_cv_curs_touchline" >&6
 case "$cf_cv_curs_touchline" in
 (bsd)
@@ -19651,7 +20084,7 @@ esac
 	;;
 (ncursesw*)
 
-echo "$as_me:19654: checking for multibyte character support" >&5
+echo "$as_me:20087: 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
@@ -19659,7 +20092,7 @@ else
 
 	cf_save_LIBS="$LIBS"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 19662 "configure"
+#line 20095 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -19672,16 +20105,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19675: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20108: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19678: \$? = $ac_status" >&5
+  echo "$as_me:20111: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19681: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20114: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19684: \$? = $ac_status" >&5
+  echo "$as_me:20117: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_utf8_lib=yes
 else
@@ -19693,12 +20126,12 @@ cat conftest.$ac_ext >&5
 cf_cv_header_path_utf8=
 cf_cv_library_path_utf8=
 
-echo "${as_me:-configure}:19696: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:20129: testing Starting FIND_LINKAGE(utf8,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 19701 "configure"
+#line 20134 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -19711,16 +20144,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19714: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20147: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19717: \$? = $ac_status" >&5
+  echo "$as_me:20150: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19720: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20153: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19723: \$? = $ac_status" >&5
+  echo "$as_me:20156: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -19734,7 +20167,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lutf8  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 19737 "configure"
+#line 20170 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -19747,16 +20180,16 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:19750: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20183: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:19753: \$? = $ac_status" >&5
+  echo "$as_me:20186: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:19756: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20189: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19759: \$? = $ac_status" >&5
+  echo "$as_me:20192: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_utf8=yes
@@ -19773,9 +20206,9 @@ cat conftest.$ac_ext >&5
 
 	test -n "$verbose" && echo "	find linkage for utf8 library" 1>&6
 
-echo "${as_me:-configure}:19776: testing find linkage for utf8 library ..." 1>&5
+echo "${as_me:-configure}:20209: testing find linkage for utf8 library ..." 1>&5
 
-echo "${as_me:-configure}:19778: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:20211: testing Searching for headers in FIND_LINKAGE(utf8,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -19866,11 +20299,11 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d $cf_cv_header_path_utf8 ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_utf8" 1>&6
 
-echo "${as_me:-configure}:19869: testing ... testing $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:20302: 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 19873 "configure"
+#line 20306 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -19883,21 +20316,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:19886: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20319: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:19889: \$? = $ac_status" >&5
+  echo "$as_me:20322: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:19892: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20325: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:19895: \$? = $ac_status" >&5
+  echo "$as_me:20328: \$? = $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}:19900: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:20333: testing ... found utf8 headers in $cf_cv_header_path_utf8 ..." 1>&5
 
 				cf_cv_find_linkage_utf8=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -19915,7 +20348,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	if test "$cf_cv_find_linkage_utf8" = maybe ; then
 
-echo "${as_me:-configure}:19918: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
+echo "${as_me:-configure}:20351: testing Searching for utf8 library in FIND_LINKAGE(utf8,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -19990,13 +20423,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}:19993: testing ... testing $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:20426: 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 19999 "configure"
+#line 20432 "configure"
 #include "confdefs.h"
 
 #include <libutf8.h>
@@ -20009,21 +20442,21 @@ putwc(0,0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20012: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20445: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20015: \$? = $ac_status" >&5
+  echo "$as_me:20448: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20018: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20451: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20021: \$? = $ac_status" >&5
+  echo "$as_me:20454: \$? = $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}:20026: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
+echo "${as_me:-configure}:20459: testing ... found utf8 library in $cf_cv_library_path_utf8 ..." 1>&5
 
 					cf_cv_find_linkage_utf8=yes
 					cf_cv_library_file_utf8="-lutf8"
@@ -20065,7 +20498,7 @@ fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:20068: result: $cf_cv_utf8_lib" >&5
+echo "$as_me:20501: 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
@@ -20100,7 +20533,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 20103 "configure"
+#line 20536 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -20112,16 +20545,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20115: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20548: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20118: \$? = $ac_status" >&5
+  echo "$as_me:20551: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20121: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20554: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20124: \$? = $ac_status" >&5
+  echo "$as_me:20557: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -20138,7 +20571,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}:20141: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:20574: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -20174,7 +20607,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}:20177: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:20610: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -20204,13 +20637,13 @@ cf_ncuconfig_root=$cf_cv_screen
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:20207: checking pkg-config for $cf_ncuconfig_root" >&5
+	echo "$as_me:20640: checking pkg-config for $cf_ncuconfig_root" >&5
 echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
 	if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then
-		echo "$as_me:20210: result: yes" >&5
+		echo "$as_me:20643: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:20213: checking if the $cf_ncuconfig_root package files work" >&5
+		echo "$as_me:20646: checking if the $cf_ncuconfig_root package files work" >&5
 echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
 		cf_have_ncuconfig=unknown
 
@@ -20236,7 +20669,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 20239 "configure"
+#line 20672 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -20248,37 +20681,37 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20251: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20684: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20254: \$? = $ac_status" >&5
+  echo "$as_me:20687: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20257: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20690: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20260: \$? = $ac_status" >&5
+  echo "$as_me:20693: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 20266 "configure"
+#line 20699 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 				int main(void)
 				{ char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:20273: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20706: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20276: \$? = $ac_status" >&5
+  echo "$as_me:20709: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:20278: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20711: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20281: \$? = $ac_status" >&5
+  echo "$as_me:20714: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -20295,7 +20728,7 @@ cat conftest.$ac_ext >&5
 cf_have_ncuconfig=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-		echo "$as_me:20298: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:20731: result: $cf_have_ncuconfig" >&5
 echo "${ECHO_T}$cf_have_ncuconfig" >&6
 		test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
 		if test "$cf_have_ncuconfig" != "yes"
@@ -20313,7 +20746,7 @@ EOF
 		fi
 
 	else
-		echo "$as_me:20316: result: no" >&5
+		echo "$as_me:20749: result: no" >&5
 echo "${ECHO_T}no" >&6
 		NCURSES_CONFIG_PKG=none
 	fi
@@ -20329,7 +20762,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:20332: checking for $ac_word" >&5
+echo "$as_me:20765: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20344,7 +20777,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:20347: found $ac_dir/$ac_word" >&5
+echo "$as_me:20780: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -20352,10 +20785,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:20355: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:20788: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:20358: result: no" >&5
+  echo "$as_me:20791: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -20368,7 +20801,7 @@ if test -z "$NCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:20371: checking for $ac_word" >&5
+echo "$as_me:20804: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -20383,7 +20816,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
-echo "$as_me:20386: found $ac_dir/$ac_word" >&5
+echo "$as_me:20819: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -20391,10 +20824,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
-  echo "$as_me:20394: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:20827: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:20397: result: no" >&5
+  echo "$as_me:20830: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -20427,7 +20860,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:20430: checking if we have identified curses headers" >&5
+echo "$as_me:20863: 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
@@ -20439,7 +20872,7 @@ for cf_header in \
 	curses.h $cf_cv_screen/curses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 20442 "configure"
+#line 20875 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -20451,16 +20884,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20454: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:20887: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20457: \$? = $ac_status" >&5
+  echo "$as_me:20890: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20460: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20893: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20463: \$? = $ac_status" >&5
+  echo "$as_me:20896: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -20471,11 +20904,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:20474: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:20907: 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:20478: error: No curses header-files found" >&5
+	{ { echo "$as_me:20911: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -20485,23 +20918,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:20488: checking for $ac_header" >&5
+echo "$as_me:20921: 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 20494 "configure"
+#line 20927 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20498: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:20931: \"$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:20504: \$? = $ac_status" >&5
+  echo "$as_me:20937: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20520,7 +20953,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:20523: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:20956: 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
@@ -20573,7 +21006,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 20576 "configure"
+#line 21009 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -20585,16 +21018,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20588: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21021: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20591: \$? = $ac_status" >&5
+  echo "$as_me:21024: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20594: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21027: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20597: \$? = $ac_status" >&5
+  echo "$as_me:21030: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -20611,7 +21044,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}:20614: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:21047: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -20630,7 +21063,7 @@ fi
 
 }
 
-echo "$as_me:20633: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:21066: 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
@@ -20642,7 +21075,7 @@ else
 	do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 20645 "configure"
+#line 21078 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -20666,16 +21099,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20669: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21102: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20672: \$? = $ac_status" >&5
+  echo "$as_me:21105: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20675: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21108: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20678: \$? = $ac_status" >&5
+  echo "$as_me:21111: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -20690,14 +21123,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 	done
 
 fi
-echo "$as_me:20693: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:21126: 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:20700: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:21133: 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
@@ -20815,7 +21248,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 20818 "configure"
+#line 21251 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -20827,16 +21260,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20830: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21263: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20833: \$? = $ac_status" >&5
+  echo "$as_me:21266: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20836: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21269: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20839: \$? = $ac_status" >&5
+  echo "$as_me:21272: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -20853,7 +21286,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}:20856: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:21289: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -20876,7 +21309,7 @@ fi
 		do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 20879 "configure"
+#line 21312 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -20900,16 +21333,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20903: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21336: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20906: \$? = $ac_status" >&5
+  echo "$as_me:21339: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20909: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21342: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20912: \$? = $ac_status" >&5
+  echo "$as_me:21345: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -20930,12 +21363,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:20933: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:21366: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:20938: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:21371: 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%/[^/]*$%%'`
@@ -20968,7 +21401,7 @@ if test -n "$cf_1st_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 20971 "configure"
+#line 21404 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -20980,16 +21413,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20983: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21416: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20986: \$? = $ac_status" >&5
+  echo "$as_me:21419: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20989: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21422: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20992: \$? = $ac_status" >&5
+  echo "$as_me:21425: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -21006,7 +21439,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}:21009: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:21442: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -21054,7 +21487,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:21057: checking for terminfo header" >&5
+echo "$as_me:21490: 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
@@ -21072,7 +21505,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 21075 "configure"
+#line 21508 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -21087,16 +21520,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21090: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21523: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21093: \$? = $ac_status" >&5
+  echo "$as_me:21526: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21096: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21529: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21099: \$? = $ac_status" >&5
+  echo "$as_me:21532: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -21112,7 +21545,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:21115: result: $cf_cv_term_header" >&5
+echo "$as_me:21548: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -21150,7 +21583,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:21153: checking for ncurses version" >&5
+echo "$as_me:21586: 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
@@ -21176,10 +21609,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:21179: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:21612: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:21182: \$? = $ac_status" >&5
+  echo "$as_me:21615: \$? = $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%".*%%'`
@@ -21189,7 +21622,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 21192 "configure"
+#line 21625 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -21214,15 +21647,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:21217: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21650: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21220: \$? = $ac_status" >&5
+  echo "$as_me:21653: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:21222: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21655: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21225: \$? = $ac_status" >&5
+  echo "$as_me:21658: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -21236,7 +21669,7 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:21239: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:21672: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -21249,7 +21682,7 @@ cf_nculib_root=$cf_cv_screen
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:21252: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:21685: 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
@@ -21257,7 +21690,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 21260 "configure"
+#line 21693 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21276,16 +21709,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21279: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21712: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21282: \$? = $ac_status" >&5
+  echo "$as_me:21715: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21285: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21718: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21288: \$? = $ac_status" >&5
+  echo "$as_me:21721: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -21296,10 +21729,10 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21299: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:21732: 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:21302: checking for initscr in -lgpm" >&5
+  echo "$as_me:21735: 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
@@ -21307,7 +21740,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 21310 "configure"
+#line 21743 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21326,16 +21759,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21329: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21762: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21332: \$? = $ac_status" >&5
+  echo "$as_me:21765: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21335: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21768: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21338: \$? = $ac_status" >&5
+  echo "$as_me:21771: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -21346,7 +21779,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21349: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:21782: 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"
@@ -21361,7 +21794,7 @@ case $host_os in
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it's static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:21364: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:21797: 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
@@ -21369,7 +21802,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 21372 "configure"
+#line 21805 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21388,16 +21821,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21391: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21824: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21394: \$? = $ac_status" >&5
+  echo "$as_me:21827: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21397: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21830: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21400: \$? = $ac_status" >&5
+  echo "$as_me:21833: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -21408,7 +21841,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21411: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:21844: 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"
@@ -21457,13 +21890,13 @@ else
 
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
-	echo "$as_me:21460: checking for initscr" >&5
+	echo "$as_me:21893: 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 21466 "configure"
+#line 21899 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */
@@ -21494,16 +21927,16 @@ f = initscr; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21497: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21930: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21500: \$? = $ac_status" >&5
+  echo "$as_me:21933: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21503: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21936: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21506: \$? = $ac_status" >&5
+  echo "$as_me:21939: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -21513,18 +21946,18 @@ ac_cv_func_initscr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:21516: result: $ac_cv_func_initscr" >&5
+echo "$as_me:21949: 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:21523: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:21956: 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 21527 "configure"
+#line 21960 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -21536,25 +21969,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21539: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21972: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21542: \$? = $ac_status" >&5
+  echo "$as_me:21975: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21545: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21978: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21548: \$? = $ac_status" >&5
+  echo "$as_me:21981: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:21550: result: yes" >&5
+  echo "$as_me:21983: 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:21557: result: no" >&5
+echo "$as_me:21990: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -21622,11 +22055,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:21625: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:22058: 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 21629 "configure"
+#line 22062 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -21638,25 +22071,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21641: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22074: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21644: \$? = $ac_status" >&5
+  echo "$as_me:22077: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21647: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22080: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21650: \$? = $ac_status" >&5
+  echo "$as_me:22083: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:21652: result: yes" >&5
+  echo "$as_me:22085: 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:21659: result: no" >&5
+echo "$as_me:22092: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -21671,7 +22104,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:21674: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:22107: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -21679,7 +22112,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:21682: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:22115: 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
@@ -21689,7 +22122,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >conftest.$ac_ext <<_ACEOF
-#line 21692 "configure"
+#line 22125 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -21701,23 +22134,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21704: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22137: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21707: \$? = $ac_status" >&5
+  echo "$as_me:22140: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21710: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22143: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21713: \$? = $ac_status" >&5
+  echo "$as_me:22146: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:21715: result: yes" >&5
+  echo "$as_me:22148: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:21720: result: no" >&5
+echo "$as_me:22153: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -21743,13 +22176,13 @@ cf_ncuconfig_root=$cf_cv_screen
 cf_have_ncuconfig=no
 
 if test "x${PKG_CONFIG:=none}" != xnone; then
-	echo "$as_me:21746: checking pkg-config for $cf_ncuconfig_root" >&5
+	echo "$as_me:22179: checking pkg-config for $cf_ncuconfig_root" >&5
 echo $ECHO_N "checking pkg-config for $cf_ncuconfig_root... $ECHO_C" >&6
 	if "$PKG_CONFIG" --exists $cf_ncuconfig_root ; then
-		echo "$as_me:21749: result: yes" >&5
+		echo "$as_me:22182: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-		echo "$as_me:21752: checking if the $cf_ncuconfig_root package files work" >&5
+		echo "$as_me:22185: checking if the $cf_ncuconfig_root package files work" >&5
 echo $ECHO_N "checking if the $cf_ncuconfig_root package files work... $ECHO_C" >&6
 		cf_have_ncuconfig=unknown
 
@@ -21775,7 +22208,7 @@ done
 LIBS="$cf_add_libs"
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 21778 "configure"
+#line 22211 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -21787,37 +22220,37 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21790: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22223: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21793: \$? = $ac_status" >&5
+  echo "$as_me:22226: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21796: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22229: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21799: \$? = $ac_status" >&5
+  echo "$as_me:22232: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   if test "$cross_compiling" = yes; then
   cf_have_ncuconfig=maybe
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 21805 "configure"
+#line 22238 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 				int main(void)
 				{ char *xx = curses_version(); return (xx == 0); }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:21812: \"$ac_link\"") >&5
+if { (eval echo "$as_me:22245: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21815: \$? = $ac_status" >&5
+  echo "$as_me:22248: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:21817: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22250: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21820: \$? = $ac_status" >&5
+  echo "$as_me:22253: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_have_ncuconfig=yes
 else
@@ -21834,7 +22267,7 @@ cat conftest.$ac_ext >&5
 cf_have_ncuconfig=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-		echo "$as_me:21837: result: $cf_have_ncuconfig" >&5
+		echo "$as_me:22270: result: $cf_have_ncuconfig" >&5
 echo "${ECHO_T}$cf_have_ncuconfig" >&6
 		test "$cf_have_ncuconfig" = maybe && cf_have_ncuconfig=yes
 		if test "$cf_have_ncuconfig" != "yes"
@@ -21852,7 +22285,7 @@ EOF
 		fi
 
 	else
-		echo "$as_me:21855: result: no" >&5
+		echo "$as_me:22288: result: no" >&5
 echo "${ECHO_T}no" >&6
 		NCURSES_CONFIG_PKG=none
 	fi
@@ -21868,7 +22301,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:21871: checking for $ac_word" >&5
+echo "$as_me:22304: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_NCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21883,7 +22316,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_NCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:21886: found $ac_dir/$ac_word" >&5
+echo "$as_me:22319: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -21891,10 +22324,10 @@ fi
 fi
 NCURSES_CONFIG=$ac_cv_prog_NCURSES_CONFIG
 if test -n "$NCURSES_CONFIG"; then
-  echo "$as_me:21894: result: $NCURSES_CONFIG" >&5
+  echo "$as_me:22327: result: $NCURSES_CONFIG" >&5
 echo "${ECHO_T}$NCURSES_CONFIG" >&6
 else
-  echo "$as_me:21897: result: no" >&5
+  echo "$as_me:22330: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -21907,7 +22340,7 @@ if test -z "$NCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:21910: checking for $ac_word" >&5
+echo "$as_me:22343: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_NCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21922,7 +22355,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_NCURSES_CONFIG="$ac_prog"
-echo "$as_me:21925: found $ac_dir/$ac_word" >&5
+echo "$as_me:22358: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -21930,10 +22363,10 @@ fi
 fi
 ac_ct_NCURSES_CONFIG=$ac_cv_prog_ac_ct_NCURSES_CONFIG
 if test -n "$ac_ct_NCURSES_CONFIG"; then
-  echo "$as_me:21933: result: $ac_ct_NCURSES_CONFIG" >&5
+  echo "$as_me:22366: result: $ac_ct_NCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_NCURSES_CONFIG" >&6
 else
-  echo "$as_me:21936: result: no" >&5
+  echo "$as_me:22369: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -21966,7 +22399,7 @@ LIBS="$cf_add_libs"
 
 		# even with config script, some packages use no-override for curses.h
 
-echo "$as_me:21969: checking if we have identified curses headers" >&5
+echo "$as_me:22402: 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
@@ -21978,7 +22411,7 @@ for cf_header in \
 	curses.h $cf_cv_screen/curses.h
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 21981 "configure"
+#line 22414 "configure"
 #include "confdefs.h"
 #include <${cf_header}>
 int
@@ -21990,16 +22423,16 @@ initscr(); tgoto("?", 0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:21993: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22426: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:21996: \$? = $ac_status" >&5
+  echo "$as_me:22429: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:21999: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22432: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22002: \$? = $ac_status" >&5
+  echo "$as_me:22435: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_header=$cf_header; break
 else
@@ -22010,11 +22443,11 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:22013: result: $cf_cv_ncurses_header" >&5
+echo "$as_me:22446: 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:22017: error: No curses header-files found" >&5
+	{ { echo "$as_me:22450: error: No curses header-files found" >&5
 echo "$as_me: error: No curses header-files found" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -22024,23 +22457,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:22027: checking for $ac_header" >&5
+echo "$as_me:22460: 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 22033 "configure"
+#line 22466 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:22037: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:22470: \"$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:22043: \$? = $ac_status" >&5
+  echo "$as_me:22476: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -22059,7 +22492,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:22062: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:22495: 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,7 +22545,7 @@ if test -n "$cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 22115 "configure"
+#line 22548 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -22124,16 +22557,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22127: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22560: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22130: \$? = $ac_status" >&5
+  echo "$as_me:22563: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22133: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22566: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22136: \$? = $ac_status" >&5
+  echo "$as_me:22569: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -22150,7 +22583,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}:22153: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:22586: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -22169,7 +22602,7 @@ fi
 
 }
 
-echo "$as_me:22172: checking for $cf_ncuhdr_root header in include-path" >&5
+echo "$as_me:22605: 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
@@ -22181,7 +22614,7 @@ else
 	do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 22184 "configure"
+#line 22617 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -22205,16 +22638,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22208: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22641: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22211: \$? = $ac_status" >&5
+  echo "$as_me:22644: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22214: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22647: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22217: \$? = $ac_status" >&5
+  echo "$as_me:22650: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h=$cf_header
 
@@ -22229,14 +22662,14 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 	done
 
 fi
-echo "$as_me:22232: result: $cf_cv_ncurses_h" >&5
+echo "$as_me:22665: 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:22239: checking for $cf_ncuhdr_root include-path" >&5
+echo "$as_me:22672: 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
@@ -22354,7 +22787,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 22357 "configure"
+#line 22790 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -22366,16 +22799,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22369: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22802: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22372: \$? = $ac_status" >&5
+  echo "$as_me:22805: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22375: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22808: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22378: \$? = $ac_status" >&5
+  echo "$as_me:22811: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -22392,7 +22825,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}:22395: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:22828: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -22415,7 +22848,7 @@ fi
 		do
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 22418 "configure"
+#line 22851 "configure"
 #include "confdefs.h"
 
 #include <$cf_header>
@@ -22439,16 +22872,16 @@ printf("old\n");
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22442: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22875: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22445: \$? = $ac_status" >&5
+  echo "$as_me:22878: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22448: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22881: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22451: \$? = $ac_status" >&5
+  echo "$as_me:22884: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_h2=$cf_header
 
@@ -22469,12 +22902,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:22472: error: not found" >&5
+	test "$cf_cv_ncurses_h2" = no && { { echo "$as_me:22905: error: not found" >&5
 echo "$as_me: error: not found" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:22477: result: $cf_cv_ncurses_h2" >&5
+echo "$as_me:22910: 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%/[^/]*$%%'`
@@ -22507,7 +22940,7 @@ if test -n "$cf_1st_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 22510 "configure"
+#line 22943 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -22519,16 +22952,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22522: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:22955: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22525: \$? = $ac_status" >&5
+  echo "$as_me:22958: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22528: \"$ac_try\"") >&5
+  { (eval echo "$as_me:22961: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22531: \$? = $ac_status" >&5
+  echo "$as_me:22964: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -22545,7 +22978,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}:22548: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:22981: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -22593,7 +23026,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:22596: checking for terminfo header" >&5
+echo "$as_me:23029: 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
@@ -22611,7 +23044,7 @@ esac
 for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 22614 "configure"
+#line 23047 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -22626,16 +23059,16 @@ int x = auto_left_margin
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:22629: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23062: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:22632: \$? = $ac_status" >&5
+  echo "$as_me:23065: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:22635: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23068: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22638: \$? = $ac_status" >&5
+  echo "$as_me:23071: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_term_header="$cf_test"
@@ -22651,7 +23084,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:22654: result: $cf_cv_term_header" >&5
+echo "$as_me:23087: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 # Set definitions to allow ifdef'ing to accommodate subdirectories
@@ -22689,7 +23122,7 @@ cat >>confdefs.h <<\EOF
 #define NCURSES 1
 EOF
 
-echo "$as_me:22692: checking for ncurses version" >&5
+echo "$as_me:23125: 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
@@ -22715,10 +23148,10 @@ Autoconf "old"
 #endif
 EOF
 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-	{ (eval echo "$as_me:22718: \"$cf_try\"") >&5
+	{ (eval echo "$as_me:23151: \"$cf_try\"") >&5
   (eval $cf_try) 2>&5
   ac_status=$?
-  echo "$as_me:22721: \$? = $ac_status" >&5
+  echo "$as_me:23154: \$? = $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%".*%%'`
@@ -22728,7 +23161,7 @@ EOF
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 22731 "configure"
+#line 23164 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -22753,15 +23186,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:22756: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23189: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22759: \$? = $ac_status" >&5
+  echo "$as_me:23192: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:22761: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23194: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22764: \$? = $ac_status" >&5
+  echo "$as_me:23197: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_ncurses_version=`cat $cf_tempfile`
@@ -22775,7 +23208,7 @@ fi
 	rm -f $cf_tempfile
 
 fi
-echo "$as_me:22778: result: $cf_cv_ncurses_version" >&5
+echo "$as_me:23211: result: $cf_cv_ncurses_version" >&5
 echo "${ECHO_T}$cf_cv_ncurses_version" >&6
 test "$cf_cv_ncurses_version" = no ||
 cat >>confdefs.h <<\EOF
@@ -22788,7 +23221,7 @@ cf_nculib_root=$cf_cv_screen
 	# to link gpm.
 cf_ncurses_LIBS=""
 cf_ncurses_SAVE="$LIBS"
-echo "$as_me:22791: checking for Gpm_Open in -lgpm" >&5
+echo "$as_me:23224: 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
@@ -22796,7 +23229,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 22799 "configure"
+#line 23232 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22815,16 +23248,16 @@ Gpm_Open ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22818: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23251: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22821: \$? = $ac_status" >&5
+  echo "$as_me:23254: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22824: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23257: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22827: \$? = $ac_status" >&5
+  echo "$as_me:23260: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_Gpm_Open=yes
 else
@@ -22835,10 +23268,10 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22838: result: $ac_cv_lib_gpm_Gpm_Open" >&5
+echo "$as_me:23271: 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:22841: checking for initscr in -lgpm" >&5
+  echo "$as_me:23274: 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
@@ -22846,7 +23279,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgpm  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 22849 "configure"
+#line 23282 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22865,16 +23298,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22868: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23301: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22871: \$? = $ac_status" >&5
+  echo "$as_me:23304: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22874: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23307: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22877: \$? = $ac_status" >&5
+  echo "$as_me:23310: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_gpm_initscr=yes
 else
@@ -22885,7 +23318,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22888: result: $ac_cv_lib_gpm_initscr" >&5
+echo "$as_me:23321: 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"
@@ -22900,7 +23333,7 @@ case $host_os in
 	# This is only necessary if you are linking against an obsolete
 	# version of ncurses (but it should do no harm, since it's static).
 	if test "$cf_nculib_root" = ncurses ; then
-		echo "$as_me:22903: checking for tgoto in -lmytinfo" >&5
+		echo "$as_me:23336: 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
@@ -22908,7 +23341,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lmytinfo  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 22911 "configure"
+#line 23344 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -22927,16 +23360,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:22930: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23363: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:22933: \$? = $ac_status" >&5
+  echo "$as_me:23366: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:22936: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23369: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:22939: \$? = $ac_status" >&5
+  echo "$as_me:23372: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_mytinfo_tgoto=yes
 else
@@ -22947,7 +23380,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:22950: result: $ac_cv_lib_mytinfo_tgoto" >&5
+echo "$as_me:23383: 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"
@@ -22996,13 +23429,13 @@ else
 
 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
 	cf_libdir=""
-	echo "$as_me:22999: checking for initscr" >&5
+	echo "$as_me:23432: 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 23005 "configure"
+#line 23438 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char initscr (); below.  */
@@ -23033,16 +23466,16 @@ f = initscr; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23036: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23469: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23039: \$? = $ac_status" >&5
+  echo "$as_me:23472: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23042: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23475: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23045: \$? = $ac_status" >&5
+  echo "$as_me:23478: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_initscr=yes
 else
@@ -23052,18 +23485,18 @@ ac_cv_func_initscr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:23055: result: $ac_cv_func_initscr" >&5
+echo "$as_me:23488: 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:23062: checking for initscr in -l$cf_nculib_root" >&5
+		echo "$as_me:23495: 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 23066 "configure"
+#line 23499 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -23075,25 +23508,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23078: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23511: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23081: \$? = $ac_status" >&5
+  echo "$as_me:23514: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23084: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23517: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23087: \$? = $ac_status" >&5
+  echo "$as_me:23520: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:23089: result: yes" >&5
+  echo "$as_me:23522: 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:23096: result: no" >&5
+echo "$as_me:23529: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -23161,11 +23594,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:23164: checking for -l$cf_nculib_root in $cf_libdir" >&5
+				echo "$as_me:23597: 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 23168 "configure"
+#line 23601 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -23177,25 +23610,25 @@ initscr()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23180: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23613: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23183: \$? = $ac_status" >&5
+  echo "$as_me:23616: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23186: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23619: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23189: \$? = $ac_status" >&5
+  echo "$as_me:23622: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:23191: result: yes" >&5
+  echo "$as_me:23624: 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:23198: result: no" >&5
+echo "$as_me:23631: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -23210,7 +23643,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'$cf_nculib_root
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:23213: error: Cannot link $cf_nculib_root library" >&5
+	{ { echo "$as_me:23646: error: Cannot link $cf_nculib_root library" >&5
 echo "$as_me: error: Cannot link $cf_nculib_root library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -23218,7 +23651,7 @@ fi
 fi
 
 if test -n "$cf_ncurses_LIBS" ; then
-	echo "$as_me:23221: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
+	echo "$as_me:23654: 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
@@ -23228,7 +23661,7 @@ echo $ECHO_N "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS..
 		fi
 	done
 	cat >conftest.$ac_ext <<_ACEOF
-#line 23231 "configure"
+#line 23664 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -23240,23 +23673,23 @@ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23243: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23676: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23246: \$? = $ac_status" >&5
+  echo "$as_me:23679: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23249: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23682: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23252: \$? = $ac_status" >&5
+  echo "$as_me:23685: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:23254: result: yes" >&5
+  echo "$as_me:23687: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:23259: result: no" >&5
+echo "$as_me:23692: result: no" >&5
 echo "${ECHO_T}no" >&6
 		 LIBS="$cf_ncurses_SAVE"
 fi
@@ -23288,7 +23721,7 @@ fi
 	;;
 (slang)
 
-echo "$as_me:23291: checking for slang header file" >&5
+echo "$as_me:23724: 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
@@ -23296,7 +23729,7 @@ else
 
 	cf_cv_slang_header=no
 	cat >conftest.$ac_ext <<_ACEOF
-#line 23299 "configure"
+#line 23732 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -23308,16 +23741,16 @@ printf("%s\n", SLANG_VERSION)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23311: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23744: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23314: \$? = $ac_status" >&5
+  echo "$as_me:23747: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23317: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23750: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23320: \$? = $ac_status" >&5
+  echo "$as_me:23753: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_header=predefined
 else
@@ -23422,7 +23855,7 @@ cf_search="$cf_search $cf_header_path_list"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:23425: result: $cf_cv_slang_header" >&5
+echo "$as_me:23858: result: $cf_cv_slang_header" >&5
 echo "${ECHO_T}$cf_cv_slang_header" >&6
 
 if test "x$cf_cv_slang_header" != xno
@@ -23463,7 +23896,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 23466 "configure"
+#line 23899 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -23475,16 +23908,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:23478: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:23911: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:23481: \$? = $ac_status" >&5
+  echo "$as_me:23914: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:23484: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23917: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23487: \$? = $ac_status" >&5
+  echo "$as_me:23920: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -23501,7 +23934,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}:23504: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:23937: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -23533,7 +23966,7 @@ else
 
 cf_cv_termlib=none
 cat >conftest.$ac_ext <<_ACEOF
-#line 23536 "configure"
+#line 23969 "configure"
 #include "confdefs.h"
 
 int
@@ -23545,19 +23978,19 @@ char *x=(char*)tgoto("",0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23548: \"$ac_link\"") >&5
+if { (eval echo "$as_me:23981: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23551: \$? = $ac_status" >&5
+  echo "$as_me:23984: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23554: \"$ac_try\"") >&5
+  { (eval echo "$as_me:23987: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23557: \$? = $ac_status" >&5
+  echo "$as_me:23990: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 23560 "configure"
+#line 23993 "configure"
 #include "confdefs.h"
 
 int
@@ -23569,16 +24002,16 @@ int x=tigetstr("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23572: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24005: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23575: \$? = $ac_status" >&5
+  echo "$as_me:24008: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23578: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24011: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23581: \$? = $ac_status" >&5
+  echo "$as_me:24014: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termlib=terminfo
 else
@@ -23589,7 +24022,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}:23592: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
+echo "${as_me:-configure}:24025: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
 
 else
   echo "$as_me: failed program was:" >&5
@@ -23604,10 +24037,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:23607: checking for $cf_func in -l$cf_lib" >&5
+			echo "$as_me:24040: 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 23610 "configure"
+#line 24043 "configure"
 #include "confdefs.h"
 
 int
@@ -23619,16 +24052,16 @@ int x=$cf_func("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23622: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24055: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23625: \$? = $ac_status" >&5
+  echo "$as_me:24058: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23628: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24061: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23631: \$? = $ac_status" >&5
+  echo "$as_me:24064: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -23637,7 +24070,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-			echo "$as_me:23640: result: $cf_result" >&5
+			echo "$as_me:24073: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				if test "$cf_func" = tigetstr ; then
@@ -23654,7 +24087,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:23657: checking for initscr in -lcurses" >&5
+	echo "$as_me:24090: 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
@@ -23662,7 +24095,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 23665 "configure"
+#line 24098 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23681,16 +24114,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23684: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24117: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23687: \$? = $ac_status" >&5
+  echo "$as_me:24120: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23690: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24123: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23693: \$? = $ac_status" >&5
+  echo "$as_me:24126: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_curses_initscr=yes
 else
@@ -23701,7 +24134,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23704: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:24137: 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
 
@@ -23723,7 +24156,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-	echo "$as_me:23726: checking for tgoto in -ltermcap" >&5
+	echo "$as_me:24159: 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
@@ -23731,7 +24164,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 23734 "configure"
+#line 24167 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23750,16 +24183,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23753: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24186: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23756: \$? = $ac_status" >&5
+  echo "$as_me:24189: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23759: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24192: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23762: \$? = $ac_status" >&5
+  echo "$as_me:24195: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_termcap_tgoto=yes
 else
@@ -23770,7 +24203,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23773: result: $ac_cv_lib_termcap_tgoto" >&5
+echo "$as_me:24206: 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
 
@@ -23797,20 +24230,20 @@ fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 if test "$cf_cv_termlib" = none; then
-	{ echo "$as_me:23800: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
+	{ echo "$as_me:24233: 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:23807: checking for acos" >&5
+echo "$as_me:24240: 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 23813 "configure"
+#line 24246 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char acos (); below.  */
@@ -23841,16 +24274,16 @@ f = acos; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23844: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24277: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23847: \$? = $ac_status" >&5
+  echo "$as_me:24280: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23850: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24283: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23853: \$? = $ac_status" >&5
+  echo "$as_me:24286: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_acos=yes
 else
@@ -23860,13 +24293,13 @@ ac_cv_func_acos=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:23863: result: $ac_cv_func_acos" >&5
+echo "$as_me:24296: 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:23869: checking for acos in -lm" >&5
+echo "$as_me:24302: 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
@@ -23874,7 +24307,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm $LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 23877 "configure"
+#line 24310 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -23893,16 +24326,16 @@ acos ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23896: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24329: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23899: \$? = $ac_status" >&5
+  echo "$as_me:24332: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23902: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24335: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23905: \$? = $ac_status" >&5
+  echo "$as_me:24338: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_m_acos=yes
 else
@@ -23913,7 +24346,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:23916: result: $ac_cv_lib_m_acos" >&5
+echo "$as_me:24349: 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
 
@@ -23939,13 +24372,13 @@ case $host_os in
 
 	eval 'cf_cv_have_lib_'video'=no'
 	cf_libdir=""
-	echo "$as_me:23942: checking for v_init" >&5
+	echo "$as_me:24375: 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 23948 "configure"
+#line 24381 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char v_init (); below.  */
@@ -23976,16 +24409,16 @@ f = v_init; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:23979: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24412: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:23982: \$? = $ac_status" >&5
+  echo "$as_me:24415: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:23985: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24418: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:23988: \$? = $ac_status" >&5
+  echo "$as_me:24421: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_v_init=yes
 else
@@ -23995,18 +24428,18 @@ ac_cv_func_v_init=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:23998: result: $ac_cv_func_v_init" >&5
+echo "$as_me:24431: 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:24005: checking for v_init in -lvideo" >&5
+		echo "$as_me:24438: 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 24009 "configure"
+#line 24442 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -24018,25 +24451,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24021: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24454: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24024: \$? = $ac_status" >&5
+  echo "$as_me:24457: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24027: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24460: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24030: \$? = $ac_status" >&5
+  echo "$as_me:24463: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:24032: result: yes" >&5
+  echo "$as_me:24465: 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:24039: result: no" >&5
+echo "$as_me:24472: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -24104,11 +24537,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:24107: checking for -lvideo in $cf_libdir" >&5
+				echo "$as_me:24540: 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 24111 "configure"
+#line 24544 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -24120,25 +24553,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24123: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24556: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24126: \$? = $ac_status" >&5
+  echo "$as_me:24559: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24129: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24562: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24132: \$? = $ac_status" >&5
+  echo "$as_me:24565: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:24134: result: yes" >&5
+  echo "$as_me:24567: 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:24141: result: no" >&5
+echo "$as_me:24574: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -24153,7 +24586,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'video
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:24156: error: Cannot link video library" >&5
+	{ { echo "$as_me:24589: error: Cannot link video library" >&5
 echo "$as_me: error: Cannot link video library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -24163,13 +24596,13 @@ esac
 
 	eval 'cf_cv_have_lib_'slang'=no'
 	cf_libdir=""
-	echo "$as_me:24166: checking for SLtt_get_screen_size" >&5
+	echo "$as_me:24599: 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 24172 "configure"
+#line 24605 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char SLtt_get_screen_size (); below.  */
@@ -24200,16 +24633,16 @@ f = SLtt_get_screen_size; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24203: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24636: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24206: \$? = $ac_status" >&5
+  echo "$as_me:24639: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24209: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24642: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24212: \$? = $ac_status" >&5
+  echo "$as_me:24645: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_SLtt_get_screen_size=yes
 else
@@ -24219,18 +24652,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:24222: result: $ac_cv_func_SLtt_get_screen_size" >&5
+echo "$as_me:24655: 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:24229: checking for SLtt_get_screen_size in -lslang" >&5
+		echo "$as_me:24662: 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 24233 "configure"
+#line 24666 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -24242,25 +24675,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24245: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24678: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24248: \$? = $ac_status" >&5
+  echo "$as_me:24681: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24251: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24684: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24254: \$? = $ac_status" >&5
+  echo "$as_me:24687: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:24256: result: yes" >&5
+  echo "$as_me:24689: 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:24263: result: no" >&5
+echo "$as_me:24696: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -24328,11 +24761,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:24331: checking for -lslang in $cf_libdir" >&5
+				echo "$as_me:24764: 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 24335 "configure"
+#line 24768 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -24344,25 +24777,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24347: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24780: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24350: \$? = $ac_status" >&5
+  echo "$as_me:24783: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24353: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24786: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24356: \$? = $ac_status" >&5
+  echo "$as_me:24789: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:24358: result: yes" >&5
+  echo "$as_me:24791: 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:24365: result: no" >&5
+echo "$as_me:24798: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -24377,13 +24810,13 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'slang
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:24380: error: Cannot link slang library" >&5
+	{ { echo "$as_me:24813: 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:24386: checking if we can link slang without termcap" >&5
+echo "$as_me:24819: 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%^.%%'`
@@ -24392,7 +24825,7 @@ else
 fi
 LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s%$cf_exclude%%" -e 's%^.%%'`
 cat >conftest.$ac_ext <<_ACEOF
-#line 24395 "configure"
+#line 24828 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -24404,16 +24837,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24407: \"$ac_link\"") >&5
+if { (eval echo "$as_me:24840: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24410: \$? = $ac_status" >&5
+  echo "$as_me:24843: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24413: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24846: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24416: \$? = $ac_status" >&5
+  echo "$as_me:24849: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -24422,13 +24855,13 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:24425: result: $cf_result" >&5
+echo "$as_me:24858: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 test $cf_result = no && LIBS="$cf_slang_LIBS3"
 
 else
 
-echo "$as_me:24431: checking for slang2 header file" >&5
+echo "$as_me:24864: checking for slang2 header file" >&5
 echo $ECHO_N "checking for slang2 header file... $ECHO_C" >&6
 if test "${cf_cv_slang2_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -24436,7 +24869,7 @@ else
 
 	cf_cv_slang2_header=no
 	cat >conftest.$ac_ext <<_ACEOF
-#line 24439 "configure"
+#line 24872 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -24448,16 +24881,16 @@ printf("%s\n", SLANG_VERSION)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24451: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:24884: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24454: \$? = $ac_status" >&5
+  echo "$as_me:24887: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24457: \"$ac_try\"") >&5
+  { (eval echo "$as_me:24890: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24460: \$? = $ac_status" >&5
+  echo "$as_me:24893: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang2_header=predefined
 else
@@ -24562,7 +24995,7 @@ cf_search="$cf_search $cf_header_path_list"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:24565: result: $cf_cv_slang2_header" >&5
+echo "$as_me:24998: result: $cf_cv_slang2_header" >&5
 echo "${ECHO_T}$cf_cv_slang2_header" >&6
 
 if test "x$cf_cv_slang2_header" != xno
@@ -24603,7 +25036,7 @@ if test -n "$cf_incdir" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 24606 "configure"
+#line 25039 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -24615,16 +25048,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:24618: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:25051: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:24621: \$? = $ac_status" >&5
+  echo "$as_me:25054: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:24624: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25057: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24627: \$? = $ac_status" >&5
+  echo "$as_me:25060: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -24641,7 +25074,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}:24644: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:25077: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -24673,7 +25106,7 @@ else
 
 cf_cv_termlib=none
 cat >conftest.$ac_ext <<_ACEOF
-#line 24676 "configure"
+#line 25109 "configure"
 #include "confdefs.h"
 
 int
@@ -24685,19 +25118,19 @@ char *x=(char*)tgoto("",0,0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24688: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25121: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24691: \$? = $ac_status" >&5
+  echo "$as_me:25124: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24694: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25127: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24697: \$? = $ac_status" >&5
+  echo "$as_me:25130: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 24700 "configure"
+#line 25133 "configure"
 #include "confdefs.h"
 
 int
@@ -24709,16 +25142,16 @@ int x=tigetstr("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24712: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25145: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24715: \$? = $ac_status" >&5
+  echo "$as_me:25148: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24718: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25151: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24721: \$? = $ac_status" >&5
+  echo "$as_me:25154: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termlib=terminfo
 else
@@ -24729,7 +25162,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}:24732: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
+echo "${as_me:-configure}:25165: testing using functions in predefined $cf_cv_termlib LIBS ..." 1>&5
 
 else
   echo "$as_me: failed program was:" >&5
@@ -24744,10 +25177,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:24747: checking for $cf_func in -l$cf_lib" >&5
+			echo "$as_me:25180: 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 24750 "configure"
+#line 25183 "configure"
 #include "confdefs.h"
 
 int
@@ -24759,16 +25192,16 @@ int x=$cf_func("")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24762: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25195: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24765: \$? = $ac_status" >&5
+  echo "$as_me:25198: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24768: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25201: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24771: \$? = $ac_status" >&5
+  echo "$as_me:25204: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -24777,7 +25210,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-			echo "$as_me:24780: result: $cf_result" >&5
+			echo "$as_me:25213: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				if test "$cf_func" = tigetstr ; then
@@ -24794,7 +25227,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:24797: checking for initscr in -lcurses" >&5
+	echo "$as_me:25230: 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
@@ -24802,7 +25235,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 24805 "configure"
+#line 25238 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24821,16 +25254,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24824: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25257: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24827: \$? = $ac_status" >&5
+  echo "$as_me:25260: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24830: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25263: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24833: \$? = $ac_status" >&5
+  echo "$as_me:25266: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_curses_initscr=yes
 else
@@ -24841,7 +25274,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24844: result: $ac_cv_lib_curses_initscr" >&5
+echo "$as_me:25277: 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
 
@@ -24863,7 +25296,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-	echo "$as_me:24866: checking for tgoto in -ltermcap" >&5
+	echo "$as_me:25299: 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
@@ -24871,7 +25304,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 24874 "configure"
+#line 25307 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -24890,16 +25323,16 @@ tgoto ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24893: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25326: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24896: \$? = $ac_status" >&5
+  echo "$as_me:25329: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24899: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25332: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24902: \$? = $ac_status" >&5
+  echo "$as_me:25335: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_termcap_tgoto=yes
 else
@@ -24910,7 +25343,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:24913: result: $ac_cv_lib_termcap_tgoto" >&5
+echo "$as_me:25346: 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
 
@@ -24937,20 +25370,20 @@ fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 if test "$cf_cv_termlib" = none; then
-	{ echo "$as_me:24940: WARNING: Cannot find -ltermlib, -lcurses, or -ltermcap" >&5
+	{ echo "$as_me:25373: 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:24947: checking for acos" >&5
+echo "$as_me:25380: 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 24953 "configure"
+#line 25386 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char acos (); below.  */
@@ -24981,16 +25414,16 @@ f = acos; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:24984: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25417: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:24987: \$? = $ac_status" >&5
+  echo "$as_me:25420: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:24990: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25423: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:24993: \$? = $ac_status" >&5
+  echo "$as_me:25426: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_acos=yes
 else
@@ -25000,13 +25433,13 @@ ac_cv_func_acos=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:25003: result: $ac_cv_func_acos" >&5
+echo "$as_me:25436: 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:25009: checking for acos in -lm" >&5
+echo "$as_me:25442: 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
@@ -25014,7 +25447,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm $LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 25017 "configure"
+#line 25450 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -25033,16 +25466,16 @@ acos ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25036: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25469: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25039: \$? = $ac_status" >&5
+  echo "$as_me:25472: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25042: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25475: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25045: \$? = $ac_status" >&5
+  echo "$as_me:25478: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_m_acos=yes
 else
@@ -25053,7 +25486,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:25056: result: $ac_cv_lib_m_acos" >&5
+echo "$as_me:25489: 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
 
@@ -25079,13 +25512,13 @@ case $host_os in
 
 	eval 'cf_cv_have_lib_'video'=no'
 	cf_libdir=""
-	echo "$as_me:25082: checking for v_init" >&5
+	echo "$as_me:25515: 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 25088 "configure"
+#line 25521 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char v_init (); below.  */
@@ -25116,16 +25549,16 @@ f = v_init; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25119: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25552: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25122: \$? = $ac_status" >&5
+  echo "$as_me:25555: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25125: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25558: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25128: \$? = $ac_status" >&5
+  echo "$as_me:25561: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_v_init=yes
 else
@@ -25135,18 +25568,18 @@ ac_cv_func_v_init=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:25138: result: $ac_cv_func_v_init" >&5
+echo "$as_me:25571: 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:25145: checking for v_init in -lvideo" >&5
+		echo "$as_me:25578: 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 25149 "configure"
+#line 25582 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -25158,25 +25591,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25161: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25594: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25164: \$? = $ac_status" >&5
+  echo "$as_me:25597: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25167: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25600: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25170: \$? = $ac_status" >&5
+  echo "$as_me:25603: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:25172: result: yes" >&5
+  echo "$as_me:25605: 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:25179: result: no" >&5
+echo "$as_me:25612: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -25244,11 +25677,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:25247: checking for -lvideo in $cf_libdir" >&5
+				echo "$as_me:25680: 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 25251 "configure"
+#line 25684 "configure"
 #include "confdefs.h"
 #include <sys/video.h>
 int
@@ -25260,25 +25693,25 @@ v_init()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25263: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25696: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25266: \$? = $ac_status" >&5
+  echo "$as_me:25699: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25269: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25702: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25272: \$? = $ac_status" >&5
+  echo "$as_me:25705: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:25274: result: yes" >&5
+  echo "$as_me:25707: 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:25281: result: no" >&5
+echo "$as_me:25714: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -25293,7 +25726,7 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'video
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:25296: error: Cannot link video library" >&5
+	{ { echo "$as_me:25729: error: Cannot link video library" >&5
 echo "$as_me: error: Cannot link video library" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -25303,13 +25736,13 @@ esac
 
 	eval 'cf_cv_have_lib_'slang2'=no'
 	cf_libdir=""
-	echo "$as_me:25306: checking for SLtt_get_screen_size" >&5
+	echo "$as_me:25739: 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 25312 "configure"
+#line 25745 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char SLtt_get_screen_size (); below.  */
@@ -25340,16 +25773,16 @@ f = SLtt_get_screen_size; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25343: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25776: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25346: \$? = $ac_status" >&5
+  echo "$as_me:25779: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25349: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25782: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25352: \$? = $ac_status" >&5
+  echo "$as_me:25785: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_SLtt_get_screen_size=yes
 else
@@ -25359,18 +25792,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:25362: result: $ac_cv_func_SLtt_get_screen_size" >&5
+echo "$as_me:25795: result: $ac_cv_func_SLtt_get_screen_size" >&5
 echo "${ECHO_T}$ac_cv_func_SLtt_get_screen_size" >&6
 if test $ac_cv_func_SLtt_get_screen_size = yes; then
   eval 'cf_cv_have_lib_'slang2'=yes'
 else
 
 		cf_save_LIBS="$LIBS"
-		echo "$as_me:25369: checking for SLtt_get_screen_size in -lslang2" >&5
+		echo "$as_me:25802: checking for SLtt_get_screen_size in -lslang2" >&5
 echo $ECHO_N "checking for SLtt_get_screen_size in -lslang2... $ECHO_C" >&6
 		LIBS="-lslang2 $LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 25373 "configure"
+#line 25806 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -25382,25 +25815,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25385: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25818: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25388: \$? = $ac_status" >&5
+  echo "$as_me:25821: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25391: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25824: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25394: \$? = $ac_status" >&5
+  echo "$as_me:25827: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:25396: result: yes" >&5
+  echo "$as_me:25829: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 eval 'cf_cv_have_lib_'slang2'=yes'
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:25403: result: no" >&5
+echo "$as_me:25836: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 cf_search=
@@ -25468,11 +25901,11 @@ cf_search="$cf_library_path_list $cf_search"
 
 			for cf_libdir in $cf_search
 			do
-				echo "$as_me:25471: checking for -lslang2 in $cf_libdir" >&5
+				echo "$as_me:25904: checking for -lslang2 in $cf_libdir" >&5
 echo $ECHO_N "checking for -lslang2 in $cf_libdir... $ECHO_C" >&6
 				LIBS="-L$cf_libdir -lslang2 $cf_save_LIBS"
 				cat >conftest.$ac_ext <<_ACEOF
-#line 25475 "configure"
+#line 25908 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -25484,25 +25917,25 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25487: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25920: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25490: \$? = $ac_status" >&5
+  echo "$as_me:25923: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25493: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25926: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25496: \$? = $ac_status" >&5
+  echo "$as_me:25929: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:25498: result: yes" >&5
+  echo "$as_me:25931: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 			 		 eval 'cf_cv_have_lib_'slang2'=yes'
 					 break
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:25505: result: no" >&5
+echo "$as_me:25938: result: no" >&5
 echo "${ECHO_T}no" >&6
 					 LIBS="$cf_save_LIBS"
 fi
@@ -25517,13 +25950,13 @@ fi
 eval 'cf_found_library=$cf_cv_have_lib_'slang2
 
 if test $cf_found_library = no ; then
-	{ { echo "$as_me:25520: error: Cannot link slang2 library" >&5
+	{ { echo "$as_me:25953: error: Cannot link slang2 library" >&5
 echo "$as_me: error: Cannot link slang2 library" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 cf_slang_LIBS3="$LIBS"
-echo "$as_me:25526: checking if we can link slang2 without termcap" >&5
+echo "$as_me:25959: checking if we can link slang2 without termcap" >&5
 echo $ECHO_N "checking if we can link slang2 without termcap... $ECHO_C" >&6
 if test -n "`echo $cf_slang_LIBS1 | sed -e 's/ //g'`" ; then
 	cf_exclude=`echo ".$cf_slang_LIBS2" | sed -e "s%$cf_slang_LIBS1%%" -e 's%^.%%'`
@@ -25532,7 +25965,7 @@ else
 fi
 LIBS=`echo ".$cf_slang_LIBS3" | sed -e "s%$cf_exclude%%" -e 's%^.%%'`
 cat >conftest.$ac_ext <<_ACEOF
-#line 25535 "configure"
+#line 25968 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -25544,16 +25977,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25547: \"$ac_link\"") >&5
+if { (eval echo "$as_me:25980: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25550: \$? = $ac_status" >&5
+  echo "$as_me:25983: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25553: \"$ac_try\"") >&5
+  { (eval echo "$as_me:25986: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25556: \$? = $ac_status" >&5
+  echo "$as_me:25989: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -25562,12 +25995,12 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-echo "$as_me:25565: result: $cf_result" >&5
+echo "$as_me:25998: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 test $cf_result = no && LIBS="$cf_slang_LIBS3"
 
 	else
-		{ { echo "$as_me:25570: error: cannot find slang headers" >&5
+		{ { echo "$as_me:26003: error: cannot find slang headers" >&5
 echo "$as_me: error: cannot find slang headers" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -25575,14 +26008,14 @@ fi
 
 # There's an unofficial set of patches for slang that gives it some limited
 # UTF8 capability.  Unfortunately it won't compile unless one defines UTF8.
-echo "$as_me:25578: checking if we must define UTF8" >&5
+echo "$as_me:26011: 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 25585 "configure"
+#line 26018 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -25594,16 +26027,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25597: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26030: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25600: \$? = $ac_status" >&5
+  echo "$as_me:26033: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25603: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26036: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25606: \$? = $ac_status" >&5
+  echo "$as_me:26039: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_utf8=no
 else
@@ -25611,7 +26044,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 25614 "configure"
+#line 26047 "configure"
 #include "confdefs.h"
 
 #define UTF8
@@ -25625,16 +26058,16 @@ SLtt_get_screen_size()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25628: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26061: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25631: \$? = $ac_status" >&5
+  echo "$as_me:26064: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25634: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26067: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25637: \$? = $ac_status" >&5
+  echo "$as_me:26070: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_utf8=yes
 else
@@ -25647,7 +26080,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:25650: result: $cf_cv_slang_utf8" >&5
+echo "$as_me:26083: result: $cf_cv_slang_utf8" >&5
 echo "${ECHO_T}$cf_cv_slang_utf8" >&6
 
 if test "$cf_cv_slang_utf8" = yes ; then
@@ -25658,14 +26091,14 @@ EOF
 
 fi
 
-echo "$as_me:25661: checking if we must tell slang this is UNIX" >&5
+echo "$as_me:26094: 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 25668 "configure"
+#line 26101 "configure"
 #include "confdefs.h"
 #include <slang.h>
 int
@@ -25684,16 +26117,16 @@ SLang_TT_Baud_Rate = 1
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:25687: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26120: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:25690: \$? = $ac_status" >&5
+  echo "$as_me:26123: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:25693: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26126: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25696: \$? = $ac_status" >&5
+  echo "$as_me:26129: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_slang_unix=yes
 else
@@ -25704,20 +26137,20 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:25707: result: $cf_cv_slang_unix" >&5
+echo "$as_me:26140: result: $cf_cv_slang_unix" >&5
 echo "${ECHO_T}$cf_cv_slang_unix" >&6
 test $cf_cv_slang_unix = yes &&
 cat >>confdefs.h <<\EOF
 #define REAL_UNIX_SYSTEM 1
 EOF
 
-	echo "$as_me:25714: checking for SLsmg_Color_Type" >&5
+	echo "$as_me:26147: checking for SLsmg_Color_Type" >&5
 echo $ECHO_N "checking for SLsmg_Color_Type... $ECHO_C" >&6
 if test "${ac_cv_type_SLsmg_Color_Type+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 25720 "configure"
+#line 26153 "configure"
 #include "confdefs.h"
 #include <slang.h>
 
@@ -25733,16 +26166,16 @@ if (sizeof (SLsmg_Color_Type))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25736: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26169: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25739: \$? = $ac_status" >&5
+  echo "$as_me:26172: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25742: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26175: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25745: \$? = $ac_status" >&5
+  echo "$as_me:26178: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_SLsmg_Color_Type=yes
 else
@@ -25752,7 +26185,7 @@ ac_cv_type_SLsmg_Color_Type=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:25755: result: $ac_cv_type_SLsmg_Color_Type" >&5
+echo "$as_me:26188: result: $ac_cv_type_SLsmg_Color_Type" >&5
 echo "${ECHO_T}$ac_cv_type_SLsmg_Color_Type" >&6
 if test $ac_cv_type_SLsmg_Color_Type = yes; then
   ac_cv_type_SLsmg_Color_Type=yes
@@ -25768,13 +26201,13 @@ EOF
 
 fi
 
-	echo "$as_me:25771: checking for SLtt_Char_Type" >&5
+	echo "$as_me:26204: checking for SLtt_Char_Type" >&5
 echo $ECHO_N "checking for SLtt_Char_Type... $ECHO_C" >&6
 if test "${ac_cv_type_SLtt_Char_Type+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 25777 "configure"
+#line 26210 "configure"
 #include "confdefs.h"
 #include <slang.h>
 
@@ -25790,16 +26223,16 @@ if (sizeof (SLtt_Char_Type))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25793: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26226: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25796: \$? = $ac_status" >&5
+  echo "$as_me:26229: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25799: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26232: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25802: \$? = $ac_status" >&5
+  echo "$as_me:26235: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_SLtt_Char_Type=yes
 else
@@ -25809,7 +26242,7 @@ ac_cv_type_SLtt_Char_Type=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:25812: result: $ac_cv_type_SLtt_Char_Type" >&5
+echo "$as_me:26245: result: $ac_cv_type_SLtt_Char_Type" >&5
 echo "${ECHO_T}$ac_cv_type_SLtt_Char_Type" >&6
 if test $ac_cv_type_SLtt_Char_Type = yes; then
   ac_cv_type_SLtt_Char_Type=yes
@@ -25829,14 +26262,14 @@ fi
 	;;
 esac
 
-echo "$as_me:25832: checking for chtype typedef" >&5
+echo "$as_me:26265: checking for chtype typedef" >&5
 echo $ECHO_N "checking for chtype typedef... $ECHO_C" >&6
 if test "${cf_cv_chtype_decl+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 25839 "configure"
+#line 26272 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -25848,16 +26281,16 @@ chtype foo
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25851: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26284: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25854: \$? = $ac_status" >&5
+  echo "$as_me:26287: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25857: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26290: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25860: \$? = $ac_status" >&5
+  echo "$as_me:26293: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_chtype_decl=yes
 else
@@ -25867,7 +26300,7 @@ cf_cv_chtype_decl=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:25870: result: $cf_cv_chtype_decl" >&5
+echo "$as_me:26303: result: $cf_cv_chtype_decl" >&5
 echo "${ECHO_T}$cf_cv_chtype_decl" >&6
 if test $cf_cv_chtype_decl = yes ; then
 
@@ -25875,14 +26308,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_TYPE_CHTYPE 1
 EOF
 
-	echo "$as_me:25878: checking if chtype is scalar or struct" >&5
+	echo "$as_me:26311: checking if chtype is scalar or struct" >&5
 echo $ECHO_N "checking if chtype is scalar or struct... $ECHO_C" >&6
 if test "${cf_cv_chtype_type+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 25885 "configure"
+#line 26318 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -25894,16 +26327,16 @@ chtype foo; long x = foo
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:25897: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26330: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:25900: \$? = $ac_status" >&5
+  echo "$as_me:26333: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:25903: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26336: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:25906: \$? = $ac_status" >&5
+  echo "$as_me:26339: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_chtype_type=scalar
 else
@@ -25913,7 +26346,7 @@ cf_cv_chtype_type=struct
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:25916: result: $cf_cv_chtype_type" >&5
+echo "$as_me:26349: result: $cf_cv_chtype_type" >&5
 echo "${ECHO_T}$cf_cv_chtype_type" >&6
 	if test $cf_cv_chtype_type = scalar ; then
 
@@ -25924,7 +26357,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:25927: checking if you want the wide-curses features" >&5
+echo "$as_me:26360: 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.
@@ -25941,10 +26374,10 @@ else
 	use_wide_curses=$cf_wide_curses
 
 fi;
-echo "$as_me:25944: result: $use_wide_curses" >&5
+echo "$as_me:26377: result: $use_wide_curses" >&5
 echo "${ECHO_T}$use_wide_curses" >&6
 
-echo "$as_me:25947: checking if color-style code should be used" >&5
+echo "$as_me:26380: 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.
@@ -25964,7 +26397,7 @@ fi;
 
 case $use_color_style in
 (no)
-	echo "$as_me:25967: result: no" >&5
+	echo "$as_me:26400: result: no" >&5
 echo "${ECHO_T}no" >&6
 	INSTALL_LSS=
 	;;
@@ -25974,10 +26407,10 @@ cat >>confdefs.h <<\EOF
 #define USE_COLOR_STYLE 1
 EOF
 
-	echo "$as_me:25977: result: yes" >&5
+	echo "$as_me:26410: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-	echo "$as_me:25980: checking for location of style-sheet file" >&5
+	echo "$as_me:26413: 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.
@@ -26013,7 +26446,7 @@ case ".$withval" in
 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:26016: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:26449: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -26022,7 +26455,7 @@ esac
 fi
 eval LYNX_LSS_FILE="$withval"
 
-	echo "$as_me:26025: result: $LYNX_LSS_FILE" >&5
+	echo "$as_me:26458: result: $LYNX_LSS_FILE" >&5
 echo "${ECHO_T}$LYNX_LSS_FILE" >&6
 
 	test "$LYNX_LSS_FILE" = no && LYNX_LSS_FILE=
@@ -26035,7 +26468,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:26038: checking for the default configuration-file" >&5
+echo "$as_me:26471: 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.
@@ -26071,7 +26504,7 @@ case ".$withval" in
 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:26074: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:26507: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -26080,7 +26513,7 @@ esac
 fi
 eval LYNX_CFG_FILE="$withval"
 
-echo "$as_me:26083: result: $LYNX_CFG_FILE" >&5
+echo "$as_me:26516: result: $LYNX_CFG_FILE" >&5
 echo "${ECHO_T}$LYNX_CFG_FILE" >&6
 
 test "$LYNX_CFG_FILE" = no && LYNX_CFG_FILE=
@@ -26089,7 +26522,7 @@ cat >>confdefs.h <<EOF
 #define LYNX_CFG_FILE "$LYNX_CFG_FILE"
 EOF
 
-echo "$as_me:26092: checking for the default configuration-path" >&5
+echo "$as_me:26525: checking for the default configuration-path" >&5
 echo $ECHO_N "checking for the default configuration-path... $ECHO_C" >&6
 
 # Check whether --with-cfg-path or --without-cfg-path was given.
@@ -26125,7 +26558,7 @@ case ".$withval" in
 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:26128: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:26561: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -26134,7 +26567,7 @@ esac
 fi
 eval LYNX_CFG_PATH="$withval"
 
-echo "$as_me:26137: result: $LYNX_CFG_PATH" >&5
+echo "$as_me:26570: result: $LYNX_CFG_PATH" >&5
 echo "${ECHO_T}$LYNX_CFG_PATH" >&6
 
 test -z "$LYNX_CFG_PATH" && `echo "$LYNX_CFG_FILE" | sed -e 's%/[^/]*$%%'`
@@ -26144,7 +26577,7 @@ cat >>confdefs.h <<EOF
 #define LYNX_CFG_PATH "$LYNX_CFG_PATH"
 EOF
 
-echo "$as_me:26147: checking if htmlized lynx.cfg should be built" >&5
+echo "$as_me:26580: 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.
@@ -26161,7 +26594,7 @@ else
 	use_htmlized_cfg=no
 
 fi;
-echo "$as_me:26164: result: $use_htmlized_cfg" >&5
+echo "$as_me:26597: result: $use_htmlized_cfg" >&5
 echo "${ECHO_T}$use_htmlized_cfg" >&6
 
 LYNXCFG_MAKE=''
@@ -26169,7 +26602,7 @@ if test $use_htmlized_cfg = no ; then
 	LYNXCFG_MAKE='#'
 fi
 
-echo "$as_me:26172: checking if local doc directory should be linked to help page" >&5
+echo "$as_me:26605: 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.
@@ -26186,7 +26619,7 @@ else
 	use_local_docs=no
 
 fi;
-echo "$as_me:26189: result: $use_local_docs" >&5
+echo "$as_me:26622: result: $use_local_docs" >&5
 echo "${ECHO_T}$use_local_docs" >&6
 
 LYNXDOC_MAKE=''
@@ -26194,7 +26627,7 @@ if test $use_local_docs = no ; then
 	LYNXDOC_MAKE='#'
 fi
 
-echo "$as_me:26197: checking for MIME library directory" >&5
+echo "$as_me:26630: 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.
@@ -26230,7 +26663,7 @@ case ".$withval" in
 	withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
 	;;
 (*)
-	{ { echo "$as_me:26233: error: expected a pathname, not \"$withval\"" >&5
+	{ { echo "$as_me:26666: error: expected a pathname, not \"$withval\"" >&5
 echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
    { (exit 1); exit 1; }; }
 	;;
@@ -26239,7 +26672,7 @@ esac
 fi
 eval MIME_LIBDIR="$withval"
 
-echo "$as_me:26242: result: $MIME_LIBDIR" >&5
+echo "$as_me:26675: result: $MIME_LIBDIR" >&5
 echo "${ECHO_T}$MIME_LIBDIR" >&6
 MIME_LIBDIR=`echo "$MIME_LIBDIR" | sed -e 's,/$,,' -e 's,$,/,'`
 
@@ -26247,7 +26680,7 @@ cat >>confdefs.h <<EOF
 #define MIME_LIBDIR "$MIME_LIBDIR"
 EOF
 
-echo "$as_me:26250: checking if locale-charset selection logic should be used" >&5
+echo "$as_me:26683: 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.
@@ -26264,7 +26697,7 @@ else
 	use_locale_charset=yes
 
 fi;
-echo "$as_me:26267: result: $use_locale_charset" >&5
+echo "$as_me:26700: result: $use_locale_charset" >&5
 echo "${ECHO_T}$use_locale_charset" >&6
 test $use_locale_charset != no &&
 cat >>confdefs.h <<\EOF
@@ -26273,7 +26706,7 @@ EOF
 
 CHARSET_DEFS=
 
-echo "$as_me:26276: checking if you want only a few charsets" >&5
+echo "$as_me:26709: 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.
@@ -26285,7 +26718,7 @@ else
 fi;
 
 if test -n "$cf_charsets" ; then
-	echo "$as_me:26288: result: yes" >&5
+	echo "$as_me:26721: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 cat >>confdefs.h <<\EOF
@@ -26299,7 +26732,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}:26302: testing using minimal list of charsets: $cf_min_charsets ..." 1>&5
+echo "${as_me:-configure}:26735: 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'`
@@ -26326,28 +26759,28 @@ echo "${as_me:-configure}:26302: testing using minimal list of charsets: $cf_min
 		then
 			test -n "$verbose" && echo "	found $cf_charset" 1>&6
 
-echo "${as_me:-configure}:26329: testing found $cf_charset ..." 1>&5
+echo "${as_me:-configure}:26762: 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}:26335: testing not found $cf_charset ..." 1>&5
+echo "${as_me:-configure}:26768: testing not found $cf_charset ..." 1>&5
 
 		fi
 	done
 else
-	echo "$as_me:26340: result: no" >&5
+	echo "$as_me:26773: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:26344: checking for ANSI C header files" >&5
+echo "$as_me:26777: 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 26350 "configure"
+#line 26783 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -26355,13 +26788,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:26358: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:26791: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:26364: \$? = $ac_status" >&5
+  echo "$as_me:26797: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -26383,7 +26816,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 26386 "configure"
+#line 26819 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -26401,7 +26834,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 26404 "configure"
+#line 26837 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -26422,7 +26855,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 26425 "configure"
+#line 26858 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -26448,15 +26881,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:26451: \"$ac_link\"") >&5
+if { (eval echo "$as_me:26884: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26454: \$? = $ac_status" >&5
+  echo "$as_me:26887: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:26456: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26889: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26459: \$? = $ac_status" >&5
+  echo "$as_me:26892: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -26469,7 +26902,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:26472: result: $ac_cv_header_stdc" >&5
+echo "$as_me:26905: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -26479,13 +26912,13 @@ EOF
 
 fi
 
-echo "$as_me:26482: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:26915: 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 26488 "configure"
+#line 26921 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -26501,16 +26934,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26504: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26937: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26507: \$? = $ac_status" >&5
+  echo "$as_me:26940: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26510: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26943: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26513: \$? = $ac_status" >&5
+  echo "$as_me:26946: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_header_time=yes
 else
@@ -26520,7 +26953,7 @@ ac_cv_header_time=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:26523: result: $ac_cv_header_time" >&5
+echo "$as_me:26956: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -26533,13 +26966,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:26536: checking for $ac_hdr that defines DIR" >&5
+echo "$as_me:26969: 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 26542 "configure"
+#line 26975 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -26554,16 +26987,16 @@ return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26557: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:26990: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26560: \$? = $ac_status" >&5
+  echo "$as_me:26993: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26563: \"$ac_try\"") >&5
+  { (eval echo "$as_me:26996: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26566: \$? = $ac_status" >&5
+  echo "$as_me:26999: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -26573,7 +27006,7 @@ eval "$as_ac_Header=no"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:26576: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:27009: 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
@@ -26586,7 +27019,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:26589: checking for opendir in -ldir" >&5
+  echo "$as_me:27022: 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
@@ -26594,7 +27027,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldir  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 26597 "configure"
+#line 27030 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -26613,16 +27046,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26616: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27049: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26619: \$? = $ac_status" >&5
+  echo "$as_me:27052: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26622: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27055: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26625: \$? = $ac_status" >&5
+  echo "$as_me:27058: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dir_opendir=yes
 else
@@ -26633,14 +27066,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:26636: result: $ac_cv_lib_dir_opendir" >&5
+echo "$as_me:27069: 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:26643: checking for opendir in -lx" >&5
+  echo "$as_me:27076: 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
@@ -26648,7 +27081,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lx  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 26651 "configure"
+#line 27084 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -26667,16 +27100,16 @@ opendir ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26670: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27103: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26673: \$? = $ac_status" >&5
+  echo "$as_me:27106: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26676: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27109: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26679: \$? = $ac_status" >&5
+  echo "$as_me:27112: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_x_opendir=yes
 else
@@ -26687,7 +27120,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:26690: result: $ac_cv_lib_x_opendir" >&5
+echo "$as_me:27123: 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"
@@ -26715,23 +27148,23 @@ for ac_header in \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:26718: checking for $ac_header" >&5
+echo "$as_me:27151: 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 26724 "configure"
+#line 27157 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:26728: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:27161: \"$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:26734: \$? = $ac_status" >&5
+  echo "$as_me:27167: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -26750,7 +27183,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:26753: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:27186: 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
@@ -26760,14 +27193,14 @@ EOF
 fi
 done
 
-echo "$as_me:26763: checking termio.h and termios.h" >&5
+echo "$as_me:27196: 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 26770 "configure"
+#line 27203 "configure"
 #include "confdefs.h"
 
 #if HAVE_TERMIO_H
@@ -26785,16 +27218,16 @@ putchar (0x0a)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:26788: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27221: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:26791: \$? = $ac_status" >&5
+  echo "$as_me:27224: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:26794: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27227: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26797: \$? = $ac_status" >&5
+  echo "$as_me:27230: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termio_and_termios=yes
 else
@@ -26805,21 +27238,21 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:26808: result: $cf_cv_termio_and_termios" >&5
+echo "$as_me:27241: 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:26815: checking for sigaction and structs" >&5
+echo "$as_me:27248: 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 26822 "configure"
+#line 27255 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -26839,16 +27272,16 @@ struct sigaction act;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:26842: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27275: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:26845: \$? = $ac_status" >&5
+  echo "$as_me:27278: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:26848: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27281: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:26851: \$? = $ac_status" >&5
+  echo "$as_me:27284: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_func_sigaction=yes
 else
@@ -26859,7 +27292,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:26862: result: $cf_cv_func_sigaction" >&5
+echo "$as_me:27295: result: $cf_cv_func_sigaction" >&5
 echo "${ECHO_T}$cf_cv_func_sigaction" >&6
 test "$cf_cv_func_sigaction" = yes &&
 cat >>confdefs.h <<\EOF
@@ -26869,23 +27302,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:26872: checking for $ac_header" >&5
+echo "$as_me:27305: 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 26878 "configure"
+#line 27311 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:26882: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:27315: \"$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:26888: \$? = $ac_status" >&5
+  echo "$as_me:27321: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -26904,7 +27337,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:26907: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:27340: 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
@@ -26925,23 +27358,23 @@ else
 for ac_header in wait.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:26928: checking for $ac_header" >&5
+echo "$as_me:27361: 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 26934 "configure"
+#line 27367 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:26938: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:27371: \"$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:26944: \$? = $ac_status" >&5
+  echo "$as_me:27377: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -26960,7 +27393,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:26963: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:27396: 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
@@ -26973,23 +27406,23 @@ done
 for ac_header in waitstatus.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:26976: checking for $ac_header" >&5
+echo "$as_me:27409: 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 26982 "configure"
+#line 27415 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:26986: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:27419: \"$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:26992: \$? = $ac_status" >&5
+  echo "$as_me:27425: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -27008,7 +27441,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:27011: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:27444: 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
@@ -27030,14 +27463,14 @@ cf_wait_headers="$cf_wait_headers
 fi
 fi
 
-echo "$as_me:27033: checking for union wait" >&5
+echo "$as_me:27466: 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 27040 "configure"
+#line 27473 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -27053,16 +27486,16 @@ int x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27056: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27489: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27059: \$? = $ac_status" >&5
+  echo "$as_me:27492: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27062: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27495: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27065: \$? = $ac_status" >&5
+  echo "$as_me:27498: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_unionwait=no
 	 echo compiles ok w/o union wait 1>&5
@@ -27072,7 +27505,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 27075 "configure"
+#line 27508 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -27092,16 +27525,16 @@ union wait x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:27095: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27528: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27098: \$? = $ac_status" >&5
+  echo "$as_me:27531: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:27101: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27534: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27104: \$? = $ac_status" >&5
+  echo "$as_me:27537: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_type_unionwait=yes
 	 echo compiles ok with union wait and possibly macros too 1>&5
@@ -27116,7 +27549,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:27119: result: $cf_cv_type_unionwait" >&5
+echo "$as_me:27552: result: $cf_cv_type_unionwait" >&5
 echo "${ECHO_T}$cf_cv_type_unionwait" >&6
 test $cf_cv_type_unionwait = yes &&
 cat >>confdefs.h <<\EOF
@@ -27125,14 +27558,14 @@ EOF
 
 if test $cf_cv_type_unionwait = yes; then
 
-	echo "$as_me:27128: checking if union wait can be used as wait-arg" >&5
+	echo "$as_me:27561: 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 27135 "configure"
+#line 27568 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -27144,16 +27577,16 @@ union wait x; wait(&x)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27147: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27580: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27150: \$? = $ac_status" >&5
+  echo "$as_me:27583: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27153: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27586: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27156: \$? = $ac_status" >&5
+  echo "$as_me:27589: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_arg_union_wait=yes
 else
@@ -27165,21 +27598,21 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-	echo "$as_me:27168: result: $cf_cv_arg_union_wait" >&5
+	echo "$as_me:27601: 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:27175: checking if union wait can be used as waitpid-arg" >&5
+	echo "$as_me:27608: 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 27182 "configure"
+#line 27615 "configure"
 #include "confdefs.h"
 $cf_wait_headers
 int
@@ -27191,16 +27624,16 @@ union wait x; waitpid(0, &x, 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27194: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27627: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27197: \$? = $ac_status" >&5
+  echo "$as_me:27630: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27200: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27633: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27203: \$? = $ac_status" >&5
+  echo "$as_me:27636: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_arg_union_waitpid=yes
 else
@@ -27212,7 +27645,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-	echo "$as_me:27215: result: $cf_cv_arg_union_waitpid" >&5
+	echo "$as_me:27648: 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
@@ -27221,13 +27654,13 @@ EOF
 
 fi
 
-echo "$as_me:27224: checking for uid_t in sys/types.h" >&5
+echo "$as_me:27657: 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 27230 "configure"
+#line 27663 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -27241,7 +27674,7 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:27244: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:27677: 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
 
@@ -27255,7 +27688,7 @@ EOF
 
 fi
 
-echo "$as_me:27258: checking type of array argument to getgroups" >&5
+echo "$as_me:27691: 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
@@ -27264,7 +27697,7 @@ else
   ac_cv_type_getgroups=cross
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 27267 "configure"
+#line 27700 "configure"
 #include "confdefs.h"
 /* Thanks to Mike Rendell for this test.  */
 #include <sys/types.h>
@@ -27290,15 +27723,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:27293: \"$ac_link\"") >&5
+if { (eval echo "$as_me:27726: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27296: \$? = $ac_status" >&5
+  echo "$as_me:27729: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:27298: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27731: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27301: \$? = $ac_status" >&5
+  echo "$as_me:27734: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_getgroups=gid_t
 else
@@ -27311,7 +27744,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 27314 "configure"
+#line 27747 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 
@@ -27326,20 +27759,20 @@ rm -rf conftest*
 
 fi
 fi
-echo "$as_me:27329: result: $ac_cv_type_getgroups" >&5
+echo "$as_me:27762: 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:27336: checking for off_t" >&5
+echo "$as_me:27769: 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 27342 "configure"
+#line 27775 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27354,16 +27787,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27357: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27790: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27360: \$? = $ac_status" >&5
+  echo "$as_me:27793: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27363: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27796: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27366: \$? = $ac_status" >&5
+  echo "$as_me:27799: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -27373,7 +27806,7 @@ ac_cv_type_off_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27376: result: $ac_cv_type_off_t" >&5
+echo "$as_me:27809: 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
   :
@@ -27385,13 +27818,13 @@ EOF
 
 fi
 
-echo "$as_me:27388: checking for pid_t" >&5
+echo "$as_me:27821: 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 27394 "configure"
+#line 27827 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27406,16 +27839,16 @@ if (sizeof (pid_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27409: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27842: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27412: \$? = $ac_status" >&5
+  echo "$as_me:27845: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27415: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27848: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27418: \$? = $ac_status" >&5
+  echo "$as_me:27851: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_pid_t=yes
 else
@@ -27425,7 +27858,7 @@ ac_cv_type_pid_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27428: result: $ac_cv_type_pid_t" >&5
+echo "$as_me:27861: 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
   :
@@ -27437,13 +27870,13 @@ EOF
 
 fi
 
-echo "$as_me:27440: checking for uid_t in sys/types.h" >&5
+echo "$as_me:27873: 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 27446 "configure"
+#line 27879 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 
@@ -27457,7 +27890,7 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:27460: result: $ac_cv_type_uid_t" >&5
+echo "$as_me:27893: 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
 
@@ -27471,13 +27904,13 @@ EOF
 
 fi
 
-echo "$as_me:27474: checking for mode_t" >&5
+echo "$as_me:27907: 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 27480 "configure"
+#line 27913 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27492,16 +27925,16 @@ if (sizeof (mode_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27495: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27928: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27498: \$? = $ac_status" >&5
+  echo "$as_me:27931: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27501: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27934: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27504: \$? = $ac_status" >&5
+  echo "$as_me:27937: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_mode_t=yes
 else
@@ -27511,7 +27944,7 @@ ac_cv_type_mode_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27514: result: $ac_cv_type_mode_t" >&5
+echo "$as_me:27947: 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
   :
@@ -27523,13 +27956,13 @@ EOF
 
 fi
 
-	echo "$as_me:27526: checking for ssize_t" >&5
+	echo "$as_me:27959: checking for ssize_t" >&5
 echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6
 if test "${ac_cv_type_ssize_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 27532 "configure"
+#line 27965 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27544,16 +27977,16 @@ if (sizeof (ssize_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27547: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:27980: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27550: \$? = $ac_status" >&5
+  echo "$as_me:27983: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27553: \"$ac_try\"") >&5
+  { (eval echo "$as_me:27986: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27556: \$? = $ac_status" >&5
+  echo "$as_me:27989: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_ssize_t=yes
 else
@@ -27563,7 +27996,7 @@ ac_cv_type_ssize_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27566: result: $ac_cv_type_ssize_t" >&5
+echo "$as_me:27999: result: $ac_cv_type_ssize_t" >&5
 echo "${ECHO_T}$ac_cv_type_ssize_t" >&6
 if test $ac_cv_type_ssize_t = yes; then
   ac_cv_type_ssize_t=yes
@@ -27579,13 +28012,13 @@ EOF
 
 fi
 
-	echo "$as_me:27582: checking for socklen_t" >&5
+	echo "$as_me:28015: 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 27588 "configure"
+#line 28021 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -27603,16 +28036,16 @@ if (sizeof (socklen_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27606: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28039: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27609: \$? = $ac_status" >&5
+  echo "$as_me:28042: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27612: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28045: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27615: \$? = $ac_status" >&5
+  echo "$as_me:28048: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_socklen_t=yes
 else
@@ -27622,7 +28055,7 @@ ac_cv_type_socklen_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27625: result: $ac_cv_type_socklen_t" >&5
+echo "$as_me:28058: 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
@@ -27638,7 +28071,7 @@ EOF
 
 fi
 
-echo "$as_me:27641: checking for long long type" >&5
+echo "$as_me:28074: checking for long long type" >&5
 echo $ECHO_N "checking for long long type... $ECHO_C" >&6
 if test "${cf_cv_type_long_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -27669,7 +28102,7 @@ _CFEOF
 	rm -f conftest*
 
 fi
-echo "$as_me:27672: result: $cf_cv_type_long_long" >&5
+echo "$as_me:28105: result: $cf_cv_type_long_long" >&5
 echo "${ECHO_T}$cf_cv_type_long_long" >&6
 
 if test "$cf_cv_type_long_long" = yes ; then
@@ -27680,14 +28113,14 @@ EOF
 
 fi
 
-echo "$as_me:27683: checking for tm.tm_gmtoff" >&5
+echo "$as_me:28116: 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 27690 "configure"
+#line 28123 "configure"
 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME
@@ -27712,16 +28145,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27715: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28148: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27718: \$? = $ac_status" >&5
+  echo "$as_me:28151: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27721: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28154: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27724: \$? = $ac_status" >&5
+  echo "$as_me:28157: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_tm_gmtoff=yes
 else
@@ -27732,20 +28165,20 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:27735: result: $cf_cv_tm_gmtoff" >&5
+echo "$as_me:28168: 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:27742: checking for int" >&5
+echo "$as_me:28175: 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 27748 "configure"
+#line 28181 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27760,16 +28193,16 @@ if (sizeof (int))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27763: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28196: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27766: \$? = $ac_status" >&5
+  echo "$as_me:28199: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27769: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28202: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27772: \$? = $ac_status" >&5
+  echo "$as_me:28205: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_int=yes
 else
@@ -27779,10 +28212,10 @@ ac_cv_type_int=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:27782: result: $ac_cv_type_int" >&5
+echo "$as_me:28215: result: $ac_cv_type_int" >&5
 echo "${ECHO_T}$ac_cv_type_int" >&6
 
-echo "$as_me:27785: checking size of int" >&5
+echo "$as_me:28218: 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
@@ -27791,7 +28224,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 27794 "configure"
+#line 28227 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27803,21 +28236,21 @@ int _array_ [1 - 2 * !((sizeof (int)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27806: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28239: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27809: \$? = $ac_status" >&5
+  echo "$as_me:28242: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27812: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28245: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27815: \$? = $ac_status" >&5
+  echo "$as_me:28248: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 27820 "configure"
+#line 28253 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27829,16 +28262,16 @@ int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27832: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28265: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27835: \$? = $ac_status" >&5
+  echo "$as_me:28268: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27838: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28271: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27841: \$? = $ac_status" >&5
+  echo "$as_me:28274: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -27854,7 +28287,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 27857 "configure"
+#line 28290 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27866,16 +28299,16 @@ int _array_ [1 - 2 * !((sizeof (int)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27869: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28302: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27872: \$? = $ac_status" >&5
+  echo "$as_me:28305: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27875: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28308: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27878: \$? = $ac_status" >&5
+  echo "$as_me:28311: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -27891,7 +28324,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 27894 "configure"
+#line 28327 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27903,16 +28336,16 @@ int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:27906: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28339: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:27909: \$? = $ac_status" >&5
+  echo "$as_me:28342: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:27912: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28345: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27915: \$? = $ac_status" >&5
+  echo "$as_me:28348: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -27925,12 +28358,12 @@ done
 ac_cv_sizeof_int=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:27928: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:28361: 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 27933 "configure"
+#line 28366 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -27946,15 +28379,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:27949: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28382: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:27952: \$? = $ac_status" >&5
+  echo "$as_me:28385: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:27954: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28387: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:27957: \$? = $ac_status" >&5
+  echo "$as_me:28390: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_int=`cat conftest.val`
 else
@@ -27970,7 +28403,7 @@ else
   ac_cv_sizeof_int=0
 fi
 fi
-echo "$as_me:27973: result: $ac_cv_sizeof_int" >&5
+echo "$as_me:28406: 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
@@ -27978,23 +28411,23 @@ EOF
 
 if test "${ac_cv_type_int+set}" = set; then
 	if test "${ac_cv_sizeof_int+set}" != set; then
-		{ echo "$as_me:27981: WARNING: using 4 for sizeof int" >&5
+		{ echo "$as_me:28414: WARNING: using 4 for sizeof int" >&5
 echo "$as_me: WARNING: using 4 for sizeof int" >&2;}
 		ac_cv_sizeof_int=4
 	elif test "x${ac_cv_sizeof_int}" = x0; then
-		{ echo "$as_me:27985: WARNING: sizeof int not found, using 4" >&5
+		{ echo "$as_me:28418: WARNING: sizeof int not found, using 4" >&5
 echo "$as_me: WARNING: sizeof int not found, using 4" >&2;}
 		ac_cv_sizeof_int=4
 	fi
 fi
 
-echo "$as_me:27991: checking for long" >&5
+echo "$as_me:28424: 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 27997 "configure"
+#line 28430 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28009,16 +28442,16 @@ if (sizeof (long))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28012: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28445: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28015: \$? = $ac_status" >&5
+  echo "$as_me:28448: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28018: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28451: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28021: \$? = $ac_status" >&5
+  echo "$as_me:28454: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_long=yes
 else
@@ -28028,10 +28461,10 @@ ac_cv_type_long=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:28031: result: $ac_cv_type_long" >&5
+echo "$as_me:28464: result: $ac_cv_type_long" >&5
 echo "${ECHO_T}$ac_cv_type_long" >&6
 
-echo "$as_me:28034: checking size of long" >&5
+echo "$as_me:28467: 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
@@ -28040,7 +28473,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 28043 "configure"
+#line 28476 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28052,21 +28485,21 @@ int _array_ [1 - 2 * !((sizeof (long)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28055: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28488: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28058: \$? = $ac_status" >&5
+  echo "$as_me:28491: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28061: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28494: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28064: \$? = $ac_status" >&5
+  echo "$as_me:28497: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 28069 "configure"
+#line 28502 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28078,16 +28511,16 @@ int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28081: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28514: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28084: \$? = $ac_status" >&5
+  echo "$as_me:28517: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28087: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28520: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28090: \$? = $ac_status" >&5
+  echo "$as_me:28523: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -28103,7 +28536,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 28106 "configure"
+#line 28539 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28115,16 +28548,16 @@ int _array_ [1 - 2 * !((sizeof (long)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28118: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28551: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28121: \$? = $ac_status" >&5
+  echo "$as_me:28554: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28124: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28557: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28127: \$? = $ac_status" >&5
+  echo "$as_me:28560: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -28140,7 +28573,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 28143 "configure"
+#line 28576 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28152,16 +28585,16 @@ int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28155: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28588: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28158: \$? = $ac_status" >&5
+  echo "$as_me:28591: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28161: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28594: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28164: \$? = $ac_status" >&5
+  echo "$as_me:28597: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -28174,12 +28607,12 @@ done
 ac_cv_sizeof_long=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:28177: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:28610: 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 28182 "configure"
+#line 28615 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28195,15 +28628,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:28198: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28631: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28201: \$? = $ac_status" >&5
+  echo "$as_me:28634: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:28203: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28636: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28206: \$? = $ac_status" >&5
+  echo "$as_me:28639: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_long=`cat conftest.val`
 else
@@ -28219,7 +28652,7 @@ else
   ac_cv_sizeof_long=0
 fi
 fi
-echo "$as_me:28222: result: $ac_cv_sizeof_long" >&5
+echo "$as_me:28655: 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
@@ -28227,23 +28660,23 @@ EOF
 
 if test "${ac_cv_type_long+set}" = set; then
 	if test "${ac_cv_sizeof_long+set}" != set; then
-		{ echo "$as_me:28230: WARNING: using 4 for sizeof long" >&5
+		{ echo "$as_me:28663: WARNING: using 4 for sizeof long" >&5
 echo "$as_me: WARNING: using 4 for sizeof long" >&2;}
 		ac_cv_sizeof_long=4
 	elif test "x${ac_cv_sizeof_long}" = x0; then
-		{ echo "$as_me:28234: WARNING: sizeof long not found, using 4" >&5
+		{ echo "$as_me:28667: WARNING: sizeof long not found, using 4" >&5
 echo "$as_me: WARNING: sizeof long not found, using 4" >&2;}
 		ac_cv_sizeof_long=4
 	fi
 fi
 
-echo "$as_me:28240: checking for off_t" >&5
+echo "$as_me:28673: 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 28246 "configure"
+#line 28679 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28258,16 +28691,16 @@ if (sizeof (off_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28261: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28694: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28264: \$? = $ac_status" >&5
+  echo "$as_me:28697: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28267: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28700: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28270: \$? = $ac_status" >&5
+  echo "$as_me:28703: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_off_t=yes
 else
@@ -28277,10 +28710,10 @@ ac_cv_type_off_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:28280: result: $ac_cv_type_off_t" >&5
+echo "$as_me:28713: result: $ac_cv_type_off_t" >&5
 echo "${ECHO_T}$ac_cv_type_off_t" >&6
 
-echo "$as_me:28283: checking size of off_t" >&5
+echo "$as_me:28716: 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
@@ -28289,7 +28722,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 28292 "configure"
+#line 28725 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28301,21 +28734,21 @@ int _array_ [1 - 2 * !((sizeof (off_t)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28304: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28737: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28307: \$? = $ac_status" >&5
+  echo "$as_me:28740: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28310: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28743: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28313: \$? = $ac_status" >&5
+  echo "$as_me:28746: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 28318 "configure"
+#line 28751 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28327,16 +28760,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28330: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28763: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28333: \$? = $ac_status" >&5
+  echo "$as_me:28766: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28336: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28769: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28339: \$? = $ac_status" >&5
+  echo "$as_me:28772: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -28352,7 +28785,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 28355 "configure"
+#line 28788 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28364,16 +28797,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28367: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28800: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28370: \$? = $ac_status" >&5
+  echo "$as_me:28803: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28373: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28806: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28376: \$? = $ac_status" >&5
+  echo "$as_me:28809: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -28389,7 +28822,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 28392 "configure"
+#line 28825 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28401,16 +28834,16 @@ int _array_ [1 - 2 * !((sizeof (off_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28404: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28837: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28407: \$? = $ac_status" >&5
+  echo "$as_me:28840: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28410: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28843: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28413: \$? = $ac_status" >&5
+  echo "$as_me:28846: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -28423,12 +28856,12 @@ done
 ac_cv_sizeof_off_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:28426: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:28859: 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 28431 "configure"
+#line 28864 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28444,15 +28877,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:28447: \"$ac_link\"") >&5
+if { (eval echo "$as_me:28880: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28450: \$? = $ac_status" >&5
+  echo "$as_me:28883: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:28452: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28885: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28455: \$? = $ac_status" >&5
+  echo "$as_me:28888: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_off_t=`cat conftest.val`
 else
@@ -28468,7 +28901,7 @@ else
   ac_cv_sizeof_off_t=0
 fi
 fi
-echo "$as_me:28471: result: $ac_cv_sizeof_off_t" >&5
+echo "$as_me:28904: 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
@@ -28476,23 +28909,23 @@ EOF
 
 if test "${ac_cv_type_off_t+set}" = set; then
 	if test "${ac_cv_sizeof_off_t+set}" != set; then
-		{ echo "$as_me:28479: WARNING: using 4 for sizeof off_t" >&5
+		{ echo "$as_me:28912: WARNING: using 4 for sizeof off_t" >&5
 echo "$as_me: WARNING: using 4 for sizeof off_t" >&2;}
 		ac_cv_sizeof_off_t=4
 	elif test "x${ac_cv_sizeof_off_t}" = x0; then
-		{ echo "$as_me:28483: WARNING: sizeof off_t not found, using 4" >&5
+		{ echo "$as_me:28916: WARNING: sizeof off_t not found, using 4" >&5
 echo "$as_me: WARNING: sizeof off_t not found, using 4" >&2;}
 		ac_cv_sizeof_off_t=4
 	fi
 fi
 
-echo "$as_me:28489: checking for time_t" >&5
+echo "$as_me:28922: 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 28495 "configure"
+#line 28928 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28507,16 +28940,16 @@ if (sizeof (time_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28510: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28943: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28513: \$? = $ac_status" >&5
+  echo "$as_me:28946: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28516: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28949: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28519: \$? = $ac_status" >&5
+  echo "$as_me:28952: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_time_t=yes
 else
@@ -28526,10 +28959,10 @@ ac_cv_type_time_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:28529: result: $ac_cv_type_time_t" >&5
+echo "$as_me:28962: result: $ac_cv_type_time_t" >&5
 echo "${ECHO_T}$ac_cv_type_time_t" >&6
 
-echo "$as_me:28532: checking size of time_t" >&5
+echo "$as_me:28965: 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
@@ -28538,7 +28971,7 @@ else
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 28541 "configure"
+#line 28974 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28550,21 +28983,21 @@ int _array_ [1 - 2 * !((sizeof (time_t)) >= 0)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28553: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:28986: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28556: \$? = $ac_status" >&5
+  echo "$as_me:28989: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28559: \"$ac_try\"") >&5
+  { (eval echo "$as_me:28992: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28562: \$? = $ac_status" >&5
+  echo "$as_me:28995: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 28567 "configure"
+#line 29000 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28576,16 +29009,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28579: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29012: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28582: \$? = $ac_status" >&5
+  echo "$as_me:29015: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28585: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29018: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28588: \$? = $ac_status" >&5
+  echo "$as_me:29021: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -28601,7 +29034,7 @@ cat conftest.$ac_ext >&5
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 28604 "configure"
+#line 29037 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28613,16 +29046,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) >= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28616: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29049: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28619: \$? = $ac_status" >&5
+  echo "$as_me:29052: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28622: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29055: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28625: \$? = $ac_status" >&5
+  echo "$as_me:29058: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -28638,7 +29071,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 28641 "configure"
+#line 29074 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28650,16 +29083,16 @@ int _array_ [1 - 2 * !((sizeof (time_t)) <= $ac_mid)]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28653: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29086: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28656: \$? = $ac_status" >&5
+  echo "$as_me:29089: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28659: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29092: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28662: \$? = $ac_status" >&5
+  echo "$as_me:29095: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -28672,12 +29105,12 @@ done
 ac_cv_sizeof_time_t=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:28675: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:29108: 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 28680 "configure"
+#line 29113 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28693,15 +29126,15 @@ fclose (f);
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:28696: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29129: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28699: \$? = $ac_status" >&5
+  echo "$as_me:29132: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:28701: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29134: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28704: \$? = $ac_status" >&5
+  echo "$as_me:29137: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_time_t=`cat conftest.val`
 else
@@ -28717,7 +29150,7 @@ else
   ac_cv_sizeof_time_t=0
 fi
 fi
-echo "$as_me:28720: result: $ac_cv_sizeof_time_t" >&5
+echo "$as_me:29153: 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
@@ -28725,23 +29158,23 @@ EOF
 
 if test "${ac_cv_type_time_t+set}" = set; then
 	if test "${ac_cv_sizeof_time_t+set}" != set; then
-		{ echo "$as_me:28728: WARNING: using 4 for sizeof time_t" >&5
+		{ echo "$as_me:29161: WARNING: using 4 for sizeof time_t" >&5
 echo "$as_me: WARNING: using 4 for sizeof time_t" >&2;}
 		ac_cv_sizeof_time_t=4
 	elif test "x${ac_cv_sizeof_time_t}" = x0; then
-		{ echo "$as_me:28732: WARNING: sizeof time_t not found, using 4" >&5
+		{ echo "$as_me:29165: WARNING: sizeof time_t not found, using 4" >&5
 echo "$as_me: WARNING: sizeof time_t not found, using 4" >&2;}
 		ac_cv_sizeof_time_t=4
 	fi
 fi
 
-echo "$as_me:28738: checking for intptr_t" >&5
+echo "$as_me:29171: checking for intptr_t" >&5
 echo $ECHO_N "checking for intptr_t... $ECHO_C" >&6
 if test "${ac_cv_type_intptr_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 28744 "configure"
+#line 29177 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -28756,16 +29189,16 @@ if (sizeof (intptr_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:28759: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:29192: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:28762: \$? = $ac_status" >&5
+  echo "$as_me:29195: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:28765: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29198: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28768: \$? = $ac_status" >&5
+  echo "$as_me:29201: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_intptr_t=yes
 else
@@ -28775,7 +29208,7 @@ ac_cv_type_intptr_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:28778: result: $ac_cv_type_intptr_t" >&5
+echo "$as_me:29211: result: $ac_cv_type_intptr_t" >&5
 echo "${ECHO_T}$ac_cv_type_intptr_t" >&6
 if test $ac_cv_type_intptr_t = yes; then
   :
@@ -28789,13 +29222,13 @@ fi
 
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-echo "$as_me:28792: checking for working alloca.h" >&5
+echo "$as_me:29225: 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 28798 "configure"
+#line 29231 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int
@@ -28807,16 +29240,16 @@ char *p = (char *) alloca (2 * sizeof (int));
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28810: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29243: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28813: \$? = $ac_status" >&5
+  echo "$as_me:29246: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28816: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29249: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28819: \$? = $ac_status" >&5
+  echo "$as_me:29252: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_working_alloca_h=yes
 else
@@ -28826,7 +29259,7 @@ ac_cv_working_alloca_h=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:28829: result: $ac_cv_working_alloca_h" >&5
+echo "$as_me:29262: 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
 
@@ -28836,13 +29269,13 @@ EOF
 
 fi
 
-echo "$as_me:28839: checking for alloca" >&5
+echo "$as_me:29272: 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 28845 "configure"
+#line 29278 "configure"
 #include "confdefs.h"
 #ifdef __GNUC__
 # define alloca __builtin_alloca
@@ -28874,16 +29307,16 @@ char *p = (char *) alloca (1);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28877: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29310: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28880: \$? = $ac_status" >&5
+  echo "$as_me:29313: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28883: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29316: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28886: \$? = $ac_status" >&5
+  echo "$as_me:29319: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_alloca_works=yes
 else
@@ -28893,7 +29326,7 @@ ac_cv_func_alloca_works=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:28896: result: $ac_cv_func_alloca_works" >&5
+echo "$as_me:29329: 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
@@ -28914,13 +29347,13 @@ cat >>confdefs.h <<\EOF
 #define C_ALLOCA 1
 EOF
 
-echo "$as_me:28917: checking whether \`alloca.c' needs Cray hooks" >&5
+echo "$as_me:29350: 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 28923 "configure"
+#line 29356 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -28938,18 +29371,18 @@ fi
 rm -rf conftest*
 
 fi
-echo "$as_me:28941: result: $ac_cv_os_cray" >&5
+echo "$as_me:29374: 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:28946: checking for $ac_func" >&5
+echo "$as_me:29379: 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 28952 "configure"
+#line 29385 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -28980,16 +29413,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:28983: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29416: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:28986: \$? = $ac_status" >&5
+  echo "$as_me:29419: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:28989: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29422: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:28992: \$? = $ac_status" >&5
+  echo "$as_me:29425: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -28999,7 +29432,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:29002: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:29435: 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
 
@@ -29013,7 +29446,7 @@ fi
   done
 fi
 
-echo "$as_me:29016: checking stack direction for C alloca" >&5
+echo "$as_me:29449: 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
@@ -29022,7 +29455,7 @@ else
   ac_cv_c_stack_direction=0
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 29025 "configure"
+#line 29458 "configure"
 #include "confdefs.h"
 int
 find_stack_direction ()
@@ -29045,15 +29478,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:29048: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29481: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29051: \$? = $ac_status" >&5
+  echo "$as_me:29484: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:29053: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29486: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29056: \$? = $ac_status" >&5
+  echo "$as_me:29489: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_stack_direction=1
 else
@@ -29065,7 +29498,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:29068: result: $ac_cv_c_stack_direction" >&5
+echo "$as_me:29501: result: $ac_cv_c_stack_direction" >&5
 echo "${ECHO_T}$ac_cv_c_stack_direction" >&6
 
 cat >>confdefs.h <<EOF
@@ -29077,23 +29510,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:29080: checking for $ac_header" >&5
+echo "$as_me:29513: 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 29086 "configure"
+#line 29519 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:29090: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:29523: \"$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:29096: \$? = $ac_status" >&5
+  echo "$as_me:29529: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -29112,7 +29545,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:29115: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:29548: 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
@@ -29125,13 +29558,13 @@ done
 for ac_func in fork vfork
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:29128: checking for $ac_func" >&5
+echo "$as_me:29561: 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 29134 "configure"
+#line 29567 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -29162,16 +29595,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29165: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29598: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29168: \$? = $ac_status" >&5
+  echo "$as_me:29601: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29171: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29604: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29174: \$? = $ac_status" >&5
+  echo "$as_me:29607: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -29181,7 +29614,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:29184: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:29617: 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
@@ -29193,7 +29626,7 @@ done
 
 ac_cv_func_fork_works=$ac_cv_func_fork
 if test "x$ac_cv_func_fork" = xyes; then
-  echo "$as_me:29196: checking for working fork" >&5
+  echo "$as_me:29629: 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
@@ -29216,15 +29649,15 @@ else
       }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:29219: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29652: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29222: \$? = $ac_status" >&5
+  echo "$as_me:29655: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:29224: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29657: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29227: \$? = $ac_status" >&5
+  echo "$as_me:29660: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_fork_works=yes
 else
@@ -29236,7 +29669,7 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:29239: result: $ac_cv_func_fork_works" >&5
+echo "$as_me:29672: result: $ac_cv_func_fork_works" >&5
 echo "${ECHO_T}$ac_cv_func_fork_works" >&6
 
 fi
@@ -29250,12 +29683,12 @@ if test "x$ac_cv_func_fork_works" = xcross; then
       ac_cv_func_fork_works=yes
       ;;
   esac
-  { echo "$as_me:29253: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:29686: 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:29258: checking for working vfork" >&5
+  echo "$as_me:29691: 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
@@ -29264,7 +29697,7 @@ else
   ac_cv_func_vfork_works=cross
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 29267 "configure"
+#line 29700 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -29361,15 +29794,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:29364: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29797: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29367: \$? = $ac_status" >&5
+  echo "$as_me:29800: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:29369: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29802: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29372: \$? = $ac_status" >&5
+  echo "$as_me:29805: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_vfork_works=yes
 else
@@ -29381,13 +29814,13 @@ fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:29384: result: $ac_cv_func_vfork_works" >&5
+echo "$as_me:29817: 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:29390: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+  { echo "$as_me:29823: 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
 
@@ -29412,14 +29845,14 @@ EOF
 
 fi
 
-echo "$as_me:29415: checking if we should use fcntl or ioctl" >&5
+echo "$as_me:29848: 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 29422 "configure"
+#line 29855 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -29436,16 +29869,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29439: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29872: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29442: \$? = $ac_status" >&5
+  echo "$as_me:29875: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29445: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29878: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29448: \$? = $ac_status" >&5
+  echo "$as_me:29881: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fionbio=ioctl
 else
@@ -29453,7 +29886,7 @@ else
 cat conftest.$ac_ext >&5
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 29456 "configure"
+#line 29889 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -29475,16 +29908,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29478: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29911: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29481: \$? = $ac_status" >&5
+  echo "$as_me:29914: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29484: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29917: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29487: \$? = $ac_status" >&5
+  echo "$as_me:29920: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fionbio=fcntl
 else
@@ -29497,21 +29930,21 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:29500: result: $cf_cv_fionbio" >&5
+echo "$as_me:29933: 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:29507: checking for broken/missing definition of remove" >&5
+echo "$as_me:29940: 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 29514 "configure"
+#line 29947 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -29523,23 +29956,23 @@ remove("dummy")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29526: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29959: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29529: \$? = $ac_status" >&5
+  echo "$as_me:29962: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29532: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29965: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29535: \$? = $ac_status" >&5
+  echo "$as_me:29968: \$? = $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 29542 "configure"
+#line 29975 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 		int __unlink(name) { return unlink(name); }
@@ -29552,16 +29985,16 @@ remove("dummy")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29555: \"$ac_link\"") >&5
+if { (eval echo "$as_me:29988: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29558: \$? = $ac_status" >&5
+  echo "$as_me:29991: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29561: \"$ac_try\"") >&5
+  { (eval echo "$as_me:29994: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29564: \$? = $ac_status" >&5
+  echo "$as_me:29997: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_baddef_remove=yes
 else
@@ -29576,21 +30009,21 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:29579: result: $cf_cv_baddef_remove" >&5
+echo "$as_me:30012: 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:29586: checking for lstat" >&5
+echo "$as_me:30019: 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 29593 "configure"
+#line 30026 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -29604,16 +30037,16 @@ lstat(".", (struct stat *)0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29607: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30040: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29610: \$? = $ac_status" >&5
+  echo "$as_me:30043: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29613: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30046: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29616: \$? = $ac_status" >&5
+  echo "$as_me:30049: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_lstat=yes
 else
@@ -29625,7 +30058,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:29628: result: $ac_cv_func_lstat " >&5
+echo "$as_me:30061: result: $ac_cv_func_lstat " >&5
 echo "${ECHO_T}$ac_cv_func_lstat " >&6
 if test $ac_cv_func_lstat = yes; then
 
@@ -29660,13 +30093,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:29663: checking for $ac_func" >&5
+echo "$as_me:30096: 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 29669 "configure"
+#line 30102 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -29697,16 +30130,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29700: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30133: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29703: \$? = $ac_status" >&5
+  echo "$as_me:30136: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29706: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30139: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29709: \$? = $ac_status" >&5
+  echo "$as_me:30142: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -29716,7 +30149,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:29719: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:30152: 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
@@ -29732,13 +30165,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:29735: checking for $ac_func" >&5
+echo "$as_me:30168: 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 29741 "configure"
+#line 30174 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -29769,16 +30202,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:29772: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30205: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29775: \$? = $ac_status" >&5
+  echo "$as_me:30208: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29778: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30211: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29781: \$? = $ac_status" >&5
+  echo "$as_me:30214: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -29788,7 +30221,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:29791: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:30224: 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
@@ -29800,7 +30233,7 @@ else
 fi
 done
 
-echo "$as_me:29803: checking for random-integer functions" >&5
+echo "$as_me:30236: 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
@@ -29820,7 +30253,7 @@ do
 	esac
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 29823 "configure"
+#line 30256 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -29839,16 +30272,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:29842: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30275: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:29845: \$? = $ac_status" >&5
+  echo "$as_me:30278: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:29848: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30281: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29851: \$? = $ac_status" >&5
+  echo "$as_me:30284: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_srand_func=$cf_func
  break
@@ -29860,10 +30293,10 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:29863: result: $cf_cv_srand_func" >&5
+echo "$as_me:30296: 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:29866: checking for range of random-integers" >&5
+	echo "$as_me:30299: 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
@@ -29884,7 +30317,7 @@ else
 			;;
 		esac
 		cat >conftest.$ac_ext <<_ACEOF
-#line 29887 "configure"
+#line 30320 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -29903,35 +30336,35 @@ long x = $cf_cv_rand_max
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29906: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30339: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29909: \$? = $ac_status" >&5
+  echo "$as_me:30342: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29912: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30345: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29915: \$? = $ac_status" >&5
+  echo "$as_me:30348: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-cf_cv_rand_max="(1L<<$cf_rand_max)-1"
+cf_cv_rand_max="(1UL<<$cf_rand_max)-1"
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:29926: result: $cf_cv_rand_max" >&5
+echo "$as_me:30359: result: $cf_cv_rand_max" >&5
 echo "${ECHO_T}$cf_cv_rand_max" >&6
 
 	case $cf_cv_srand_func in
 	(*/arc4random)
-		echo "$as_me:29931: checking if <bsd/stdlib.h> should be included" >&5
+		echo "$as_me:30364: checking if <bsd/stdlib.h> should be included" >&5
 echo $ECHO_N "checking if <bsd/stdlib.h> should be included... $ECHO_C" >&6
 		cat >conftest.$ac_ext <<_ACEOF
-#line 29934 "configure"
+#line 30367 "configure"
 #include "confdefs.h"
 #include <bsd/stdlib.h>
 int
@@ -29944,23 +30377,23 @@ void *arc4random(int);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29947: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30380: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29950: \$? = $ac_status" >&5
+  echo "$as_me:30383: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29953: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30386: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29956: \$? = $ac_status" >&5
+  echo "$as_me:30389: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_bsd_stdlib_h=no
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 29963 "configure"
+#line 30396 "configure"
 #include "confdefs.h"
 #include <bsd/stdlib.h>
 int
@@ -29972,16 +30405,16 @@ unsigned x = arc4random()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:29975: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30408: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:29978: \$? = $ac_status" >&5
+  echo "$as_me:30411: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:29981: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30414: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:29984: \$? = $ac_status" >&5
+  echo "$as_me:30417: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_bsd_stdlib_h=yes
 else
@@ -29992,7 +30425,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-	    echo "$as_me:29995: result: $cf_bsd_stdlib_h" >&5
+	    echo "$as_me:30428: result: $cf_bsd_stdlib_h" >&5
 echo "${ECHO_T}$cf_bsd_stdlib_h" >&6
 		if test "$cf_bsd_stdlib_h" = yes
 		then
@@ -30002,10 +30435,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 		else
-			echo "$as_me:30005: checking if <bsd/random.h> should be included" >&5
+			echo "$as_me:30438: checking if <bsd/random.h> should be included" >&5
 echo $ECHO_N "checking if <bsd/random.h> should be included... $ECHO_C" >&6
 			cat >conftest.$ac_ext <<_ACEOF
-#line 30008 "configure"
+#line 30441 "configure"
 #include "confdefs.h"
 #include <bsd/random.h>
 int
@@ -30018,23 +30451,23 @@ void *arc4random(int);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30021: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30454: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30024: \$? = $ac_status" >&5
+  echo "$as_me:30457: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30027: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30460: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30030: \$? = $ac_status" >&5
+  echo "$as_me:30463: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_bsd_random_h=no
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 30037 "configure"
+#line 30470 "configure"
 #include "confdefs.h"
 #include <bsd/random.h>
 int
@@ -30046,16 +30479,16 @@ unsigned x = arc4random()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30049: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30482: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30052: \$? = $ac_status" >&5
+  echo "$as_me:30485: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30055: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30488: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30058: \$? = $ac_status" >&5
+  echo "$as_me:30491: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_bsd_random_h=yes
 else
@@ -30066,7 +30499,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-			echo "$as_me:30069: result: $cf_bsd_random_h" >&5
+			echo "$as_me:30502: result: $cf_bsd_random_h" >&5
 echo "${ECHO_T}$cf_bsd_random_h" >&6
 			if test "$cf_bsd_random_h" = yes
 			then
@@ -30076,7 +30509,7 @@ cat >>confdefs.h <<\EOF
 EOF
 
 			else
-				{ echo "$as_me:30079: WARNING: no header file found for arc4random" >&5
+				{ echo "$as_me:30512: WARNING: no header file found for arc4random" >&5
 echo "$as_me: WARNING: no header file found for arc4random" >&2;}
 			fi
 		fi
@@ -30111,13 +30544,13 @@ fi
 for ac_func in sleep
 do
 
-echo "$as_me:30114: checking for $ac_func declaration" >&5
+echo "$as_me:30547: 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 30120 "configure"
+#line 30553 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -30138,20 +30571,20 @@ extern	int	$ac_func();
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30141: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30574: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30144: \$? = $ac_status" >&5
+  echo "$as_me:30577: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30147: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30580: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30150: \$? = $ac_status" >&5
+  echo "$as_me:30583: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 30154 "configure"
+#line 30587 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -30172,16 +30605,16 @@ int	(*p)() = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30175: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30608: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30178: \$? = $ac_status" >&5
+  echo "$as_me:30611: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30181: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30614: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30184: \$? = $ac_status" >&5
+  echo "$as_me:30617: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -30202,11 +30635,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:30205: result: yes" >&5
+  echo "$as_me:30638: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:30209: result: no" >&5
+  echo "$as_me:30642: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -30221,13 +30654,13 @@ done
 for ac_func in strstr
 do
 
-echo "$as_me:30224: checking for $ac_func declaration" >&5
+echo "$as_me:30657: 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 30230 "configure"
+#line 30663 "configure"
 #include "confdefs.h"
 #include <string.h>
 int
@@ -30241,20 +30674,20 @@ extern	int	$ac_func();
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30244: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30677: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30247: \$? = $ac_status" >&5
+  echo "$as_me:30680: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30250: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30683: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30253: \$? = $ac_status" >&5
+  echo "$as_me:30686: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 30257 "configure"
+#line 30690 "configure"
 #include "confdefs.h"
 #include <string.h>
 int
@@ -30268,16 +30701,16 @@ int	(*p)() = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30271: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30704: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30274: \$? = $ac_status" >&5
+  echo "$as_me:30707: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30277: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30710: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30280: \$? = $ac_status" >&5
+  echo "$as_me:30713: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -30298,11 +30731,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:30301: result: yes" >&5
+  echo "$as_me:30734: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:30305: result: no" >&5
+  echo "$as_me:30738: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -30317,13 +30750,13 @@ done
 for ac_func in getgrgid getgrnam
 do
 
-echo "$as_me:30320: checking for $ac_func declaration" >&5
+echo "$as_me:30753: 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 30326 "configure"
+#line 30759 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -30339,20 +30772,20 @@ extern	int	$ac_func();
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30342: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30775: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30345: \$? = $ac_status" >&5
+  echo "$as_me:30778: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30348: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30781: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30351: \$? = $ac_status" >&5
+  echo "$as_me:30784: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 30355 "configure"
+#line 30788 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -30368,16 +30801,16 @@ int	(*p)() = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30371: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30804: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30374: \$? = $ac_status" >&5
+  echo "$as_me:30807: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30377: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30810: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30380: \$? = $ac_status" >&5
+  echo "$as_me:30813: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 eval "ac_cv_func_decl_$ac_func=yes"
@@ -30398,11 +30831,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:30401: result: yes" >&5
+  echo "$as_me:30834: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   :
 else
-  echo "$as_me:30405: result: no" >&5
+  echo "$as_me:30838: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 ac_tr_func=`echo "DECL_$ac_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
@@ -30414,14 +30847,14 @@ EOF
 fi
 done
 
-echo "$as_me:30417: checking if TRUE/FALSE are defined" >&5
+echo "$as_me:30850: 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 30424 "configure"
+#line 30857 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -30435,16 +30868,16 @@ int x = TRUE, y = FALSE
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30438: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30871: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30441: \$? = $ac_status" >&5
+  echo "$as_me:30874: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30444: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30877: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30447: \$? = $ac_status" >&5
+  echo "$as_me:30880: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_bool_defs=yes
 else
@@ -30455,7 +30888,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:30458: result: $cf_cv_bool_defs" >&5
+echo "$as_me:30891: result: $cf_cv_bool_defs" >&5
 echo "${ECHO_T}$cf_cv_bool_defs" >&6
 if test "$cf_cv_bool_defs" = no ; then
 
@@ -30469,14 +30902,14 @@ EOF
 
 fi
 
-echo "$as_me:30472: checking if external errno is declared" >&5
+echo "$as_me:30905: 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 30479 "configure"
+#line 30912 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -30494,16 +30927,16 @@ int x = (int) errno
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30497: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:30930: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30500: \$? = $ac_status" >&5
+  echo "$as_me:30933: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30503: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30936: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30506: \$? = $ac_status" >&5
+  echo "$as_me:30939: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_errno=yes
 else
@@ -30514,7 +30947,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:30517: result: $cf_cv_dcl_errno" >&5
+echo "$as_me:30950: result: $cf_cv_dcl_errno" >&5
 echo "${ECHO_T}$cf_cv_dcl_errno" >&6
 
 if test "$cf_cv_dcl_errno" = no ; then
@@ -30529,14 +30962,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:30532: checking if external errno exists" >&5
+echo "$as_me:30965: 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 30539 "configure"
+#line 30972 "configure"
 #include "confdefs.h"
 
 #undef errno
@@ -30551,16 +30984,16 @@ errno = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30554: \"$ac_link\"") >&5
+if { (eval echo "$as_me:30987: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30557: \$? = $ac_status" >&5
+  echo "$as_me:30990: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30560: \"$ac_try\"") >&5
+  { (eval echo "$as_me:30993: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30563: \$? = $ac_status" >&5
+  echo "$as_me:30996: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_errno=yes
 else
@@ -30571,7 +31004,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:30574: result: $cf_cv_have_errno" >&5
+echo "$as_me:31007: result: $cf_cv_have_errno" >&5
 echo "${ECHO_T}$cf_cv_have_errno" >&6
 
 if test "$cf_cv_have_errno" = yes ; then
@@ -30584,7 +31017,7 @@ EOF
 
 fi
 
-echo "$as_me:30587: checking if we can set errno" >&5
+echo "$as_me:31020: 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
@@ -30592,7 +31025,7 @@ else
 
 if test "$cross_compiling" = yes; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 30595 "configure"
+#line 31028 "configure"
 #include "confdefs.h"
 #include <errno.h>
 int
@@ -30604,16 +31037,16 @@ errno = 255
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30607: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31040: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30610: \$? = $ac_status" >&5
+  echo "$as_me:31043: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30613: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31046: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30616: \$? = $ac_status" >&5
+  echo "$as_me:31049: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_set_errno=maybe
 else
@@ -30624,7 +31057,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 30627 "configure"
+#line 31060 "configure"
 #include "confdefs.h"
 
 #include <errno.h>
@@ -30635,15 +31068,15 @@ int main()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:30638: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31071: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30641: \$? = $ac_status" >&5
+  echo "$as_me:31074: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:30643: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31076: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30646: \$? = $ac_status" >&5
+  echo "$as_me:31079: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_set_errno=yes
 else
@@ -30656,21 +31089,21 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
 fi
-echo "$as_me:30659: result: $cf_cv_set_errno" >&5
+echo "$as_me:31092: 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:30666: checking for setlocale()" >&5
+echo "$as_me:31099: 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 30673 "configure"
+#line 31106 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int
@@ -30682,16 +31115,16 @@ setlocale(LC_ALL, "")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30685: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31118: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30688: \$? = $ac_status" >&5
+  echo "$as_me:31121: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30691: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31124: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30694: \$? = $ac_status" >&5
+  echo "$as_me:31127: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_locale=yes
 else
@@ -30703,7 +31136,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:30706: result: $cf_cv_locale" >&5
+echo "$as_me:31139: result: $cf_cv_locale" >&5
 echo "${ECHO_T}$cf_cv_locale" >&6
 test $cf_cv_locale = yes && {
 cat >>confdefs.h <<\EOF
@@ -30711,14 +31144,14 @@ cat >>confdefs.h <<\EOF
 EOF
  }
 
-echo "$as_me:30714: checking if NGROUPS is defined" >&5
+echo "$as_me:31147: 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 30721 "configure"
+#line 31154 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -30737,23 +31170,23 @@ int x = NGROUPS
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30740: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31173: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30743: \$? = $ac_status" >&5
+  echo "$as_me:31176: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30746: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31179: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30749: \$? = $ac_status" >&5
+  echo "$as_me:31182: \$? = $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 30756 "configure"
+#line 31189 "configure"
 #include "confdefs.h"
 
 #if HAVE_SYS_PARAM_H
@@ -30772,16 +31205,16 @@ int x = NGROUPS_MAX
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30775: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31208: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30778: \$? = $ac_status" >&5
+  echo "$as_me:31211: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30781: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31214: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30784: \$? = $ac_status" >&5
+  echo "$as_me:31217: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ngroups=NGROUPS_MAX
 else
@@ -30793,7 +31226,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:30796: result: $cf_cv_ngroups" >&5
+echo "$as_me:31229: result: $cf_cv_ngroups" >&5
 echo "${ECHO_T}$cf_cv_ngroups" >&6
 
 fi
@@ -30811,14 +31244,14 @@ EOF
 
 fi
 
-echo "$as_me:30814: checking if external sys_nerr is declared" >&5
+echo "$as_me:31247: 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 30821 "configure"
+#line 31254 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -30836,16 +31269,16 @@ int x = (int) sys_nerr
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30839: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31272: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30842: \$? = $ac_status" >&5
+  echo "$as_me:31275: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30845: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31278: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30848: \$? = $ac_status" >&5
+  echo "$as_me:31281: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_sys_nerr=yes
 else
@@ -30856,7 +31289,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:30859: result: $cf_cv_dcl_sys_nerr" >&5
+echo "$as_me:31292: 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
@@ -30871,14 +31304,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:30874: checking if external sys_nerr exists" >&5
+echo "$as_me:31307: 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 30881 "configure"
+#line 31314 "configure"
 #include "confdefs.h"
 
 #undef sys_nerr
@@ -30893,16 +31326,16 @@ sys_nerr = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:30896: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31329: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:30899: \$? = $ac_status" >&5
+  echo "$as_me:31332: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:30902: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31335: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30905: \$? = $ac_status" >&5
+  echo "$as_me:31338: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_sys_nerr=yes
 else
@@ -30913,7 +31346,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:30916: result: $cf_cv_have_sys_nerr" >&5
+echo "$as_me:31349: 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
@@ -30926,14 +31359,14 @@ EOF
 
 fi
 
-echo "$as_me:30929: checking if external sys_errlist is declared" >&5
+echo "$as_me:31362: 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 30936 "configure"
+#line 31369 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_STDLIB_H
@@ -30951,16 +31384,16 @@ int x = (int) sys_errlist
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:30954: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31387: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:30957: \$? = $ac_status" >&5
+  echo "$as_me:31390: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:30960: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31393: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:30963: \$? = $ac_status" >&5
+  echo "$as_me:31396: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_dcl_sys_errlist=yes
 else
@@ -30971,7 +31404,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:30974: result: $cf_cv_dcl_sys_errlist" >&5
+echo "$as_me:31407: 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
@@ -30986,14 +31419,14 @@ fi
 
 # It's possible (for near-UNIX clones) that the data doesn't exist
 
-echo "$as_me:30989: checking if external sys_errlist exists" >&5
+echo "$as_me:31422: 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 30996 "configure"
+#line 31429 "configure"
 #include "confdefs.h"
 
 #undef sys_errlist
@@ -31008,16 +31441,16 @@ sys_errlist = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31011: \"$ac_link\"") >&5
+if { (eval echo "$as_me:31444: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31014: \$? = $ac_status" >&5
+  echo "$as_me:31447: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31017: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31450: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31020: \$? = $ac_status" >&5
+  echo "$as_me:31453: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_sys_errlist=yes
 else
@@ -31028,7 +31461,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:31031: result: $cf_cv_have_sys_errlist" >&5
+echo "$as_me:31464: 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
@@ -31044,23 +31477,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:31047: checking for $ac_header" >&5
+echo "$as_me:31480: 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 31053 "configure"
+#line 31486 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:31057: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:31490: \"$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:31063: \$? = $ac_status" >&5
+  echo "$as_me:31496: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -31079,7 +31512,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:31082: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:31515: 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
@@ -31089,14 +31522,14 @@ EOF
 fi
 done
 
-echo "$as_me:31092: checking for lastlog path" >&5
+echo "$as_me:31525: 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 31099 "configure"
+#line 31532 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -31116,16 +31549,16 @@ char *path = _PATH_LASTLOG
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31119: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31552: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31122: \$? = $ac_status" >&5
+  echo "$as_me:31555: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31125: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31558: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31128: \$? = $ac_status" >&5
+  echo "$as_me:31561: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_path_lastlog="_PATH_LASTLOG"
 else
@@ -31140,14 +31573,14 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:31143: result: $cf_cv_path_lastlog" >&5
+echo "$as_me:31576: 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:31150: checking for utmp implementation" >&5
+echo "$as_me:31583: 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
@@ -31164,7 +31597,7 @@ cf_utmp_includes="
 #endif
 "
 	cat >conftest.$ac_ext <<_ACEOF
-#line 31167 "configure"
+#line 31600 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -31178,16 +31611,16 @@ struct $cf_header x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31181: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31614: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31184: \$? = $ac_status" >&5
+  echo "$as_me:31617: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31187: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31620: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31190: \$? = $ac_status" >&5
+  echo "$as_me:31623: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -31196,7 +31629,7 @@ else
 cat conftest.$ac_ext >&5
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 31199 "configure"
+#line 31632 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -31210,16 +31643,16 @@ struct $cf_header x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31213: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31646: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31216: \$? = $ac_status" >&5
+  echo "$as_me:31649: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31219: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31652: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31222: \$? = $ac_status" >&5
+  echo "$as_me:31655: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp=$cf_header
 	 break
@@ -31234,7 +31667,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:31237: result: $cf_cv_have_utmp" >&5
+echo "$as_me:31670: result: $cf_cv_have_utmp" >&5
 echo "${ECHO_T}$cf_cv_have_utmp" >&6
 
 if test $cf_cv_have_utmp != no ; then
@@ -31249,14 +31682,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:31252: checking if ${cf_cv_have_utmp}.ut_host is declared" >&5
+echo "$as_me:31685: 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 31259 "configure"
+#line 31692 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -31270,16 +31703,16 @@ struct $cf_cv_have_utmp x; char *y = &x.ut_host[0]
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31273: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31706: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31276: \$? = $ac_status" >&5
+  echo "$as_me:31709: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31279: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31712: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31282: \$? = $ac_status" >&5
+  echo "$as_me:31715: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_host=yes
 else
@@ -31291,7 +31724,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:31294: result: $cf_cv_have_utmp_ut_host" >&5
+echo "$as_me:31727: 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
@@ -31301,14 +31734,14 @@ EOF
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:31304: checking if ${cf_cv_have_utmp}.ut_syslen is declared" >&5
+echo "$as_me:31737: 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 31311 "configure"
+#line 31744 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -31322,16 +31755,16 @@ struct $cf_cv_have_utmp x; int y = x.ut_syslen
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31325: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31758: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31328: \$? = $ac_status" >&5
+  echo "$as_me:31761: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31331: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31764: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31334: \$? = $ac_status" >&5
+  echo "$as_me:31767: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_syslen=yes
 else
@@ -31343,7 +31776,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:31346: result: $cf_cv_have_utmp_ut_syslen" >&5
+echo "$as_me:31779: 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
@@ -31353,7 +31786,7 @@ EOF
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:31356: checking if ${cf_cv_have_utmp}.ut_name is declared" >&5
+echo "$as_me:31789: 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
@@ -31370,7 +31803,7 @@ cf_utmp_includes="
 "
 for cf_header in ut_name ut_user ; do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 31373 "configure"
+#line 31806 "configure"
 #include "confdefs.h"
 $cf_utmp_includes
 int
@@ -31384,16 +31817,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31387: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31820: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31390: \$? = $ac_status" >&5
+  echo "$as_me:31823: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31393: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31826: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31396: \$? = $ac_status" >&5
+  echo "$as_me:31829: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_name=$cf_header
 	 break
@@ -31405,12 +31838,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:31408: result: $cf_cv_have_utmp_ut_name" >&5
+echo "$as_me:31841: result: $cf_cv_have_utmp_ut_name" >&5
 echo "${ECHO_T}$cf_cv_have_utmp_ut_name" >&6
 
 case $cf_cv_have_utmp_ut_name in
 (no)
-	{ { echo "$as_me:31413: error: Cannot find declaration for ut.ut_name" >&5
+	{ { echo "$as_me:31846: 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; }; }
 	;;
@@ -31425,7 +31858,7 @@ esac
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:31428: checking for exit-status in $cf_cv_have_utmp" >&5
+echo "$as_me:31861: 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
@@ -31438,7 +31871,7 @@ for cf_result in \
 	ut_exit.ut_exit
 do
 cat >conftest.$ac_ext <<_ACEOF
-#line 31441 "configure"
+#line 31874 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -31452,16 +31885,16 @@ struct $cf_cv_have_utmp x; long y = x.$cf_result = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31455: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31888: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31458: \$? = $ac_status" >&5
+  echo "$as_me:31891: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31461: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31894: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31464: \$? = $ac_status" >&5
+  echo "$as_me:31897: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_xstatus=$cf_result
 	 break
@@ -31474,7 +31907,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:31477: result: $cf_cv_have_utmp_ut_xstatus" >&5
+echo "$as_me:31910: 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
 
@@ -31490,14 +31923,14 @@ fi
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:31493: checking if ${cf_cv_have_utmp}.ut_xtime is declared" >&5
+echo "$as_me:31926: 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 31500 "configure"
+#line 31933 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -31511,23 +31944,23 @@ struct $cf_cv_have_utmp x; long y = x.ut_xtime = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31514: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31947: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31517: \$? = $ac_status" >&5
+  echo "$as_me:31950: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31520: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31953: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31523: \$? = $ac_status" >&5
+  echo "$as_me:31956: \$? = $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 31530 "configure"
+#line 31963 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -31541,16 +31974,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:31544: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:31977: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31547: \$? = $ac_status" >&5
+  echo "$as_me:31980: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31550: \"$ac_try\"") >&5
+  { (eval echo "$as_me:31983: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31553: \$? = $ac_status" >&5
+  echo "$as_me:31986: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_xtime=define
 else
@@ -31564,7 +31997,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:31567: result: $cf_cv_have_utmp_ut_xtime" >&5
+echo "$as_me:32000: 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
 
@@ -31583,14 +32016,14 @@ fi
 fi
 
 if test $cf_cv_have_utmp != no ; then
-echo "$as_me:31586: checking if ${cf_cv_have_utmp}.ut_session is declared" >&5
+echo "$as_me:32019: 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 31593 "configure"
+#line 32026 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -31604,16 +32037,16 @@ struct $cf_cv_have_utmp x; long y = x.ut_session
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:31607: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32040: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:31610: \$? = $ac_status" >&5
+  echo "$as_me:32043: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:31613: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32046: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31616: \$? = $ac_status" >&5
+  echo "$as_me:32049: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_utmp_ut_session=yes
 else
@@ -31624,7 +32057,7 @@ fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:31627: result: $cf_cv_have_utmp_ut_session" >&5
+echo "$as_me:32060: 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
 
@@ -31635,7 +32068,7 @@ EOF
 fi
 fi
 
-echo "$as_me:31638: checking if $cf_cv_have_utmp is SYSV flavor" >&5
+echo "$as_me:32071: 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
@@ -31643,7 +32076,7 @@ else
 
 test "$cf_cv_have_utmp" = "utmp" && cf_prefix="ut" || cf_prefix="utx"
 cat >conftest.$ac_ext <<_ACEOF
-#line 31646 "configure"
+#line 32079 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -31662,16 +32095,16 @@ struct $cf_cv_have_utmp x;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31665: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32098: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31668: \$? = $ac_status" >&5
+  echo "$as_me:32101: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31671: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32104: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31674: \$? = $ac_status" >&5
+  echo "$as_me:32107: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_sysv_utmp=yes
 else
@@ -31682,7 +32115,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:31685: result: $cf_cv_sysv_utmp" >&5
+echo "$as_me:32118: result: $cf_cv_sysv_utmp" >&5
 echo "${ECHO_T}$cf_cv_sysv_utmp" >&6
 test $cf_cv_sysv_utmp = yes &&
 cat >>confdefs.h <<\EOF
@@ -31691,14 +32124,14 @@ EOF
 
 fi
 
-echo "$as_me:31694: checking if external h_errno exists" >&5
+echo "$as_me:32127: 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 31701 "configure"
+#line 32134 "configure"
 #include "confdefs.h"
 
 #undef h_errno
@@ -31713,16 +32146,16 @@ h_errno = 2
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:31716: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32149: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:31719: \$? = $ac_status" >&5
+  echo "$as_me:32152: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:31722: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32155: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:31725: \$? = $ac_status" >&5
+  echo "$as_me:32158: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_h_errno=yes
 else
@@ -31733,7 +32166,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:31736: result: $cf_cv_have_h_errno" >&5
+echo "$as_me:32169: 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
@@ -31746,7 +32179,7 @@ EOF
 
 fi
 
-echo "$as_me:31749: checking if bibp: URLs should be supported" >&5
+echo "$as_me:32182: 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.
@@ -31763,14 +32196,14 @@ else
 	use_bibp_urls=yes
 
 fi;
-echo "$as_me:31766: result: $use_bibp_urls" >&5
+echo "$as_me:32199: 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:31773: checking if configuration info should be browsable" >&5
+echo "$as_me:32206: 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.
@@ -31787,14 +32220,14 @@ else
 	use_config_info=yes
 
 fi;
-echo "$as_me:31790: result: $use_config_info" >&5
+echo "$as_me:32223: 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:31797: checking if new-style forms-based options screen should be used" >&5
+echo "$as_me:32230: 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.
@@ -31811,14 +32244,14 @@ else
 	use_forms_options=yes
 
 fi;
-echo "$as_me:31814: result: $use_forms_options" >&5
+echo "$as_me:32247: 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:31821: checking if old-style options menu should be used" >&5
+echo "$as_me:32254: 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.
@@ -31835,14 +32268,14 @@ else
 	use_menu_options=yes
 
 fi;
-echo "$as_me:31838: result: $use_menu_options" >&5
+echo "$as_me:32271: 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:31845: checking if sessions code should be used" >&5
+echo "$as_me:32278: 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.
@@ -31859,7 +32292,7 @@ else
 	use_sessions=yes
 
 fi;
-echo "$as_me:31862: result: $use_sessions" >&5
+echo "$as_me:32295: result: $use_sessions" >&5
 echo "${ECHO_T}$use_sessions" >&6
 if test $use_sessions != no ; then
 
@@ -31870,7 +32303,7 @@ EOF
 	EXTRA_OBJS="$EXTRA_OBJS LYSession\$o"
 fi
 
-echo "$as_me:31873: checking if session-caching code should be used" >&5
+echo "$as_me:32306: 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.
@@ -31887,7 +32320,7 @@ else
 	use_session_cache=yes
 
 fi;
-echo "$as_me:31890: result: $use_session_cache" >&5
+echo "$as_me:32323: result: $use_session_cache" >&5
 echo "${ECHO_T}$use_session_cache" >&6
 if test $use_session_cache != no ; then
 
@@ -31897,7 +32330,7 @@ EOF
 
 fi
 
-echo "$as_me:31900: checking if address-list page should be used" >&5
+echo "$as_me:32333: checking if address-list page should be used" >&5
 echo $ECHO_N "checking if address-list page should be used... $ECHO_C" >&6
 
 # Check whether --enable-addrlist-page or --disable-addrlist-page was given.
@@ -31914,14 +32347,14 @@ else
 	use_addrlist_page=yes
 
 fi;
-echo "$as_me:31917: result: $use_addrlist_page" >&5
+echo "$as_me:32350: result: $use_addrlist_page" >&5
 echo "${ECHO_T}$use_addrlist_page" >&6
 test $use_addrlist_page != no &&
 cat >>confdefs.h <<\EOF
 #define USE_ADDRLIST_PAGE 1
 EOF
 
-echo "$as_me:31924: checking if experimental CJK logic should be used" >&5
+echo "$as_me:32357: 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.
@@ -31938,14 +32371,14 @@ else
 	use_cjk=no
 
 fi;
-echo "$as_me:31941: result: $use_cjk" >&5
+echo "$as_me:32374: 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:31948: checking if experimental Japanese UTF-8 logic should be used" >&5
+echo "$as_me:32381: 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.
@@ -31962,7 +32395,7 @@ else
 	use_ja_utf8=no
 
 fi;
-echo "$as_me:31965: result: $use_ja_utf8" >&5
+echo "$as_me:32398: result: $use_ja_utf8" >&5
 echo "${ECHO_T}$use_ja_utf8" >&6
 if test $use_ja_utf8 != no ; then
 
@@ -32008,7 +32441,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 32011 "configure"
+#line 32444 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -32020,16 +32453,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32023: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32456: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32026: \$? = $ac_status" >&5
+  echo "$as_me:32459: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32029: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32462: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32032: \$? = $ac_status" >&5
+  echo "$as_me:32465: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -32046,7 +32479,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}:32049: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:32482: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -32089,7 +32522,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 32092 "configure"
+#line 32525 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -32101,16 +32534,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32104: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32537: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32107: \$? = $ac_status" >&5
+  echo "$as_me:32540: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32110: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32543: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32113: \$? = $ac_status" >&5
+  echo "$as_me:32546: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -32127,7 +32560,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}:32130: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:32563: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -32145,7 +32578,7 @@ echo "${as_me:-configure}:32130: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:32148: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:32581: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -32170,7 +32603,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}:32173: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:32606: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -32199,7 +32632,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}:32202: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:32635: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -32208,7 +32641,7 @@ echo "${as_me:-configure}:32202: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:32211: error: cannot find libiconv under $withval" >&5
+{ { echo "$as_me:32644: error: cannot find libiconv under $withval" >&5
 echo "$as_me: error: cannot find libiconv under $withval" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -32219,7 +32652,7 @@ esac
 
 fi;
 
-  echo "$as_me:32222: checking for iconv" >&5
+  echo "$as_me:32655: 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
@@ -32230,12 +32663,12 @@ else
 cf_cv_header_path_iconv=
 cf_cv_library_path_iconv=
 
-echo "${as_me:-configure}:32233: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:32666: testing Starting FIND_LINKAGE(iconv,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 32238 "configure"
+#line 32671 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -32254,16 +32687,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32257: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32690: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32260: \$? = $ac_status" >&5
+  echo "$as_me:32693: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32263: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32696: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32266: \$? = $ac_status" >&5
+  echo "$as_me:32699: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -32277,7 +32710,7 @@ cat conftest.$ac_ext >&5
 LIBS="-liconv  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 32280 "configure"
+#line 32713 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -32296,16 +32729,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32299: \"$ac_link\"") >&5
+if { (eval echo "$as_me:32732: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32302: \$? = $ac_status" >&5
+  echo "$as_me:32735: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32305: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32738: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32308: \$? = $ac_status" >&5
+  echo "$as_me:32741: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_iconv=yes
@@ -32322,9 +32755,9 @@ cat conftest.$ac_ext >&5
 
 	test -n "$verbose" && echo "	find linkage for iconv library" 1>&6
 
-echo "${as_me:-configure}:32325: testing find linkage for iconv library ..." 1>&5
+echo "${as_me:-configure}:32758: testing find linkage for iconv library ..." 1>&5
 
-echo "${as_me:-configure}:32327: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:32760: testing Searching for headers in FIND_LINKAGE(iconv,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -32415,11 +32848,11 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d $cf_cv_header_path_iconv ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_iconv" 1>&6
 
-echo "${as_me:-configure}:32418: testing ... testing $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:32851: 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 32422 "configure"
+#line 32855 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -32438,21 +32871,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32441: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:32874: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32444: \$? = $ac_status" >&5
+  echo "$as_me:32877: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32447: \"$ac_try\"") >&5
+  { (eval echo "$as_me:32880: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32450: \$? = $ac_status" >&5
+  echo "$as_me:32883: \$? = $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}:32455: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
+echo "${as_me:-configure}:32888: testing ... found iconv headers in $cf_cv_header_path_iconv ..." 1>&5
 
 				cf_cv_find_linkage_iconv=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -32470,7 +32903,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	if test "$cf_cv_find_linkage_iconv" = maybe ; then
 
-echo "${as_me:-configure}:32473: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
+echo "${as_me:-configure}:32906: testing Searching for iconv library in FIND_LINKAGE(iconv,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -32545,13 +32978,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}:32548: testing ... testing $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:32981: 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 32554 "configure"
+#line 32987 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -32570,21 +33003,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:32573: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33006: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:32576: \$? = $ac_status" >&5
+  echo "$as_me:33009: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:32579: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33012: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32582: \$? = $ac_status" >&5
+  echo "$as_me:33015: \$? = $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}:32587: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
+echo "${as_me:-configure}:33020: testing ... found iconv library in $cf_cv_library_path_iconv ..." 1>&5
 
 					cf_cv_find_linkage_iconv=yes
 					cf_cv_library_file_iconv="-liconv"
@@ -32624,7 +33057,7 @@ am_cv_func_iconv="no, consider installing GNU libiconv"
 fi
 
 fi
-echo "$as_me:32627: result: $am_cv_func_iconv" >&5
+echo "$as_me:33060: result: $am_cv_func_iconv" >&5
 echo "${ECHO_T}$am_cv_func_iconv" >&6
 
   if test "$am_cv_func_iconv" = yes; then
@@ -32633,14 +33066,14 @@ cat >>confdefs.h <<\EOF
 #define HAVE_ICONV 1
 EOF
 
-    echo "$as_me:32636: checking if the declaration of iconv() needs const." >&5
+    echo "$as_me:33069: 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 32643 "configure"
+#line 33076 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -32665,16 +33098,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32668: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33101: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32671: \$? = $ac_status" >&5
+  echo "$as_me:33104: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32674: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33107: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32677: \$? = $ac_status" >&5
+  echo "$as_me:33110: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   am_cv_proto_iconv_const=no
 else
@@ -32684,7 +33117,7 @@ am_cv_proto_iconv_const=yes
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:32687: result: $am_cv_proto_iconv_const" >&5
+echo "$as_me:33120: 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
@@ -32726,7 +33159,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 32729 "configure"
+#line 33162 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -32738,16 +33171,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:32741: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33174: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:32744: \$? = $ac_status" >&5
+  echo "$as_me:33177: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:32747: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33180: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:32750: \$? = $ac_status" >&5
+  echo "$as_me:33183: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -32764,7 +33197,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}:32767: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:33200: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -32803,7 +33236,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}:32806: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:33239: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -32827,7 +33260,7 @@ case $cf_cv_screen in
 esac
 
 if test "$use_dft_colors" != no ; then
-echo "$as_me:32830: checking if you want to use default-colors" >&5
+echo "$as_me:33263: 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.
@@ -32844,7 +33277,7 @@ else
 	use_dft_colors=no
 
 fi;
-echo "$as_me:32847: result: $use_dft_colors" >&5
+echo "$as_me:33280: result: $use_dft_colors" >&5
 echo "${ECHO_T}$use_dft_colors" >&6
 test $use_dft_colors = "yes" &&
 cat >>confdefs.h <<\EOF
@@ -32853,7 +33286,7 @@ EOF
 
 fi
 
-echo "$as_me:32856: checking if experimental keyboard-layout logic should be used" >&5
+echo "$as_me:33289: 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.
@@ -32870,14 +33303,14 @@ else
 	use_kbd_layout=no
 
 fi;
-echo "$as_me:32873: result: $use_kbd_layout" >&5
+echo "$as_me:33306: 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:32880: checking if experimental nested-table logic should be used" >&5
+echo "$as_me:33313: 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.
@@ -32894,14 +33327,14 @@ else
 	use_nested_tables=no
 
 fi;
-echo "$as_me:32897: result: $use_nested_tables" >&5
+echo "$as_me:33330: 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:32904: checking if alternative line-edit bindings should be used" >&5
+echo "$as_me:33337: 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.
@@ -32918,14 +33351,14 @@ else
 	use_alt_bindings=yes
 
 fi;
-echo "$as_me:32921: result: $use_alt_bindings" >&5
+echo "$as_me:33354: result: $use_alt_bindings" >&5
 echo "${ECHO_T}$use_alt_bindings" >&6
 test $use_alt_bindings != no &&
 cat >>confdefs.h <<\EOF
 #define USE_ALT_BINDINGS 1
 EOF
 
-echo "$as_me:32928: checking if ascii case-conversion should be used" >&5
+echo "$as_me:33361: checking if ascii case-conversion should be used" >&5
 echo $ECHO_N "checking if ascii case-conversion should be used... $ECHO_C" >&6
 
 # Check whether --enable-ascii-ctypes or --disable-ascii-ctypes was given.
@@ -32942,14 +33375,14 @@ else
 	use_ascii_ctypes=yes
 
 fi;
-echo "$as_me:32945: result: $use_ascii_ctypes" >&5
+echo "$as_me:33378: result: $use_ascii_ctypes" >&5
 echo "${ECHO_T}$use_ascii_ctypes" >&6
 test $use_ascii_ctypes != no &&
 cat >>confdefs.h <<\EOF
 #define USE_ASCII_CTYPES 1
 EOF
 
-echo "$as_me:32952: checking if you want to use extended HTML DTD logic" >&5
+echo "$as_me:33385: 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.
@@ -32966,14 +33399,14 @@ else
 	use_ext_htmldtd=yes
 
 fi;
-echo "$as_me:32969: result: $use_ext_htmldtd" >&5
+echo "$as_me:33402: 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:32976: checking if file-upload logic should be used" >&5
+echo "$as_me:33409: 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.
@@ -32990,14 +33423,14 @@ else
 	use_file_upload=yes
 
 fi;
-echo "$as_me:32993: result: $use_file_upload" >&5
+echo "$as_me:33426: 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:33000: checking if IDNA support should be used" >&5
+echo "$as_me:33433: checking if IDNA support should be used" >&5
 echo $ECHO_N "checking if IDNA support should be used... $ECHO_C" >&6
 
 # Check whether --enable-idna or --disable-idna was given.
@@ -33014,7 +33447,7 @@ else
 	use_idna=yes
 
 fi;
-echo "$as_me:33017: result: $use_idna" >&5
+echo "$as_me:33450: result: $use_idna" >&5
 echo "${ECHO_T}$use_idna" >&6
 
 if test "$use_idna" = yes ; then
@@ -33053,7 +33486,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 33056 "configure"
+#line 33489 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -33065,16 +33498,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33068: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33501: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33071: \$? = $ac_status" >&5
+  echo "$as_me:33504: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33074: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33507: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33077: \$? = $ac_status" >&5
+  echo "$as_me:33510: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -33091,7 +33524,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}:33094: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:33527: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -33134,7 +33567,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 33137 "configure"
+#line 33570 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -33146,16 +33579,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33149: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33582: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33152: \$? = $ac_status" >&5
+  echo "$as_me:33585: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33155: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33588: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33158: \$? = $ac_status" >&5
+  echo "$as_me:33591: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -33172,7 +33605,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}:33175: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:33608: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -33190,7 +33623,7 @@ echo "${as_me:-configure}:33175: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:33193: error: cannot find  under $use_idna" >&5
+{ { echo "$as_me:33626: error: cannot find  under $use_idna" >&5
 echo "$as_me: error: cannot find  under $use_idna" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -33215,7 +33648,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}:33218: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:33651: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -33244,7 +33677,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}:33247: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:33680: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -33253,7 +33686,7 @@ echo "${as_me:-configure}:33247: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:33256: error: cannot find  under $use_idna" >&5
+{ { echo "$as_me:33689: error: cannot find  under $use_idna" >&5
 echo "$as_me: error: cannot find  under $use_idna" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -33267,12 +33700,12 @@ esac
 cf_cv_header_path_idn=
 cf_cv_library_path_idn=
 
-echo "${as_me:-configure}:33270: testing Starting FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:33703: testing Starting FIND_LINKAGE(idn,) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 33275 "configure"
+#line 33708 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -33290,16 +33723,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33293: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33726: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33296: \$? = $ac_status" >&5
+  echo "$as_me:33729: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33299: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33732: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33302: \$? = $ac_status" >&5
+  echo "$as_me:33735: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_idn=yes
@@ -33313,7 +33746,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lidn $LIBICONV $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 33316 "configure"
+#line 33749 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -33331,16 +33764,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33334: \"$ac_link\"") >&5
+if { (eval echo "$as_me:33767: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33337: \$? = $ac_status" >&5
+  echo "$as_me:33770: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33340: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33773: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33343: \$? = $ac_status" >&5
+  echo "$as_me:33776: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_idn=yes
@@ -33357,9 +33790,9 @@ cat conftest.$ac_ext >&5
 
 	test -n "$verbose" && echo "	find linkage for idn library" 1>&6
 
-echo "${as_me:-configure}:33360: testing find linkage for idn library ..." 1>&5
+echo "${as_me:-configure}:33793: testing find linkage for idn library ..." 1>&5
 
-echo "${as_me:-configure}:33362: testing Searching for headers in FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:33795: testing Searching for headers in FIND_LINKAGE(idn,) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -33450,11 +33883,11 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d $cf_cv_header_path_idn ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_idn" 1>&6
 
-echo "${as_me:-configure}:33453: testing ... testing $cf_cv_header_path_idn ..." 1>&5
+echo "${as_me:-configure}:33886: testing ... testing $cf_cv_header_path_idn ..." 1>&5
 
 			CPPFLAGS="$cf_save_CPPFLAGS -I$cf_cv_header_path_idn"
 			cat >conftest.$ac_ext <<_ACEOF
-#line 33457 "configure"
+#line 33890 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -33472,21 +33905,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33475: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:33908: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33478: \$? = $ac_status" >&5
+  echo "$as_me:33911: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33481: \"$ac_try\"") >&5
+  { (eval echo "$as_me:33914: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33484: \$? = $ac_status" >&5
+  echo "$as_me:33917: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 				test -n "$verbose" && echo "	... found idn headers in $cf_cv_header_path_idn" 1>&6
 
-echo "${as_me:-configure}:33489: testing ... found idn headers in $cf_cv_header_path_idn ..." 1>&5
+echo "${as_me:-configure}:33922: testing ... found idn headers in $cf_cv_header_path_idn ..." 1>&5
 
 				cf_cv_find_linkage_idn=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -33504,7 +33937,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	if test "$cf_cv_find_linkage_idn" = maybe ; then
 
-echo "${as_me:-configure}:33507: testing Searching for idn library in FIND_LINKAGE(idn,) ..." 1>&5
+echo "${as_me:-configure}:33940: testing Searching for idn library in FIND_LINKAGE(idn,) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -33579,13 +34012,13 @@ cf_search="$cf_library_path_list $cf_search"
 				if test -d $cf_cv_library_path_idn ; then
 					test -n "$verbose" && echo "	... testing $cf_cv_library_path_idn" 1>&6
 
-echo "${as_me:-configure}:33582: testing ... testing $cf_cv_library_path_idn ..." 1>&5
+echo "${as_me:-configure}:34015: testing ... testing $cf_cv_library_path_idn ..." 1>&5
 
 					CPPFLAGS="$cf_test_CPPFLAGS"
 					LIBS="-lidn $LIBICONV $cf_save_LIBS"
 					LDFLAGS="$cf_save_LDFLAGS -L$cf_cv_library_path_idn"
 					cat >conftest.$ac_ext <<_ACEOF
-#line 33588 "configure"
+#line 34021 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -33603,21 +34036,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:33606: \"$ac_link\"") >&5
+if { (eval echo "$as_me:34039: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:33609: \$? = $ac_status" >&5
+  echo "$as_me:34042: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:33612: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34045: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33615: \$? = $ac_status" >&5
+  echo "$as_me:34048: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 					test -n "$verbose" && echo "	... found idn library in $cf_cv_library_path_idn" 1>&6
 
-echo "${as_me:-configure}:33620: testing ... found idn library in $cf_cv_library_path_idn ..." 1>&5
+echo "${as_me:-configure}:34053: testing ... found idn library in $cf_cv_library_path_idn ..." 1>&5
 
 					cf_cv_find_linkage_idn=yes
 					cf_cv_library_file_idn="-lidn"
@@ -33676,7 +34109,7 @@ if test -n "$cf_cv_header_path_idn" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 33679 "configure"
+#line 34112 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -33688,16 +34121,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:33691: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34124: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:33694: \$? = $ac_status" >&5
+  echo "$as_me:34127: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:33697: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34130: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:33700: \$? = $ac_status" >&5
+  echo "$as_me:34133: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -33714,7 +34147,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}:33717: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:34150: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -33750,7 +34183,7 @@ if test -n "$cf_cv_library_path_idn" ; then
 			if test "$cf_have_libdir" = no ; then
 				test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
 
-echo "${as_me:-configure}:33753: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:34186: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -33775,7 +34208,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:33778: WARNING: Cannot find idn library" >&5
+{ echo "$as_me:34211: WARNING: Cannot find idn library" >&5
 echo "$as_me: WARNING: Cannot find idn library" >&2;}
 fi
 
@@ -33789,7 +34222,7 @@ fi
 
 fi
 
-echo "$as_me:33792: checking if element-justification logic should be used" >&5
+echo "$as_me:34225: 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.
@@ -33806,14 +34239,14 @@ else
 	use_justify_elts=yes
 
 fi;
-echo "$as_me:33809: result: $use_justify_elts" >&5
+echo "$as_me:34242: result: $use_justify_elts" >&5
 echo "${ECHO_T}$use_justify_elts" >&6
 test $use_justify_elts != no &&
 cat >>confdefs.h <<\EOF
 #define USE_JUSTIFY_ELTS 1
 EOF
 
-echo "$as_me:33816: checking if partial-display should be used" >&5
+echo "$as_me:34249: 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.
@@ -33830,14 +34263,14 @@ else
 	use_partial_display=yes
 
 fi;
-echo "$as_me:33833: result: $use_partial_display" >&5
+echo "$as_me:34266: 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:33840: checking if persistent-cookie logic should be used" >&5
+echo "$as_me:34273: 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.
@@ -33854,14 +34287,14 @@ else
 	use_filed_cookies=yes
 
 fi;
-echo "$as_me:33857: result: $use_filed_cookies" >&5
+echo "$as_me:34290: 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:33864: checking if html source should be colorized" >&5
+echo "$as_me:34297: 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.
@@ -33878,14 +34311,14 @@ else
 	use_prettysrc=yes
 
 fi;
-echo "$as_me:33881: result: $use_prettysrc" >&5
+echo "$as_me:34314: 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:33888: checking if progress-bar code should be used" >&5
+echo "$as_me:34321: 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.
@@ -33902,14 +34335,14 @@ else
 	use_progressbar=yes
 
 fi;
-echo "$as_me:33905: result: $use_progressbar" >&5
+echo "$as_me:34338: 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:33912: checking if read-progress message should show ETA" >&5
+echo "$as_me:34345: 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.
@@ -33926,14 +34359,14 @@ else
 	use_read_eta=yes
 
 fi;
-echo "$as_me:33929: result: $use_read_eta" >&5
+echo "$as_me:34362: 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:33936: checking if source caching should be used" >&5
+echo "$as_me:34369: 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.
@@ -33950,14 +34383,14 @@ else
 	use_source_cache=yes
 
 fi;
-echo "$as_me:33953: result: $use_source_cache" >&5
+echo "$as_me:34386: 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:33960: checking if scrollbar code should be used" >&5
+echo "$as_me:34393: 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.
@@ -33974,10 +34407,10 @@ else
 	use_scrollbar=yes
 
 fi;
-echo "$as_me:33977: result: $use_scrollbar" >&5
+echo "$as_me:34410: result: $use_scrollbar" >&5
 echo "${ECHO_T}$use_scrollbar" >&6
 
-echo "$as_me:33980: checking if charset-selection logic should be used" >&5
+echo "$as_me:34413: checking if charset-selection logic should be used" >&5
 echo $ECHO_N "checking if charset-selection logic should be used... $ECHO_C" >&6
 
 # Check whether --enable-charset-choice or --disable-charset-choice was given.
@@ -33994,14 +34427,14 @@ else
 	use_charset_choice=no
 
 fi;
-echo "$as_me:33997: result: $use_charset_choice" >&5
+echo "$as_me:34430: result: $use_charset_choice" >&5
 echo "${ECHO_T}$use_charset_choice" >&6
 test $use_charset_choice != no &&
 cat >>confdefs.h <<\EOF
 #define USE_CHARSET_CHOICE 1
 EOF
 
-echo "$as_me:34004: checking if you want to use external commands" >&5
+echo "$as_me:34437: 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.
@@ -34018,7 +34451,7 @@ else
 	use_externs=no
 
 fi;
-echo "$as_me:34021: result: $use_externs" >&5
+echo "$as_me:34454: result: $use_externs" >&5
 echo "${ECHO_T}$use_externs" >&6
 if test $use_externs != "no" ; then
 
@@ -34029,7 +34462,7 @@ EOF
 	EXTRA_OBJS="$EXTRA_OBJS LYExtern\$o"
 fi
 
-echo "$as_me:34032: checking if you want to use setfont support" >&5
+echo "$as_me:34465: 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.
@@ -34046,7 +34479,7 @@ else
 	use_setfont=no
 
 fi;
-echo "$as_me:34049: result: $use_setfont" >&5
+echo "$as_me:34482: result: $use_setfont" >&5
 echo "${ECHO_T}$use_setfont" >&6
 if test $use_setfont = yes ; then
 	case $host_os in
@@ -34057,7 +34490,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:34060: checking for $ac_word" >&5
+echo "$as_me:34493: 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
@@ -34074,7 +34507,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:34077: found $ac_dir/$ac_word" >&5
+   echo "$as_me:34510: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -34085,10 +34518,10 @@ fi
 SETFONT=$ac_cv_path_SETFONT
 
 if test -n "$SETFONT"; then
-  echo "$as_me:34088: result: $SETFONT" >&5
+  echo "$as_me:34521: result: $SETFONT" >&5
 echo "${ECHO_T}$SETFONT" >&6
 else
-  echo "$as_me:34091: result: no" >&5
+  echo "$as_me:34524: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -34147,7 +34580,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:34150: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:34583: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define SETFONT_PATH "$cf_path_prog"
@@ -34165,19 +34598,19 @@ fi
 		SETFONT=built-in
 		test -n "$verbose" && echo "	Assume $host_os has font-switching" 1>&6
 
-echo "${as_me:-configure}:34168: testing Assume $host_os has font-switching ..." 1>&5
+echo "${as_me:-configure}:34601: 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}:34175: testing Assume $host_os has no font-switching ..." 1>&5
+echo "${as_me:-configure}:34608: testing Assume $host_os has no font-switching ..." 1>&5
 
 		;;
 	esac
 	if test -z "$SETFONT" ; then
-		{ echo "$as_me:34180: WARNING: Cannot find a font-setting program" >&5
+		{ echo "$as_me:34613: WARNING: Cannot find a font-setting program" >&5
 echo "$as_me: WARNING: Cannot find a font-setting program" >&2;}
 	elif test "$SETFONT" != unknown ; then
 
@@ -34188,7 +34621,7 @@ EOF
 	fi
 fi
 
-echo "$as_me:34191: checking if you want cgi-link support" >&5
+echo "$as_me:34624: 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.
@@ -34205,10 +34638,10 @@ EOF
 else
   enableval=no
 fi;
-echo "$as_me:34208: result: $enableval" >&5
+echo "$as_me:34641: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:34211: checking if you want change-exec support" >&5
+echo "$as_me:34644: 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.
@@ -34225,14 +34658,14 @@ else
 	use_change_exec=no
 
 fi;
-echo "$as_me:34228: result: $use_change_exec" >&5
+echo "$as_me:34661: 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:34235: checking if you want exec-links support" >&5
+echo "$as_me:34668: 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.
@@ -34249,14 +34682,14 @@ else
 	use_exec_links=$enableval
 
 fi;
-echo "$as_me:34252: result: $use_exec_links" >&5
+echo "$as_me:34685: 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:34259: checking if you want exec-scripts support" >&5
+echo "$as_me:34692: 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.
@@ -34273,14 +34706,14 @@ else
 	use_exec_scripts=$enableval
 
 fi;
-echo "$as_me:34276: result: $use_exec_scripts" >&5
+echo "$as_me:34709: 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:34283: checking if you want internal-links feature" >&5
+echo "$as_me:34716: 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.
@@ -34297,14 +34730,14 @@ else
 	use_internal_links=no
 
 fi;
-echo "$as_me:34300: result: $use_internal_links" >&5
+echo "$as_me:34733: result: $use_internal_links" >&5
 echo "${ECHO_T}$use_internal_links" >&6
 test $use_internal_links = yes &&
 cat >>confdefs.h <<\EOF
 #define TRACK_INTERNAL_LINKS 1
 EOF
 
-echo "$as_me:34307: checking if you want to fork NSL requests" >&5
+echo "$as_me:34740: 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.
@@ -34321,7 +34754,7 @@ else
 	use_nsl_fork=no
 
 fi;
-echo "$as_me:34324: result: $use_nsl_fork" >&5
+echo "$as_me:34757: result: $use_nsl_fork" >&5
 echo "${ECHO_T}$use_nsl_fork" >&6
 if test $use_nsl_fork = yes ; then
 	case $host_os in
@@ -34342,7 +34775,7 @@ EOF
 	esac
 fi
 
-echo "$as_me:34345: checking if you want to log URL requests via syslog" >&5
+echo "$as_me:34778: 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.
@@ -34359,14 +34792,14 @@ else
 	use_syslog=no
 
 fi;
-echo "$as_me:34362: result: $use_syslog" >&5
+echo "$as_me:34795: 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:34369: checking if you want to underline links" >&5
+echo "$as_me:34802: 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.
@@ -34383,7 +34816,7 @@ else
 	use_underline=no
 
 fi;
-echo "$as_me:34386: result: $use_underline" >&5
+echo "$as_me:34819: result: $use_underline" >&5
 echo "${ECHO_T}$use_underline" >&6
 test $use_underline = yes &&
 cat >>confdefs.h <<\EOF
@@ -34395,7 +34828,7 @@ cat >>confdefs.h <<\EOF
 #define UNDERLINE_LINKS 0
 EOF
 
-echo "$as_me:34398: checking if help files should be gzip'ed" >&5
+echo "$as_me:34831: 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.
@@ -34412,10 +34845,10 @@ else
 	use_gzip_help=no
 
 fi;
-echo "$as_me:34415: result: $use_gzip_help" >&5
+echo "$as_me:34848: result: $use_gzip_help" >&5
 echo "${ECHO_T}$use_gzip_help" >&6
 
-echo "$as_me:34418: checking if you want to use libbz2 for decompression of some bzip2 files" >&5
+echo "$as_me:34851: 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.
@@ -34425,7 +34858,7 @@ if test "${with_bzlib+set}" = set; then
 else
   use_bzlib=no
 fi;
-echo "$as_me:34428: result: $use_bzlib" >&5
+echo "$as_me:34861: result: $use_bzlib" >&5
 echo "${ECHO_T}$use_bzlib" >&6
 
 if test ".$use_bzlib" != ".no" ; then
@@ -34464,7 +34897,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 34467 "configure"
+#line 34900 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -34476,16 +34909,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34479: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34912: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34482: \$? = $ac_status" >&5
+  echo "$as_me:34915: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:34485: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34918: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34488: \$? = $ac_status" >&5
+  echo "$as_me:34921: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -34502,7 +34935,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}:34505: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:34938: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -34545,7 +34978,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 34548 "configure"
+#line 34981 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -34557,16 +34990,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34560: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:34993: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34563: \$? = $ac_status" >&5
+  echo "$as_me:34996: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:34566: \"$ac_try\"") >&5
+  { (eval echo "$as_me:34999: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34569: \$? = $ac_status" >&5
+  echo "$as_me:35002: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -34583,7 +35016,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}:34586: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:35019: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -34601,7 +35034,7 @@ echo "${as_me:-configure}:34586: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:34604: error: cannot find  under $use_bzlib" >&5
+{ { echo "$as_me:35037: error: cannot find  under $use_bzlib" >&5
 echo "$as_me: error: cannot find  under $use_bzlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -34626,7 +35059,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}:34629: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:35062: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -34655,7 +35088,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}:34658: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:35091: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -34664,7 +35097,7 @@ echo "${as_me:-configure}:34658: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:34667: error: cannot find  under $use_bzlib" >&5
+{ { echo "$as_me:35100: error: cannot find  under $use_bzlib" >&5
 echo "$as_me: error: cannot find  under $use_bzlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -34678,12 +35111,12 @@ esac
 cf_cv_header_path_bz2=
 cf_cv_library_path_bz2=
 
-echo "${as_me:-configure}:34681: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:35114: testing Starting FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 34686 "configure"
+#line 35119 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -34700,16 +35133,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34703: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35136: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34706: \$? = $ac_status" >&5
+  echo "$as_me:35139: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:34709: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35142: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34712: \$? = $ac_status" >&5
+  echo "$as_me:35145: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_bz2=yes
@@ -34723,7 +35156,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lbz2  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 34726 "configure"
+#line 35159 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -34740,16 +35173,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34743: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35176: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34746: \$? = $ac_status" >&5
+  echo "$as_me:35179: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:34749: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35182: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34752: \$? = $ac_status" >&5
+  echo "$as_me:35185: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_bz2=yes
@@ -34766,9 +35199,9 @@ cat conftest.$ac_ext >&5
 
 	test -n "$verbose" && echo "	find linkage for bz2 library" 1>&6
 
-echo "${as_me:-configure}:34769: testing find linkage for bz2 library ..." 1>&5
+echo "${as_me:-configure}:35202: testing find linkage for bz2 library ..." 1>&5
 
-echo "${as_me:-configure}:34771: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:35204: testing Searching for headers in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -34859,11 +35292,11 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d $cf_cv_header_path_bz2 ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_bz2" 1>&6
 
-echo "${as_me:-configure}:34862: testing ... testing $cf_cv_header_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:35295: 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 34866 "configure"
+#line 35299 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -34880,21 +35313,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:34883: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35316: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:34886: \$? = $ac_status" >&5
+  echo "$as_me:35319: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:34889: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35322: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34892: \$? = $ac_status" >&5
+  echo "$as_me:35325: \$? = $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}:34897: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:35330: testing ... found bz2 headers in $cf_cv_header_path_bz2 ..." 1>&5
 
 				cf_cv_find_linkage_bz2=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -34912,7 +35345,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	if test "$cf_cv_find_linkage_bz2" = maybe ; then
 
-echo "${as_me:-configure}:34915: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
+echo "${as_me:-configure}:35348: testing Searching for bz2 library in FIND_LINKAGE(bz2,bzlib) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -34920,7 +35353,7 @@ echo "${as_me:-configure}:34915: testing Searching for bz2 library in FIND_LINKA
 		CPPFLAGS="$cf_test_CPPFLAGS"
 		LIBS="-lbz2  $cf_save_LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 34923 "configure"
+#line 35356 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -34937,21 +35370,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:34940: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35373: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:34943: \$? = $ac_status" >&5
+  echo "$as_me:35376: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:34946: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35379: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:34949: \$? = $ac_status" >&5
+  echo "$as_me:35382: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 			test -n "$verbose" && echo "	... found bz2 library in system" 1>&6
 
-echo "${as_me:-configure}:34954: testing ... found bz2 library in system ..." 1>&5
+echo "${as_me:-configure}:35387: testing ... found bz2 library in system ..." 1>&5
 
 			cf_cv_find_linkage_bz2=yes
 else
@@ -35032,13 +35465,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}:35035: testing ... testing $cf_cv_library_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:35468: 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 35041 "configure"
+#line 35474 "configure"
 #include "confdefs.h"
 
 #include <stdio.h>
@@ -35055,21 +35488,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35058: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35491: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35061: \$? = $ac_status" >&5
+  echo "$as_me:35494: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35064: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35497: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35067: \$? = $ac_status" >&5
+  echo "$as_me:35500: \$? = $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}:35072: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5
+echo "${as_me:-configure}:35505: testing ... found bz2 library in $cf_cv_library_path_bz2 ..." 1>&5
 
 					cf_cv_find_linkage_bz2=yes
 					cf_cv_library_file_bz2="-lbz2"
@@ -35128,7 +35561,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 35131 "configure"
+#line 35564 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -35140,16 +35573,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:35143: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35576: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35146: \$? = $ac_status" >&5
+  echo "$as_me:35579: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:35149: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35582: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35152: \$? = $ac_status" >&5
+  echo "$as_me:35585: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -35166,7 +35599,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}:35169: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:35602: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -35202,7 +35635,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}:35205: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:35638: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -35227,7 +35660,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:35230: WARNING: Cannot find bz2 library" >&5
+{ echo "$as_me:35663: WARNING: Cannot find bz2 library" >&5
 echo "$as_me: WARNING: Cannot find bz2 library" >&2;}
 fi
 
@@ -35238,7 +35671,7 @@ EOF
 
 fi
 
-echo "$as_me:35241: checking if you want to use zlib for decompression of some gzip files" >&5
+echo "$as_me:35674: 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.
@@ -35248,7 +35681,7 @@ if test "${with_zlib+set}" = set; then
 else
   use_zlib=no
 fi;
-echo "$as_me:35251: result: $use_zlib" >&5
+echo "$as_me:35684: result: $use_zlib" >&5
 echo "${ECHO_T}$use_zlib" >&6
 
 if test ".$use_zlib" != ".no" ; then
@@ -35287,7 +35720,7 @@ if test -n "$cf_searchpath/include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 35290 "configure"
+#line 35723 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -35299,16 +35732,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:35302: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35735: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35305: \$? = $ac_status" >&5
+  echo "$as_me:35738: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:35308: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35741: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35311: \$? = $ac_status" >&5
+  echo "$as_me:35744: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -35325,7 +35758,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}:35328: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:35761: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -35368,7 +35801,7 @@ if test -n "$cf_searchpath/../include" ; then
 			  cf_save_CPPFLAGS=$CPPFLAGS
 			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 			  cat >conftest.$ac_ext <<_ACEOF
-#line 35371 "configure"
+#line 35804 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -35380,16 +35813,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:35383: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:35816: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35386: \$? = $ac_status" >&5
+  echo "$as_me:35819: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:35389: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35822: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35392: \$? = $ac_status" >&5
+  echo "$as_me:35825: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -35406,7 +35839,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}:35409: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:35842: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -35424,7 +35857,7 @@ echo "${as_me:-configure}:35409: testing adding $cf_add_incdir to include-path .
 fi
 
 	else
-{ { echo "$as_me:35427: error: cannot find  under $use_zlib" >&5
+{ { echo "$as_me:35860: error: cannot find  under $use_zlib" >&5
 echo "$as_me: error: cannot find  under $use_zlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -35449,7 +35882,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}:35452: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:35885: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -35478,7 +35911,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}:35481: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:35914: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -35487,7 +35920,7 @@ echo "${as_me:-configure}:35481: testing adding $cf_add_libdir to library-path .
 fi
 
 	else
-{ { echo "$as_me:35490: error: cannot find  under $use_zlib" >&5
+{ { echo "$as_me:35923: error: cannot find  under $use_zlib" >&5
 echo "$as_me: error: cannot find  under $use_zlib" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -35501,12 +35934,12 @@ esac
 cf_cv_header_path_z=
 cf_cv_library_path_z=
 
-echo "${as_me:-configure}:35504: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:35937: testing Starting FIND_LINKAGE(z,zlib) ..." 1>&5
 
 cf_save_LIBS="$LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 35509 "configure"
+#line 35942 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -35522,16 +35955,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35525: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35958: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35528: \$? = $ac_status" >&5
+  echo "$as_me:35961: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35531: \"$ac_try\"") >&5
+  { (eval echo "$as_me:35964: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35534: \$? = $ac_status" >&5
+  echo "$as_me:35967: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_z=yes
@@ -35545,7 +35978,7 @@ cat conftest.$ac_ext >&5
 LIBS="-lz  $cf_save_LIBS"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 35548 "configure"
+#line 35981 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -35561,16 +35994,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35564: \"$ac_link\"") >&5
+if { (eval echo "$as_me:35997: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35567: \$? = $ac_status" >&5
+  echo "$as_me:36000: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35570: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36003: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35573: \$? = $ac_status" >&5
+  echo "$as_me:36006: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 	cf_cv_find_linkage_z=yes
@@ -35587,9 +36020,9 @@ cat conftest.$ac_ext >&5
 
 	test -n "$verbose" && echo "	find linkage for z library" 1>&6
 
-echo "${as_me:-configure}:35590: testing find linkage for z library ..." 1>&5
+echo "${as_me:-configure}:36023: testing find linkage for z library ..." 1>&5
 
-echo "${as_me:-configure}:35592: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:36025: testing Searching for headers in FIND_LINKAGE(z,zlib) ..." 1>&5
 
 	cf_save_CPPFLAGS="$CPPFLAGS"
 	cf_test_CPPFLAGS="$CPPFLAGS"
@@ -35680,11 +36113,11 @@ cf_search="$cf_search $cf_header_path_list"
 		if test -d $cf_cv_header_path_z ; then
 			test -n "$verbose" && echo "	... testing $cf_cv_header_path_z" 1>&6
 
-echo "${as_me:-configure}:35683: testing ... testing $cf_cv_header_path_z ..." 1>&5
+echo "${as_me:-configure}:36116: 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 35687 "configure"
+#line 36120 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -35700,21 +36133,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:35703: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36136: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35706: \$? = $ac_status" >&5
+  echo "$as_me:36139: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:35709: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36142: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35712: \$? = $ac_status" >&5
+  echo "$as_me:36145: \$? = $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}:35717: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5
+echo "${as_me:-configure}:36150: testing ... found z headers in $cf_cv_header_path_z ..." 1>&5
 
 				cf_cv_find_linkage_z=maybe
 				cf_test_CPPFLAGS="$CPPFLAGS"
@@ -35732,7 +36165,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 	if test "$cf_cv_find_linkage_z" = maybe ; then
 
-echo "${as_me:-configure}:35735: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5
+echo "${as_me:-configure}:36168: testing Searching for z library in FIND_LINKAGE(z,zlib) ..." 1>&5
 
 		cf_save_LIBS="$LIBS"
 		cf_save_LDFLAGS="$LDFLAGS"
@@ -35740,7 +36173,7 @@ echo "${as_me:-configure}:35735: testing Searching for z library in FIND_LINKAGE
 		CPPFLAGS="$cf_test_CPPFLAGS"
 		LIBS="-lz  $cf_save_LIBS"
 		cat >conftest.$ac_ext <<_ACEOF
-#line 35743 "configure"
+#line 36176 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -35756,21 +36189,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35759: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36192: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35762: \$? = $ac_status" >&5
+  echo "$as_me:36195: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35765: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36198: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35768: \$? = $ac_status" >&5
+  echo "$as_me:36201: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
 
 			test -n "$verbose" && echo "	... found z library in system" 1>&6
 
-echo "${as_me:-configure}:35773: testing ... found z library in system ..." 1>&5
+echo "${as_me:-configure}:36206: testing ... found z library in system ..." 1>&5
 
 			cf_cv_find_linkage_z=yes
 else
@@ -35851,13 +36284,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}:35854: testing ... testing $cf_cv_library_path_z ..." 1>&5
+echo "${as_me:-configure}:36287: 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 35860 "configure"
+#line 36293 "configure"
 #include "confdefs.h"
 
 #include <zlib.h>
@@ -35873,21 +36306,21 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:35876: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36309: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:35879: \$? = $ac_status" >&5
+  echo "$as_me:36312: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:35882: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36315: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35885: \$? = $ac_status" >&5
+  echo "$as_me:36318: \$? = $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}:35890: testing ... found z library in $cf_cv_library_path_z ..." 1>&5
+echo "${as_me:-configure}:36323: testing ... found z library in $cf_cv_library_path_z ..." 1>&5
 
 					cf_cv_find_linkage_z=yes
 					cf_cv_library_file_z="-lz"
@@ -35946,7 +36379,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 35949 "configure"
+#line 36382 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -35958,16 +36391,16 @@ printf("Hello")
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:35961: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:36394: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:35964: \$? = $ac_status" >&5
+  echo "$as_me:36397: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:35967: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36400: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:35970: \$? = $ac_status" >&5
+  echo "$as_me:36403: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -35984,7 +36417,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}:35987: testing adding $cf_add_incdir to include-path ..." 1>&5
+echo "${as_me:-configure}:36420: testing adding $cf_add_incdir to include-path ..." 1>&5
 
 		  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
 
@@ -36020,7 +36453,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}:36023: testing adding $cf_add_libdir to library-path ..." 1>&5
+echo "${as_me:-configure}:36456: testing adding $cf_add_libdir to library-path ..." 1>&5
 
 				LDFLAGS="-L$cf_add_libdir $LDFLAGS"
 			fi
@@ -36045,7 +36478,7 @@ done
 LIBS="$cf_add_libs"
 
 else
-{ echo "$as_me:36048: WARNING: Cannot find z library" >&5
+{ echo "$as_me:36481: WARNING: Cannot find z library" >&5
 echo "$as_me: WARNING: Cannot find z library" >&2;}
 fi
 
@@ -36054,13 +36487,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:36057: checking for $ac_func" >&5
+echo "$as_me:36490: 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 36063 "configure"
+#line 36496 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -36091,16 +36524,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36094: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36527: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36097: \$? = $ac_status" >&5
+  echo "$as_me:36530: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36100: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36533: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36103: \$? = $ac_status" >&5
+  echo "$as_me:36536: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -36110,7 +36543,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:36113: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:36546: 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
@@ -36127,7 +36560,7 @@ EOF
 
 fi
 
-echo "$as_me:36130: checking if you want to exclude FINGER code" >&5
+echo "$as_me:36563: 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.
@@ -36144,14 +36577,14 @@ else
 	use_finger=no
 
 fi;
-echo "$as_me:36147: result: $use_finger" >&5
+echo "$as_me:36580: 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:36154: checking if you want to exclude GOPHER code" >&5
+echo "$as_me:36587: 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.
@@ -36168,14 +36601,14 @@ else
 	use_gopher=no
 
 fi;
-echo "$as_me:36171: result: $use_gopher" >&5
+echo "$as_me:36604: 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:36178: checking if you want to exclude NEWS code" >&5
+echo "$as_me:36611: 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.
@@ -36192,14 +36625,14 @@ else
 	use_news=no
 
 fi;
-echo "$as_me:36195: result: $use_news" >&5
+echo "$as_me:36628: 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:36202: checking if you want to exclude FTP code" >&5
+echo "$as_me:36635: 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.
@@ -36216,14 +36649,14 @@ else
 	use_ftp=no
 
 fi;
-echo "$as_me:36219: result: $use_ftp" >&5
+echo "$as_me:36652: result: $use_ftp" >&5
 echo "${ECHO_T}$use_ftp" >&6
 test $use_ftp != "no" &&
 cat >>confdefs.h <<\EOF
 #define DISABLE_FTP 1
 EOF
 
-echo "$as_me:36226: checking if you want to include WAIS code" >&5
+echo "$as_me:36659: checking if you want to include WAIS code" >&5
 echo $ECHO_N "checking if you want to include WAIS code... $ECHO_C" >&6
 
 # Check whether --enable-wais or --disable-wais was given.
@@ -36240,13 +36673,13 @@ else
 	use_wais=no
 
 fi;
-echo "$as_me:36243: result: $use_wais" >&5
+echo "$as_me:36676: result: $use_wais" >&5
 echo "${ECHO_T}$use_wais" >&6
 
 MAKE_WAIS="#"
 if test $use_wais != "no"
 then
-	echo "$as_me:36249: checking for fs_free in -lwais" >&5
+	echo "$as_me:36682: checking for fs_free in -lwais" >&5
 echo $ECHO_N "checking for fs_free in -lwais... $ECHO_C" >&6
 if test "${ac_cv_lib_wais_fs_free+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -36254,7 +36687,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lwais  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 36257 "configure"
+#line 36690 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -36273,16 +36706,16 @@ fs_free ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36276: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36709: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36279: \$? = $ac_status" >&5
+  echo "$as_me:36712: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36282: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36715: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36285: \$? = $ac_status" >&5
+  echo "$as_me:36718: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_wais_fs_free=yes
 else
@@ -36293,21 +36726,22 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:36296: result: $ac_cv_lib_wais_fs_free" >&5
+echo "$as_me:36729: result: $ac_cv_lib_wais_fs_free" >&5
 echo "${ECHO_T}$ac_cv_lib_wais_fs_free" >&6
 if test $ac_cv_lib_wais_fs_free = yes; then
 
-echo "$as_me:36300: checking if -lm needed for math functions" >&5
+echo "$as_me:36733: checking if -lm needed for math functions" >&5
 echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6
 if test "${cf_cv_need_libm+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 36307 "configure"
+#line 36740 "configure"
 #include "confdefs.h"
 
 	#include <stdio.h>
+	#include <stdlib.h>
 	#include <math.h>
 
 int
@@ -36319,16 +36753,16 @@ double x = rand(); printf("result = %g\n", sin(x))
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:36322: \"$ac_link\"") >&5
+if { (eval echo "$as_me:36756: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:36325: \$? = $ac_status" >&5
+  echo "$as_me:36759: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:36328: \"$ac_try\"") >&5
+  { (eval echo "$as_me:36762: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:36331: \$? = $ac_status" >&5
+  echo "$as_me:36765: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_libm=no
 else
@@ -36338,7 +36772,7 @@ cf_cv_need_libm=yes
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:36341: result: $cf_cv_need_libm" >&5
+echo "$as_me:36775: result: $cf_cv_need_libm" >&5
 echo "${ECHO_T}$cf_cv_need_libm" >&6
 if test "$cf_cv_need_libm" = yes
 then
@@ -36380,23 +36814,23 @@ LIBS="$cf_add_libs"
 for ac_header in wais.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:36383: checking for $ac_header" >&5
+echo "$as_me:36817: 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 36389 "configure"
+#line 36823 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:36393: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:36827: \"$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:36399: \$? = $ac_status" >&5
+  echo "$as_me:36833: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -36415,7 +36849,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:36418: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:36852: 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
@@ -36428,7 +36862,7 @@ done
 		MAKE_WAIS=
 
 else
-  { echo "$as_me:36431: WARNING: could not find WAIS library" >&5
+  { echo "$as_me:36865: WARNING: could not find WAIS library" >&5
 echo "$as_me: WARNING: could not find WAIS library" >&2;}
 fi
 
@@ -36436,7 +36870,7 @@ fi
 
 # All DirEd functions that were enabled on compilation can be disabled
 # or modified at run time via DIRED_MENU symbols in lynx.cfg.
-echo "$as_me:36439: checking if directory-editor code should be used" >&5
+echo "$as_me:36873: 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.
@@ -36453,7 +36887,7 @@ else
 	use_dired=yes
 
 fi;
-echo "$as_me:36456: result: $use_dired" >&5
+echo "$as_me:36890: result: $use_dired" >&5
 echo "${ECHO_T}$use_dired" >&6
 
 if test ".$use_dired" != ".no" ; then
@@ -36463,7 +36897,7 @@ cat >>confdefs.h <<\EOF
 #define DIRED_SUPPORT 1
 EOF
 
-	echo "$as_me:36466: checking if you wish to allow extracting from archives via DirEd" >&5
+	echo "$as_me:36900: 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.
@@ -36480,10 +36914,10 @@ EOF
 else
   enableval=yes
 fi;
-	echo "$as_me:36483: result: $enableval" >&5
+	echo "$as_me:36917: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:36486: checking if DirEd mode should override keys" >&5
+	echo "$as_me:36920: 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.
@@ -36507,10 +36941,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:36510: result: $enableval" >&5
+	echo "$as_me:36944: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:36513: checking if you wish to allow permissions commands via DirEd" >&5
+	echo "$as_me:36947: 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.
@@ -36534,10 +36968,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:36537: result: $enableval" >&5
+	echo "$as_me:36971: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:36540: checking if you wish to allow executable-permission commands via DirEd" >&5
+	echo "$as_me:36974: 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.
@@ -36554,10 +36988,10 @@ EOF
 else
   enableval=yes
 fi;
-	echo "$as_me:36557: result: $enableval" >&5
+	echo "$as_me:36991: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:36560: checking if you wish to allow \"tar\" commands from DirEd" >&5
+	echo "$as_me:36994: 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.
@@ -36581,10 +37015,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:36584: result: $enableval" >&5
+	echo "$as_me:37018: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:36587: checking if you wish to allow \"uudecode\" commands from DirEd" >&5
+	echo "$as_me:37021: 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.
@@ -36608,10 +37042,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:36611: result: $enableval" >&5
+	echo "$as_me:37045: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:36614: checking if you wish to allow \"zip\" and \"unzip\" commands from DirEd" >&5
+	echo "$as_me:37048: 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.
@@ -36635,10 +37069,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:36638: result: $enableval" >&5
+	echo "$as_me:37072: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-	echo "$as_me:36641: checking if you wish to allow \"gzip\" and \"gunzip\" commands from DirEd" >&5
+	echo "$as_me:37075: 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.
@@ -36662,11 +37096,11 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-	echo "$as_me:36665: result: $enableval" >&5
+	echo "$as_me:37099: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 fi
 
-echo "$as_me:36669: checking if you want long-directory listings" >&5
+echo "$as_me:37103: 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.
@@ -36690,10 +37124,10 @@ cat >>confdefs.h <<\EOF
 EOF
 
 fi;
-echo "$as_me:36693: result: $enableval" >&5
+echo "$as_me:37127: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
-echo "$as_me:36696: checking if parent-directory references are permitted" >&5
+echo "$as_me:37130: 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.
@@ -36710,7 +37144,7 @@ EOF
 else
   enableval=yes
 fi;
-echo "$as_me:36713: result: $enableval" >&5
+echo "$as_me:37147: result: $enableval" >&5
 echo "${ECHO_T}$enableval" >&6
 
 test -z "$TELNET" && TELNET=telnet
@@ -36718,7 +37152,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:36721: checking for $ac_word" >&5
+echo "$as_me:37155: 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
@@ -36735,7 +37169,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:36738: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37172: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -36746,10 +37180,10 @@ fi
 TELNET=$ac_cv_path_TELNET
 
 if test -n "$TELNET"; then
-  echo "$as_me:36749: result: $TELNET" >&5
+  echo "$as_me:37183: result: $TELNET" >&5
 echo "${ECHO_T}$TELNET" >&6
 else
-  echo "$as_me:36752: result: no" >&5
+  echo "$as_me:37186: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -36808,7 +37242,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:36811: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37245: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TELNET_PATH "$cf_path_prog"
@@ -36826,7 +37260,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:36829: checking for $ac_word" >&5
+echo "$as_me:37263: 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
@@ -36843,7 +37277,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:36846: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37280: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -36854,10 +37288,10 @@ fi
 TN3270=$ac_cv_path_TN3270
 
 if test -n "$TN3270"; then
-  echo "$as_me:36857: result: $TN3270" >&5
+  echo "$as_me:37291: result: $TN3270" >&5
 echo "${ECHO_T}$TN3270" >&6
 else
-  echo "$as_me:36860: result: no" >&5
+  echo "$as_me:37294: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -36916,7 +37350,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:36919: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37353: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TN3270_PATH "$cf_path_prog"
@@ -36934,7 +37368,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:36937: checking for $ac_word" >&5
+echo "$as_me:37371: 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
@@ -36951,7 +37385,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:36954: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37388: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -36962,10 +37396,10 @@ fi
 RLOGIN=$ac_cv_path_RLOGIN
 
 if test -n "$RLOGIN"; then
-  echo "$as_me:36965: result: $RLOGIN" >&5
+  echo "$as_me:37399: result: $RLOGIN" >&5
 echo "${ECHO_T}$RLOGIN" >&6
 else
-  echo "$as_me:36968: result: no" >&5
+  echo "$as_me:37402: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37024,7 +37458,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37027: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37461: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define RLOGIN_PATH "$cf_path_prog"
@@ -37042,7 +37476,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:37045: checking for $ac_word" >&5
+echo "$as_me:37479: 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
@@ -37059,7 +37493,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:37062: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37496: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37070,10 +37504,10 @@ fi
 MV=$ac_cv_path_MV
 
 if test -n "$MV"; then
-  echo "$as_me:37073: result: $MV" >&5
+  echo "$as_me:37507: result: $MV" >&5
 echo "${ECHO_T}$MV" >&6
 else
-  echo "$as_me:37076: result: no" >&5
+  echo "$as_me:37510: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37132,7 +37566,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37135: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37569: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define MV_PATH "$cf_path_prog"
@@ -37150,7 +37584,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:37153: checking for $ac_word" >&5
+echo "$as_me:37587: 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
@@ -37167,7 +37601,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:37170: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37604: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37178,10 +37612,10 @@ fi
 GZIP=$ac_cv_path_GZIP
 
 if test -n "$GZIP"; then
-  echo "$as_me:37181: result: $GZIP" >&5
+  echo "$as_me:37615: result: $GZIP" >&5
 echo "${ECHO_T}$GZIP" >&6
 else
-  echo "$as_me:37184: result: no" >&5
+  echo "$as_me:37618: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37240,7 +37674,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37243: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37677: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define GZIP_PATH "$cf_path_prog"
@@ -37258,7 +37692,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:37261: checking for $ac_word" >&5
+echo "$as_me:37695: 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
@@ -37275,7 +37709,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:37278: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37712: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37286,10 +37720,10 @@ fi
 UNCOMPRESS=$ac_cv_path_UNCOMPRESS
 
 if test -n "$UNCOMPRESS"; then
-  echo "$as_me:37289: result: $UNCOMPRESS" >&5
+  echo "$as_me:37723: result: $UNCOMPRESS" >&5
 echo "${ECHO_T}$UNCOMPRESS" >&6
 else
-  echo "$as_me:37292: result: no" >&5
+  echo "$as_me:37726: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37348,7 +37782,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37351: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37785: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define UNCOMPRESS_PATH "$cf_path_prog"
@@ -37366,7 +37800,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:37369: checking for $ac_word" >&5
+echo "$as_me:37803: 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
@@ -37383,7 +37817,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:37386: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37820: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37394,10 +37828,10 @@ fi
 UNZIP=$ac_cv_path_UNZIP
 
 if test -n "$UNZIP"; then
-  echo "$as_me:37397: result: $UNZIP" >&5
+  echo "$as_me:37831: result: $UNZIP" >&5
 echo "${ECHO_T}$UNZIP" >&6
 else
-  echo "$as_me:37400: result: no" >&5
+  echo "$as_me:37834: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37456,7 +37890,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37459: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:37893: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define UNZIP_PATH "$cf_path_prog"
@@ -37474,7 +37908,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:37477: checking for $ac_word" >&5
+echo "$as_me:37911: 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
@@ -37491,7 +37925,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:37494: found $ac_dir/$ac_word" >&5
+   echo "$as_me:37928: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37502,10 +37936,10 @@ fi
 BZIP2=$ac_cv_path_BZIP2
 
 if test -n "$BZIP2"; then
-  echo "$as_me:37505: result: $BZIP2" >&5
+  echo "$as_me:37939: result: $BZIP2" >&5
 echo "${ECHO_T}$BZIP2" >&6
 else
-  echo "$as_me:37508: result: no" >&5
+  echo "$as_me:37942: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37564,7 +37998,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37567: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:38001: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define BZIP2_PATH "$cf_path_prog"
@@ -37582,7 +38016,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:37585: checking for $ac_word" >&5
+echo "$as_me:38019: 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
@@ -37599,7 +38033,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:37602: found $ac_dir/$ac_word" >&5
+   echo "$as_me:38036: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37610,10 +38044,10 @@ fi
 TAR=$ac_cv_path_TAR
 
 if test -n "$TAR"; then
-  echo "$as_me:37613: result: $TAR" >&5
+  echo "$as_me:38047: result: $TAR" >&5
 echo "${ECHO_T}$TAR" >&6
 else
-  echo "$as_me:37616: result: no" >&5
+  echo "$as_me:38050: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37672,7 +38106,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37675: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:38109: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define TAR_PATH "$cf_path_prog"
@@ -37730,7 +38164,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:37733: checking for $ac_word" >&5
+echo "$as_me:38167: 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
@@ -37747,7 +38181,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:37750: found $ac_dir/$ac_word" >&5
+   echo "$as_me:38184: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37758,10 +38192,10 @@ fi
 COMPRESS=$ac_cv_path_COMPRESS
 
 if test -n "$COMPRESS"; then
-  echo "$as_me:37761: result: $COMPRESS" >&5
+  echo "$as_me:38195: result: $COMPRESS" >&5
 echo "${ECHO_T}$COMPRESS" >&6
 else
-  echo "$as_me:37764: result: no" >&5
+  echo "$as_me:38198: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37820,7 +38254,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37823: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:38257: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define COMPRESS_PATH "$cf_path_prog"
@@ -37838,7 +38272,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:37841: checking for $ac_word" >&5
+echo "$as_me:38275: 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
@@ -37855,7 +38289,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:37858: found $ac_dir/$ac_word" >&5
+   echo "$as_me:38292: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37866,10 +38300,10 @@ fi
 RM=$ac_cv_path_RM
 
 if test -n "$RM"; then
-  echo "$as_me:37869: result: $RM" >&5
+  echo "$as_me:38303: result: $RM" >&5
 echo "${ECHO_T}$RM" >&6
 else
-  echo "$as_me:37872: result: no" >&5
+  echo "$as_me:38306: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -37928,7 +38362,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:37931: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:38365: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define RM_PATH "$cf_path_prog"
@@ -37946,7 +38380,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:37949: checking for $ac_word" >&5
+echo "$as_me:38383: 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
@@ -37963,7 +38397,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:37966: found $ac_dir/$ac_word" >&5
+   echo "$as_me:38400: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -37974,10 +38408,10 @@ fi
 UUDECODE=$ac_cv_path_UUDECODE
 
 if test -n "$UUDECODE"; then
-  echo "$as_me:37977: result: $UUDECODE" >&5
+  echo "$as_me:38411: result: $UUDECODE" >&5
 echo "${ECHO_T}$UUDECODE" >&6
 else
-  echo "$as_me:37980: result: no" >&5
+  echo "$as_me:38414: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -38036,7 +38470,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:38039: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:38473: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define UUDECODE_PATH "$cf_path_prog"
@@ -38054,7 +38488,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:38057: checking for $ac_word" >&5
+echo "$as_me:38491: 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
@@ -38071,7 +38505,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:38074: found $ac_dir/$ac_word" >&5
+   echo "$as_me:38508: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -38082,10 +38516,10 @@ fi
 ZCAT=$ac_cv_path_ZCAT
 
 if test -n "$ZCAT"; then
-  echo "$as_me:38085: result: $ZCAT" >&5
+  echo "$as_me:38519: result: $ZCAT" >&5
 echo "${ECHO_T}$ZCAT" >&6
 else
-  echo "$as_me:38088: result: no" >&5
+  echo "$as_me:38522: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -38144,7 +38578,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:38147: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:38581: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define ZCAT_PATH "$cf_path_prog"
@@ -38162,7 +38596,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:38165: checking for $ac_word" >&5
+echo "$as_me:38599: 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
@@ -38179,7 +38613,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:38182: found $ac_dir/$ac_word" >&5
+   echo "$as_me:38616: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -38190,10 +38624,10 @@ fi
 ZIP=$ac_cv_path_ZIP
 
 if test -n "$ZIP"; then
-  echo "$as_me:38193: result: $ZIP" >&5
+  echo "$as_me:38627: result: $ZIP" >&5
 echo "${ECHO_T}$ZIP" >&6
 else
-  echo "$as_me:38196: result: no" >&5
+  echo "$as_me:38630: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -38252,7 +38686,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:38255: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:38689: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define ZIP_PATH "$cf_path_prog"
@@ -38280,7 +38714,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:38283: checking for $ac_word" >&5
+echo "$as_me:38717: 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
@@ -38297,7 +38731,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:38300: found $ac_dir/$ac_word" >&5
+   echo "$as_me:38734: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -38308,10 +38742,10 @@ fi
 INSTALL=$ac_cv_path_INSTALL
 
 if test -n "$INSTALL"; then
-  echo "$as_me:38311: result: $INSTALL" >&5
+  echo "$as_me:38745: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 else
-  echo "$as_me:38314: result: no" >&5
+  echo "$as_me:38748: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -38370,7 +38804,7 @@ IFS="$cf_save_ifs"
 
 if test -n "$cf_path_prog" ; then
 
-echo "${as_me:-configure}:38373: testing defining path for ${cf_path_prog} ..." 1>&5
+echo "${as_me:-configure}:38807: testing defining path for ${cf_path_prog} ..." 1>&5
 
 cat >>confdefs.h <<EOF
 #define INSTALL_PATH "$cf_path_prog"
@@ -38400,7 +38834,7 @@ if test $cf_cv_screen = pdcurses ; then
 	case $host_os in
 	(mingw*)
 
-echo "$as_me:38403: checking for initscr in -lpdcurses" >&5
+echo "$as_me:38837: checking for initscr in -lpdcurses" >&5
 echo $ECHO_N "checking for initscr in -lpdcurses... $ECHO_C" >&6
 if test "${ac_cv_lib_pdcurses_initscr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -38408,7 +38842,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpdcurses  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 38411 "configure"
+#line 38845 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -38427,16 +38861,16 @@ initscr ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38430: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38864: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38433: \$? = $ac_status" >&5
+  echo "$as_me:38867: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38436: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38870: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38439: \$? = $ac_status" >&5
+  echo "$as_me:38873: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_pdcurses_initscr=yes
 else
@@ -38447,7 +38881,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:38450: result: $ac_cv_lib_pdcurses_initscr" >&5
+echo "$as_me:38884: result: $ac_cv_lib_pdcurses_initscr" >&5
 echo "${ECHO_T}$ac_cv_lib_pdcurses_initscr" >&6
 if test $ac_cv_lib_pdcurses_initscr = yes; then
 
@@ -38469,13 +38903,13 @@ LIBS="$cf_add_libs"
 
 	cf_cv_term_header=no
 	cf_cv_unctrl_header=no
-	echo "$as_me:38472: checking for winwstr" >&5
+	echo "$as_me:38906: checking for winwstr" >&5
 echo $ECHO_N "checking for winwstr... $ECHO_C" >&6
 if test "${ac_cv_func_winwstr+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 38478 "configure"
+#line 38912 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char winwstr (); below.  */
@@ -38506,16 +38940,16 @@ f = winwstr; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38509: \"$ac_link\"") >&5
+if { (eval echo "$as_me:38943: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38512: \$? = $ac_status" >&5
+  echo "$as_me:38946: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38515: \"$ac_try\"") >&5
+  { (eval echo "$as_me:38949: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38518: \$? = $ac_status" >&5
+  echo "$as_me:38952: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_winwstr=yes
 else
@@ -38525,7 +38959,7 @@ ac_cv_func_winwstr=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:38528: result: $ac_cv_func_winwstr" >&5
+echo "$as_me:38962: result: $ac_cv_func_winwstr" >&5
 echo "${ECHO_T}$ac_cv_func_winwstr" >&6
 if test $ac_cv_func_winwstr = yes; then
   cat >>confdefs.h <<\EOF
@@ -38534,13 +38968,13 @@ EOF
 
 fi
 
-	echo "$as_me:38537: checking for pdcurses_dll_iname" >&5
+	echo "$as_me:38971: checking for pdcurses_dll_iname" >&5
 echo $ECHO_N "checking for pdcurses_dll_iname... $ECHO_C" >&6
 if test "${ac_cv_func_pdcurses_dll_iname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 38543 "configure"
+#line 38977 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char pdcurses_dll_iname (); below.  */
@@ -38571,16 +39005,16 @@ f = pdcurses_dll_iname; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38574: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39008: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38577: \$? = $ac_status" >&5
+  echo "$as_me:39011: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38580: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39014: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38583: \$? = $ac_status" >&5
+  echo "$as_me:39017: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_pdcurses_dll_iname=yes
 else
@@ -38590,7 +39024,7 @@ ac_cv_func_pdcurses_dll_iname=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:38593: result: $ac_cv_func_pdcurses_dll_iname" >&5
+echo "$as_me:39027: result: $ac_cv_func_pdcurses_dll_iname" >&5
 echo "${ECHO_T}$ac_cv_func_pdcurses_dll_iname" >&6
 if test $ac_cv_func_pdcurses_dll_iname = yes; then
   cat >>confdefs.h <<\EOF
@@ -38603,7 +39037,7 @@ fi
 
 		;;
 	(*)
-		echo "$as_me:38606: checking for X" >&5
+		echo "$as_me:39040: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -38700,17 +39134,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 38703 "configure"
+#line 39137 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:38707: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:39141: \"$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:38713: \$? = $ac_status" >&5
+  echo "$as_me:39147: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -38743,7 +39177,7 @@ if test "$ac_x_libraries" = no; then
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >conftest.$ac_ext <<_ACEOF
-#line 38746 "configure"
+#line 39180 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -38755,16 +39189,16 @@ XtMalloc (0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38758: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39192: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38761: \$? = $ac_status" >&5
+  echo "$as_me:39195: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38764: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39198: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38767: \$? = $ac_status" >&5
+  echo "$as_me:39201: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -38802,7 +39236,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:38805: result: $have_x" >&5
+  echo "$as_me:39239: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -38812,7 +39246,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:38815: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:39249: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -38836,11 +39270,11 @@ else
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:38839: checking whether -R must be followed by a space" >&5
+      echo "$as_me:39273: 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 38843 "configure"
+#line 39277 "configure"
 #include "confdefs.h"
 
 int
@@ -38852,16 +39286,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38855: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39289: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38858: \$? = $ac_status" >&5
+  echo "$as_me:39292: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38861: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39295: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38864: \$? = $ac_status" >&5
+  echo "$as_me:39298: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_nospace=yes
 else
@@ -38871,13 +39305,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:38874: result: no" >&5
+	echo "$as_me:39308: 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 38880 "configure"
+#line 39314 "configure"
 #include "confdefs.h"
 
 int
@@ -38889,16 +39323,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38892: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39326: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38895: \$? = $ac_status" >&5
+  echo "$as_me:39329: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38898: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39332: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38901: \$? = $ac_status" >&5
+  echo "$as_me:39335: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_space=yes
 else
@@ -38908,11 +39342,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:38911: result: yes" >&5
+	  echo "$as_me:39345: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:38915: result: neither works" >&5
+	  echo "$as_me:39349: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -38932,7 +39366,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 38935 "configure"
+#line 39369 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -38951,22 +39385,22 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38954: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39388: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38957: \$? = $ac_status" >&5
+  echo "$as_me:39391: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:38960: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39394: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:38963: \$? = $ac_status" >&5
+  echo "$as_me:39397: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:38969: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:39403: 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
@@ -38974,7 +39408,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 38977 "configure"
+#line 39411 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -38993,16 +39427,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:38996: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39430: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:38999: \$? = $ac_status" >&5
+  echo "$as_me:39433: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39002: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39436: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39005: \$? = $ac_status" >&5
+  echo "$as_me:39439: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -39013,14 +39447,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:39016: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:39450: 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:39023: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:39457: 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
@@ -39028,7 +39462,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 39031 "configure"
+#line 39465 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -39047,16 +39481,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39050: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39484: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39053: \$? = $ac_status" >&5
+  echo "$as_me:39487: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39056: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39490: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39059: \$? = $ac_status" >&5
+  echo "$as_me:39493: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -39067,7 +39501,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:39070: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:39504: 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"
@@ -39086,13 +39520,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:39089: checking for gethostbyname" >&5
+    echo "$as_me:39523: 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 39095 "configure"
+#line 39529 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname (); below.  */
@@ -39123,16 +39557,16 @@ f = gethostbyname; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39126: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39560: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39129: \$? = $ac_status" >&5
+  echo "$as_me:39563: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39132: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39566: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39135: \$? = $ac_status" >&5
+  echo "$as_me:39569: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -39142,11 +39576,11 @@ ac_cv_func_gethostbyname=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:39145: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:39579: 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:39149: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:39583: 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
@@ -39154,7 +39588,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 39157 "configure"
+#line 39591 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -39173,16 +39607,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39176: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39610: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39179: \$? = $ac_status" >&5
+  echo "$as_me:39613: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39182: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39616: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39185: \$? = $ac_status" >&5
+  echo "$as_me:39619: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -39193,14 +39627,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:39196: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:39630: 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:39203: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:39637: 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
@@ -39208,7 +39642,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 39211 "configure"
+#line 39645 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -39227,16 +39661,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39230: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39664: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39233: \$? = $ac_status" >&5
+  echo "$as_me:39667: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39236: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39670: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39239: \$? = $ac_status" >&5
+  echo "$as_me:39673: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -39247,7 +39681,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:39250: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:39684: 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"
@@ -39263,13 +39697,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:39266: checking for connect" >&5
+    echo "$as_me:39700: 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 39272 "configure"
+#line 39706 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect (); below.  */
@@ -39300,16 +39734,16 @@ f = connect; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39303: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39737: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39306: \$? = $ac_status" >&5
+  echo "$as_me:39740: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39309: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39743: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39312: \$? = $ac_status" >&5
+  echo "$as_me:39746: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_connect=yes
 else
@@ -39319,11 +39753,11 @@ ac_cv_func_connect=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:39322: result: $ac_cv_func_connect" >&5
+echo "$as_me:39756: 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:39326: checking for connect in -lsocket" >&5
+      echo "$as_me:39760: 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
@@ -39331,7 +39765,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 39334 "configure"
+#line 39768 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -39350,16 +39784,16 @@ connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39353: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39787: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39356: \$? = $ac_status" >&5
+  echo "$as_me:39790: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39359: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39793: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39362: \$? = $ac_status" >&5
+  echo "$as_me:39796: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -39370,7 +39804,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:39373: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:39807: 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"
@@ -39379,13 +39813,13 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:39382: checking for remove" >&5
+    echo "$as_me:39816: 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 39388 "configure"
+#line 39822 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove (); below.  */
@@ -39416,16 +39850,16 @@ f = remove; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39419: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39853: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39422: \$? = $ac_status" >&5
+  echo "$as_me:39856: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39425: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39859: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39428: \$? = $ac_status" >&5
+  echo "$as_me:39862: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_remove=yes
 else
@@ -39435,11 +39869,11 @@ ac_cv_func_remove=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:39438: result: $ac_cv_func_remove" >&5
+echo "$as_me:39872: 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:39442: checking for remove in -lposix" >&5
+      echo "$as_me:39876: 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
@@ -39447,7 +39881,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 39450 "configure"
+#line 39884 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -39466,16 +39900,16 @@ remove ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39469: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39903: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39472: \$? = $ac_status" >&5
+  echo "$as_me:39906: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39475: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39909: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39478: \$? = $ac_status" >&5
+  echo "$as_me:39912: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -39486,7 +39920,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:39489: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:39923: 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"
@@ -39495,13 +39929,13 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:39498: checking for shmat" >&5
+    echo "$as_me:39932: 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 39504 "configure"
+#line 39938 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat (); below.  */
@@ -39532,16 +39966,16 @@ f = shmat; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39535: \"$ac_link\"") >&5
+if { (eval echo "$as_me:39969: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39538: \$? = $ac_status" >&5
+  echo "$as_me:39972: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39541: \"$ac_try\"") >&5
+  { (eval echo "$as_me:39975: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39544: \$? = $ac_status" >&5
+  echo "$as_me:39978: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -39551,11 +39985,11 @@ ac_cv_func_shmat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:39554: result: $ac_cv_func_shmat" >&5
+echo "$as_me:39988: 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:39558: checking for shmat in -lipc" >&5
+      echo "$as_me:39992: 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
@@ -39563,7 +39997,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 39566 "configure"
+#line 40000 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -39582,16 +40016,16 @@ shmat ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39585: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40019: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39588: \$? = $ac_status" >&5
+  echo "$as_me:40022: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39591: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40025: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39594: \$? = $ac_status" >&5
+  echo "$as_me:40028: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -39602,7 +40036,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:39605: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:40039: 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"
@@ -39620,7 +40054,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:39623: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:40057: 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
@@ -39628,7 +40062,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 39631 "configure"
+#line 40065 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -39647,16 +40081,16 @@ IceConnectionNumber ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39650: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40084: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39653: \$? = $ac_status" >&5
+  echo "$as_me:40087: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39656: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40090: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39659: \$? = $ac_status" >&5
+  echo "$as_me:40093: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -39667,7 +40101,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:39670: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:40104: 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"
@@ -39679,7 +40113,7 @@ fi
 
 cf_x_athena=${cf_x_athena:-Xaw}
 
-echo "$as_me:39682: checking if you want to link with Xaw 3d library" >&5
+echo "$as_me:40116: 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=
 
@@ -39690,14 +40124,14 @@ if test "${with_Xaw3d+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3d
-	echo "$as_me:39693: result: yes" >&5
+	echo "$as_me:40127: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:39696: result: no" >&5
+	echo "$as_me:40130: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:39700: checking if you want to link with Xaw 3d xft library" >&5
+echo "$as_me:40134: checking if you want to link with Xaw 3d xft library" >&5
 echo $ECHO_N "checking if you want to link with Xaw 3d xft library... $ECHO_C" >&6
 withval=
 
@@ -39708,14 +40142,14 @@ if test "${with_Xaw3dxft+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=Xaw3dxft
-	echo "$as_me:39711: result: yes" >&5
+	echo "$as_me:40145: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:39714: result: no" >&5
+	echo "$as_me:40148: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:39718: checking if you want to link with neXT Athena library" >&5
+echo "$as_me:40152: 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=
 
@@ -39726,14 +40160,14 @@ if test "${with_neXtaw+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=neXtaw
-	echo "$as_me:39729: result: yes" >&5
+	echo "$as_me:40163: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:39732: result: no" >&5
+	echo "$as_me:40166: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:39736: checking if you want to link with Athena-Plus library" >&5
+echo "$as_me:40170: 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=
 
@@ -39744,10 +40178,10 @@ if test "${with_XawPlus+set}" = set; then
 fi;
 if test "$withval" = yes ; then
 	cf_x_athena=XawPlus
-	echo "$as_me:39747: result: yes" >&5
+	echo "$as_me:40181: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-	echo "$as_me:39750: result: no" >&5
+	echo "$as_me:40184: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -39767,17 +40201,17 @@ if test "$PKG_CONFIG" != none ; then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists $cf_athena_pkg; then
 	test -n "$verbose" && echo "	found package $cf_athena_pkg" 1>&6
 
-echo "${as_me:-configure}:39770: testing found package $cf_athena_pkg ..." 1>&5
+echo "${as_me:-configure}:40204: testing found package $cf_athena_pkg ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags $cf_athena_pkg 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   $cf_athena_pkg 2>/dev/null`"
 	test -n "$verbose" && echo "	package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:39776: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:40210: testing package $cf_athena_pkg CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package $cf_athena_pkg LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:39780: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:40214: testing package $cf_athena_pkg LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -39799,10 +40233,16 @@ case $cf_fix_cppflags in
 				&& cf_fix_cppflags=yes
 
 			if test $cf_fix_cppflags = yes ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			elif test "${cf_tst_cflags}" = "\"'" ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			fi
 			;;
@@ -39821,17 +40261,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
 				;;
 			esac
-			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+	cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+
 			;;
 		esac
 		;;
 	(*)
-		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+	test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+	cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+
 		;;
 	esac
 	;;
 (yes)
-	cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
@@ -39844,17 +40292,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
-	CFLAGS="$CFLAGS $cf_new_cflags"
+	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+	CFLAGS="${CFLAGS}$cf_new_cflags"
+
 fi
 
 if test -n "$cf_new_cppflags" ; then
 
-	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
-	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+
 fi
 
 cf_add_libs="$cf_pkgconfig_libs"
@@ -39888,20 +40342,20 @@ EOF
 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
 
-echo "${as_me:-configure}:39891: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:40345: testing ..trimmed $LIBS ..." 1>&5
 
 			;;
 		esac
 	done
 
-echo "$as_me:39897: checking for usable $cf_x_athena/Xmu package" >&5
+echo "$as_me:40351: checking for usable $cf_x_athena/Xmu package" >&5
 echo $ECHO_N "checking for usable $cf_x_athena/Xmu package... $ECHO_C" >&6
 if test "${cf_cv_xaw_compat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 39904 "configure"
+#line 40358 "configure"
 #include "confdefs.h"
 
 #include <X11/Xmu/CharSet.h>
@@ -39917,16 +40371,16 @@ int check = XmuCompareISOLatin1("big", "small")
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:39920: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40374: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:39923: \$? = $ac_status" >&5
+  echo "$as_me:40377: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:39926: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40380: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:39929: \$? = $ac_status" >&5
+  echo "$as_me:40383: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xaw_compat=yes
 else
@@ -39936,7 +40390,7 @@ cf_cv_xaw_compat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:39939: result: $cf_cv_xaw_compat" >&5
+echo "$as_me:40393: result: $cf_cv_xaw_compat" >&5
 echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 
 			if test "$cf_cv_xaw_compat" = no
@@ -39948,7 +40402,7 @@ echo "${ECHO_T}$cf_cv_xaw_compat" >&6
 				(*)
 					test -n "$verbose" && echo "	work around broken package" 1>&6
 
-echo "${as_me:-configure}:39951: testing work around broken package ..." 1>&5
+echo "${as_me:-configure}:40405: testing work around broken package ..." 1>&5
 
 					cf_save_xmu="$LIBS"
 					cf_first_lib=`echo "$cf_save_xmu" | sed -e 's/^  *//' -e 's/ .*//'`
@@ -39956,17 +40410,17 @@ echo "${as_me:-configure}:39951: testing work around broken package ..." 1>&5
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xmu; then
 	test -n "$verbose" && echo "	found package xmu" 1>&6
 
-echo "${as_me:-configure}:39959: testing found package xmu ..." 1>&5
+echo "${as_me:-configure}:40413: testing found package xmu ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags xmu 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   xmu 2>/dev/null`"
 	test -n "$verbose" && echo "	package xmu CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:39965: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:40419: testing package xmu CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package xmu LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:39969: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:40423: testing package xmu LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -39988,10 +40442,16 @@ case $cf_fix_cppflags in
 				&& cf_fix_cppflags=yes
 
 			if test $cf_fix_cppflags = yes ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			elif test "${cf_tst_cflags}" = "\"'" ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			fi
 			;;
@@ -40010,17 +40470,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
 				;;
 			esac
-			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+	cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+
 			;;
 		esac
 		;;
 	(*)
-		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+	test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+	cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+
 		;;
 	esac
 	;;
 (yes)
-	cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
@@ -40033,17 +40501,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
-	CFLAGS="$CFLAGS $cf_new_cflags"
+	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+	CFLAGS="${CFLAGS}$cf_new_cflags"
+
 fi
 
 if test -n "$cf_new_cppflags" ; then
 
-	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
-	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+
 fi
 
 cf_add_libs="$cf_pkgconfig_libs"
@@ -40066,12 +40540,12 @@ LIBS="$cf_add_libs"
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:40069: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:40543: testing ...before $LIBS ..." 1>&5
 
 LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%$cf_first_lib %$cf_first_lib $cf_pkgconfig_libs %" -e 's%  % %g'`
 test -n "$verbose" && echo "	...after  $LIBS" 1>&6
 
-echo "${as_me:-configure}:40074: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:40548: testing ...after  $LIBS ..." 1>&5
 
 else
 	cf_pkgconfig_incs=
@@ -40079,12 +40553,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:40082: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:40556: testing ...before $LIBS ..." 1>&5
 
 LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%$cf_first_lib %$cf_first_lib -lXmu %" -e 's%  % %g'`
 test -n "$verbose" && echo "	...after  $LIBS" 1>&6
 
-echo "${as_me:-configure}:40087: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:40561: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -40095,7 +40569,7 @@ fi
 			LIBS=`echo "$LIBS " | sed -e 's/  / /g' -e 's%-l'"$cf_trim_lib"' %%' -e 's/ $//'`
 			test -n "$verbose" && echo "	..trimmed $LIBS" 1>&6
 
-echo "${as_me:-configure}:40098: testing ..trimmed $LIBS ..." 1>&5
+echo "${as_me:-configure}:40572: testing ..trimmed $LIBS ..." 1>&5
 
 			;;
 		esac
@@ -40120,17 +40594,17 @@ if test -z "$cf_x_athena_lib" ; then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists Xext; then
 	test -n "$verbose" && echo "	found package Xext" 1>&6
 
-echo "${as_me:-configure}:40123: testing found package Xext ..." 1>&5
+echo "${as_me:-configure}:40597: testing found package Xext ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags Xext 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   Xext 2>/dev/null`"
 	test -n "$verbose" && echo "	package Xext CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:40129: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:40603: testing package Xext CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package Xext LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:40133: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:40607: testing package Xext LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -40152,10 +40626,16 @@ case $cf_fix_cppflags in
 				&& cf_fix_cppflags=yes
 
 			if test $cf_fix_cppflags = yes ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			elif test "${cf_tst_cflags}" = "\"'" ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			fi
 			;;
@@ -40174,17 +40654,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
 				;;
 			esac
-			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+	cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+
 			;;
 		esac
 		;;
 	(*)
-		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+	test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+	cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+
 		;;
 	esac
 	;;
 (yes)
-	cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
@@ -40197,17 +40685,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
-	CFLAGS="$CFLAGS $cf_new_cflags"
+	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+	CFLAGS="${CFLAGS}$cf_new_cflags"
+
 fi
 
 if test -n "$cf_new_cppflags" ; then
 
-	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
-	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+
 fi
 
 cf_add_libs="$cf_pkgconfig_libs"
@@ -40231,7 +40725,7 @@ else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
 
-	echo "$as_me:40234: checking for XextCreateExtension in -lXext" >&5
+	echo "$as_me:40728: 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
@@ -40239,7 +40733,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 40242 "configure"
+#line 40736 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -40258,16 +40752,16 @@ XextCreateExtension ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40261: \"$ac_link\"") >&5
+if { (eval echo "$as_me:40755: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40264: \$? = $ac_status" >&5
+  echo "$as_me:40758: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40267: \"$ac_try\"") >&5
+  { (eval echo "$as_me:40761: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40270: \$? = $ac_status" >&5
+  echo "$as_me:40764: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xext_XextCreateExtension=yes
 else
@@ -40278,7 +40772,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:40281: result: $ac_cv_lib_Xext_XextCreateExtension" >&5
+echo "$as_me:40775: 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
 
@@ -40314,17 +40808,17 @@ then
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then
 	test -n "$verbose" && echo "	found package x11" 1>&6
 
-echo "${as_me:-configure}:40317: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:40811: testing found package x11 ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags x11 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   x11 2>/dev/null`"
 	test -n "$verbose" && echo "	package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:40323: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:40817: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package x11 LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:40327: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:40821: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -40346,10 +40840,16 @@ case $cf_fix_cppflags in
 				&& cf_fix_cppflags=yes
 
 			if test $cf_fix_cppflags = yes ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			elif test "${cf_tst_cflags}" = "\"'" ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			fi
 			;;
@@ -40368,17 +40868,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
 				;;
 			esac
-			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+	cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+
 			;;
 		esac
 		;;
 	(*)
-		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+	test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+	cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+
 		;;
 	esac
 	;;
 (yes)
-	cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
@@ -40391,17 +40899,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
-	CFLAGS="$CFLAGS $cf_new_cflags"
+	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+	CFLAGS="${CFLAGS}$cf_new_cflags"
+
 fi
 
 if test -n "$cf_new_cppflags" ; then
 
-	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
-	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+
 fi
 
 cf_add_libs="$cf_pkgconfig_libs"
@@ -40424,24 +40938,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:40427: WARNING: unable to find X11 library" >&5
+	{ echo "$as_me:40941: WARNING: unable to find X11 library" >&5
 echo "$as_me: WARNING: unable to find X11 library" >&2;}
 fi
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then
 	test -n "$verbose" && echo "	found package ice" 1>&6
 
-echo "${as_me:-configure}:40434: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:40948: testing found package ice ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags ice 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   ice 2>/dev/null`"
 	test -n "$verbose" && echo "	package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:40440: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:40954: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package ice LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:40444: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:40958: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -40463,10 +40977,16 @@ case $cf_fix_cppflags in
 				&& cf_fix_cppflags=yes
 
 			if test $cf_fix_cppflags = yes ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			elif test "${cf_tst_cflags}" = "\"'" ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			fi
 			;;
@@ -40485,17 +41005,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
 				;;
 			esac
-			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+	cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+
 			;;
 		esac
 		;;
 	(*)
-		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+	test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+	cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+
 		;;
 	esac
 	;;
 (yes)
-	cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
@@ -40508,17 +41036,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
-	CFLAGS="$CFLAGS $cf_new_cflags"
+	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+	CFLAGS="${CFLAGS}$cf_new_cflags"
+
 fi
 
 if test -n "$cf_new_cppflags" ; then
 
-	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
-	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+
 fi
 
 cf_add_libs="$cf_pkgconfig_libs"
@@ -40541,24 +41075,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:40544: WARNING: unable to find ICE library" >&5
+	{ echo "$as_me:41078: WARNING: unable to find ICE library" >&5
 echo "$as_me: WARNING: unable to find ICE library" >&2;}
 fi
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then
 	test -n "$verbose" && echo "	found package sm" 1>&6
 
-echo "${as_me:-configure}:40551: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:41085: testing found package sm ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags sm 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   sm 2>/dev/null`"
 	test -n "$verbose" && echo "	package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:40557: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:41091: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package sm LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:40561: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:41095: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -40580,10 +41114,16 @@ case $cf_fix_cppflags in
 				&& cf_fix_cppflags=yes
 
 			if test $cf_fix_cppflags = yes ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			elif test "${cf_tst_cflags}" = "\"'" ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			fi
 			;;
@@ -40602,17 +41142,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
 				;;
 			esac
-			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+	cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+
 			;;
 		esac
 		;;
 	(*)
-		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+	test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+	cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+
 		;;
 	esac
 	;;
 (yes)
-	cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
@@ -40625,17 +41173,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
-	CFLAGS="$CFLAGS $cf_new_cflags"
+	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+	CFLAGS="${CFLAGS}$cf_new_cflags"
+
 fi
 
 if test -n "$cf_new_cppflags" ; then
 
-	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
-	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+
 fi
 
 cf_add_libs="$cf_pkgconfig_libs"
@@ -40658,24 +41212,24 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:40661: WARNING: unable to find SM library" >&5
+	{ echo "$as_me:41215: WARNING: unable to find SM library" >&5
 echo "$as_me: WARNING: unable to find SM library" >&2;}
 fi
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then
 	test -n "$verbose" && echo "	found package xt" 1>&6
 
-echo "${as_me:-configure}:40668: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:41222: testing found package xt ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags xt 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   xt 2>/dev/null`"
 	test -n "$verbose" && echo "	package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:40674: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:41228: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package xt LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:40678: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:41232: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -40697,10 +41251,16 @@ case $cf_fix_cppflags in
 				&& cf_fix_cppflags=yes
 
 			if test $cf_fix_cppflags = yes ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			elif test "${cf_tst_cflags}" = "\"'" ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			fi
 			;;
@@ -40719,17 +41279,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
 				;;
 			esac
-			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+	cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+
 			;;
 		esac
 		;;
 	(*)
-		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+	test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+	cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+
 		;;
 	esac
 	;;
 (yes)
-	cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
@@ -40742,17 +41310,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
-	CFLAGS="$CFLAGS $cf_new_cflags"
+	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+	CFLAGS="${CFLAGS}$cf_new_cflags"
+
 fi
 
 if test -n "$cf_new_cppflags" ; then
 
-	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
-	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+
 fi
 
 cf_add_libs="$cf_pkgconfig_libs"
@@ -40775,7 +41349,7 @@ LIBS="$cf_add_libs"
 else
 	cf_pkgconfig_incs=
 	cf_pkgconfig_libs=
-	{ echo "$as_me:40778: WARNING: unable to find Xt library" >&5
+	{ echo "$as_me:41352: WARNING: unable to find Xt library" >&5
 echo "$as_me: WARNING: unable to find Xt library" >&2;}
 fi
 
@@ -40786,17 +41360,17 @@ cf_have_X_LIBS=no
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists xt; then
 	test -n "$verbose" && echo "	found package xt" 1>&6
 
-echo "${as_me:-configure}:40789: testing found package xt ..." 1>&5
+echo "${as_me:-configure}:41363: testing found package xt ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags xt 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   xt 2>/dev/null`"
 	test -n "$verbose" && echo "	package xt CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:40795: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:41369: testing package xt CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package xt LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:40799: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:41373: testing package xt LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -40818,10 +41392,16 @@ case $cf_fix_cppflags in
 				&& cf_fix_cppflags=yes
 
 			if test $cf_fix_cppflags = yes ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			elif test "${cf_tst_cflags}" = "\"'" ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			fi
 			;;
@@ -40840,17 +41420,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
 				;;
 			esac
-			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+	cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+
 			;;
 		esac
 		;;
 	(*)
-		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+	test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+	cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+
 		;;
 	esac
 	;;
 (yes)
-	cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
@@ -40863,17 +41451,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
-	CFLAGS="$CFLAGS $cf_new_cflags"
+	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+	CFLAGS="${CFLAGS}$cf_new_cflags"
+
 fi
 
 if test -n "$cf_new_cppflags" ; then
 
-	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
-	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+
 fi
 
 cf_add_libs="$cf_pkgconfig_libs"
@@ -40897,14 +41491,14 @@ LIBS="$cf_add_libs"
 		;;
 	(*)
 # we have an "xt" package, but it may omit Xt's dependency on X11
-echo "$as_me:40900: checking for usable X dependency" >&5
+echo "$as_me:41494: checking for usable X dependency" >&5
 echo $ECHO_N "checking for usable X dependency... $ECHO_C" >&6
 if test "${cf_cv_xt_x11_compat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 40907 "configure"
+#line 41501 "configure"
 #include "confdefs.h"
 
 #include <X11/Xlib.h>
@@ -40923,16 +41517,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:40926: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41520: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:40929: \$? = $ac_status" >&5
+  echo "$as_me:41523: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:40932: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41526: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:40935: \$? = $ac_status" >&5
+  echo "$as_me:41529: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xt_x11_compat=yes
 else
@@ -40942,30 +41536,30 @@ cf_cv_xt_x11_compat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:40945: result: $cf_cv_xt_x11_compat" >&5
+echo "$as_me:41539: result: $cf_cv_xt_x11_compat" >&5
 echo "${ECHO_T}$cf_cv_xt_x11_compat" >&6
 		if test "$cf_cv_xt_x11_compat" = no
 		then
 			test -n "$verbose" && echo "	work around broken X11 dependency" 1>&6
 
-echo "${as_me:-configure}:40951: testing work around broken X11 dependency ..." 1>&5
+echo "${as_me:-configure}:41545: testing work around broken X11 dependency ..." 1>&5
 
 			# 2010/11/19 - good enough until a working Xt on Xcb is delivered.
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists x11; then
 	test -n "$verbose" && echo "	found package x11" 1>&6
 
-echo "${as_me:-configure}:40958: testing found package x11 ..." 1>&5
+echo "${as_me:-configure}:41552: testing found package x11 ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags x11 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   x11 2>/dev/null`"
 	test -n "$verbose" && echo "	package x11 CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:40964: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:41558: testing package x11 CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package x11 LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:40968: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:41562: testing package x11 LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -40987,10 +41581,16 @@ case $cf_fix_cppflags in
 				&& cf_fix_cppflags=yes
 
 			if test $cf_fix_cppflags = yes ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			elif test "${cf_tst_cflags}" = "\"'" ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			fi
 			;;
@@ -41009,17 +41609,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
 				;;
 			esac
-			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+	cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+
 			;;
 		esac
 		;;
 	(*)
-		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+	test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+	cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+
 		;;
 	esac
 	;;
 (yes)
-	cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
@@ -41032,17 +41640,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
-	CFLAGS="$CFLAGS $cf_new_cflags"
+	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+	CFLAGS="${CFLAGS}$cf_new_cflags"
+
 fi
 
 if test -n "$cf_new_cppflags" ; then
 
-	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
-	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+
 fi
 
 cf_add_libs="$cf_pkgconfig_libs"
@@ -41068,12 +41682,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:41071: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:41685: testing ...before $LIBS ..." 1>&5
 
 LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%-lXt %-lXt -lX11 %" -e 's%  % %g'`
 test -n "$verbose" && echo "	...after  $LIBS" 1>&6
 
-echo "${as_me:-configure}:41076: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:41690: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -41081,14 +41695,14 @@ fi
 		;;
 	esac
 
-echo "$as_me:41084: checking for usable X Toolkit package" >&5
+echo "$as_me:41698: checking for usable X Toolkit package" >&5
 echo $ECHO_N "checking for usable X Toolkit package... $ECHO_C" >&6
 if test "${cf_cv_xt_ice_compat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 41091 "configure"
+#line 41705 "configure"
 #include "confdefs.h"
 
 #include <X11/Shell.h>
@@ -41103,16 +41717,16 @@ int num = IceConnectionNumber(0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:41106: \"$ac_link\"") >&5
+if { (eval echo "$as_me:41720: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41109: \$? = $ac_status" >&5
+  echo "$as_me:41723: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:41112: \"$ac_try\"") >&5
+  { (eval echo "$as_me:41726: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41115: \$? = $ac_status" >&5
+  echo "$as_me:41729: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_xt_ice_compat=yes
 else
@@ -41122,7 +41736,7 @@ cf_cv_xt_ice_compat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:41125: result: $cf_cv_xt_ice_compat" >&5
+echo "$as_me:41739: result: $cf_cv_xt_ice_compat" >&5
 echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
 
 	if test "$cf_cv_xt_ice_compat" = no
@@ -41136,22 +41750,22 @@ echo "${ECHO_T}$cf_cv_xt_ice_compat" >&6
 			(*)
 				test -n "$verbose" && echo "	work around broken ICE dependency" 1>&6
 
-echo "${as_me:-configure}:41139: testing work around broken ICE dependency ..." 1>&5
+echo "${as_me:-configure}:41753: testing work around broken ICE dependency ..." 1>&5
 
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists ice; then
 	test -n "$verbose" && echo "	found package ice" 1>&6
 
-echo "${as_me:-configure}:41144: testing found package ice ..." 1>&5
+echo "${as_me:-configure}:41758: testing found package ice ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags ice 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   ice 2>/dev/null`"
 	test -n "$verbose" && echo "	package ice CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:41150: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:41764: testing package ice CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package ice LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:41154: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:41768: testing package ice LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -41173,10 +41787,16 @@ case $cf_fix_cppflags in
 				&& cf_fix_cppflags=yes
 
 			if test $cf_fix_cppflags = yes ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			elif test "${cf_tst_cflags}" = "\"'" ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			fi
 			;;
@@ -41195,17 +41815,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
 				;;
 			esac
-			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+	cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+
 			;;
 		esac
 		;;
 	(*)
-		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+	test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+	cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+
 		;;
 	esac
 	;;
 (yes)
-	cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
@@ -41218,17 +41846,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
-	CFLAGS="$CFLAGS $cf_new_cflags"
+	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+	CFLAGS="${CFLAGS}$cf_new_cflags"
+
 fi
 
 if test -n "$cf_new_cppflags" ; then
 
-	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
-	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+
 fi
 
 cf_add_libs="$cf_pkgconfig_libs"
@@ -41250,17 +41884,17 @@ LIBS="$cf_add_libs"
 if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists sm; then
 	test -n "$verbose" && echo "	found package sm" 1>&6
 
-echo "${as_me:-configure}:41253: testing found package sm ..." 1>&5
+echo "${as_me:-configure}:41887: testing found package sm ..." 1>&5
 
 	cf_pkgconfig_incs="`$PKG_CONFIG --cflags sm 2>/dev/null`"
 	cf_pkgconfig_libs="`$PKG_CONFIG --libs   sm 2>/dev/null`"
 	test -n "$verbose" && echo "	package sm CFLAGS: $cf_pkgconfig_incs" 1>&6
 
-echo "${as_me:-configure}:41259: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
+echo "${as_me:-configure}:41893: testing package sm CFLAGS: $cf_pkgconfig_incs ..." 1>&5
 
 	test -n "$verbose" && echo "	package sm LIBS: $cf_pkgconfig_libs" 1>&6
 
-echo "${as_me:-configure}:41263: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
+echo "${as_me:-configure}:41897: testing package sm LIBS: $cf_pkgconfig_libs ..." 1>&5
 
 cf_fix_cppflags=no
 cf_new_cflags=
@@ -41282,10 +41916,16 @@ case $cf_fix_cppflags in
 				&& cf_fix_cppflags=yes
 
 			if test $cf_fix_cppflags = yes ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			elif test "${cf_tst_cflags}" = "\"'" ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			fi
 			;;
@@ -41304,17 +41944,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
 				;;
 			esac
-			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+	cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+
 			;;
 		esac
 		;;
 	(*)
-		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+	test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+	cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+
 		;;
 	esac
 	;;
 (yes)
-	cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
@@ -41327,17 +41975,23 @@ done
 
 if test -n "$cf_new_cflags" ; then
 
-	CFLAGS="$CFLAGS $cf_new_cflags"
+	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+	CFLAGS="${CFLAGS}$cf_new_cflags"
+
 fi
 
 if test -n "$cf_new_cppflags" ; then
 
-	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
+
 fi
 
 if test -n "$cf_new_extra_cppflags" ; then
 
-	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
+	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
+
 fi
 
 cf_add_libs="$cf_pkgconfig_libs"
@@ -41369,12 +42023,12 @@ else
 
 test -n "$verbose" && echo "	...before $LIBS" 1>&6
 
-echo "${as_me:-configure}:41372: testing ...before $LIBS ..." 1>&5
+echo "${as_me:-configure}:42026: testing ...before $LIBS ..." 1>&5
 
 LIBS=`echo "$LIBS" | sed -e "s/[ 	][ 	]*/ /g" -e "s%-lXt %-lXt $X_PRE_LIBS %" -e 's%  % %g'`
 test -n "$verbose" && echo "	...after  $LIBS" 1>&6
 
-echo "${as_me:-configure}:41377: testing ...after  $LIBS ..." 1>&5
+echo "${as_me:-configure}:42031: testing ...after  $LIBS ..." 1>&5
 
 fi
 
@@ -41394,7 +42048,7 @@ else
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:41397: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:42051: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -41419,10 +42073,16 @@ case $cf_fix_cppflags in
 				&& cf_fix_cppflags=yes
 
 			if test $cf_fix_cppflags = yes ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			elif test "${cf_tst_cflags}" = "\"'" ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			fi
 			;;
@@ -41441,17 +42101,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
 				;;
 			esac
-			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+	cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+
 			;;
 		esac
 		;;
 	(*)
-		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+	test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+	cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+
 		;;
 	esac
 	;;
 (yes)
-	cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
@@ -41465,30 +42133,36 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:41468: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:42136: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+
+	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+	CFLAGS="${CFLAGS}$cf_new_cflags"
 
-	CFLAGS="$CFLAGS $cf_new_cflags"
 fi
 
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:41476: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:42146: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
 
-	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
 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}:41484: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:42156: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+
+	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
 
-	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
 fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 41491 "configure"
+#line 42165 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -41500,16 +42174,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:41503: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42177: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41506: \$? = $ac_status" >&5
+  echo "$as_me:42180: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:41509: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42183: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41512: \$? = $ac_status" >&5
+  echo "$as_me:42186: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -41517,12 +42191,12 @@ else
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:41520: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:42194: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
 
 	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:41525: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:42199: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_flags"
@@ -41530,13 +42204,13 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-	echo "$as_me:41533: checking for XOpenDisplay" >&5
+	echo "$as_me:42207: 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 41539 "configure"
+#line 42213 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char XOpenDisplay (); below.  */
@@ -41567,16 +42241,16 @@ f = XOpenDisplay; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:41570: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42244: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41573: \$? = $ac_status" >&5
+  echo "$as_me:42247: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:41576: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42250: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41579: \$? = $ac_status" >&5
+  echo "$as_me:42253: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_XOpenDisplay=yes
 else
@@ -41586,13 +42260,13 @@ ac_cv_func_XOpenDisplay=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:41589: result: $ac_cv_func_XOpenDisplay" >&5
+echo "$as_me:42263: 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:41595: checking for XOpenDisplay in -lX11" >&5
+	echo "$as_me:42269: 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
@@ -41600,7 +42274,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 41603 "configure"
+#line 42277 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -41619,16 +42293,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:41622: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42296: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41625: \$? = $ac_status" >&5
+  echo "$as_me:42299: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:41628: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42302: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41631: \$? = $ac_status" >&5
+  echo "$as_me:42305: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -41639,7 +42313,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:41642: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:42316: 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
 
@@ -41663,13 +42337,13 @@ fi
 
 fi
 
-	echo "$as_me:41666: checking for XtAppInitialize" >&5
+	echo "$as_me:42340: 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 41672 "configure"
+#line 42346 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char XtAppInitialize (); below.  */
@@ -41700,16 +42374,16 @@ f = XtAppInitialize; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:41703: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42377: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41706: \$? = $ac_status" >&5
+  echo "$as_me:42380: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:41709: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42383: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41712: \$? = $ac_status" >&5
+  echo "$as_me:42386: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_XtAppInitialize=yes
 else
@@ -41719,13 +42393,13 @@ ac_cv_func_XtAppInitialize=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:41722: result: $ac_cv_func_XtAppInitialize" >&5
+echo "$as_me:42396: 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:41728: checking for XtAppInitialize in -lXt" >&5
+	echo "$as_me:42402: 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
@@ -41733,7 +42407,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 41736 "configure"
+#line 42410 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -41752,16 +42426,16 @@ XtAppInitialize ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:41755: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42429: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41758: \$? = $ac_status" >&5
+  echo "$as_me:42432: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:41761: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42435: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41764: \$? = $ac_status" >&5
+  echo "$as_me:42438: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xt_XtAppInitialize=yes
 else
@@ -41772,7 +42446,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:41775: result: $ac_cv_lib_Xt_XtAppInitialize" >&5
+echo "$as_me:42449: 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
 
@@ -41789,7 +42463,7 @@ fi
 fi
 
 if test $cf_have_X_LIBS = no ; then
-	{ echo "$as_me:41792: WARNING: Unable to successfully link X Toolkit library (-lXt) with
+	{ echo "$as_me:42466: 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
@@ -41811,14 +42485,14 @@ do
 		cf_test=X11/$cf_x_athena_root/SimpleMenu.h
 		if test $cf_path != default ; then
 			CPPFLAGS="$cf_save -I$cf_path/include"
-			echo "$as_me:41814: checking for $cf_test in $cf_path" >&5
+			echo "$as_me:42488: 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:41817: checking for $cf_test" >&5
+			echo "$as_me:42491: checking for $cf_test" >&5
 echo $ECHO_N "checking for $cf_test... $ECHO_C" >&6
 		fi
 		cat >conftest.$ac_ext <<_ACEOF
-#line 41821 "configure"
+#line 42495 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -41832,16 +42506,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:41835: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:42509: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:41838: \$? = $ac_status" >&5
+  echo "$as_me:42512: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:41841: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42515: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41844: \$? = $ac_status" >&5
+  echo "$as_me:42518: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -41850,7 +42524,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-		echo "$as_me:41853: result: $cf_result" >&5
+		echo "$as_me:42527: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 		if test "$cf_result" = yes ; then
 			cf_x_athena_inc=$cf_path
@@ -41862,7 +42536,7 @@ echo "${ECHO_T}$cf_result" >&6
 done
 
 if test -z "$cf_x_athena_inc" ; then
-	{ echo "$as_me:41865: WARNING: Unable to successfully find Athena header files with test program" >&5
+	{ echo "$as_me:42539: WARNING: Unable to successfully find Athena header files with test program" >&5
 echo "$as_me: WARNING: Unable to successfully find Athena header files with test program" >&2;}
 elif test "$cf_x_athena_inc" != default ; then
 	CPPFLAGS="$CPPFLAGS -I$cf_x_athena_inc"
@@ -41908,7 +42582,7 @@ do
 done
 LIBS="$cf_add_libs"
 
-				echo "$as_me:41911: checking for $cf_libs in $cf_path" >&5
+				echo "$as_me:42585: checking for $cf_libs in $cf_path" >&5
 echo $ECHO_N "checking for $cf_libs in $cf_path... $ECHO_C" >&6
 			else
 
@@ -41928,11 +42602,11 @@ do
 done
 LIBS="$cf_add_libs"
 
-				echo "$as_me:41931: checking for $cf_test in $cf_libs" >&5
+				echo "$as_me:42605: checking for $cf_test in $cf_libs" >&5
 echo $ECHO_N "checking for $cf_test in $cf_libs... $ECHO_C" >&6
 			fi
 			cat >conftest.$ac_ext <<_ACEOF
-#line 41935 "configure"
+#line 42609 "configure"
 #include "confdefs.h"
 
 #include <X11/Intrinsic.h>
@@ -41948,16 +42622,16 @@ $cf_test((XtAppContext) 0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:41951: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42625: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:41954: \$? = $ac_status" >&5
+  echo "$as_me:42628: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:41957: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42631: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:41960: \$? = $ac_status" >&5
+  echo "$as_me:42634: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -41966,7 +42640,7 @@ cat conftest.$ac_ext >&5
 cf_result=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-			echo "$as_me:41969: result: $cf_result" >&5
+			echo "$as_me:42643: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 			if test "$cf_result" = yes ; then
 				cf_x_athena_lib="$cf_libs"
@@ -41980,7 +42654,7 @@ echo "${ECHO_T}$cf_result" >&6
 done
 
 if test -z "$cf_x_athena_lib" ; then
-	{ { echo "$as_me:41983: error: Unable to successfully link Athena library (-l$cf_x_athena_root) with test program" >&5
+	{ { echo "$as_me:42657: 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
@@ -41998,7 +42672,7 @@ if test -n "$ac_tool_prefix"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:42001: checking for $ac_word" >&5
+echo "$as_me:42675: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_XCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -42013,7 +42687,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_XCURSES_CONFIG="$ac_tool_prefix$ac_prog"
-echo "$as_me:42016: found $ac_dir/$ac_word" >&5
+echo "$as_me:42690: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -42021,10 +42695,10 @@ fi
 fi
 XCURSES_CONFIG=$ac_cv_prog_XCURSES_CONFIG
 if test -n "$XCURSES_CONFIG"; then
-  echo "$as_me:42024: result: $XCURSES_CONFIG" >&5
+  echo "$as_me:42698: result: $XCURSES_CONFIG" >&5
 echo "${ECHO_T}$XCURSES_CONFIG" >&6
 else
-  echo "$as_me:42027: result: no" >&5
+  echo "$as_me:42701: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -42037,7 +42711,7 @@ if test -z "$XCURSES_CONFIG"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:42040: checking for $ac_word" >&5
+echo "$as_me:42714: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_XCURSES_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -42052,7 +42726,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_XCURSES_CONFIG="$ac_prog"
-echo "$as_me:42055: found $ac_dir/$ac_word" >&5
+echo "$as_me:42729: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -42060,10 +42734,10 @@ fi
 fi
 ac_ct_XCURSES_CONFIG=$ac_cv_prog_ac_ct_XCURSES_CONFIG
 if test -n "$ac_ct_XCURSES_CONFIG"; then
-  echo "$as_me:42063: result: $ac_ct_XCURSES_CONFIG" >&5
+  echo "$as_me:42737: result: $ac_ct_XCURSES_CONFIG" >&5
 echo "${ECHO_T}$ac_ct_XCURSES_CONFIG" >&6
 else
-  echo "$as_me:42066: result: no" >&5
+  echo "$as_me:42740: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -42102,7 +42776,7 @@ LDFLAGS="$LDFLAGS $X_LIBS"
 
 test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
 
-echo "${as_me:-configure}:42105: testing checking additions to CFLAGS ..." 1>&5
+echo "${as_me:-configure}:42779: testing checking additions to CFLAGS ..." 1>&5
 
 cf_check_cflags="$CFLAGS"
 cf_check_cppflags="$CPPFLAGS"
@@ -42127,10 +42801,16 @@ case $cf_fix_cppflags in
 				&& cf_fix_cppflags=yes
 
 			if test $cf_fix_cppflags = yes ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			elif test "${cf_tst_cflags}" = "\"'" ; then
-				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
+
 				continue
 			fi
 			;;
@@ -42149,17 +42829,25 @@ CPPFLAGS=`echo "$CPPFLAGS" | \
 
 				;;
 			esac
-			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_cppflags" && cf_new_cppflags="$cf_new_cppflags "
+	cf_new_cppflags="${cf_new_cppflags}$cf_add_cflags"
+
 			;;
 		esac
 		;;
 	(*)
-		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
+
+	test -n "$cf_new_cflags" && cf_new_cflags="$cf_new_cflags "
+	cf_new_cflags="${cf_new_cflags}$cf_add_cflags"
+
 		;;
 	esac
 	;;
 (yes)
-	cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
+
+	test -n "$cf_new_extra_cppflags" && cf_new_extra_cppflags="$cf_new_extra_cppflags "
+	cf_new_extra_cppflags="${cf_new_extra_cppflags}$cf_add_cflags"
 
 	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
 
@@ -42173,30 +42861,36 @@ done
 if test -n "$cf_new_cflags" ; then
 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
 
-echo "${as_me:-configure}:42176: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+echo "${as_me:-configure}:42864: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
+
+	test -n "$CFLAGS" && CFLAGS="$CFLAGS "
+	CFLAGS="${CFLAGS}$cf_new_cflags"
 
-	CFLAGS="$CFLAGS $cf_new_cflags"
 fi
 
 if test -n "$cf_new_cppflags" ; then
 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
 
-echo "${as_me:-configure}:42184: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+echo "${as_me:-configure}:42874: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
+
+	test -n "$CPPFLAGS" && CPPFLAGS="$CPPFLAGS "
+	CPPFLAGS="${CPPFLAGS}$cf_new_cppflags"
 
-	CPPFLAGS="$CPPFLAGS $cf_new_cppflags"
 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}:42192: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+echo "${as_me:-configure}:42884: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
+
+	test -n "$EXTRA_CPPFLAGS" && EXTRA_CPPFLAGS="$EXTRA_CPPFLAGS "
+	EXTRA_CPPFLAGS="${EXTRA_CPPFLAGS}$cf_new_extra_cppflags"
 
-	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
 fi
 
 if test "x$cf_check_cflags" != "x$CFLAGS" ; then
 cat >conftest.$ac_ext <<_ACEOF
-#line 42199 "configure"
+#line 42893 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -42208,16 +42902,16 @@ printf("Hello world");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42211: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42905: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42214: \$? = $ac_status" >&5
+  echo "$as_me:42908: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42217: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42911: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42220: \$? = $ac_status" >&5
+  echo "$as_me:42914: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -42225,12 +42919,12 @@ else
 cat conftest.$ac_ext >&5
 test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
 
-echo "${as_me:-configure}:42228: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
+echo "${as_me:-configure}:42922: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
 
 	 if test "x$cf_check_cppflags" != "x$CPPFLAGS" ; then
 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
 
-echo "${as_me:-configure}:42233: testing but keeping change to \$CPPFLAGS ..." 1>&5
+echo "${as_me:-configure}:42927: testing but keeping change to \$CPPFLAGS ..." 1>&5
 
 	 fi
 	 CFLAGS="$cf_check_flags"
@@ -42238,7 +42932,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
 
-echo "$as_me:42241: checking for XOpenDisplay in -lX11" >&5
+echo "$as_me:42935: 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
@@ -42246,7 +42940,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 42249 "configure"
+#line 42943 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -42265,16 +42959,16 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42268: \"$ac_link\"") >&5
+if { (eval echo "$as_me:42962: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42271: \$? = $ac_status" >&5
+  echo "$as_me:42965: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42274: \"$ac_try\"") >&5
+  { (eval echo "$as_me:42968: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42277: \$? = $ac_status" >&5
+  echo "$as_me:42971: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_XOpenDisplay=yes
 else
@@ -42285,7 +42979,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:42288: result: $ac_cv_lib_X11_XOpenDisplay" >&5
+echo "$as_me:42982: 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
 
@@ -42307,7 +43001,7 @@ LIBS="$cf_add_libs"
 
 fi
 
-echo "$as_me:42310: checking for XCurses library" >&5
+echo "$as_me:43004: 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
@@ -42330,7 +43024,7 @@ done
 LIBS="$cf_add_libs"
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 42333 "configure"
+#line 43027 "configure"
 #include "confdefs.h"
 
 #include <xcurses.h>
@@ -42345,16 +43039,16 @@ XCursesExit();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42348: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43042: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42351: \$? = $ac_status" >&5
+  echo "$as_me:43045: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42354: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43048: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42357: \$? = $ac_status" >&5
+  echo "$as_me:43051: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_lib_XCurses=yes
 else
@@ -42365,7 +43059,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:42368: result: $cf_cv_lib_XCurses" >&5
+echo "$as_me:43062: result: $cf_cv_lib_XCurses" >&5
 echo "${ECHO_T}$cf_cv_lib_XCurses" >&6
 
 fi
@@ -42380,23 +43074,23 @@ cat >>confdefs.h <<\EOF
 #define XCURSES 1
 EOF
 
-	echo "$as_me:42383: checking for xcurses.h" >&5
+	echo "$as_me:43077: checking for xcurses.h" >&5
 echo $ECHO_N "checking for xcurses.h... $ECHO_C" >&6
 if test "${ac_cv_header_xcurses_h+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 42389 "configure"
+#line 43083 "configure"
 #include "confdefs.h"
 #include <xcurses.h>
 _ACEOF
-if { (eval echo "$as_me:42393: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:43087: \"$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:42399: \$? = $ac_status" >&5
+  echo "$as_me:43093: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -42415,7 +43109,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:42418: result: $ac_cv_header_xcurses_h" >&5
+echo "$as_me:43112: result: $ac_cv_header_xcurses_h" >&5
 echo "${ECHO_T}$ac_cv_header_xcurses_h" >&6
 if test $ac_cv_header_xcurses_h = yes; then
 
@@ -42426,7 +43120,7 @@ EOF
 fi
 
 else
-	{ { echo "$as_me:42429: error: Cannot link with XCurses" >&5
+	{ { echo "$as_me:43123: error: Cannot link with XCurses" >&5
 echo "$as_me: error: Cannot link with XCurses" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -42435,7 +43129,7 @@ fi
 	esac
 else
 
-echo "$as_me:42438: checking if we can include termio.h with curses" >&5
+echo "$as_me:43132: 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
@@ -42445,7 +43139,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 42448 "configure"
+#line 43142 "configure"
 #include "confdefs.h"
 
 #include <LYCurses.h>
@@ -42459,16 +43153,16 @@ putchar(0x0a)
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:42462: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:43156: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:42465: \$? = $ac_status" >&5
+  echo "$as_me:43159: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:42468: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43162: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42471: \$? = $ac_status" >&5
+  echo "$as_me:43165: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_termio_and_curses=yes
 else
@@ -42481,7 +43175,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
     rm -f lynx_cfg.h
 
 fi
-echo "$as_me:42484: result: $cf_cv_termio_and_curses" >&5
+echo "$as_me:43178: result: $cf_cv_termio_and_curses" >&5
 echo "${ECHO_T}$cf_cv_termio_and_curses" >&6
 
 test $cf_cv_termio_and_curses = yes &&
@@ -42498,23 +43192,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:42501: checking for $ac_header" >&5
+echo "$as_me:43195: 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 42507 "configure"
+#line 43201 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:42511: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:43205: \"$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:42517: \$? = $ac_status" >&5
+  echo "$as_me:43211: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -42533,7 +43227,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:42536: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:43230: 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
@@ -42545,7 +43239,7 @@ done
 
 	fi
 
-echo "$as_me:42548: checking if curses supports alternate-character set" >&5
+echo "$as_me:43242: 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
@@ -42554,7 +43248,7 @@ else
 for mapname in acs_map _acs_map
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 42557 "configure"
+#line 43251 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -42568,16 +43262,16 @@ chtype x = $mapname['l']; $mapname['m'] = 0
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42571: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43265: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42574: \$? = $ac_status" >&5
+  echo "$as_me:43268: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42577: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43271: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42580: \$? = $ac_status" >&5
+  echo "$as_me:43274: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_alt_char_set=$mapname
 	 break
@@ -42591,21 +43285,21 @@ done
 
 fi
 
-echo "$as_me:42594: result: $cf_cv_alt_char_set" >&5
+echo "$as_me:43288: 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:42601: checking if curses supports fancy attributes" >&5
+echo "$as_me:43295: 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 42608 "configure"
+#line 43302 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -42623,16 +43317,16 @@ attrset(A_UNDERLINE|A_BOLD|A_REVERSE);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42626: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43320: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42629: \$? = $ac_status" >&5
+  echo "$as_me:43323: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42632: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43326: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42635: \$? = $ac_status" >&5
+  echo "$as_me:43329: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_fancy_curses=yes
 else
@@ -42644,14 +43338,14 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:42647: result: $cf_cv_fancy_curses" >&5
+echo "$as_me:43341: 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:42654: checking for function curses_version" >&5
+echo "$as_me:43348: 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
@@ -42661,7 +43355,7 @@ if test "$cross_compiling" = yes; then
   cf_cv_func_curses_version=unknown
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 42664 "configure"
+#line 43358 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -42674,15 +43368,15 @@ int main()
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:42677: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43371: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42680: \$? = $ac_status" >&5
+  echo "$as_me:43374: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:42682: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43376: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42685: \$? = $ac_status" >&5
+  echo "$as_me:43379: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_func_curses_version=yes
 
@@ -42697,7 +43391,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f core
 fi
-echo "$as_me:42700: result: $cf_cv_func_curses_version" >&5
+echo "$as_me:43394: 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
@@ -42705,14 +43399,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 if test "$cf_cv_ncurses_version" != no ; then
-echo "$as_me:42708: checking for obsolete/broken version of ncurses" >&5
+echo "$as_me:43402: 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 42715 "configure"
+#line 43409 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -42731,16 +43425,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:42734: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:43428: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:42737: \$? = $ac_status" >&5
+  echo "$as_me:43431: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:42740: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43434: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42743: \$? = $ac_status" >&5
+  echo "$as_me:43437: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_ncurses_broken=no
 else
@@ -42752,10 +43446,10 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 
-echo "$as_me:42755: result: $cf_cv_ncurses_broken" >&5
+echo "$as_me:43449: 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:42758: WARNING: hmm... you should get an up-to-date version of ncurses" >&5
+	{ echo "$as_me:43452: 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
@@ -42765,14 +43459,14 @@ EOF
 fi
 fi
 
-echo "$as_me:42768: checking if curses supports color attributes" >&5
+echo "$as_me:43462: 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 42775 "configure"
+#line 43469 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -42792,16 +43486,16 @@ chtype x = COLOR_BLUE;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:42795: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43489: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:42798: \$? = $ac_status" >&5
+  echo "$as_me:43492: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:42801: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43495: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42804: \$? = $ac_status" >&5
+  echo "$as_me:43498: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_color_curses=yes
 else
@@ -42813,7 +43507,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:42816: result: $cf_cv_color_curses" >&5
+echo "$as_me:43510: result: $cf_cv_color_curses" >&5
 echo "${ECHO_T}$cf_cv_color_curses" >&6
 if test $cf_cv_color_curses = yes ; then
 
@@ -42835,23 +43529,23 @@ unistd.h \
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:42838: checking for $ac_header" >&5
+echo "$as_me:43532: 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 42844 "configure"
+#line 43538 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:42848: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:43542: \"$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:42854: \$? = $ac_status" >&5
+  echo "$as_me:43548: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -42870,7 +43564,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:42873: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:43567: 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
@@ -42885,23 +43579,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:42888: checking for $ac_header" >&5
+echo "$as_me:43582: 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 42894 "configure"
+#line 43588 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:42898: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:43592: \"$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:42904: \$? = $ac_status" >&5
+  echo "$as_me:43598: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -42920,7 +43614,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:42923: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:43617: 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
@@ -42938,10 +43632,10 @@ if test "$ac_cv_header_termios_h" = yes ; then
 	(*)	termios_bad=maybe ;;
 	esac
 	if test "$termios_bad" = maybe ; then
-	echo "$as_me:42941: checking whether termios.h needs _POSIX_SOURCE" >&5
+	echo "$as_me:43635: 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 42944 "configure"
+#line 43638 "configure"
 #include "confdefs.h"
 #include <termios.h>
 int
@@ -42953,16 +43647,16 @@ struct termios foo; int x = foo.c_iflag
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:42956: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:43650: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:42959: \$? = $ac_status" >&5
+  echo "$as_me:43653: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:42962: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43656: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42965: \$? = $ac_status" >&5
+  echo "$as_me:43659: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   termios_bad=no
 else
@@ -42970,7 +43664,7 @@ else
 cat conftest.$ac_ext >&5
 
 		cat >conftest.$ac_ext <<_ACEOF
-#line 42973 "configure"
+#line 43667 "configure"
 #include "confdefs.h"
 
 #define _POSIX_SOURCE
@@ -42984,16 +43678,16 @@ struct termios foo; int x = foo.c_iflag
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:42987: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:43681: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:42990: \$? = $ac_status" >&5
+  echo "$as_me:43684: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:42993: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43687: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:42996: \$? = $ac_status" >&5
+  echo "$as_me:43690: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   termios_bad=unknown
 else
@@ -43009,12 +43703,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
-	echo "$as_me:43012: result: $termios_bad" >&5
+	echo "$as_me:43706: result: $termios_bad" >&5
 echo "${ECHO_T}$termios_bad" >&6
 	fi
 fi
 
-echo "$as_me:43017: checking declaration of size-change" >&5
+echo "$as_me:43711: 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
@@ -43029,7 +43723,7 @@ do
 	CPPFLAGS="$cf_save_CPPFLAGS"
 	test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 43032 "configure"
+#line 43726 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_TERMIOS_H
@@ -43073,16 +43767,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:43076: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:43770: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:43079: \$? = $ac_status" >&5
+  echo "$as_me:43773: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:43082: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43776: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43085: \$? = $ac_status" >&5
+  echo "$as_me:43779: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_sizechange=yes
 else
@@ -43101,7 +43795,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:43104: result: $cf_cv_sizechange" >&5
+echo "$as_me:43798: result: $cf_cv_sizechange" >&5
 echo "${ECHO_T}$cf_cv_sizechange" >&6
 if test "$cf_cv_sizechange" != no ; then
 
@@ -43119,14 +43813,14 @@ EOF
 	esac
 fi
 
-echo "$as_me:43122: checking if ttytype is declared in curses library" >&5
+echo "$as_me:43816: 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 43129 "configure"
+#line 43823 "configure"
 #include "confdefs.h"
 #include <${cf_cv_ncurses_header:-curses.h}>
 int
@@ -43138,16 +43832,16 @@ char *x = &ttytype[1]; *x = 1
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:43141: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43835: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43144: \$? = $ac_status" >&5
+  echo "$as_me:43838: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:43147: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43841: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43150: \$? = $ac_status" >&5
+  echo "$as_me:43844: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_have_ttytype=yes
 else
@@ -43159,7 +43853,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
 
-echo "$as_me:43162: result: $cf_cv_have_ttytype" >&5
+echo "$as_me:43856: result: $cf_cv_have_ttytype" >&5
 echo "${ECHO_T}$cf_cv_have_ttytype" >&6
 test $cf_cv_have_ttytype = yes &&
 cat >>confdefs.h <<\EOF
@@ -43168,14 +43862,14 @@ EOF
 
 	if test "$use_wide_curses" = yes ; then
 
-echo "$as_me:43171: checking if curses supports wide characters" >&5
+echo "$as_me:43865: 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 43178 "configure"
+#line 43872 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -43194,16 +43888,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:43197: \"$ac_link\"") >&5
+if { (eval echo "$as_me:43891: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43200: \$? = $ac_status" >&5
+  echo "$as_me:43894: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:43203: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43897: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43206: \$? = $ac_status" >&5
+  echo "$as_me:43900: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_widec_curses=yes
 else
@@ -43214,7 +43908,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:43217: result: $cf_cv_widec_curses" >&5
+echo "$as_me:43911: result: $cf_cv_widec_curses" >&5
 echo "${ECHO_T}$cf_cv_widec_curses" >&6
 
 if test "$cf_cv_widec_curses" = yes ; then
@@ -43224,14 +43918,14 @@ cat >>confdefs.h <<\EOF
 EOF
 
 	# This is needed on Tru64 5.0 to declare mbstate_t
-	echo "$as_me:43227: checking if we must include wchar.h to declare mbstate_t" >&5
+	echo "$as_me:43921: 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 43234 "configure"
+#line 43928 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -43245,23 +43939,23 @@ mbstate_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:43248: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:43942: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:43251: \$? = $ac_status" >&5
+  echo "$as_me:43945: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:43254: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43948: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43257: \$? = $ac_status" >&5
+  echo "$as_me:43951: \$? = $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 43264 "configure"
+#line 43958 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -43276,16 +43970,16 @@ mbstate_t state
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:43279: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:43973: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:43282: \$? = $ac_status" >&5
+  echo "$as_me:43976: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:43285: \"$ac_try\"") >&5
+  { (eval echo "$as_me:43979: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43288: \$? = $ac_status" >&5
+  echo "$as_me:43982: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_widec_mbstate=yes
 else
@@ -43297,7 +43991,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:43300: result: $cf_cv_widec_mbstate" >&5
+echo "$as_me:43994: result: $cf_cv_widec_mbstate" >&5
 echo "${ECHO_T}$cf_cv_widec_mbstate" >&6
 
 if test "$cf_cv_widec_mbstate" = yes ; then
@@ -43320,7 +44014,7 @@ fi
 
 	fi
 
-echo "$as_me:43323: checking definition to turn on extended curses functions" >&5
+echo "$as_me:44017: checking definition to turn on extended curses functions" >&5
 echo $ECHO_N "checking definition to turn on extended curses functions... $ECHO_C" >&6
 if test "${cf_cv_need_xopen_extension+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -43328,7 +44022,7 @@ else
 
 cf_cv_need_xopen_extension=unknown
 cat >conftest.$ac_ext <<_ACEOF
-#line 43331 "configure"
+#line 44025 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -43354,16 +44048,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:43357: \"$ac_link\"") >&5
+if { (eval echo "$as_me:44051: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43360: \$? = $ac_status" >&5
+  echo "$as_me:44054: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:43363: \"$ac_try\"") >&5
+  { (eval echo "$as_me:44057: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43366: \$? = $ac_status" >&5
+  echo "$as_me:44060: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_xopen_extension=none
 else
@@ -43373,7 +44067,7 @@ cat conftest.$ac_ext >&5
 	for cf_try_xopen_extension in _XOPEN_SOURCE_EXTENDED NCURSES_WIDECHAR
 	do
 		cat >conftest.$ac_ext <<_ACEOF
-#line 43376 "configure"
+#line 44070 "configure"
 #include "confdefs.h"
 
 #define $cf_try_xopen_extension 1
@@ -43395,16 +44089,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:43398: \"$ac_link\"") >&5
+if { (eval echo "$as_me:44092: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43401: \$? = $ac_status" >&5
+  echo "$as_me:44095: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:43404: \"$ac_try\"") >&5
+  { (eval echo "$as_me:44098: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43407: \$? = $ac_status" >&5
+  echo "$as_me:44101: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_need_xopen_extension=$cf_try_xopen_extension; break
 else
@@ -43418,7 +44112,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:43421: result: $cf_cv_need_xopen_extension" >&5
+echo "$as_me:44115: result: $cf_cv_need_xopen_extension" >&5
 echo "${ECHO_T}$cf_cv_need_xopen_extension" >&6
 
 case $cf_cv_need_xopen_extension in
@@ -43427,7 +44121,7 @@ case $cf_cv_need_xopen_extension in
 	;;
 esac
 
-echo "$as_me:43430: checking for term.h" >&5
+echo "$as_me:44124: 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
@@ -43448,7 +44142,7 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 43451 "configure"
+#line 44145 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -43462,16 +44156,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:43465: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:44159: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:43468: \$? = $ac_status" >&5
+  echo "$as_me:44162: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:43471: \"$ac_try\"") >&5
+  { (eval echo "$as_me:44165: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43474: \$? = $ac_status" >&5
+  echo "$as_me:44168: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_term_header=$cf_header
 	 break
@@ -43490,7 +44184,7 @@ case $cf_cv_term_header in
 	for cf_header in ncurses/term.h ncursesw/term.h
 	do
 		cat >conftest.$ac_ext <<_ACEOF
-#line 43493 "configure"
+#line 44187 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -43508,16 +44202,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:43511: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:44205: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:43514: \$? = $ac_status" >&5
+  echo "$as_me:44208: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:43517: \"$ac_try\"") >&5
+  { (eval echo "$as_me:44211: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43520: \$? = $ac_status" >&5
+  echo "$as_me:44214: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_term_header=$cf_header
 			 break
@@ -43532,7 +44226,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 esac
 
 fi
-echo "$as_me:43535: result: $cf_cv_term_header" >&5
+echo "$as_me:44229: result: $cf_cv_term_header" >&5
 echo "${ECHO_T}$cf_cv_term_header" >&6
 
 case $cf_cv_term_header in
@@ -43559,7 +44253,7 @@ EOF
 	;;
 esac
 
-echo "$as_me:43562: checking for unctrl.h" >&5
+echo "$as_me:44256: checking for unctrl.h" >&5
 echo $ECHO_N "checking for unctrl.h... $ECHO_C" >&6
 if test "${cf_cv_unctrl_header+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -43580,7 +44274,7 @@ esac
 for cf_header in $cf_header_list
 do
 	cat >conftest.$ac_ext <<_ACEOF
-#line 43583 "configure"
+#line 44277 "configure"
 #include "confdefs.h"
 
 #include <${cf_cv_ncurses_header:-curses.h}>
@@ -43594,16 +44288,16 @@ WINDOW *x
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:43597: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:44291: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:43600: \$? = $ac_status" >&5
+  echo "$as_me:44294: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:43603: \"$ac_try\"") >&5
+  { (eval echo "$as_me:44297: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43606: \$? = $ac_status" >&5
+  echo "$as_me:44300: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_cv_unctrl_header=$cf_header
 	 break
@@ -43616,12 +44310,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:43619: result: $cf_cv_unctrl_header" >&5
+echo "$as_me:44313: result: $cf_cv_unctrl_header" >&5
 echo "${ECHO_T}$cf_cv_unctrl_header" >&6
 
 case $cf_cv_unctrl_header in
 (no)
-	{ echo "$as_me:43624: WARNING: unctrl.h header not found" >&5
+	{ echo "$as_me:44318: WARNING: unctrl.h header not found" >&5
 echo "$as_me: WARNING: unctrl.h header not found" >&2;}
 	;;
 esac
@@ -43677,10 +44371,10 @@ do
 
 cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
 
-	echo "$as_me:43680: checking for ${cf_func}" >&5
+	echo "$as_me:44374: checking for ${cf_func}" >&5
 echo $ECHO_N "checking for ${cf_func}... $ECHO_C" >&6
 
-echo "${as_me:-configure}:43683: testing ${cf_func} ..." 1>&5
+echo "${as_me:-configure}:44377: testing ${cf_func} ..." 1>&5
 
 	if eval "test \"\${cf_cv_func_$cf_func+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -43689,7 +44383,7 @@ else
 		eval cf_result='$ac_cv_func_'$cf_func
 		if test ".$cf_result" != ".no"; then
 			cat >conftest.$ac_ext <<_ACEOF
-#line 43692 "configure"
+#line 44386 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_XCURSES
@@ -43722,16 +44416,16 @@ if (foo + 1234 > 5678)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:43725: \"$ac_link\"") >&5
+if { (eval echo "$as_me:44419: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43728: \$? = $ac_status" >&5
+  echo "$as_me:44422: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:43731: \"$ac_try\"") >&5
+  { (eval echo "$as_me:44425: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43734: \$? = $ac_status" >&5
+  echo "$as_me:44428: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_result=yes
 else
@@ -43747,7 +44441,7 @@ fi
 
 	# use the computed/retrieved cache-value:
 	eval 'cf_result=$cf_cv_func_'$cf_func
-	echo "$as_me:43750: result: $cf_result" >&5
+	echo "$as_me:44444: result: $cf_result" >&5
 echo "${ECHO_T}$cf_result" >&6
 	if test $cf_result != no; then
 		cat >>confdefs.h <<EOF
@@ -43763,13 +44457,13 @@ for ac_func in \
 
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:43766: checking for $ac_func" >&5
+echo "$as_me:44460: 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 43772 "configure"
+#line 44466 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -43800,16 +44494,16 @@ f = $ac_func; /* workaround for ICC 12.0.3 */ if (f == 0) return 1;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:43803: \"$ac_link\"") >&5
+if { (eval echo "$as_me:44497: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43806: \$? = $ac_status" >&5
+  echo "$as_me:44500: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:43809: \"$ac_try\"") >&5
+  { (eval echo "$as_me:44503: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43812: \$? = $ac_status" >&5
+  echo "$as_me:44506: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -43819,7 +44513,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:43822: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:44516: 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
@@ -43833,12 +44527,12 @@ fi
 
 if test $use_color_style != no ; then
 	if test .$cf_cv_color_curses != .yes ; then
-		{ { echo "$as_me:43836: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:44530: 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:43841: error: Configuration does not support color-styles" >&5
+		{ { echo "$as_me:44535: error: Configuration does not support color-styles" >&5
 echo "$as_me: error: Configuration does not support color-styles" >&2;}
    { (exit 1); exit 1; }; }
 	fi
@@ -43846,7 +44540,7 @@ fi
 
 if test $use_scrollbar != no ; then
 	if test .$cf_cv_fancy_curses != .yes ; then
-		{ echo "$as_me:43849: WARNING: Configuration does not support ACS_xxx definitions" >&5
+		{ echo "$as_me:44543: WARNING: Configuration does not support ACS_xxx definitions" >&5
 echo "$as_me: WARNING: Configuration does not support ACS_xxx definitions" >&2;}
 	else
 
@@ -43860,7 +44554,7 @@ fi
 # use rpath for libraries in unusual places
 
 LD_RPATH_OPT=
-echo "$as_me:43863: checking for an rpath option" >&5
+echo "$as_me:44557: checking for an rpath option" >&5
 echo $ECHO_N "checking for an rpath option... $ECHO_C" >&6
 case $cf_cv_system_name in
 (irix*)
@@ -43891,12 +44585,12 @@ case $cf_cv_system_name in
 (*)
 	;;
 esac
-echo "$as_me:43894: result: $LD_RPATH_OPT" >&5
+echo "$as_me:44588: result: $LD_RPATH_OPT" >&5
 echo "${ECHO_T}$LD_RPATH_OPT" >&6
 
 case "x$LD_RPATH_OPT" in
 (x-R*)
-	echo "$as_me:43899: checking if we need a space after rpath option" >&5
+	echo "$as_me:44593: checking if we need a space after rpath option" >&5
 echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
 	cf_save_LIBS="$LIBS"
 
@@ -43917,7 +44611,7 @@ done
 LIBS="$cf_add_libs"
 
 	cat >conftest.$ac_ext <<_ACEOF
-#line 43920 "configure"
+#line 44614 "configure"
 #include "confdefs.h"
 
 int
@@ -43929,16 +44623,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:43932: \"$ac_link\"") >&5
+if { (eval echo "$as_me:44626: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:43935: \$? = $ac_status" >&5
+  echo "$as_me:44629: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:43938: \"$ac_try\"") >&5
+  { (eval echo "$as_me:44632: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:43941: \$? = $ac_status" >&5
+  echo "$as_me:44635: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_rpath_space=no
 else
@@ -43948,13 +44642,13 @@ cf_rpath_space=yes
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	LIBS="$cf_save_LIBS"
-	echo "$as_me:43951: result: $cf_rpath_space" >&5
+	echo "$as_me:44645: result: $cf_rpath_space" >&5
 echo "${ECHO_T}$cf_rpath_space" >&6
 	test "$cf_rpath_space" = yes && LD_RPATH_OPT="$LD_RPATH_OPT "
 	;;
 esac
 
-echo "$as_me:43957: checking if rpath-hack should be disabled" >&5
+echo "$as_me:44651: checking if rpath-hack should be disabled" >&5
 echo $ECHO_N "checking if rpath-hack should be disabled... $ECHO_C" >&6
 
 # Check whether --enable-rpath-hack or --disable-rpath-hack was given.
@@ -43971,21 +44665,21 @@ else
 	cf_disable_rpath_hack=no
 
 fi;
-echo "$as_me:43974: result: $cf_disable_rpath_hack" >&5
+echo "$as_me:44668: result: $cf_disable_rpath_hack" >&5
 echo "${ECHO_T}$cf_disable_rpath_hack" >&6
 if test "$cf_disable_rpath_hack" = no ; then
 
-echo "$as_me:43978: checking for updated LDFLAGS" >&5
+echo "$as_me:44672: checking for updated LDFLAGS" >&5
 echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
 if test -n "$LD_RPATH_OPT" ; then
-	echo "$as_me:43981: result: maybe" >&5
+	echo "$as_me:44675: result: maybe" >&5
 echo "${ECHO_T}maybe" >&6
 
 	for ac_prog in ldd
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:43988: checking for $ac_word" >&5
+echo "$as_me:44682: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_cf_ldd_prog+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -44000,7 +44694,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_cf_ldd_prog="$ac_prog"
-echo "$as_me:44003: found $ac_dir/$ac_word" >&5
+echo "$as_me:44697: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -44008,10 +44702,10 @@ fi
 fi
 cf_ldd_prog=$ac_cv_prog_cf_ldd_prog
 if test -n "$cf_ldd_prog"; then
-  echo "$as_me:44011: result: $cf_ldd_prog" >&5
+  echo "$as_me:44705: result: $cf_ldd_prog" >&5
 echo "${ECHO_T}$cf_ldd_prog" >&6
 else
-  echo "$as_me:44014: result: no" >&5
+  echo "$as_me:44708: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44025,7 +44719,7 @@ test -n "$cf_ldd_prog" || cf_ldd_prog="no"
 		cf_rpath_oops=
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 44028 "configure"
+#line 44722 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -44037,16 +44731,16 @@ printf("Hello");
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:44040: \"$ac_link\"") >&5
+if { (eval echo "$as_me:44734: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:44043: \$? = $ac_status" >&5
+  echo "$as_me:44737: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:44046: \"$ac_try\"") >&5
+  { (eval echo "$as_me:44740: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:44049: \$? = $ac_status" >&5
+  echo "$as_me:44743: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort | uniq`
 		 cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[ 	]/%/%' -e 's%/[^/][^/]*$%%' |sort | uniq`
@@ -44074,7 +44768,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 					then
 						test -n "$verbose" && echo "	...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src" 1>&6
 
-echo "${as_me:-configure}:44077: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
+echo "${as_me:-configure}:44771: testing ...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src ..." 1>&5
 
 						LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
 						break
@@ -44086,11 +44780,11 @@ echo "${as_me:-configure}:44077: testing ...adding -L$cf_rpath_dir/lib to LDFLAG
 
 	test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:44089: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:44783: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:44093: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:44787: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LDFLAGS
@@ -44127,7 +44821,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:44130: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:44824: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -44140,11 +44834,11 @@ LDFLAGS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:44143: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:44837: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
 
 test -n "$verbose" && echo "	...checking LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:44147: testing ...checking LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:44841: testing ...checking LIBS $LIBS ..." 1>&5
 
 cf_rpath_dst=
 for cf_rpath_src in $LIBS
@@ -44181,7 +44875,7 @@ do
 			then
 				test -n "$verbose" && echo "	...Filter $cf_rpath_src ->$cf_rpath_tmp" 1>&6
 
-echo "${as_me:-configure}:44184: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
+echo "${as_me:-configure}:44878: testing ...Filter $cf_rpath_src ->$cf_rpath_tmp ..." 1>&5
 
 				EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
 			fi
@@ -44194,14 +44888,14 @@ LIBS=$cf_rpath_dst
 
 test -n "$verbose" && echo "	...checked LIBS $LIBS" 1>&6
 
-echo "${as_me:-configure}:44197: testing ...checked LIBS $LIBS ..." 1>&5
+echo "${as_me:-configure}:44891: testing ...checked LIBS $LIBS ..." 1>&5
 
 	test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
 
-echo "${as_me:-configure}:44201: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
+echo "${as_me:-configure}:44895: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
 
 else
-	echo "$as_me:44204: result: no" >&5
+	echo "$as_me:44898: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -44302,7 +44996,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:44305: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:44999: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -44478,7 +45172,7 @@ cat >>$CONFIG_STATUS <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:44481: error: ambiguous option: $1
+    { { echo "$as_me:45175: 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;}
@@ -44497,7 +45191,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:44500: error: unrecognized option: $1
+  -*) { { echo "$as_me:45194: 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;}
@@ -44550,7 +45244,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:44553: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:45247: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -44902,7 +45596,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:44905: creating $ac_file" >&5
+    { echo "$as_me:45599: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -44920,7 +45614,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:44923: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:45617: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -44933,7 +45627,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:44936: error: cannot find input file: $f" >&5
+           { { echo "$as_me:45630: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -44949,7 +45643,7 @@ cat >>$CONFIG_STATUS <<\EOF
       if test -n "$ac_seen"; then
         ac_used=`grep '@datarootdir@' $ac_item`
         if test -z "$ac_used"; then
-          { echo "$as_me:44952: WARNING: datarootdir was used implicitly but not set:
+          { echo "$as_me:45646: WARNING: datarootdir was used implicitly but not set:
 $ac_seen" >&5
 echo "$as_me: WARNING: datarootdir was used implicitly but not set:
 $ac_seen" >&2;}
@@ -44958,7 +45652,7 @@ $ac_seen" >&2;}
       fi
       ac_seen=`grep '${datarootdir}' $ac_item`
       if test -n "$ac_seen"; then
-        { echo "$as_me:44961: WARNING: datarootdir was used explicitly but not set:
+        { echo "$as_me:45655: WARNING: datarootdir was used explicitly but not set:
 $ac_seen" >&5
 echo "$as_me: WARNING: datarootdir was used explicitly but not set:
 $ac_seen" >&2;}
@@ -44995,7 +45689,7 @@ s, at INSTALL@,$ac_INSTALL,;t t
             ac_init=`egrep '[ 	]*'$ac_name'[ 	]*=' $ac_file`
             if test -z "$ac_init"; then
               ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
-              { echo "$as_me:44998: WARNING: Variable $ac_name is used but was not set:
+              { echo "$as_me:45692: WARNING: Variable $ac_name is used but was not set:
 $ac_seen" >&5
 echo "$as_me: WARNING: Variable $ac_name is used but was not set:
 $ac_seen" >&2;}
@@ -45006,7 +45700,7 @@ $ac_seen" >&2;}
     egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out
     if test -s $tmp/out; then
       ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
-      { echo "$as_me:45009: WARNING: Some variables may not be substituted:
+      { echo "$as_me:45703: WARNING: Some variables may not be substituted:
 $ac_seen" >&5
 echo "$as_me: WARNING: Some variables may not be substituted:
 $ac_seen" >&2;}
@@ -45055,7 +45749,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:45058: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:45752: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -45066,7 +45760,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:45069: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:45763: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -45079,7 +45773,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:45082: error: cannot find input file: $f" >&5
+           { { echo "$as_me:45776: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -45197,7 +45891,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:45200: $ac_file is unchanged" >&5
+      { echo "$as_me:45894: $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 610fa14..6f87323 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $LynxId: configure.in,v 1.284 2016/11/15 09:04:25 tom Exp $
+dnl $LynxId: configure.in,v 1.287 2017/04/29 14:49:46 tom Exp $
 dnl
 dnl Process this file with autoconf to produce a configure script.
 dnl
@@ -7,7 +7,7 @@ dnl by T.E.Dickey <dickey at invisible-island.net>
 dnl and Jim Spath <jspath at mail.bcpl.lib.md.us>
 dnl
 dnl ---------------------------------------------------------------------------
-dnl Copyright 1997-2015,2016 by Thomas E. Dickey
+dnl Copyright 1997-2016,2017 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,
@@ -29,7 +29,7 @@ dnl ---------------------------------------------------------------------------
 dnl
 dnl ask PRCS to plug-in the project-version for the configure-script.
 dnl $Format: "AC_REVISION($ProjectVersion$)"$
-AC_REVISION(2.8.9dev.11)
+AC_REVISION(2.8.9dev.13)
 
 # Save the original $CFLAGS so we can distinguish whether the user set those
 # in the environment, or whether autoconf added -O and -g options:
@@ -64,7 +64,7 @@ AC_ARG_PROGRAM
 PACKAGE=lynx
 dnl ask PRCS to plug-in the project-version for the packages.
 # $Format: "VERSION=$ProjectVersion$"$
-VERSION=2.8.9dev.11
+VERSION=2.8.9dev.13
 
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
diff --git a/lynx.cfg b/lynx.cfg
index e5cfc4f..e289787 100644
--- a/lynx.cfg
+++ b/lynx.cfg
@@ -1,13 +1,13 @@
-# $LynxId: lynx.cfg,v 1.274 2016/11/15 09:04:25 tom Exp $
+# $LynxId: lynx.cfg,v 1.280 2017/04/29 12:47:15 tom Exp $
 # lynx.cfg file.
 # The default placement for this file is /usr/local/lib/lynx.cfg (Unix)
 #                                     or Lynx_Dir:lynx.cfg (VMS)
 #
 # $Format: "#PRCS LYNX_VERSION \"$ProjectVersion$\""$
-#PRCS LYNX_VERSION "2.8.9dev.11"
+#PRCS LYNX_VERSION "2.8.9dev.13"
 #
 # $Format: "#PRCS LYNX_DATE \"$ProjectDate$\""$
-#PRCS LYNX_DATE "Tue, 15 Nov 2016 04:04:25 -0500"
+#PRCS LYNX_DATE "Sat, 29 Apr 2017 08:47:15 -0400"
 #
 # Definition pairs are of the form  VARIABLE:DEFINITION
 # NO spaces are allowed between the pair items.
@@ -1058,8 +1058,8 @@ DEFAULT_INDEX_FILE:http://scout.wisc.edu/
 # is the same as for TRUSTED_EXEC rules (see above).  Example rules:
 #
 #	TRUSTED_LYNXCGI:file://localhost/
-# 	TRUSTED_LYNXCGI:<tab>/usr/local/etc/httpd/cgi-bin/
-# 	TRUSTED_LYNXCGI:file://localhost/<tab>/usr/local/www/cgi-bin/
+#	TRUSTED_LYNXCGI:<tab>/usr/local/etc/httpd/cgi-bin/
+#	TRUSTED_LYNXCGI:file://localhost/<tab>/usr/local/www/cgi-bin/
 #
 # VMS:
 # ====
@@ -2348,7 +2348,7 @@ MINIMAL_COMMENTS:TRUE
 # ===
 #GLOBAL_MAILCAP:Lynx_Dir:mailcap
 #
-# 	Sought in user's home (Unix) or sys$login (VMS) directory.
+#	Sought in user's home (Unix) or sys$login (VMS) directory.
 #PERSONAL_MAILCAP:.mailcap
 
 .h2 PREFERRED_MEDIA_TYPES
@@ -2486,7 +2486,7 @@ MINIMAL_COMMENTS:TRUE
 #KEYMAP:SELECT_KEY:END		# Function key Select - Go to bottom of current document
 #KEYMAP:UPARROW:PREV_LINK	# Move to the previous link or page
 #KEYMAP:DNARROW:NEXT_LINK	# Move to the next link or page
-#KEYMAP:BACKTAB_KEY:FASTBACKW_LINK 	# Back Tab - Move to previous link or text area
+#KEYMAP:BACKTAB_KEY:FASTBACKW_LINK	# Back Tab - Move to previous link or text area
 #KEYMAP:^I:FASTFORW_LINK	# Tab key - Move always to next link or text area
 #KEYMAP:^:FIRST_LINK		# Move to the first link on line
 #KEYMAP:$:LAST_LINK		# Move to the last link on line
@@ -3377,7 +3377,7 @@ COLOR:6:brightred:black
 #ENABLE_LYNXRC:COOKIE_LOOSE_INVALID_DOMAINS:ON
 #ENABLE_LYNXRC:COOKIE_QUERY_INVALID_DOMAINS:ON
 #ENABLE_LYNXRC:COOKIE_REJECT_DOMAINS:ON
-#ENABLE_LYNXRC:COOKIE_STRICT_INVALID_DOMAINS:ON
+#ENABLE_LYNXRC:COOKIE_STRICT_INVALID_DOMAIN:ON
 #ENABLE_LYNXRC:DIR_LIST_STYLE:ON
 #ENABLE_LYNXRC:DISPLAY:OFF
 #ENABLE_LYNXRC:EMACS_KEYS:ON
@@ -3403,7 +3403,7 @@ COLOR:6:brightred:black
 #ENABLE_LYNXRC:PREFERRED_MEDIA_TYPES:OFF
 #ENABLE_LYNXRC:RAW_MODE:OFF
 #ENABLE_LYNXRC:RUN_ALL_EXECUTION_LINKS:ON
-#ENABLE_LYNXRC:RUN_EXECUTION_LINKS_ON_LOCAL_FILES:ON
+#ENABLE_LYNXRC:RUN_EXECUTION_LINKS_LOCAL:ON
 #ENABLE_LYNXRC:SCROLLBAR:OFF
 #ENABLE_LYNXRC:SELECT_POPUPS:ON
 #ENABLE_LYNXRC:SEND_USERAGENT:OFF
@@ -3417,7 +3417,6 @@ COLOR:6:brightred:black
 #ENABLE_LYNXRC:TAGSOUP:OFF
 #ENABLE_LYNXRC:UNDERLINE_LINKS:OFF
 #ENABLE_LYNXRC:USER_MODE:ON
-#ENABLE_LYNXRC:SEND_USERAGENT:OFF
 #ENABLE_LYNXRC:USERAGENT:OFF
 #ENABLE_LYNXRC:VERBOSE_IMAGES:ON
 #ENABLE_LYNXRC:VI_KEYS:ON
@@ -3560,7 +3559,7 @@ COLOR:6:brightred:black
 
 .h2 SSL_CLIENT_CERT_FILE
 # Set SSL_CLIENT_CERT_FILE to the file that contains a client certificate
-# (in PEM format) in case the $SSL_CLIENT_CERT_FILE environment variable is 
+# (in PEM format) in case the $SSL_CLIENT_CERT_FILE environment variable is
 # not set, e.g.,
 #
 #SSL_CLIENT_CERT_FILE:/home/qux/certs/cert.crt
@@ -3568,7 +3567,7 @@ COLOR:6:brightred:black
 
 .h2 SSL_CLIENT_KEY_FILE
 # Set SSL_CLIENT_KEY_FILE to the file that contains a client certificate
-# key (in PEM format), in case the $SSL_CLIENT_KEY_FILE environment variable 
+# key (in PEM format), in case the $SSL_CLIENT_KEY_FILE environment variable
 # is not set, e.g.,
 #
 #SSL_CLIENT_KEY_FILE:/home/qux/certs/cert.key
diff --git a/lynx.hlp b/lynx.hlp
index c6d83cf..33415c7 100644
--- a/lynx.hlp
+++ b/lynx.hlp
@@ -43,9 +43,9 @@
        (local files and remote URLs) are added to the G)oto history.
 
        Lynx uses only long option names.  Option names can begin  with  double
-       dash  as well, underscores and dashes can be intermixed in option names
-       (in the reference below options are with one dash before them and  with
-       underscores).
+       dash  "--"  as well, underscores and dashes can be intermixed in option
+       names (in the reference below, options are  shown  with  one  dash  "-"
+       before them, and with underscores "_").
 
        Lynx  provides many command-line options.  Some options require a value
        (string, number or keyword).  These are noted in the  reference  below.
@@ -55,9 +55,11 @@
        or toggle (between true/false).  For any of these,  an  explicit  value
        can  be  given  in  different  forms  to  allow  for  operating  system
        constraints, e.g.,
-              -center:off
-              -center=off
-              -center-
+
+         -center:off
+         -center=off
+         -center-
+
        Lynx recognizes "1", "+", "on" and "true" for  true  values,  and  "0",
        "-",  "off"  and  "false"  for  false  values.  Other option-values are
        ignored.
@@ -69,7 +71,7 @@
        third pass of options-processing, so any option which sets a value,  as
        well as runtime configuration values are reflected in the help-message.
 
-       -      If  the  argument  is only `-', then Lynx expects to receive the
+       -      If  the  argument  is only "-", then Lynx expects to receive the
               arguments from the standard input.  This is  to  allow  for  the
               potentially  very  long command line that can be associated with
               the -get_data or -post_data arguments (see below).  It can  also
@@ -85,7 +87,7 @@
               -restrictions.
 
        -assume_charset=MIMEname
-              charset for documents that don't specify it.
+              charset for documents that do not specify it.
 
        -assume_local_charset=MIMEname
               charset assumed for local files, i.e., files which Lynx  creates
@@ -210,7 +212,7 @@
        -debug_partial
               separate incremental display stages with MessageSecs delay
 
-       -default-colors
+       -default_colors
               toggles  the default-colors feature which is normally set in the
               lynx.cfg file.
 
@@ -231,7 +233,7 @@
               interactive mode, all documents are processed.  This can be used
               in the following way:
 
-              lynx -dump http://www.subir.com/lynx.html
+                lynx -dump http://www.subir.com/lynx.html
 
               Files specified on the command line are  formatted  as  HTML  if
               their  names  end  with one of the standard web suffixes such as
@@ -263,7 +265,7 @@
               session.
 
        -force_empty_hrefless_a
-              force  HREF-less `A' elements to be empty (close them as soon as
+              force  HREF-less "A" elements to be empty (close them as soon as
               they are seen).
 
        -force_html
@@ -275,8 +277,17 @@
               files).
 
               Lynx recognizes these file suffixes as HTML:
-              ".ht3",  ".htm",  ".html3",  ".html", ".htmlx", ".php3", ".php",
-              ".phtml", ".sht", and ".shtml".
+
+                ".ht3",
+                ".htm",
+                ".html3",
+                ".html",
+                ".htmlx",
+                ".php3",
+                ".php",
+                ".phtml",
+                ".sht", and
+                ".shtml".
 
        -force_secure
               toggles forcing of the secure flag for SSL cookies.
@@ -289,13 +300,13 @@
        -ftp   disable ftp access.
 
        -get_data
-              properly formatted data for a get form  are  read  in  from  the
+              properly  formatted  data  for  a  get form are read in from the
               standard input and passed to the form.  Input is terminated by a
-              line that starts with `---'.
+              line that starts with "---".
 
-              Lynx issues an HTTP GET, sending the form to  the  path  or  URL
+              Lynx  issues  an  HTTP  GET, sending the form to the path or URL
               given on the command-line and prints the response of the server.
-              If no path or URL is given, Lynx sends the form  to  the  start-
+              If  no  path  or URL is given, Lynx sends the form to the start-
               page.
 
        -head  send a HEAD request for the mime headers.
@@ -306,21 +317,21 @@
               control the display of hidden links.
 
               merge
-                 hidden  links  show  up as bracketed numbers and are numbered
+                 hidden links show up as bracketed numbers  and  are  numbered
                  together with other links in the sequence of their occurrence
                  in the document.
 
               listonly
-                 hidden  links  are  shown  only on L)ist screens and listings
-                 generated by -dump  or  from  the  P)rint  menu,  but  appear
-                 separately  at  the  end of those lists.  This is the default
+                 hidden links are shown only on  L)ist  screens  and  listings
+                 generated  by  -dump  or  from  the  P)rint  menu, but appear
+                 separately at the end of those lists.  This  is  the  default
                  behavior.
 
               ignore
                  hidden links do not appear even in listings.
 
        -historical
-              toggles use of `>' or `-->' as a terminator for comments.
+              toggles use of ">" or "-->" as a terminator for comments.
 
        -homepage=URL
               set homepage separate from start page.
@@ -331,7 +342,7 @@
        -index=URL
               set the default index file to the specified URL.
 
-       -ismap toggles inclusion of  ISMAP  links  when  client-side  MAPs  are
+       -ismap toggles  inclusion  of  ISMAP  links  when  client-side MAPs are
               present.
 
        -justify
@@ -350,17 +361,17 @@
               disable URLs that point to remote hosts.
 
        -locexec
-              enable  local  program  execution from local files only (if Lynx
+              enable local program execution from local files  only  (if  Lynx
               was compiled with local execution enabled).
 
        -lss=FILENAME
-              specify  filename  containing  color-style   information.    The
+              specify   filename   containing  color-style  information.   The
               default is lynx.lss.  If you give an empty filename, Lynx uses a
-              built-in monochrome scheme which  imitates  the  non-color-style
+              built-in  monochrome  scheme  which imitates the non-color-style
               configuration.
 
        -mime_header
-              prints  the  MIME  header  of  a fetched document along with its
+              prints the MIME header of a  fetched  document  along  with  its
               source.
 
        -minimal
@@ -382,11 +393,11 @@
               disable directory browsing.
 
        -nocc  disable Cc: prompts for self copies of mailings.  Note that this
-              does  not disable any CCs which are incorporated within a mailto
+              does not disable any CCs which are incorporated within a  mailto
               URL or form ACTION.
 
        -nocolor
-              force color mode off, overriding terminal capabilities  and  any
+              force  color  mode off, overriding terminal capabilities and any
               -color flags, COLORTERM variable, and saved .lynxrc settings.
 
        -noexec
@@ -407,13 +418,13 @@
               disable -more- string in statusline messages.
 
        -nonrestarting_sigwinch
-              This  flag  is  not  available  on all systems, Lynx needs to be
-              compiled with HAVE_SIGACTION defined.  If available,  this  flag
-              may  cause Lynx to react more immediately to window changes when
+              This flag is not available on all  systems,  Lynx  needs  to  be
+              compiled  with  HAVE_SIGACTION defined.  If available, this flag
+              may cause Lynx to react more immediately to window changes  when
               run within an xterm.
 
        -nonumbers
-              disable   link-    and    field-numbering.     This    overrides
+              disable    link-    and    field-numbering.     This   overrides
               -number_fields and -number_links.
 
        -nopause
@@ -423,7 +434,7 @@
               disable most print functions.
 
        -noredir
-              prevents  automatic redirection and prints a message with a link
+              prevents automatic redirection and prints a message with a  link
               to the new URL.
 
        -noreferer
@@ -457,29 +468,29 @@
               number  of  lines  to  render  before  repainting  display  with
               partial-display logic
 
-       -passive-ftp
+       -passive_ftp
               toggles passive ftp connections.
 
        -pauth=ID:PASSWD
-              set  authorization  ID and password for a protected proxy server
-              at startup.  Be sure to protect any script files which use  this
+              set authorization ID and password for a protected  proxy  server
+              at  startup.  Be sure to protect any script files which use this
               switch.
 
-       -popup toggles  handling  of  single-choice  SELECT  options  via popup
+       -popup toggles handling  of  single-choice  SELECT  options  via  popup
               windows or as lists of radio buttons.
 
        -post_data
-              properly formatted data for a post form are  read  in  from  the
+              properly  formatted  data  for  a post form are read in from the
               standard input and passed to the form.  Input is terminated by a
-              line that starts with `---'.
+              line that starts with "---".
 
-              Lynx issues an HTTP POST, sending the form to the  path  or  URL
+              Lynx  issues  an  HTTP POST, sending the form to the path or URL
               given on the command-line and prints the response of the server.
-              If no path or URL is given, Lynx sends the form  to  the  start-
+              If  no  path  or URL is given, Lynx sends the form to the start-
               page.
 
        -preparsed
-              show  HTML  source  preparsed  and  reformatted  when  used with
+              show HTML  source  preparsed  and  reformatted  when  used  with
               -source or in source view.
 
        -prettysrc
@@ -490,7 +501,7 @@
        -pseudo_inlines
               toggles pseudo-ALTs for inline images with no ALT string.
 
-       -raw   toggles default setting of 8-bit character translations  or  CJK
+       -raw   toggles  default  setting of 8-bit character translations or CJK
               mode for the startup character set.
 
        -realm restricts access to URLs in the starting realm.
@@ -499,12 +510,12 @@
               Sets the read-timeout, where N is given in seconds.
 
        -reload
-              flushes  the  cache  on  a proxy server (only the first document
+              flushes the cache on a proxy server  (only  the  first  document
               given on the command-line is affected).
 
        -restrictions=[option][,option][,option]...
-              allows a list of services to be  disabled  selectively.   Dashes
-              and   underscores  in  option  names  can  be  intermixed.   The
+              allows  a  list  of services to be disabled selectively.  Dashes
+              and  underscores  in  option  names  can  be  intermixed.    The
               following list is printed if no options are specified.
 
               all
@@ -517,18 +528,18 @@
                  disallow execution links via the bookmark file.
 
               change_exec_perms
-                 disallow changing the eXecute permission on files (but  still
-                 allow  it  for  directories)  when  local  file management is
+                 disallow  changing the eXecute permission on files (but still
+                 allow it for  directories)  when  local  file  management  is
                  enabled.
 
               default
-                 same as command line  option  -anonymous.   Disables  default
-                 services  for anonymous users.  Set to all restricted, except
-                 for: inside_telnet, outside_telnet, inside_ftp,  outside_ftp,
-                 inside_rlogin,   outside_rlogin,  inside_news,  outside_news,
+                 same  as  command  line  option -anonymous.  Disables default
+                 services for anonymous users.  Set to all restricted,  except
+                 for:  inside_telnet, outside_telnet, inside_ftp, outside_ftp,
+                 inside_rlogin,  outside_rlogin,  inside_news,   outside_news,
                  telnet_port, jump, mail, print, exec, and goto.  The settings
-                 for  these,  as  well  as  additional  goto  restrictions for
-                 specific URL schemes that are also applied, are derived  from
+                 for these,  as  well  as  additional  goto  restrictions  for
+                 specific  URL schemes that are also applied, are derived from
                  definitions within userdefs.h.
 
               dired_support
@@ -541,7 +552,7 @@
                  disallow access to, or creation of, hidden (dot) files.
 
               download
-                 disallow  some  downloaders  in  the  download menu (does not
+                 disallow some downloaders in  the  download  menu  (does  not
                  imply disk_save restriction).
 
               editor
@@ -554,35 +565,35 @@
                  disallow the user from changing the local execution option.
 
               externals
-                 disallow some "EXTERNAL" configuration lines if  support  for
+                 disallow  some  "EXTERNAL" configuration lines if support for
                  passing  URLs  to  external  applications  (with  the  EXTERN
                  command) is compiled in.
 
               file_url
-                 disallow using G)oto, served links  or  bookmarks  for  file:
+                 disallow  using  G)oto,  served  links or bookmarks for file:
                  URLs.
 
               goto
-                 disable the `g' (goto) command.
+                 disable the "g" (goto) command.
 
               inside_ftp
                  disallow ftps for people coming from inside your domain (utmp
                  required for selectivity).
 
               inside_news
-                 disallow USENET news posting for people  coming  from  inside
+                 disallow  USENET  news  posting for people coming from inside
                  your domain (utmp required for selectivity).
 
               inside_rlogin
-                 disallow  rlogins  for  people coming from inside your domain
+                 disallow rlogins for people coming from  inside  your  domain
                  (utmp required for selectivity).
 
               inside_telnet
-                 disallow telnets for people coming from  inside  your  domain
+                 disallow  telnets  for  people coming from inside your domain
                  (utmp required for selectivity).
 
               jump
-                 disable the `j' (jump) command.
+                 disable the "j" (jump) command.
 
               multibook
                  disallow multiple bookmarks.
@@ -597,22 +608,22 @@
                  disallow saving options in .lynxrc.
 
               outside_ftp
-                 disallow  ftps  for  people  coming  from outside your domain
+                 disallow ftps for people  coming  from  outside  your  domain
                  (utmp required for selectivity).
 
               outside_news
-                 disallow USENET news reading and posting  for  people  coming
-                 from  outside  your  domain  (utmp required for selectivity).
-                 This restriction applies to "news", "nntp",  "newspost",  and
-                 "newsreply"   URLs,  but  not  to  "snews",  "snewspost",  or
+                 disallow  USENET  news  reading and posting for people coming
+                 from outside your domain  (utmp  required  for  selectivity).
+                 This  restriction  applies to "news", "nntp", "newspost", and
+                 "newsreply"  URLs,  but  not  to  "snews",  "snewspost",   or
                  "snewsreply" in case they are supported.
 
               outside_rlogin
-                 disallow rlogins for people coming from outside  your  domain
+                 disallow  rlogins  for people coming from outside your domain
                  (utmp required for selectivity).
 
               outside_telnet
-                 disallow  telnets  for people coming from outside your domain
+                 disallow telnets for people coming from outside  your  domain
                  (utmp required for selectivity).
 
               print
@@ -631,8 +642,8 @@
                  disallow modifications of the User-Agent header.
 
        -resubmit_posts
-              toggles forced resubmissions (no-cache)  of  forms  with  method
-              POST  when  the  documents  they  returned  are  sought with the
+              toggles  forced  resubmissions  (no-cache)  of forms with method
+              POST when the  documents  they  returned  are  sought  with  the
               PREV_DOC command or from the History List.
 
        -rlogin
@@ -658,7 +669,7 @@
               saves session to specified file.
 
        -short_url
-              show  very  long URLs in the status line with "..." to represent
+              show very long URLs in the status line with "..."  to  represent
               the portion which cannot be displayed.  The beginning and end of
               the URL are displayed, rather than suppressing the end.
 
@@ -667,34 +678,34 @@
               and exit.
 
        -show_cursor
-              If enabled the cursor will not  be  hidden  in  the  right  hand
-              corner  but  will  instead  be  positioned  at  the start of the
+              If  enabled  the  cursor  will  not  be hidden in the right hand
+              corner but will instead  be  positioned  at  the  start  of  the
               currently selected link.  Show cursor is the default for systems
-              without  FANCY_CURSES  capabilities.   The default configuration
-              can be changed in userdefs.h  or  lynx.cfg.   The  command  line
+              without FANCY_CURSES capabilities.   The  default  configuration
+              can  be  changed  in  userdefs.h  or lynx.cfg.  The command line
               switch toggles the default.
 
        -show_rate
-              If  enabled  the  transfer  rate  is  shown in bytes/second.  If
-              disabled, no transfer  rate  is  shown.   Use  lynx.cfg  or  the
+              If enabled the transfer  rate  is  shown  in  bytes/second.   If
+              disabled,  no  transfer  rate  is  shown.   Use  lynx.cfg or the
               options menu to select KB/second and/or ETA.
 
        -soft_dquotes
-              toggles  emulation  of  the  old  Netscape  and Mosaic bug which
-              treated `>' as a co-terminator for double-quotes and tags.
+              toggles emulation of the  old  Netscape  and  Mosaic  bug  which
+              treated ">" as a co-terminator for double-quotes and tags.
 
        -source
-              works the same as  dump  but  outputs  HTML  source  instead  of
+              works  the  same  as  dump  but  outputs  HTML source instead of
               formatted text.  For example
 
-              lynx -source . >foo.html
+                lynx -source . >foo.html
 
-              generates   HTML   source  listing  the  files  in  the  current
-              directory.  Each file is marked  by  an  HREF  relative  to  the
-              parent  directory.   Add  a  trailing  slash  to make the HREF's
+              generates  HTML  source  listing  the  files  in   the   current
+              directory.   Each  file  is  marked  by  an HREF relative to the
+              parent directory.  Add a  trailing  slash  to  make  the  HREF's
               relative to the current directory:
 
-              lynx -source ./ >foo.html
+                lynx -source ./ >foo.html
 
        -stack_dump
               disable SIGINT cleanup handler
@@ -703,9 +714,9 @@
               allow non-http startfile and homepage with -validate.
 
        -stderr
-              When dumping a document using -dump or  -source,  Lynx  normally
-              does  not  display  alert  (error)  messages that you see on the
-              screen in the status line.  Use the -stderr option to tell  Lynx
+              When  dumping  a  document using -dump or -source, Lynx normally
+              does not display alert (error) messages  that  you  see  on  the
+              screen  in the status line.  Use the -stderr option to tell Lynx
               to write these messages to the standard error.
 
        -stdin read the startfile from standard input (UNIX only).
@@ -713,7 +724,7 @@
        -syslog=text
               information for syslog call.
 
-       -syslog-urls
+       -syslog_urls
               log requested URLs with syslog.
 
        -tagsoup
@@ -723,25 +734,25 @@
               disable recognition of telnet commands.
 
        -term=TERM
-              tell  Lynx what terminal type to assume it is talking to.  (This
-              may be useful for remote  execution,  when,  for  example,  Lynx
-              connects  to  a remote TCP/IP port that starts a script that, in
+              tell Lynx what terminal type to assume it is talking to.   (This
+              may  be  useful  for  remote  execution, when, for example, Lynx
+              connects to a remote TCP/IP port that starts a script  that,  in
               turn, starts another Lynx process.)
 
        -timeout=N
-              For win32, sets the network read-timeout, where N  is  given  in
+              For  win32,  sets  the network read-timeout, where N is given in
               seconds.
 
-       -tlog  toggles  between  using  a  Lynx  Trace Log and stderr for trace
+       -tlog  toggles between using a Lynx Trace  Log  and  stderr  for  trace
               output from the session.
 
        -tna   turns on "Textfields Need Activation" mode.
 
-       -trace turns on Lynx trace mode.  Destination of trace  output  depends
+       -trace turns  on  Lynx trace mode.  Destination of trace output depends
               on -tlog.
 
        -trace_mask=value
-              turn  on  optional  traces, which may result in very large trace
+              turn on optional traces, which may result in  very  large  trace
               files.  Logically OR the values to combine options:
 
               1  SGML character parsing states
@@ -750,7 +761,7 @@
 
               4  TRST (table layout)
 
-              8  configuration (lynx.cfg, .lynxrc,  .lynx-keymaps,  mime.types
+              8  configuration  (lynx.cfg,  .lynxrc, .lynx-keymaps, mime.types
                  and mailcap contents)
 
               16 binary string copy/append, used in form data construction.
@@ -766,10 +777,11 @@
                  timing
 
        -traversal
-              traverse  all http links derived from startfile.  When used with
-              -crawl, each link that begins with the same string as  startfile
-              is  output to a file, intended for indexing.  See CRAWL.announce
-              for more information.
+              traverse all http links derived from startfile.  When used  with
+              -crawl,  each link that begins with the same string as startfile
+              is output to a file, intended for indexing.
+
+              See CRAWL.announce for more information.
 
        -trim_input_fields
               trim input text/textarea fields in forms.
@@ -823,7 +835,7 @@
               typically 1024 (the MAX_LINE symbol).
 
        -with_backspaces
-              emit backspaces in output if -dump'ing or -crawl'ing (like `man'
+              emit  backspaces  in output if -dump'ing or -crawl'ing (like man
               does)
 
        -xhtml_parsing
@@ -834,22 +846,22 @@
        More  than  one key can be mapped to a given command.  Here are some of
        the most useful:
 
-       o  Use Up arrow and Down arrow to scroll through hypertext links.
+       *   Use Up arrow and Down arrow to scroll through hypertext links.
 
-       o  Right arrow or Return will follow a highlighted hypertext link.
+       *   Right arrow or Return will follow a highlighted hypertext link.
 
-       o  Left Arrow or "u" will retreat from a link.
+       *   Left Arrow or "u" will retreat from a link.
 
-       o  Type "H", "?", or F1 for online help and descriptions of  key-stroke
-          commands.
+       *   Type "H", "?", or F1 for online help and descriptions of key-stroke
+           commands.
 
-       o  Type  "k"  or  "K"  for  a  list  of  the current key-stroke command
-          mappings.
+       *   Type  "k"  or  "K"  for  a  list  of the current key-stroke command
+           mappings.
 
-          If the same command is mapped to the same letter differing  only  by
-          upper/lowercase only the lowercase mapping is shown.
+           If the same command is mapped to the same letter differing only  by
+           upper/lowercase only the lowercase mapping is shown.
 
-       o  Type Delete to view history list.
+       *   Type Delete to view history list.
 
 2 Environment
        In  addition  to various "standard" environment variables such as HOME,
@@ -878,31 +890,33 @@
                            location and name of the global configuration  file
                            (normally,   lynx.cfg)  that  was  defined  by  the
                            LYNX_CFG_FILE  constant  in  the  userdefs.h  file,
-                           during  installation.   See the userdefs.h file for
-                           more information.
+                           during installation.
+
+                           See the userdefs.h file for more information.
 
-       LYNX_CFG_PATH       If set, this  variable  overrides  the  compiled-in
-                           search-list   of   directories  used  to  find  the
-                           configuration files, e.g., lynx.cfg  and  lynx.lss.
+       LYNX_CFG_PATH       If  set,  this  variable  overrides the compiled-in
+                           search-list  of  directories  used  to   find   the
+                           configuration  files,  e.g., lynx.cfg and lynx.lss.
                            The list is delimited with ":" (or ";" for Windows)
                            like the PATH environment variable.
 
        LYNX_HELPFILE       If set, this variable overrides the compiled-in URL
                            and configuration file URL for the Lynx help file.
 
-       LYNX_LOCALEDIR      If  set,  this  variable  overrides the compiled-in
-                           location of the  locale  directory  which  contains
+       LYNX_LOCALEDIR      If set, this  variable  overrides  the  compiled-in
+                           location  of  the  locale  directory which contains
                            native language (NLS) message text.
 
-       LYNX_LSS            This  variable,  if  set, specifies the location of
-                           the  default  Lynx  character  style  sheet   file.
-                           [Currently  only meaningful if Lynx was built using
+       LYNX_LSS            This variable, if set, specifies  the  location  of
+                           the   default  Lynx  character  style  sheet  file.
+                           [Currently only meaningful if Lynx was built  using
                            curses color style support.]
 
-       LYNX_SAVE_SPACE     This variable, if set, will  override  the  default
+       LYNX_SAVE_SPACE     This  variable,  if  set, will override the default
                            path prefix for files saved to disk that is defined
-                           in the lynx.cfg  SAVE_SPACE:  statement.   See  the
-                           lynx.cfg file for more information.
+                           in the lynx.cfg SAVE_SPACE: statement.
+
+                           See the lynx.cfg file for more information.
 
        LYNX_TEMP_SPACE     This  variable,  if  set, will override the default
                            path prefix for temporary files  that  was  defined
@@ -932,29 +946,33 @@
        PROTOCOL_proxy      Lynx supports the use of proxy servers that can act
                            as firewall gateways and caching servers.  They are
                            preferable  to  the  older  gateway  servers   (see
-                           WWW_access_GATEWAY,  below).  Each protocol used by
-                           Lynx, (http,  ftp,  gopher,  etc),  can  be  mapped
-                           separately  by setting environment variables of the
-                           form   PROTOCOL_proxy    (literally:    http_proxy,
-                           ftp_proxy,       gopher_proxy,       etc),       to
-                           "http://some.server.dom:port/".   See  Lynx   Users
-                           Guide for additional details and examples.
-
-       SSL_CERT_DIR        Set    to    the   directory   containing   trusted
+                           WWW_access_GATEWAY, below).
+
+                           Each  protocol  used  by  Lynx, (http, ftp, gopher,
+                           etc),  can  be   mapped   separately   by   setting
+                           environment  variables  of  the form PROTOCOL_proxy
+                           (literally:  http_proxy,  ftp_proxy,  gopher_proxy,
+                           etc), to "http://some.server.dom:port/".
+
+                           See  Lynx  Users  Guide  for additional details and
+                           examples.
+
+       SSL_CERT_DIR        Set   to   the   directory    containing    trusted
                            certificates.
 
-       SSL_CERT_FILE       Set to the full path and filename for your file  of
+       SSL_CERT_FILE       Set  to the full path and filename for your file of
                            trusted certificates.
 
-       WWW_access_GATEWAY  Lynx  still  supports  use of gateway servers, with
-                           the  servers  specified  via   "WWW_access_GATEWAY"
-                           variables  (where "access" is lower case and can be
-                           "http", "ftp", "gopher" or  "wais"),  however  most
-                           gateway  servers have been discontinued.  Note that
-                           you do not include a terminal `/' for gateways, but
-                           do   for   proxies   specified   by  PROTOCOL_proxy
-                           environment variables.  See Lynx  Users  Guide  for
-                           details.
+       WWW_access_GATEWAY  Lynx still supports use of  gateway  servers,  with
+                           the   servers  specified  via  "WWW_access_GATEWAY"
+                           variables (where "access" is lower case and can  be
+                           "http",  "ftp",  "gopher" or "wais").  However most
+                           gateway servers have been discontinued.  Note  that
+                           you do not include a terminal "/" for gateways, but
+                           do  for   proxies   specified   by   PROTOCOL_proxy
+                           environment variables.
+
+                           See Lynx Users Guide for details.
 
        WWW_HOME            This  variable,  if  set, will override the default
                            startup  URL  specified  in   any   of   the   Lynx
@@ -1009,26 +1027,27 @@
 
        LYNX_VERSION        This variable is always set by  Lynx,  and  may  be
                            used  by an external program to determine if it was
-                           invoked by Lynx.  See  also  the  comments  in  the
-                           distribution's  sample  mailcap  file, for notes on
-                           usage in such a file.
+                           invoked by Lynx.
+
+                           See also the comments in the distribution's  sample
+                           mailcap file, for notes on usage in such a file.
 
-       TERM                Normally,  this  variable  is  used  by   Lynx   to
-                           determine  the  terminal  type being used to invoke
+       TERM                Normally,   this   variable  is  used  by  Lynx  to
+                           determine the terminal type being  used  to  invoke
                            Lynx.  If, however, it is unset at startup time (or
-                           has  the value "unknown"), or if the -term command-
-                           line option is used (see  OPTIONS  section  above),
-                           Lynx  will  set  or  modify  its  value to the user
-                           specified terminal type  (for  the  Lynx  execution
-                           environment).   Note:  If set/modified by Lynx, the
-                           values of  the  LINES  and/or  COLUMNS  environment
+                           has the value "unknown"), or if the -term  command-
+                           line  option  is  used (see OPTIONS section above),
+                           Lynx will set or  modify  its  value  to  the  user
+                           specified  terminal  type  (for  the Lynx execution
+                           environment).  Note: If set/modified by  Lynx,  the
+                           values  of  the  LINES  and/or  COLUMNS environment
                            variables may also be changed.
 
 2 Simulated Cgi Support
        If built with the cgi-links option enabled, Lynx allows access to a cgi
        script directly without the need for an http daemon.
 
-       When executing such  "lynxcgi  scripts"  (if  enabled),  the  following
+       When  executing  such  "lynxcgi  scripts"  (if  enabled), the following
        variables may be set for simulating a CGI environment:
 
        CONTENT_LENGTH
@@ -1057,98 +1076,98 @@
 
        SERVER_SOFTWARE
 
-       Other  environment  variables  are  not inherited by the script, unless
-       they  are  provided  via  a  LYNXCGI_ENVIRONMENT   statement   in   the
-       configuration  file.   See  the  lynx.cfg file, and the (draft) CGI 1.1
+       Other environment variables are not inherited  by  the  script,  unless
+       they   are   provided   via  a  LYNXCGI_ENVIRONMENT  statement  in  the
+       configuration file.  See the lynx.cfg file, and  the  (draft)  CGI  1.1
        Specification <http://Web.Golux.Com/coar/cgi/draft-coar-cgi-v11-00.txt>
        for the definition and usage of these variables.
 
-       The  CGI  Specification,  and other associated documentation, should be
+       The CGI Specification, and other associated  documentation,  should  be
        consulted for general information on CGI script programming.
 
 2 Native Language Support
-       If configured and installed with Native  Language  Support,  Lynx  will
+       If  configured  and  installed  with Native Language Support, Lynx will
        display status and other messages in your local language.  See the file
-       ABOUT_NLS in the source distribution, or at your local  GNU  site,  for
+       ABOUT_NLS  in  the  source distribution, or at your local GNU site, for
        more information about internationalization.
 
-       The  following  environment  variables  may  be  used  to alter default
+       The following environment  variables  may  be  used  to  alter  default
        settings:
 
-       LANG                This variable, if set, will  override  the  default
+       LANG                This  variable,  if  set, will override the default
                            message language.  It is an ISO 639 two-letter code
-                           identifying the language.  Language codes  are  NOT
+                           identifying  the  language.  Language codes are NOT
                            the same as the country codes given in ISO 3166.
 
-       LANGUAGE            This  variable,  if  set, will override the default
+       LANGUAGE            This variable, if set, will  override  the  default
                            message language.  This is a GNU extension that has
-                           higher  priority  for  setting  the message catalog
+                           higher priority for  setting  the  message  catalog
                            than LANG or LC_ALL.
 
        LC_ALL              and
 
-       LC_MESSAGES         These variables, if  set,  specify  the  notion  of
+       LC_MESSAGES         These  variables,  if  set,  specify  the notion of
                            native language formatting style.  They are POSIXly
                            correct.
 
        LINGUAS             This  variable,  if  set  prior  to  configuration,
-                           limits  the installed languages to specific values.
-                           It is a space-separated list of  two-letter  codes.
+                           limits the installed languages to specific  values.
+                           It  is  a space-separated list of two-letter codes.
                            Currently, it is hard-coded to a wish list.
 
-       NLSPATH             This  variable,  if set, is used as the path prefix
+       NLSPATH             This variable, if set, is used as the  path  prefix
                            for message catalogs.
 
 2 Notes
        This is the Lynx v2.8.8 Release; development is in progress for 2.8.9.
 
        If you wish to contribute to the further development of Lynx, subscribe
-       to  our mailing list.  Send email to <lynx-dev-request at nongnu.org> with
+       to our mailing list.  Send email to <lynx-dev-request at nongnu.org>  with
        "subscribe lynx-dev" as the only line in the body of your message.
 
-       Send bug reports, comments, suggestions to <lynx-dev at nongnu.org>  after
+       Send  bug reports, comments, suggestions to <lynx-dev at nongnu.org> after
        subscribing.
 
-       Unsubscribe  by  sending  email  to  <lynx-dev-request at nongnu.org> with
-       "unsubscribe lynx-dev" as the only line in the body  of  your  message.
+       Unsubscribe by  sending  email  to  <lynx-dev-request at nongnu.org>  with
+       "unsubscribe  lynx-dev"  as  the only line in the body of your message.
        Do not send the unsubscribe message to the lynx-dev list, itself.
 
 2 See Also
-       catgets(3),  curses(3),  environ(7),  execve(2),  ftp(1), gettext(GNU),
-       localeconv(3),   ncurses(3),   setlocale(3),   slang(?),    termcap(5),
+       catgets(3), curses(3),  environ(7),  execve(2),  ftp(1),  gettext(GNU),
+       localeconv(3),    ncurses(3),   setlocale(3),   slang(?),   termcap(5),
        terminfo(5), wget(GNU)
 
        Note that man page availability and section numbering is somewhat platform
        dependent, and may vary from the above references.
 
-       A section shown as (GNU), is intended to denote that the topic  may  be
+       A  section  shown as (GNU), is intended to denote that the topic may be
        available via an info page, instead of a man page (i.e., try "info subject",
        rather than "man subject").
 
-       A section shown as (?) denotes that documentation on the topic  exists,
-       but  is  not part of an established documentation retrieval system (see
-       the distribution files associated with the topic, or contact your  System
+       A  section shown as (?) denotes that documentation on the topic exists,
+       but is not part of an established documentation retrieval  system  (see
+       the  distribution files associated with the topic, or contact your System
        Administrator for further information).
 
 2 Acknowledgments
-       Lynx  has  incorporated  code  from a variety of sources along the way.
-       The earliest versions of Lynx included code from Earl Fogel of  Comput-
-       ing  Services at the University of Saskatchewan, who implemented HYPER-
-       REZ in the Unix environment.  HYPERREZ was developed by Niel Larson  of
-       Think.com  and  served  as  the  model  for the early versions of Lynx.
+       Lynx has incorporated code from a variety of  sources  along  the  way.
+       The  earliest versions of Lynx included code from Earl Fogel of Comput-
+       ing Services at the University of Saskatchewan, who implemented  HYPER-
+       REZ  in the Unix environment.  HYPERREZ was developed by Niel Larson of
+       Think.com and served as the model  for  the  early  versions  of  Lynx.
        Those versions also incorporated libraries from the Unix Gopher clients
-       developed  at  the  University  of Minnesota, and the later versions of
-       Lynx rely on the WWW client library code developed by  Tim  Berners-Lee
-       and  the  WWW  community.  Also a special thanks to Foteos Macrides who
+       developed at the University of Minnesota, and  the  later  versions  of
+       Lynx  rely  on the WWW client library code developed by Tim Berners-Lee
+       and the WWW community.  Also a special thanks to  Foteos  Macrides  who
        ported much of Lynx to VMS and did or organized most of its development
-       since  the  departures of Lou Montulli and Garrett Blythe from the Uni-
-       versity of Kansas in the summer of 1994 through the release of  v2.7.2,
-       and  to  everyone  on the net who has contributed to Lynx's development
+       since the departures of Lou Montulli and Garrett Blythe from  the  Uni-
+       versity  of Kansas in the summer of 1994 through the release of v2.7.2,
+       and to everyone on the net who has contributed  to  Lynx's  development
        either directly (through patches, comments or bug reports) or indirect-
        ly (through inspiration and development of other systems).
 
 2 Authors
-       Lou  Montulli,  Garrett  Blythe, Craig Lavender, Michael Grobe, Charles
+       Lou Montulli, Garrett Blythe, Craig Lavender,  Michael  Grobe,  Charles
        Rezac
        Academic Computing Services
        University of Kansas
diff --git a/lynx.man b/lynx.man
index 9e82ccb..d5feb3d 100644
--- a/lynx.man
+++ b/lynx.man
@@ -1,4 +1,4 @@
-.\" $LynxId: lynx.man,v 1.113 2016/10/14 08:59:24 tom Exp $
+.\" $LynxId: lynx.man,v 1.117 2017/04/28 01:19:42 tom Exp $
 .\" **************************************************************************
 .\" Escape single quotes in literal strings from groff's Unicode transform.
 .ie \n(.g .ds AQ \(aq
@@ -7,6 +7,22 @@
 .el       .ds `` ``
 .ie \n(.g .ds '' \(rq
 .el       .ds '' ''
+.de bP
+.IP \(bu 4
+..
+.de NS
+.ie \n(.sp
+.el    .sp .5
+.ie \n(.in +4
+.el    .in +2
+.nf
+.ft C			\" Courier
+..
+.de NE
+.fi
+.ft R
+.in -4
+..
 .\" **************************************************************************
 .TH LYNX 1
 .SH NAME
@@ -72,10 +88,12 @@ If more than one local file or remote URL is listed on the command line,
 All of the names (local files and remote URLs) are added to the \fBG)oto\fP history.
 .PP
 \fILynx\fR uses only long option names.
-Option names can begin with double dash as well,
+Option names can begin with double dash \*(``\-\-\*('' as well,
 underscores and dashes can be intermixed in
-option names (in the reference below options
-are with one dash before them and with underscores).
+option names (in the reference below, options
+are shown
+with one dash \*(``\-\*('' before them, and
+with underscores \*(``_\*('').
 .PP
 \fILynx\fR provides many command-line options.
 Some options require a value (string, number or keyword).
@@ -87,13 +105,12 @@ set (to true), unset (to false), or toggle (between true/false).
 For any of these, an explicit value can be given in different
 forms to allow for operating system constraints,
 e.g.,
-.RS
-.nf
+.NS
 \fB\-center:off\fP
 \fB\-center=off\fP
 \fB\-center\-\fP
-.fi
-.RE
+.NE
+.PP
 \fILynx\fR recognizes
 \*(``1\*('', \*(``+\*('', \*(``on\*('' and \*(``true\*('' for true values, and
 \*(``0\*('', \*(``\-\*('', \*(``off\*('' and \*(``false\*('' for false values.
@@ -108,7 +125,7 @@ so any option which sets a value,
 as well as runtime configuration values are reflected in the help-message.
 .TP 7
 .B \-
-If the argument is only '\-', then \fILynx\fP expects to receive
+If the argument is only \*(``\-\*('', then \fILynx\fP expects to receive
 the arguments from the standard input.
 This is to allow for the
 potentially very long command line that can be associated
@@ -125,7 +142,7 @@ accept all cookies.
 apply restrictions for anonymous account, see also \fB\-restrictions\fR.
 .TP
 .B \-assume_charset\fR=\fIMIMEname
-charset for documents that don't specify it.
+charset for documents that do not specify it.
 .TP
 .B \-assume_local_charset\fR=\fIMIMEname
 charset assumed for local files,
@@ -266,7 +283,7 @@ Toggling this option makes the feature altogether unavailable.
 .B \-debug_partial
 separate incremental display stages with MessageSecs delay
 .TP
-.B \-default-colors
+.B \-default_colors
 toggles the default-colors feature which is normally set in the lynx.cfg file.
 .TP
 .B \-delay
@@ -287,8 +304,9 @@ dumps the formatted output of the default document or those
 specified on the command line to standard output.
 Unlike interactive mode, all documents are processed.
 This can be used in the following way:
-.sp
+.NS
 lynx \fB\-dump\fR http://www.subir.com/lynx.html
+.NE
 .IP
 Files specified on the command line are formatted as HTML if
 their names end with one of the standard web suffixes such
@@ -324,7 +342,8 @@ is not compiled-into your executable, but when it is,
 it can be disabled for a session.
 .TP
 .B \-force_empty_hrefless_a
-force HREF-less 'A' elements to be empty (close them as soon as they are seen).
+force HREF-less \*(``A\*('' elements to be empty
+(close them as soon as they are seen).
 .TP
 .B \-force_html
 forces the first document to be interpreted as HTML.
@@ -334,7 +353,7 @@ which have an unrecognized suffix (or the suffix is associated with a
 non-HTML type, such as \*(``.txt\*('' for plain text files).
 .IP
 \fILynx\fP recognizes these file suffixes as HTML:
-.RS
+.NS
 \*(``.ht3\*('',
 \*(``.htm\*('',
 \*(``.html3\*('',
@@ -345,7 +364,7 @@ non-HTML type, such as \*(``.txt\*('' for plain text files).
 \*(``.phtml\*('',
 \*(``.sht\*('', and
 \*(``.shtml\*(''.
-.RE
+.NE
 .TP
 .B \-force_secure
 toggles forcing of the secure flag for SSL cookies.
@@ -362,7 +381,7 @@ disable ftp access.
 .B \-get_data
 properly formatted data for a \fIget\fP form are read in from
 the standard input and passed to the form.
-Input is terminated by a line that starts with '\-\-\-'.
+Input is terminated by a line that starts with \*(``\-\-\-\*(''.
 .IP
 \fILynx\fP issues an HTTP \fBGET\fP,
 sending the form to the path or URL given on the
@@ -395,7 +414,7 @@ hidden links do not appear even in listings.
 .RE
 .TP
 .B \-historical
-toggles use of '>' or '\-\->' as a terminator for comments.
+toggles use of \*(``>\*('' or \*(``\-\->\*('' as a terminator for comments.
 .TP
 .B \-homepage\fR=\fIURL
 set homepage separate from start page.
@@ -537,7 +556,7 @@ toggles display partial pages while loading.
 number of lines to render before repainting display
 with partial-display logic
 .TP
-.B \-passive-ftp
+.B \-passive_ftp
 toggles passive ftp connections.
 .TP
 .B \-pauth\fR=\fIID\fR:\fIPASSWD
@@ -551,7 +570,7 @@ popup windows or as lists of radio buttons.
 .B \-post_data
 properly formatted data for a \fIpost\fP form are read in from
 the standard input and passed to the form.
-Input is terminated by a line that starts with '\-\-\-'.
+Input is terminated by a line that starts with \*(``\-\-\-\*(''.
 .IP
 \fILynx\fP issues an HTTP \fBPOST\fP,
 sending the form to the path or URL given on the
@@ -656,7 +675,7 @@ disallow using \fBG)oto\fP, served links or bookmarks for
 file: URLs.
 .TP
 .B goto
-disable the 'g' (goto) command.
+disable the \*(``g\*('' (goto) command.
 .TP
 .B inside_ftp
 disallow ftps for people coming from inside your
@@ -675,7 +694,7 @@ disallow telnets for people coming from inside
 your domain (utmp required for selectivity).
 .TP
 .B jump
-disable the 'j' (jump) command.
+disable the \*(``j\*('' (jump) command.
 .TP
 .B multibook
 disallow multiple bookmarks.
@@ -773,24 +792,22 @@ Use lynx.cfg or the options menu to select KB/second and/or ETA.
 .TP
 .B \-soft_dquotes
 toggles emulation of the old Netscape and Mosaic bug which
-treated '>' as a co-terminator for double-quotes and tags.
+treated \*(``>\*('' as a co-terminator for double-quotes and tags.
 .TP
 .B \-source
 works the same as dump but outputs HTML source instead of
 formatted text.
 For example
-.sp
-.RS
+.NS
 lynx \-source . >foo.html
-.RE
+.NE
 .IP
 generates HTML source listing the files in the current directory.
 Each file is marked by an HREF relative to the parent directory.
 Add a trailing slash to make the HREF's relative to the current directory:
-.sp
-.RS
+.NS
 lynx \-source ./ >foo.html
-.RE
+.NE
 .TP
 .B \-stack_dump
 disable SIGINT cleanup handler
@@ -812,7 +829,7 @@ read the startfile from standard input
 .B \-syslog\fR=\fItext
 information for syslog call.
 .TP
-.B \-syslog\-urls
+.B \-syslog_urls
 log requested URLs with syslog.
 .TP
 .B \-tagsoup
@@ -880,6 +897,7 @@ traverse all http links derived from startfile.
 When used with
 \fB\-crawl\fR, each link that begins with the same string as startfile
 is output to a file, intended for indexing.
+.IP
 See CRAWL.announce for more information.
 .TP
 .B \-trim_input_fields
@@ -936,7 +954,8 @@ This is limited by the number of columns that \fILynx\fP could display,
 typically 1024 (the \fIMAX_LINE\fP symbol).
 .TP
 .B \-with_backspaces
-emit backspaces in output if \fB\-dump\fR'ing or \fB\-crawl\fR'ing (like 'man' does)
+emit backspaces in output if \fB\-dump\fR'ing or \fB\-crawl\fR'ing
+(like \fBman\fP does)
 .TP
 .B \-xhtml_parsing
 tells \fILynx\fP that it can ignore certain tags which have no content
@@ -946,28 +965,22 @@ For example \*(``<p/>\*('' will be discarded.
 .PP
 More than one key can be mapped to a given command.
 Here are some of the most useful:
-.TP 3
-.B o
+.bP
 Use \fBUp arrow\fR and \fBDown arrow\fR to scroll through hypertext links.
-.TP
-.B o
+.bP
 \fBRight arrow\fR or \fBReturn\fR will follow a highlighted hypertext link.
-.TP
-.B o
+.bP
 \fBLeft Arrow\fR or \*(``\fBu\fR\*('' will retreat from a link.
-.TP
-.B o
+.bP
 Type \*(``\fBH\fR\*('', \*(``\fB?\fR\*('', or \fBF1\fR for online help and descriptions
 of key-stroke commands.
-.TP
-.B o
+.bP
 Type \*(``\fBk\fR\*('' or \*(``\fBK\fR\*('' for a list of the current key-stroke
 command mappings.
 .IP
 If the same command is mapped to the same letter differing only
 by upper/lowercase only the lowercase mapping is shown.
-.TP
-.B o
+.bP
 Type \fBDelete\fR to view history list.
 .SH ENVIRONMENT
 In addition to various \*(``standard\*('' environment variables such as
@@ -998,6 +1011,7 @@ screen-handling library.
 This variable, if set, will override the default location and name of
 the global configuration file (normally, \fBlynx.cfg\fR) that was defined
 by the LYNX_CFG_FILE constant in the userdefs.h file, during installation.
+.IP
 See the userdefs.h file for more information.
 .TP
 .B LYNX_CFG_PATH
@@ -1023,6 +1037,7 @@ built using curses color style support.]
 .B LYNX_SAVE_SPACE
 This variable, if set, will override the default path prefix for files
 saved to disk that is defined in the \fBlynx.cfg SAVE_SPACE:\fR statement.
+.IP
 See the \fBlynx.cfg\fR file for more information.
 .TP
 .B LYNX_TEMP_SPACE
@@ -1051,15 +1066,39 @@ header of \fBUSENET\fR news postings.
 On \fBUNIX\fR, it will override the
 contents of an /etc/organization file, if present.
 .TP
-.B PROTOCOL_proxy
+.I PROTOCOL\fB_proxy\fR
 \fILynx\fR supports the use of proxy servers that can act as firewall
 gateways and caching servers.
 They are preferable to the older gateway
 servers (see WWW_access_GATEWAY, below).
+.IP
 Each protocol used by \fILynx\fR,
 (http, ftp, gopher, etc), can be mapped separately by setting environment
-variables of the form PROTOCOL_proxy (literally: http_proxy, ftp_proxy,
-gopher_proxy, etc), to \*(``http://some.server.dom:port/\*(''.
+variables of the form \fIPROTOCOL\fP_proxy.
+Protocols are indicated in a URI by the name before \*(``:\*('', e.g.,
+\*(``http\*('' in 
+\*(``http://some.server.dom:port/\*('' for HTML. 
+.IP
+Depending on your system configuration and supported protocols,
+the environment variables recognized by \fIlynx\fP may include
+.NS
+cso_proxy
+finger_proxy
+ftp_proxy
+gopher_proxy
+https_proxy
+http_proxy
+newspost_proxy
+newsreply_proxy
+news_proxy
+nntp_proxy
+no_proxy
+snewspost_proxy
+snewsreply_proxy
+snews_proxy
+wais_proxy
+.NE
+.IP
 See \fBLynx Users Guide\fR for additional details and examples.
 .TP
 .B SSL_CERT_DIR
@@ -1068,13 +1107,15 @@ Set to the directory containing trusted certificates.
 .B SSL_CERT_FILE
 Set to the full path and filename for your file of trusted certificates.
 .TP
-.B WWW_access_GATEWAY
+.B WWW_\fIaccess\fB_GATEWAY
 \fILynx\fR still supports use of gateway servers, with the servers specified
-via \*(``WWW_access_GATEWAY\*('' variables (where \*(``access\*('' is lower case and can be
-\*(``http\*('', \*(``ftp\*('', \*(``gopher\*('' or \*(``wais\*(''), however most gateway servers have been
-discontinued.
-Note that you do not include a terminal '/' for gateways, but
-do for proxies specified by PROTOCOL_proxy environment variables.
+via \*(``WWW_\fIaccess\fP_GATEWAY\*('' variables
+(where \*(``\fIaccess\fP\*('' is lower case and can be
+\*(``http\*('', \*(``ftp\*('', \*(``gopher\*('' or \*(``wais\*('').
+However most gateway servers have been discontinued.
+Note that you do not include a terminal \*(``/\*('' for gateways, but
+do for proxies specified by \fIPROTOCOL\fP_proxy environment variables.
+.IP
 See \fBLynx Users Guide\fR for details.
 .TP
 .B WWW_HOME
@@ -1136,6 +1177,7 @@ The trace file is in either case relative to the home directory.
 .B LYNX_VERSION
 This variable is always set by \fILynx\fR, and may be used by an external
 program to determine if it was invoked by \fILynx\fR.
+.IP
 See also the comments
 in the distribution's sample \fBmailcap\fR file, for notes on usage in such
 a file.
@@ -1266,7 +1308,7 @@ A section shown as (GNU), is intended to denote that the topic
 may be available via an info page, instead of a man page (i.e., try
 \*(``info subject\*('', rather than \*(``man subject\*('').
 .PP
-A section shown as (?) denotes that documentation on the topic exists,
+A section shown as \fB(?)\fP denotes that documentation on the topic exists,
 but is not part of an established documentation retrieval system (see
 the distribution files associated with the topic, or contact your
 System Administrator for further information).
diff --git a/lynx_help/Lynx_users_guide.html b/lynx_help/Lynx_users_guide.html
index 338894b..c6cb8cb 100644
--- a/lynx_help/Lynx_users_guide.html
+++ b/lynx_help/Lynx_users_guide.html
@@ -1,4 +1,4 @@
-<!-- $LynxId: Lynx_users_guide.html,v 1.128 2015/12/18 10:24:31 tom Exp $ -->
+<!-- $LynxId: Lynx_users_guide.html,v 1.130 2017/04/28 16:42:13 tom Exp $ -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 
 <html>
@@ -161,19 +161,20 @@
   help</a></h2>
 
   <p>Online help is available while viewing any document. Press the
-  '<em>?</em>' or '<em>H</em>' key (or the '<em>h</em>' key if
-  vi-like key movement is not on) to see a list of help topics. See
-  the section titled <a href="#IntraDocNav">Navigating hypertext
-  documents with Lynx</a> for information on navigating through the
-  help files.</p>
+  “<em>?</em>” or “<em>H</em>” key (or the
+  “<em>h</em>” key if vi-like key movement is not on)
+  to see a list of help topics. See the section titled <a href=
+  "#IntraDocNav">Navigating hypertext documents with Lynx</a> for
+  information on navigating through the help files.</p>
 
   <p>In addition, a summary description of all the Lynx keystroke
   commands and their key bindings is available by pressing the
-  '<em>K</em>' key (or the '<em>k</em>' key if vi-like key movement
-  is not on).</p>
+  “<em>K</em>” key (or the “<em>k</em>” key
+  if vi-like key movement is not on).</p>
 
   <p>If you want to recall recent status-line messages, you can do
-  so by entering the `g' command, followed by `LYNXMESSAGES:'.</p>
+  so by entering the “g” command, followed by
+  “LYNXMESSAGES:”.</p>
 
   <p>[<a href="#ToC-Help">ToC</a>]</p>
 
@@ -261,19 +262,20 @@
   file) for initial display and should you select the link again.
   If you do select a link again and have reason to desire a new
   fetch and rendering of the file, use the NOCACHE command,
-  normally mapped to '<em>x</em>' and '<em>X</em>', instead of the
-  <em>right-arrow</em> or <em>Return</em> key when positioned on
-  the link. You also can force a new fetch and rendering of the
-  currently displayed document via the RELOAD command, normally
-  mapped to <em>Control-R</em>.</p>
+  normally mapped to “<em>x</em>” and
+  “<em>X</em>”, instead of the <em>right-arrow</em> or
+  <em>Return</em> key when positioned on the link. You also can
+  force a new fetch and rendering of the currently displayed
+  document via the RELOAD command, normally mapped to
+  <em>Control-R</em>.</p>
 
   <p>When a binary file is encountered Lynx will ask the user if
   he/she wishes to download the file or cancel. If the user selects
-  '<em>D'</em> for download, Lynx will transfer the file into a
-  temporary location and present the user with a list of options.
-  The only default option is <em>Save to disk</em>, which is
-  disabled if Lynx is running in anonymous mode. Additional
-  download methods may be defined in the <a href=
+  “<em>D</em>” for download, Lynx will transfer the
+  file into a temporary location and present the user with a list
+  of options. The only default option is <em>Save to disk</em>,
+  which is disabled if Lynx is running in anonymous mode.
+  Additional download methods may be defined in the <a href=
   "#lynx.cfg">lynx.cfg</a> file. Programs like kermit, zmodem and
   FTP are some possible options.</p>
 
@@ -282,10 +284,11 @@
   <h2 id="id-Leaving"><a name="Leaving" id="Leaving">Leaving
   Lynx</a></h2>
 
-  <p>To exit Lynx use the '<em>q</em>' command. You will be asked
-  whether you really want to quit. Answering '<em>y</em>' will exit
-  and '<em>n</em>' will return you to the current document. Use
-  '<em>Q</em>' or <em>Control-D</em> to quit without
+  <p>To exit Lynx use the “<em>q</em>” command. You
+  will be asked whether you really want to quit. Answering
+  “<em>y</em>” will exit and “<em>n</em>”
+  will return you to the current document. Use
+  “<em>Q</em>” or <em>Control-D</em> to quit without
   verification.</p>
 
   <p>[<a href="#ToC-Leaving">ToC</a>]</p>
@@ -438,20 +441,22 @@
   links leading to your access of the current document. Any of the
   previous documents shown in the list may be revisited by
   selecting them from the history screen. The VLINKS keystroke
-  command, normally mapped to uppercase '<em>V</em>', will show the
-  <em>Visited Links Page</em>, and you similarly can select links
-  in that list. The MAIN_MENU keystroke command, normally mapped to
-  '<em>m</em>' and '<em>M</em>', will take you back to the starting
+  command, normally mapped to uppercase “<em>V</em>”,
+  will show the <em>Visited Links Page</em>, and you similarly can
+  select links in that list. The MAIN_MENU keystroke command,
+  normally mapped to “<em>m</em>” and
+  “<em>M</em>”, will take you back to the starting
   document unless you specified the <em>-homepage=URL</em> option
   at the command line. Also, the LIST and ADDRLIST keystroke
-  commands, normally mapped to '<em>l</em>' and <em>A</em>'
-  respectively, will create a compact lists of all the links in the
-  current document, and they can be selected via those lists.</p>
+  commands, normally mapped to “<em>l</em>” and
+  “<em>A</em>” respectively, will create a compact
+  lists of all the links in the current document, and they can be
+  selected via those lists.</p>
 
-  <p>The '<em>i</em>' key presents an index of documents. The
-  default index offered contains many useful links, but can be
-  changed in <em>lynx.cfg</em> or on the command line using the
-  <em>-index=URL</em> switch.</p>
+  <p>The “<em>i</em>” key presents an index of
+  documents. The default index offered contains many useful links,
+  but can be changed in <em>lynx.cfg</em> or on the command line
+  using the <em>-index=URL</em> switch.</p>
 
   <p>If you choose a link to a server with active access
   authorization, Lynx will automatically prompt for a username and
@@ -467,17 +472,17 @@
   disk.</a></h2>
 
   <p>Rendered HTML documents, and plain text files, may be printed
-  using the '<em>p</em>' command while viewing the document. After
-  pressing the '<em>p</em>' key a menu of <em>Print Options</em>
-  will be displayed. The menu will vary according to several
-  factors. First, some sites set up special accounts to let users
-  run Lynx to access local information systems. Typically these
-  accounts require no passwords and do not require users to
-  identify themselves. As a result such accounts are called
-  "anonymous" accounts, and their users are considered "anonymous"
-  users. In most configurations, all Lynx users (including
-  anonymous users) are able to mail files to themselves and print
-  the entire file to the screen.</p>
+  using the “<em>p</em>” command while viewing the
+  document. After pressing the “<em>p</em>” key a menu
+  of <em>Print Options</em> will be displayed. The menu will vary
+  according to several factors. First, some sites set up special
+  accounts to let users run Lynx to access local information
+  systems. Typically these accounts require no passwords and do not
+  require users to identify themselves. As a result such accounts
+  are called "anonymous" accounts, and their users are considered
+  "anonymous" users. In most configurations, all Lynx users
+  (including anonymous users) are able to mail files to themselves
+  and print the entire file to the screen.</p>
 
   <p>Additional print options are available for users who are using
   Lynx from their own accounts (that is, so-called "non-anonymous
@@ -504,10 +509,10 @@
 
   <p>When viewing HTML documents it is possible to retrieve and
   display the unrendered (i.e., the original HTML) source of the
-  document by pressing the '<em>\</em>' (backslash) key. Lynx
-  usually caches only the rendering of the document and doesn't
-  keep the source (unless it is configured to do so in the <a href=
-  "#lynx.cfg">lynx.cfg</a> file), so to display the source
+  document by pressing the “<em>\</em>” (backslash)
+  key. Lynx usually caches only the rendering of the document and
+  does not keep the source (unless it is configured to do so in the
+  <a href="#lynx.cfg">lynx.cfg</a> file), so to display the source
   unrendered, Lynx must reload it from the server or disk. When
   viewing unrendered documents you may print them as any normal
   document.</p>
@@ -538,23 +543,25 @@
   <p>In addition, the user must also specify an editor in the
   <em>Options Menu</em> so that Lynx knows which editor to use. If
   the file is specified correctly and an editor is defined, then
-  you may edit documents by using the '<em>e</em>' command. When
-  the '<em>e</em>' command is entered your specified editor is
-  spawned to edit the file. After changes are completed, exit your
-  editor and you will return to Lynx. Lynx will reload and render
-  the file so that changes can be immediately examined.</p>
+  you may edit documents by using the “<em>e</em>”
+  command. When the “<em>e</em>” command is entered
+  your specified editor is spawned to edit the file. After changes
+  are completed, exit your editor and you will return to Lynx. Lynx
+  will reload and render the file so that changes can be
+  immediately examined.</p>
 
   <p>[<a href="#ToC-LocalSource">ToC</a>]</p>
 
   <h2 id="id-RemoteSource"><a name="RemoteSource" id=
   "RemoteSource">Downloading and Saving source files.</a></h2>
 
-  <p>If the DOWNLOAD keystroke command ('<em>d</em>' or <em>D</em>)
-  is used when positioned on a link for an HTML, plain text, or
-  binary file, Lynx will transfer the file, without rendering, into
-  a temporary location and present the user with a list of options,
-  just as it does when a link for a binary file of a type for which
-  no viewer has been mapped is activated.</p>
+  <p>If the DOWNLOAD keystroke command (“<em>d</em>” or
+  “<em>D</em>”) is used when positioned on a link for
+  an HTML, plain text, or binary file, Lynx will transfer the file,
+  without rendering, into a temporary location and present the user
+  with a list of options, just as it does when a link for a binary
+  file of a type for which no viewer has been mapped is
+  activated.</p>
 
   <p>There is a default <em>Download option</em> of <em>Save to
   disk</em>. This is disabled if Lynx is running in anonymous mode.
@@ -595,39 +602,39 @@
   or wipe the screen to remove or correct any errors that may be
   caused by operating system or other messages.</p>
 
-  <p>The NOCACHE ('<em>x</em>' or '<em>X</em>') command can be used
-  in lieu of ACTIVATE (<em>Return</em> or <em>right-arrow</em>) to
-  request an uncached copy and new rendition for the current link,
-  or resubmission of a FORM, if a cache from a previous request or
-  submission exits. The request or submission will include
-  <em>Pragma: no-cache</em> and <em>Cache-Control: no-cache</em> in
-  its headers. Note that FORMs with POST content will be
-  resubmitted regardless of whether the NOCACHE or ACTIVATE command
-  is used (see <a href="#Forms"><em>Lynx and HTML
-  Forms</em></a>).</p>
+  <p>The NOCACHE (“<em>x</em>” or
+  “<em>X</em>”) command can be used in lieu of ACTIVATE
+  (<em>Return</em> or <em>right-arrow</em>) to request an uncached
+  copy and new rendition for the current link, or resubmission of a
+  FORM, if a cache from a previous request or submission exits. The
+  request or submission will include <em>Pragma: no-cache</em> and
+  <em>Cache-Control: no-cache</em> in its headers. Note that FORMs
+  with POST content will be resubmitted regardless of whether the
+  NOCACHE or ACTIVATE command is used (see <a href=
+  "#Forms"><em>Lynx and HTML Forms</em></a>).</p>
 
   <p>[<a href="#ToC-ReDo">ToC</a>]</p>
 
   <h2 id="id-Search"><a name="Search" id="Search">Lynx searching
   commands</a></h2>
 
-  <p>Two commands activate searching in Lynx: '<em>/</em>' and
-  '<em>s</em>'.</p>
+  <p>Two commands activate searching in Lynx:
+  “<em>/</em>” and “<em>s</em>”.</p>
 
-  <p>While viewing a normal document use the '<em>/</em>' command
-  to find a word or phrase within the current document. The search
-  type will depend on the search option setting in the <a href=
-  "#InteractiveOptions">Options Menu</a>. The search options are
-  case sensitive and case insensitive. These searches are entirely
-  local to Lynx.</p>
+  <p>While viewing a normal document use the
+  “<em>/</em>” command to find a word or phrase within
+  the current document. The search type will depend on the search
+  option setting in the <a href="#InteractiveOptions">Options
+  Menu</a>. The search options are case sensitive and case
+  insensitive. These searches are entirely local to Lynx.</p>
 
   <p>Some documents are designated <em>index documents</em> by
   virtue of an ISINDEX element in their HEAD section. These
   documents can be used to retrieve additional information based on
   searches using words or phrases submitted to an index server. The
   Lynx statusline will indicate that you are viewing such a
-  document, and if so, the '<em>s</em>' key will invoke a
-  statusline prompt to enter a query string. The prompt can be
+  document, and if so, the “<em>s</em>” key will invoke
+  a statusline prompt to enter a query string. The prompt can be
   specified via a PROMPT attribute in the ISINDEX element.
   Otherwise, Lynx will use an internally configured prompt. The
   address for submitting the search can be specified via an HREF or
@@ -639,11 +646,11 @@
   Lynx session are saved in a circular buffer, and can be retrieved
   for re-use by pressing the <em>up-arrow</em> or
   <em>down-arrow</em> keys at the prompt for a search word or
-  string. Also, you can use the '<em>n</em>'ext command to repeat a
-  search with the last-entered search word or phrase, starting from
-  the current position in the document. The word or phrase matches
-  will be highlighted throughout the document, but such
-  highlighting will not persist for new documents, or if the
+  string. Also, you can use the “<em>n</em>”ext command
+  to repeat a search with the last-entered search word or phrase,
+  starting from the current position in the document. The word or
+  phrase matches will be highlighted throughout the document, but
+  such highlighting will not persist for new documents, or if the
   current document is reloaded. The search cycles to the top of the
   document if the word or phrase is not located below your current
   position.</p>
@@ -670,9 +677,9 @@
   "InteractiveOptions">Lynx Options Menu</a></h2>
 
   <p>The Lynx <em>Options Menu</em> may be accessed by pressing the
-  '<em>o</em>' key. It allows you to change options at runtime, if
-  you need to. Most changes are read from & saved to your
-  .lynxrc file; those which are not are marked (!) in the
+  “<em>o</em>” key. It allows you to change options at
+  runtime, if you need to. Most changes are read from & saved
+  to your .lynxrc file; those which are not are marked (!) in the
   form-based menu (as below). Many other options are stored in the
   <a href="#lynx.cfg">lynx.cfg</a> file.</p>
 
@@ -789,9 +796,9 @@
 
   <p>An option can be changed by entering the capital letter or
   character in parentheses for the option you wish to change (e.g.,
-  '<em>E</em>' for Editor or '<em>@</em>' for show cursor). For
-  fields where text must be entered, simply enter the text by
-  typing on the keyboard. The <a href=
+  “<em>E</em>” for Editor or “<em>@</em>”
+  for show cursor). For fields where text must be entered, simply
+  enter the text by typing on the keyboard. The <a href=
   "keystrokes/edit_help.html">Line Editor</a> can be used to
   correct mistakes, and <em>Control-U</em> can be used to erase the
   line. When you are done entering a change press the
@@ -811,9 +818,10 @@
   the choices, then press the <em>Return</em> key to finish the
   change.</p>
 
-  <p>When you are done changing options use the '<em>r</em>'
-  command to return to Lynx or the '<em>></em>' command to save
-  the options to a <em>.lynxrc</em> file and return to Lynx.</p>
+  <p>When you are done changing options use the
+  “<em>r</em>” command to return to Lynx or the
+  “<em>></em>” command to save the options to a
+  <em>.lynxrc</em> file and return to Lynx.</p>
 
   <p>The following table describes the options available on the
   <em>Options Menu</em>:</p>
@@ -830,8 +838,8 @@
     broken pages if you know by some means what the charset is.
     When the value given here or by an -assume_charset command line
     flag is in effect, Lynx will treat documents as if they were
-    encoded accordingly. This option active when 'Raw 8-bit or CJK
-    Mode' is OFF.</dd>
+    encoded accordingly. This option active when “Raw 8-bit
+    or CJK Mode” is OFF.</dd>
 
     <dt>Auto Session</dt>
 
@@ -872,31 +880,32 @@
     <dd>
       When multi-bookmarks is OFF, this is the filename and
       location of your default personal bookmark file. Enter
-      '<em>B</em>' to modify the filename and/or location via the
-      <a href="keystrokes/edit_help.html">Line Editor</a>. Bookmark
-      files allow frequently traveled links to be stored in
-      personal easy to access files.
-
-      <p>Using the '<em>a</em>'dd bookmark link command (see
-      <a href="#Bookmarks">Lynx bookmarks</a>) you may save any
-      link that does not have associated POST content into a
+      “<em>B</em>” to modify the filename and/or
+      location via the <a href="keystrokes/edit_help.html">Line
+      Editor</a>. Bookmark files allow frequently traveled links to
+      be stored in personal easy to access files.
+
+      <p>Using the “<em>a</em>”dd bookmark link command
+      (see <a href="#Bookmarks">Lynx bookmarks</a>) you may save
+      any link that does not have associated POST content into a
       bookmark file. All bookmark files must be in or under your
       account's home directory. If the location specified does not
       begin with a dot-slash (./), its presence will still be
       assumed, and referenced to the home directory.</p>
 
       <p>When multi-bookmarks is STANDARD or ADVANCED, entering
-      '<em>B</em>' will invoke a menu of up to 26 bookmark files
-      (associated with the letters of the English alphabet), for
-      editing their filenames and locations (<em>filepath</em>),
-      and descriptions.</p>
-
-      <p>Lynx will create bookmark files, if they don't already
-      exist, when you first '<em>a</em>'dd a bookmark link to them.
-      However, if you've specified a subdirectory (e.g.,
-      ./BM/lynx_bookmarks.html), that subdirectory must already
-      exist. Note that on VMS you should use the URL syntax for the
-      filepath (e.g., <em>not</em> [.BM]lynx_bookmarks.html).</p>
+      “<em>B</em>” will invoke a menu of up to 26
+      bookmark files (associated with the letters of the English
+      alphabet), for editing their filenames and locations
+      (<em>filepath</em>), and descriptions.</p>
+
+      <p>Lynx will create bookmark files, if they do not already
+      exist, when you first “<em>a</em>”dd a bookmark
+      link to them. However, if you've specified a subdirectory
+      (e.g., ./BM/lynx_bookmarks.html), that subdirectory must
+      already exist. Note that on VMS you should use the URL syntax
+      for the filepath (e.g., <em>not</em>
+      [.BM]lynx_bookmarks.html).</p>
     </dd>
 
     <dt>Cookies</dt>
@@ -1076,7 +1085,7 @@
         <dt>By type</dt>
 
         <dd>by filename suffix, e.g., the text beginning with
-        '.'</dd>
+        “.”</dd>
 
         <dt>By user</dt>
 
@@ -1092,17 +1101,18 @@
 
     <dd>Lynx supports a default bookmark file, and up to 26 total
     bookmark files (see below). When multi-bookmarks is OFF, the
-    default bookmark file is used for the '<em>v</em>'iew bookmarks
-    and '<em>a</em>'dd bookmark link commands. If multi-bookmark
-    support is available in your account, the setting can be
-    changed to STANDARD or ADVANCED. In STANDARD mode, a menu of
-    available bookmarks always is invoked when you seek to view a
-    bookmark file or add a link, and you select the bookmark file
-    by its letter token (see <em>Bookmark file</em>, below) in that
-    menu. In ADVANCED mode, you instead are prompted for the letter
-    of the desired bookmark file, but can enter '<em>=</em>' to
-    invoke the STANDARD selection menu, or <em>RETURN</em> for the
-    default bookmark file.</dd>
+    default bookmark file is used for the
+    “<em>v</em>”iew bookmarks and
+    “<em>a</em>”dd bookmark link commands. If
+    multi-bookmark support is available in your account, the
+    setting can be changed to STANDARD or ADVANCED. In STANDARD
+    mode, a menu of available bookmarks always is invoked when you
+    seek to view a bookmark file or add a link, and you select the
+    bookmark file by its letter token (see <em>Bookmark file</em>,
+    below) in that menu. In ADVANCED mode, you instead are prompted
+    for the letter of the desired bookmark file, but can enter
+    “<em>=</em>” to invoke the STANDARD selection menu,
+    or <em>RETURN</em> for the default bookmark file.</dd>
 
     <dt>Password for anonymous ftp</dt>
 
@@ -1233,10 +1243,11 @@
     header from an HTTP server to indicate what it is) but you know
     by some means that you have the matching display character set
     selected. Should be OFF when an Asian (CJK) set is selected but
-    the document is ISO-8859-1 or another 'assumed document
-    character set'. The setting also can be toggled via the
-    RAW_TOGGLE command, normally mapped to '<em>@</em>', and at
-    startup via the <em>-raw</em> switch.</dd>
+    the document is ISO-8859-1 or another “assumed document
+    character set”. The setting also can be toggled via the
+    RAW_TOGGLE command, normally mapped to
+    “<em>@</em>”, and at startup via the <em>-raw</em>
+    switch.</dd>
 
     <dt>Send User-Agent header</dt>
 
@@ -1488,13 +1499,13 @@
   links</a></h2>
 
   <p>At any time while viewing documents within Lynx, you may use
-  the '<em>c</em>' command to send a mail message to the owner of
-  the current document if the author of the document has specified
-  ownership. (Note to authors: if you want to assign the ownership
-  to your document, you need to add into HEAD section a LINK
-  element with appropriate value for REV attribute. Two values are
-  recognized: <em>owner</em> and <em>made</em> (these are case
-  insensitive). For example,</p>
+  the “<em>c</em>” command to send a mail message to
+  the owner of the current document if the author of the document
+  has specified ownership. (Note to authors: if you want to assign
+  the ownership to your document, you need to add into HEAD section
+  a LINK element with appropriate value for REV attribute. Two
+  values are recognized: <em>owner</em> and <em>made</em> (these
+  are case insensitive). For example,</p>
   <pre>
 <HEAD>
     …
@@ -1525,14 +1536,14 @@
 
   <p>To finish sending the message, exit your spawned editor or, if
   you are using the simple line mode input scheme, type a
-  '<em>.</em>' (period) on a line by itself. You will be asked a
-  final time whether to send the message. If you press
-  '<em>y</em>', you will be prompted whether to append your
-  signature file if one was defined in <a href=
+  “<em>.</em>” (period) on a line by itself. You will
+  be asked a final time whether to send the message. If you press
+  “<em>y</em>”, you will be prompted whether to append
+  your signature file if one was defined in <a href=
   "#lynx.cfg">lynx.cfg</a> and is accessible, and then the message
-  will be sent, whereas if you press '<em>n</em>' the message will
-  be deleted. Entering Control-G in response to any prompts also
-  will cancel the mailing.</p>
+  will be sent, whereas if you press “<em>n</em>” the
+  message will be deleted. Entering Control-G in response to any
+  prompts also will cancel the mailing.</p>
 
   <p>[<a href="#ToC-Mail">ToC</a>]</p>
 
@@ -1585,37 +1596,40 @@
   Menu</em>.</p>
 
   <p>To save a bookmark to the document you wish to place in the
-  bookmark file press the '<em>a</em>' key and you will be
-  asked:</p>
+  bookmark file press the “<em>a</em>” key and you will
+  be asked:</p>
 
   <blockquote>
     <p>Save D)ocument or L)ink to bookmark file or C)ancel?
     (d,l,c):</p>
   </blockquote>
 
-  <p>Answer '<em>d</em>' to save a link to the document you are
-  currently viewing or '<em>l</em>' to save the link that is
-  currently selected on the page. Selecting '<em>c</em>' will
-  cancel without saving anything to your bookmark file.</p>
+  <p>Answer “<em>d</em>” to save a link to the document
+  you are currently viewing or “<em>l</em>” to save the
+  link that is currently selected on the page. Selecting
+  “<em>c</em>” will cancel without saving anything to
+  your bookmark file.</p>
 
   <p>A bookmark file will be created in conjunction with acting on
-  the '<em>a</em>'dd command if it does not already exist.
-  Otherwise, the link will be added to the bottom of the
+  the “<em>a</em>”dd command if it does not already
+  exist. Otherwise, the link will be added to the bottom of the
   pre-existing bookmark file. You must have created a bookmark file
-  via the '<em>a</em>'dd command before you can view it.</p>
+  via the “<em>a</em>”dd command before you can view
+  it.</p>
 
-  <p>Use the '<em>v</em>' command to view the list of bookmarks you
-  have saved. While viewing the bookmark list you may select a
-  bookmark as you would any other link.</p>
+  <p>Use the “<em>v</em>” command to view the list of
+  bookmarks you have saved. While viewing the bookmark list you may
+  select a bookmark as you would any other link.</p>
 
   <p>You can remove a link from the bookmark list by pressing the
-  '<em>r</em>' key when positioned on that link. You also can use a
-  standard text editor (e.g., via the '<em>e</em>'dit command while
-  viewing a bookmark file, if an external editor has been defined
-  via the <em>Options menu</em>) to delete or re-order links in the
-  bookmark file, or to modify a link name by editing the content of
-  the <em>A</em>nchor element for the link, but you should not
-  change the format within the line for the link, consisting of an
+  “<em>r</em>” key when positioned on that link. You
+  also can use a standard text editor (e.g., via the
+  “<em>e</em>”dit command while viewing a bookmark
+  file, if an external editor has been defined via the <em>Options
+  menu</em>) to delete or re-order links in the bookmark file, or
+  to modify a link name by editing the content of the
+  <em>A</em>nchor element for the link, but you should not change
+  the format within the line for the link, consisting of an
   <em>LI</em> element followed by the <em>A</em>nchor element, nor
   cause the line to become wrapped to a second line. You similarly
   can change the link destination by editing the double-quoted
@@ -1628,8 +1642,8 @@
   markup to the bookmark file. If the format and spacing (other
   than the <em>A</em>nchor content or <em>HREF</em> value) within
   lines is changed or other HTML markup is added, the
-  '<em>a</em>'dd and '<em>r</em>'emove commands may not work
-  properly.</p>
+  “<em>a</em>”dd and “<em>r</em>”emove
+  commands may not work properly.</p>
 
   <p>When multi-bookmarks (see <a href=
   "#InteractiveOptions">Options Menu</a>) is OFF, you will always
@@ -1637,9 +1651,9 @@
   STANDARD, a menu of up to 26 bookmark files will be invoked, and
   you select the bookmark file by entering its letter token. When
   it is ADVANCED, you will be prompted for the letter token, but
-  can enter '<em>=</em>' to invoke the STANDARD selection menu, or
-  <em>RETURN</em> for the default bookmark file. [<a href=
-  "#ToC-Bookmarks">ToC</a>]</p>
+  can enter “<em>=</em>” to invoke the STANDARD
+  selection menu, or <em>RETURN</em> for the default bookmark file.
+  [<a href="#ToC-Bookmarks">ToC</a>]</p>
 
   <h2 id="id-Jumps"><a name="Jumps" id="Jumps">Jump
   Command</a></h2>
@@ -1649,11 +1663,12 @@
   distribution package. To use the jumps command, create a
   <em>jumps file</em> with the same format as the sample file, but
   containing your own URLs & short-cut names. Once you have
-  done that, typing '<em>j</em>' prompts you to enter a short-cut
-  name, which will take you straight to the URL associated with the
-  short-cut in the jumps file, much like using '<em>g</em>'. If you
-  want to check which short-cuts are available, type '<em>?</em>'
-  at the jump prompt for the full list.</p>
+  done that, typing “<em>j</em>” prompts you to enter a
+  short-cut name, which will take you straight to the URL
+  associated with the short-cut in the jumps file, much like using
+  “<em>g</em>”. If you want to check which short-cuts
+  are available, type “<em>?</em>” at the jump prompt
+  for the full list.</p>
 
   <p>You can set up a jumps file which makes Lynx prompt for
   parameters, e.g., as part of a search. Do this by putting a "%s"
@@ -1662,8 +1677,8 @@
   you for the parameters, one by one.</p>
 
   <p>All jump short-cuts you have entered are saved in a circular
-  buffer in the same way as with '<em>g</em>' and '<em>/</em>'
-  (search):<br>
+  buffer in the same way as with “<em>g</em>” and
+  “<em>/</em>” (search):<br>
   previous entries can be retrieved with <em>up-arrow</em> or
   <em>down-arrow</em>.</p>
 
@@ -1694,49 +1709,50 @@
   <dl>
     <dt><code>C)reate</code></dt>
 
-    <dd>Type '<em>c</em>' to create a new file. New file will be
-    empty.</dd>
+    <dd>Type “<em>c</em>” to create a new file. New
+    file will be empty.</dd>
 
     <dt><code>D)ownload</code></dt>
 
-    <dd>Type '<em>d</em>' to download using one of the pre-defined
-    options.</dd>
+    <dd>Type “<em>d</em>” to download using one of the
+    pre-defined options.</dd>
 
     <dt><code>E)dit</code></dt>
 
-    <dd>Type '<em>e</em>' to spawn the editor defined in
-    <em>Options Menu</em> and load a selected file for
+    <dd>Type “<em>e</em>” to spawn the editor defined
+    in <em>Options Menu</em> and load a selected file for
     editing.</dd>
 
     <dt><code>F)ull Menu</code></dt>
 
-    <dd>Type '<em>f</em>' to show full menu of options available
-    for selection. Menu may vary according to type of file selected
-    and compression facilities available. 
+    <dd>Type “<em>f</em>” to show full menu of options
+    available for selection. Menu may vary according to type of
+    file selected and compression facilities available. 
     <!-- List of full menu options --></dd>
 
     <dt><code>M)odify</code></dt>
 
-    <dd>Type '<em>m</em>' to modify the name or location of file.
-    Then type '<em>n</em>' to rename the file or '<em>l</em>' to
-    move the file to a different location.</dd>
+    <dd>Type “<em>m</em>” to modify the name or
+    location of file. Then type “<em>n</em>” to rename
+    the file or “<em>l</em>” to move the file to a
+    different location.</dd>
 
     <dt><code>R)emove</code></dt>
 
-    <dd>Type '<em>r</em>' to remove the selected file or
-    directory.</dd>
+    <dd>Type “<em>r</em>” to remove the selected file
+    or directory.</dd>
 
     <dt><code>T)ag</code></dt>
 
-    <dd>Type '<em>t</em>' to tag highlighted file. Further
-    operations will be performed on tagged files instead of
+    <dd>Type “<em>t</em>” to tag highlighted file.
+    Further operations will be performed on tagged files instead of
     highlighted ones.</dd>
 
     <dt><code>U)pload</code></dt>
 
-    <dd>Type '<em>u</em>' to upload a file to the present
-    directory. An uploading method must have been pre-defined in
-    <a href="#lynx.cfg">lynx.cfg</a> .</dd>
+    <dd>Type “<em>u</em>” to upload a file to the
+    present directory. An uploading method must have been
+    pre-defined in <a href="#lynx.cfg">lynx.cfg</a> .</dd>
   </dl>
 
   <p>[<a href="#ToC-DirEd">ToC</a>]</p>
@@ -1753,8 +1769,8 @@
 
   <p>A summary of all the keystroke commands and their key bindings
   can be invoked via the KEYMAP command, normally mapped to
-  '<em>k</em>' and '<em>K</em>'. The following describes some of
-  the most commonly used commands.</p>
+  “<em>k</em>” and “<em>K</em>”. The
+  following describes some of the most commonly used commands.</p>
 
   <dl>
     <dt><em>^A</em></dt>
@@ -1820,65 +1836,67 @@
 
     <dt><em>#</em></dt>
 
-    <dd>The '<em>#</em>' command jumps you to the pseudo Toolbar or
-    Banner if present in the current document. Use
-    <em>left-arrow</em> to return from there to your previous
+    <dd>The “<em>#</em>” command jumps you to the
+    pseudo Toolbar or Banner if present in the current document.
+    Use <em>left-arrow</em> to return from there to your previous
     position in the document.</dd>
 
     <dt><em>!</em></dt>
 
-    <dd>When '<em>!</em>' is pressed your default shell will be
-    spawned. When you quit or exit the shell you will return to
-    Lynx (usually <em>exit</em> under Unix and <em>logout</em>
-    under VMS). This command is usually disabled for anonymous
-    users. On VMS, '<em>$</em>' normally is a synonym. On Win32,
-    this has no effect [???].</dd>
+    <dd>When “<em>!</em>” is pressed your default shell
+    will be spawned. When you quit or exit the shell you will
+    return to Lynx (usually <em>exit</em> under Unix and
+    <em>logout</em> under VMS). This command is usually disabled
+    for anonymous users. On VMS, “<em>$</em>” normally
+    is a synonym. On Win32, this has no effect [???].</dd>
 
     <dt><em>g</em></dt>
 
-    <dd>The '<em>g</em>' command allows any URL to be viewed.
-    Pressing the '<em>g</em>' command will bring up a prompt asking
-    for a URL. Type in the URL that you wish to view. All
-    previously entered goto URLs are saved in a circular buffer,
-    and can be accessed at the prompt by pressing the
-    <em>up-arrow</em> or <em>down-arrow</em> keys.</dd>
+    <dd>The “<em>g</em>” command allows any URL to be
+    viewed. Pressing the “<em>g</em>” command will
+    bring up a prompt asking for a URL. Type in the URL that you
+    wish to view. All previously entered goto URLs are saved in a
+    circular buffer, and can be accessed at the prompt by pressing
+    the <em>up-arrow</em> or <em>down-arrow</em> keys.</dd>
 
     <dt><em>G</em></dt>
 
-    <dd>The '<em>G</em>' command allows you to edit the URL of the
-    current document and then use that as a goto URL. Pressing the
-    '<em>G</em>' command will bring up a prompt asking you to edit
-    the current document's URL. If you do not modify it, or
-    completely delete it, or enter Control-G, the command will be
-    cancelled. If the current document has POST content associated
-    with it, an Alert will be issued. If you do edit that URL, and
-    it does not simply involve a fragment change (for seeking a
-    position in the current document), the modified URL will be
-    submitted with method GET and no POST content. If a
+    <dd>The “<em>G</em>” command allows you to edit the
+    URL of the current document and then use that as a goto URL.
+    Pressing the “<em>G</em>” command will bring up a
+    prompt asking you to edit the current document's URL. If you do
+    not modify it, or completely delete it, or enter Control-G, the
+    command will be cancelled. If the current document has POST
+    content associated with it, an Alert will be issued. If you do
+    edit that URL, and it does not simply involve a fragment change
+    (for seeking a position in the current document), the modified
+    URL will be submitted with method GET and no POST content. If a
     modification of the current document's URL results in a
     submission, that modified URL will be entered into the circular
     buffer for goto URLs, and can be accessed for further
-    modification via the '<em>g</em>' command.</dd>
+    modification via the “<em>g</em>” command.</dd>
 
     <dt><em>E</em></dt>
 
-    <dd>The '<em>E</em>' command allows you to edit the URL (or
-    ACTION) of the current link and then use that as a goto URL.
-    Pressing the '<em>E</em>' command will bring up a prompt asking
-    you to edit the current link's URL. If you do not modify it, or
-    completely delete it, or enter Control-G, the command will be
-    cancelled. Otherwise, the request for the 'E'dited URL will be
-    sent with method GET, and will be entered into the circular
-    buffer for goto URLs so that it can be accessed for further
-    modification via the '<em>g</em>' command. Note that lower case
-    'e' invokes the external editor for the current document.</dd>
+    <dd>The “<em>E</em>” command allows you to edit the
+    URL (or ACTION) of the current link and then use that as a goto
+    URL. Pressing the “<em>E</em>” command will bring
+    up a prompt asking you to edit the current link's URL. If you
+    do not modify it, or completely delete it, or enter Control-G,
+    the command will be cancelled. Otherwise, the request for the
+    “E”dited URL will be sent with method GET, and will
+    be entered into the circular buffer for goto URLs so that it
+    can be accessed for further modification via the
+    “<em>g</em>” command. Note that lower case
+    “e” invokes the external editor for the current
+    document.</dd>
 
     <dt><em>=</em></dt>
 
-    <dd>The '<em>=</em>' command shows information about the
-    current document and the currently selected link if there is
-    one. The number of lines in the file, URL, title, owner, and
-    type are shown.</dd>
+    <dd>The “<em>=</em>” command shows information
+    about the current document and the currently selected link if
+    there is one. The number of lines in the file, URL, title,
+    owner, and type are shown.</dd>
 
     <dt><em>^T</em></dt>
 
@@ -1889,10 +1907,10 @@
     document in trace mode. You may then examine the <em>Lynx Trace
     Log</em> file with the <em>;</em> command if enabled (see
     below), watch out especially for lines marked with a number of
-    asterisks '<code>*****</code>'. You also can submit the
-    document for validation via links in the online help menu. If
-    you are able to diagnose the problem, send a message about it
-    to the document's author.</dd>
+    asterisks “<code>*****</code>”. You also can submit
+    the document for validation via links in the online help menu.
+    If you are able to diagnose the problem, send a message about
+    it to the document's author.</dd>
 
     <dt><em>;</em></dt>
 
@@ -1913,43 +1931,44 @@
     <dt><a name="asterisk-key" id=
     "asterisk-key"><em>*</em></a></dt>
 
-    <dd>The '<em>*</em>' command toggles image_links mode on and
-    off. When on, links will be created for all images, including
-    inline images. If you have an image viewer mapped to the
-    image's MIME type, you can activate such links to view an
+    <dd>The “<em>*</em>” command toggles image_links
+    mode on and off. When on, links will be created for all images,
+    including inline images. If you have an image viewer mapped to
+    the image's MIME type, you can activate such links to view an
     inline image. You should normally have this mode toggled
     off.</dd>
 
     <dt><em>@</em></dt>
 
-    <dd>The '<em>@</em>' command toggles raw 8-bit or CJK mode on
-    and off. When on, the charset is assumed to match the selected
-    character set and 8-bit characters are not reverse translated
-    with respect to the ISO-8859-1 conversion tables.</dd>
+    <dd>The “<em>@</em>” command toggles raw 8-bit or
+    CJK mode on and off. When on, the charset is assumed to match
+    the selected character set and 8-bit characters are not reverse
+    translated with respect to the ISO-8859-1 conversion
+    tables.</dd>
 
     <dt><a name="lbracket-key" id=
     "lbracket-key"><em>[</em></a></dt>
 
-    <dd>The '<em>[</em>' command toggles pseudo_inlines mode on and
-    off. When on, inline images which have no ALT string specified
-    will have an <em>[INLINE]</em> pseudo-ALT string inserted in
-    the Lynx display. When off, they will be treated as having
-    ALT="" (i.e., they'll be ignored). If image_links mode is
-    toggled on, the pseudo-ALT strings will be restored, to serve
-    as links to the inline images' sources.</dd>
+    <dd>The “<em>[</em>” command toggles pseudo_inlines
+    mode on and off. When on, inline images which have no ALT
+    string specified will have an <em>[INLINE]</em> pseudo-ALT
+    string inserted in the Lynx display. When off, they will be
+    treated as having ALT="" (i.e., they will be ignored). If
+    image_links mode is toggled on, the pseudo-ALT strings will be
+    restored, to serve as links to the inline images' sources.</dd>
 
     <dt><em>]</em></dt>
 
-    <dd>The '<em>]</em>' command is used to send HEAD requests for
-    the current document or link. It applies only to documents or
-    links (or form submit buttons) of http servers. A statusline
-    message will notify you if the context for this command was
-    inappropriate. The HEAD requests always are sent to the http
-    server, i.e., Lynx does not retrieve any previous server
-    replies from its cache. Note that for form submissions, http
-    servers vary in whether they'll treat HEAD requests as valid
-    and return the CGI script's headers, or treat it as invalid and
-    return an error message.</dd>
+    <dd>The “<em>]</em>” command is used to send HEAD
+    requests for the current document or link. It applies only to
+    documents or links (or form submit buttons) of http servers. A
+    statusline message will notify you if the context for this
+    command was inappropriate. The HEAD requests always are sent to
+    the http server, i.e., Lynx does not retrieve any previous
+    server replies from its cache. Note that for form submissions,
+    http servers vary in whether they'll treat HEAD requests as
+    valid and return the CGI script's headers, or treat it as
+    invalid and return an error message.</dd>
 
     <dt><em>^K</em></dt>
 
@@ -1965,9 +1984,10 @@
     <dt><em>z</em></dt>
 
     <dd>Lynx supports completely interruptible I/O processes. Press
-    the '<em>z</em>' key at any time during a connect or transfer
-    process and the process will be halted. If any data was
-    transferred before the interrupt, it will be displayed.</dd>
+    the “<em>z</em>” key at any time during a connect
+    or transfer process and the process will be halted. If any data
+    was transferred before the interrupt, it will be
+    displayed.</dd>
 
     <dt><em>numbers</em></dt>
 
@@ -2001,8 +2021,9 @@
     <dd>Buttons are displayed in the same way that Lynx displays
     links in a document. To "push" the button press the
     <em>right-arrow</em> or <em>Return</em> key. If it is a form
-    submission button, you also can use the NOCACHE ('<em>x</em>')
-    or DOWNLOAD ('<em>d</em>') keystroke commands to "push" the
+    submission button, you also can use the NOCACHE
+    (“<em>x</em>”) or DOWNLOAD
+    (“<em>d</em>”) keystroke commands to "push" the
     button (see below).</dd>
 
     <dt>Checkboxes and Radio buttons</dt>
@@ -2026,16 +2047,16 @@
     <em>down-arrow</em>, <em>page-up</em>, <em>page-down</em>, and
     other navigation keys to move the cursor among options, and the
     <em>right-arrow</em> or <em>Return</em> key to select an
-    option. You also can use the '<em>/</em>' and '<em>n</em>'ext
-    <a href="#Search">searching</a> commands for navigating to
-    options which contain particular strings. <em>NOTE</em> that
-    the popup menu feature can be disabled via compilation and/or
-    configuration options, or via the <a href=
-    "#InteractiveOptions">Options Menu</a>, in which case the
-    selection field options will be converted to a list of radio
-    buttons. The default setting for use of popups or radio button
-    lists can be toggled via the <em>-popup</em> command line
-    switch.</dd>
+    option. You also can use the “<em>/</em>” and
+    “<em>n</em>”ext <a href="#Search">searching</a>
+    commands for navigating to options which contain particular
+    strings. <em>NOTE</em> that the popup menu feature can be
+    disabled via compilation and/or configuration options, or via
+    the <a href="#InteractiveOptions">Options Menu</a>, in which
+    case the selection field options will be converted to a list of
+    radio buttons. The default setting for use of popups or radio
+    button lists can be toggled via the <em>-popup</em> command
+    line switch.</dd>
 
     <dt>Text Entry Fields</dt>
 
@@ -2075,11 +2096,11 @@
       <p>Some flavors of UNIX, shells & terminal settings
       require that you enter <em>^V^Ve</em> in order to start the
       external editor, as they also use <em>^V</em> as default
-      command-line quote key (called `lnext' in stty man pages and
-      `stty -a' output); to avoid this, you can put `stty lnext
-      undef' in your .cshrc file (or .profile or .bashrc, depending
-      on what shell you use), or invoke Lynx with a wrapper script,
-      e.g.</p>
+      command-line quote key (called “lnext” in stty
+      man pages and “stty -a” output); to avoid this,
+      you can put “stty lnext undef” in your .cshrc
+      file (or .profile or .bashrc, depending on what shell you
+      use), or invoke Lynx with a wrapper script, e.g.</p>
 
       <p><code>  #!/bin/sh<br>
         stty lnext undef<br>
@@ -2152,8 +2173,8 @@
         KEYMAP:e:DWIMEDIT<br>
       (the first is only functional for TEXTAREA editing, while the
       second allows to use the same key for normal <a href=
-      "#FileEdit">file editing</a> <em>as long as both functions
-      don't conflict</em>).</p>
+      "#FileEdit">file editing</a> <em>as long as both functions do
+      not conflict</em>).</p>
 
       <p>Please see the <a href="#CtrlVNote">note above</a> for
       details about <em>^V</em> behavior.</p>You can also use two
@@ -2211,11 +2232,11 @@
   content, and the METHOD was <em>GET</em>, Lynx will retrieve from
   its cache what was returned from the previous submission. If you
   wish to resubmit that form to the server with the same content as
-  previously, use the NOCACHE command ('<em>x</em>') when
-  positioned on the submit button. The <em>right-arrow</em> and
-  <em>Return</em> keys also will invoke a no-cache resubmission if
-  the reply from a form submission included a META element with a
-  no-cache Pragma or Cache-Control directive:<br></p>
+  previously, use the NOCACHE command (“<em>x</em>”)
+  when positioned on the submit button. The <em>right-arrow</em>
+  and <em>Return</em> keys also will invoke a no-cache resubmission
+  if the reply from a form submission included a META element with
+  a no-cache Pragma or Cache-Control directive:<br></p>
   <pre>
       <em><META HTTP-EQUIV="Pragma" CONTENT="no-cache"></em>
       <em><META HTTP-EQUIV="Cache-Control" CONTENT="no-cache"></em>
@@ -2224,10 +2245,10 @@
   <p>or the server sent a "Pragma" or "Cache-Control" MIME header
   with a no-cache directive.</p>
 
-  <p>You also can use the DOWNLOAD ('<em>d</em>') keystroke command
-  when positioned on a form submit button if you wish to download
-  the server's reply to the submission instead of having Lynx
-  render and display it.</p>
+  <p>You also can use the DOWNLOAD (“<em>d</em>”)
+  keystroke command when positioned on a form submit button if you
+  wish to download the server's reply to the submission instead of
+  having Lynx render and display it.</p>
 
   <p>Forms which have <em>POST</em> as the METHOD, or a <a href=
   "lynx_url_support.html#mailto_url">mailto:</a> URL as the ACTION,
@@ -2281,16 +2302,16 @@
   submitting the form. Otherwise, the entire string is treated as a
   submit button. If a VALUE or ALT attribute is present and
   clickable images is set, Lynx prepends "[IMAGE]" as a link for
-  the image, followed by '-' and then the attribute's value as the
-  displayed string for the submit button. Note that earlier
-  versions of Lynx would send a name=value pair instead of a 0,0
-  coordinate pair if a TYPE="image" submit button was NAME-ed, had
-  a VALUE attribute in the INPUT tag, and was used to submit the
-  form. The script which analyzes the form content thus could be
-  made aware whether the submission was by a user with a graphic
-  client and had image loading turned on, or by a user who did not
-  see the image nor make a conscious choice within it. However,
-  requests that this be included in HTML specifications
+  the image, followed by “-” and then the attribute's
+  value as the displayed string for the submit button. Note that
+  earlier versions of Lynx would send a name=value pair instead of
+  a 0,0 coordinate pair if a TYPE="image" submit button was
+  NAME-ed, had a VALUE attribute in the INPUT tag, and was used to
+  submit the form. The script which analyzes the form content thus
+  could be made aware whether the submission was by a user with a
+  graphic client and had image loading turned on, or by a user who
+  did not see the image nor make a conscious choice within it.
+  However, requests that this be included in HTML specifications
   consistently have fallen on deaf ears, and thus Lynx now "fakes"
   a 0,0 coordinate pair whether or not a VALUE or ALT attribute is
   present in the INPUT tag. Ideally, the script which analyzes the
@@ -2327,17 +2348,17 @@
   <em>ENCTYPE="application/sgml-form-urlencoded"</em> for which all
   reserved characters in the content will be hex escaped, as with
   <em>application/x-www-form-urlencoded</em>, but semicolons
-  ('<em>;</em>') instead of ampersands ('<em>&</em>') will be
-  used as the separator for name=value pairs in the form content.
-  The use of semicolons is preferred for forms with the
-  <em>GET</em> METHOD, because the <em>GET</em> METHOD causes the
-  encoded form content to be appended as a <em>?searchpart</em> for
-  the form's ACTION, and if such URLs are used in
-  <em>text/html</em> documents or bookmark files without conversion
-  of the ampersands to SGML character references
-  (<em>&amp;</em> or <em>&#38;</em>), their being followed
-  by form field NAMEs which might correspond to SGML entities could
-  lead to corruption of the intended URL.</p>
+  (“<em>;</em>”) instead of ampersands
+  (“<em>&</em>”) will be used as the separator for
+  name=value pairs in the form content. The use of semicolons is
+  preferred for forms with the <em>GET</em> METHOD, because the
+  <em>GET</em> METHOD causes the encoded form content to be
+  appended as a <em>?searchpart</em> for the form's ACTION, and if
+  such URLs are used in <em>text/html</em> documents or bookmark
+  files without conversion of the ampersands to SGML character
+  references (<em>&amp;</em> or <em>&#38;</em>), their
+  being followed by form field NAMEs which might correspond to SGML
+  entities could lead to corruption of the intended URL.</p>
 
   <p>NOTE, in this regard, that Lynx converts ampersands to
   <em>&amp;</em> when creating bookmarks, and thus the bookmark
@@ -2354,20 +2375,20 @@
   Lynx does not yet support INPUTs with <em>TYPE="file"</em> or
   <em>TYPE="range"</em> and will set the <em>DISABLED</em>
   attribute for all of the form's fields if any INPUTs with either
-  of those two TYPEs are present, so that the form can't be
+  of those two TYPEs are present, so that the form cannot be
   submitted. Otherwise, Lynx will submit the form with the
   multipart ENCTYPE.</p>
 
   <p>A
   <em>Content-Disposition: file; filename=name.suffix</em>
   header can be used by CGI scripts to set the suggested filename
-  offered by Lynx for '<em>d</em>'ownload and '<em>p</em>'rint menu
-  options to save or mail the body returned by the script following
-  submission of a FORM. Otherwise, Lynx uses the last symbolic
-  element in the path for the FORM's ACTION, which is normally the
-  script, itself, or a PATH_INFO field, and thus might be
-  misleading. This also can be done via a META element in any
-  document:</p>
+  offered by Lynx for “<em>d</em>”ownload and
+  “<em>p</em>”rint menu options to save or mail the
+  body returned by the script following submission of a FORM.
+  Otherwise, Lynx uses the last symbolic element in the path for
+  the FORM's ACTION, which is normally the script, itself, or a
+  PATH_INFO field, and thus might be misleading. This also can be
+  done via a META element in any document:</p>
   <pre>
       <em><META HTTP-EQUIV="Content-Disposition"
             CONTENT="file; filename=name.suffix"></em>
@@ -2400,12 +2421,13 @@
           VERBOSE_        Y  Y       Y    verbose_img
 
 FM = Form-based Menu ; KM = Key-based Menu ;
-in  .lynxrc ,  VERBOSE_IMAGES  is called `verbose_images':
+in  .lynxrc ,  VERBOSE_IMAGES  is called “verbose_images”:
 the other two cannot be saved between sessions.
 </pre>
 
-  <p>In the Form-based Menu, the 3-way `Show images' selection
-  combines the effects of the `*' & `[' keys, as follows:</p>
+  <p>In the Form-based Menu, the 3-way “Show images”
+  selection combines the effects of the “*” &
+  “[” keys, as follows:</p>
   <pre>
      Ignore      clickable_images = FALSE, pseudo_inline_alts = FALSE
      As labels   clickable_images = FALSE, pseudo_inline_alts = TRUE
@@ -2583,7 +2605,7 @@ the other two cannot be saved between sessions.
   value in the LINK, will invoke creation of a <em>banner</em> at
   the top of the first page, with the element's HREF as the link,
   and the token as the default link name. If a TITLE attribute is
-  included in the LINK, it's value will be used as the link name
+  included in the LINK, its value will be used as the link name
   instead of the default. <em>Bookmark</em> and <em>Banner</em> are
   intended to be accompanied by a TITLE attribute, which in effect
   makes the namespace for REL <em>banner</em> tokens infinite.</p>
@@ -2595,39 +2617,40 @@ the other two cannot be saved between sessions.
   <em>STARTFILE</em> (i.e., derived from the configuration files or
   the WWW_HOME environment variable, <em>not</em> the command line
   <em>startfile</em> if one was used). However, if a
-  <em>-homepage=URL</em> was specified on the command line, it's
-  URL will be used as the HREF. For the special token
-  <em>Index</em> without an HREF, Lynx will use the
-  <em>DEFAULT_INDEX_FILE</em> derived from the configuration files,
-  or if an <em>-index=URL</em> was specified on the command line,
-  it's URL will be used as the HREF.</p>
+  <em>-homepage=URL</em> was specified on the command line, its URL
+  will be used as the HREF. For the special token <em>Index</em>
+  without an HREF, Lynx will use the <em>DEFAULT_INDEX_FILE</em>
+  derived from the configuration files, or if an
+  <em>-index=URL</em> was specified on the command line, its URL
+  will be used as the HREF.</p>
 
   <p>Lynx does not waste screen real estate maintaining the
   <em>banner</em> at the top of every page, but the Lynx TOOLBAR
-  keystroke command ('<em>#</em>') will, any time it is pressed,
-  position you on the <em>banner</em> so that any of its links can
-  be activated, and pressing the <em>left-arrow</em> when in the
-  <em>banner</em> will return you to where you were in the current
-  document. The toolbar is indicated by a '<em>#</em>" preceding
-  its first link when present on the screen, that is, when the
-  first page of the document is being displayed. The availability
-  of a toolbar is indicated by a '<em>#</em>' at the top, left-hand
-  corner of the screen when the second or subsequent pages of the
-  document are being displayed.</p>
+  keystroke command (“<em>#</em>”) will, any time it is
+  pressed, position you on the <em>banner</em> so that any of its
+  links can be activated, and pressing the <em>left-arrow</em> when
+  in the <em>banner</em> will return you to where you were in the
+  current document. The toolbar is indicated by a
+  “<em>#</em>" preceding its first link when present on the
+  screen, that is, when the first page of the document is being
+  displayed. The availability of a toolbar is indicated by a
+  “<em>#</em>” at the top, left-hand corner of the
+  screen when the second or subsequent pages of the document are
+  being displayed.</p>
 
   <p>Lynx also recognizes the <a href=
   "http://www.w3.org/MarkUp/html3/Contents.html">HTML 3.0</a>
   BANNER container element, and will create a <em>banner</em> based
   on its content if one has not already been created based on LINK
   elements. Lynx treats the Microsoft MARQUEE element as a synonym
-  for BANNER (i.e., presenting it's markup as a static
+  for BANNER (i.e., presenting its markup as a static
   <em>banner</em>, without any horizontal scrolling of its
   content). Lynx does not prefix the BANNER or MARQUEE content with
-  a '<em>#</em>' because the content need not be only a series of
-  links with brief, descriptive links names, but does add a
-  '<em>#</em>' at the top, left-hand corner of the screen when the
-  content is not being displayed, to indicate it's accessibility
-  via the TOOLBAR keystroke command.</p>
+  a “<em>#</em>” because the content need not be only a
+  series of links with brief, descriptive links names, but does add
+  a “<em>#</em>” at the top, left-hand corner of the
+  screen when the content is not being displayed, to indicate its
+  accessibility via the TOOLBAR keystroke command.</p>
 
   <p>[<a href="#ToC-Banners">ToC</a>]</p>
 
@@ -2773,7 +2796,7 @@ the other two cannot be saved between sessions.
   "http://www.w3.org/MarkUp/html3/Contents.html">HTML 3.0</a> and
   later specifications provide for two classes of quotation in HTML
   documents. Block quotes, designated by the BLOCKQUOTE element (or
-  it's abbreviated synonym BQ in HTML 3.0), have implied paragraph
+  its abbreviated synonym BQ in HTML 3.0), have implied paragraph
   breaks preceding and following the start and end tags for the
   block. Character level quotes, designated by the Q element, in
   contrast are simply directives in the markup to insert an
@@ -2969,21 +2992,22 @@ the other two cannot be saved between sessions.
 
   <p>When cookie support is enabled, <em>Set-Cookie</em> MIME
   headers received from an http server invoke confirmation prompts
-  with possible replies of '<em>Y</em>'es or '<em>N</em>'o for
-  acceptance of the cookie, '<em>A</em>'lways to accept the cookie
-  and to allow all subsequent cookies from that <em>domain</em>
-  (server's Fully Qualified Domain Name, or site-identifying
-  portion of the FQDN) without further confirmation prompts, or
-  ne'<em>V</em>'er to never allow cookies from that <em>domain</em>
-  to be accepted (silently ignore its <em>Set-Cookie</em> MIME
-  headers). All unexpired cookies are held in a hypothetical
-  <em>Cookie Jar</em> which can be examined via the COOKIE_JAR
-  keystroke command, normally mapped to <em>Ctrl-K</em>, for
-  invoking the <a href="keystrokes/cookie_help.html">Cookie Jar
-  Page</a>. If Lynx has been compiled with the
-  --enable-persistent-cookies flag, then unexpired cookies will be
-  stored between sessions in the filename set with the COOKIE_FILE
-  option in your .lynxrc.</p>
+  with possible replies of “<em>Y</em>”es or
+  “<em>N</em>”o for acceptance of the cookie,
+  “<em>A</em>”lways to accept the cookie and to allow
+  all subsequent cookies from that <em>domain</em> (server's Fully
+  Qualified Domain Name, or site-identifying portion of the FQDN)
+  without further confirmation prompts, or
+  ne“<em>V</em>”er to never allow cookies from that
+  <em>domain</em> to be accepted (silently ignore its
+  <em>Set-Cookie</em> MIME headers). All unexpired cookies are held
+  in a hypothetical <em>Cookie Jar</em> which can be examined via
+  the COOKIE_JAR keystroke command, normally mapped to
+  <em>Ctrl-K</em>, for invoking the <a href=
+  "keystrokes/cookie_help.html">Cookie Jar Page</a>. If Lynx has
+  been compiled with the --enable-persistent-cookies flag, then
+  unexpired cookies will be stored between sessions in the filename
+  set with the COOKIE_FILE option in your .lynxrc.</p>
 
   <p>A common use of cookies by http servers is simply to track the
   documents visited by individual users. Though this can be useful
@@ -3004,9 +3028,9 @@ the other two cannot be saved between sessions.
   <p>If you accept cookies when accessing a site, but are given no
   indication about how they will be used in subsequent requests to
   that site, nor can infer how they will be used, you can
-  <em>Gobble</em> (delete) the cookies and/or change the 'allow'
-  setting for its <em>domain</em> via the <a href=
-  "keystrokes/cookie_help.html">Cookie Jar Page</a>.</p>
+  <em>Gobble</em> (delete) the cookies and/or change the
+  “allow” setting for its <em>domain</em> via the
+  <a href="keystrokes/cookie_help.html">Cookie Jar Page</a>.</p>
 
   <p>[<a href="#ToC-Cookies">ToC</a>]</p>
 
@@ -3205,10 +3229,10 @@ the other two cannot be saved between sessions.
         <dt><code><strong>-</strong></code></dt>
 
         <dd>If the argument is only
-        '<code><strong>-</strong></code>' (dash), then Lynx expects
-        to receive the arguments from stdin. This is to allow for
-        the potentially very long command line that can be
-        associated with the <em>-get_data</em> or
+        “<code><strong>-</strong></code>” (dash), then
+        Lynx expects to receive the arguments from stdin. This is
+        to allow for the potentially very long command line that
+        can be associated with the <em>-get_data</em> or
         <em>-post_data</em> arguments (see below). It can also be
         used to avoid having sensitive information in the invoking
         command line (which would be visible to other processes on
@@ -3216,9 +3240,9 @@ the other two cannot be saved between sessions.
         <em>-pauth</em> options are used. On VMS, the dash must be
         encased in double-quotes ("-") and the keyboard input
         terminated with <em>Control-Z</em> or the command file
-        input terminated by a line that begins with '<em>$</em>'.
-        On Unix, the keyboard input terminator is
-        <em>Control-D</em>. On Win32, [???].</dd>
+        input terminated by a line that begins with
+        “<em>$</em>”. On Unix, the keyboard input
+        terminator is <em>Control-D</em>. On Win32, [???].</dd>
 
         <dt><code><strong>-accept_all_cookies</strong></code></dt>
 
@@ -3233,7 +3257,7 @@ the other two cannot be saved between sessions.
         <dt>
         <code><strong>-assume_charset=</strong><em>MIMENAME</em></code></dt>
 
-        <dd>charset for documents that don't specify it.</dd>
+        <dd>charset for documents that do not specify it.</dd>
 
         <dt>
         <code><strong>-assume_local_charset=</strong><em>MIMENAME</em></code></dt>
@@ -3480,8 +3504,8 @@ the other two cannot be saved between sessions.
         <dt>
         <code><strong>-force_empty_hrefless_a</strong></code></dt>
 
-        <dd>force HREF-less 'A' elements to be empty (close them as
-        soon as they are seen).</dd>
+        <dd>force HREF-less “A” elements to be empty
+        (close them as soon as they are seen).</dd>
 
         <dt><code><strong>-force_html</strong></code></dt>
 
@@ -3511,7 +3535,7 @@ the other two cannot be saved between sessions.
 
         <dd>properly formatted data for a get form are read in from
         stdin and passed to the form. Input is terminated by a line
-        that starts with '---'.</dd>
+        that starts with “---”.</dd>
 
         <dt><code><strong>-head</strong></code></dt>
 
@@ -3550,8 +3574,8 @@ the other two cannot be saved between sessions.
 
         <dt><code><strong>-historical</strong></code></dt>
 
-        <dd>toggles use of '>' or '-->' as a terminator for
-        comments.</dd>
+        <dd>toggles use of “>” or
+        “-->” as a terminator for comments.</dd>
 
         <dt>
         <code><strong>-homepage=</strong><em>URL</em></code></dt>
@@ -3559,8 +3583,8 @@ the other two cannot be saved between sessions.
         <dd>set homepage separate from start page. Will be used if
         a fetch of the start page fails or if it is a script which
         does not return a document, and as the
-        <code><em>URL</em></code> for the '<em>m</em>'ain menu
-        command.</dd>
+        <code><em>URL</em></code> for the
+        “<em>m</em>”ain menu command.</dd>
 
         <dt><code><strong>-image_links</strong></code></dt>
 
@@ -3608,11 +3632,12 @@ the other two cannot be saved between sessions.
         <dt><code><strong>-minimal</strong></code></dt>
 
         <dd>toggles minimal versus valid comment parsing. When
-        minimal, any '-->' serves as a terminator for a comment
-        element. When valid, pairs of '--' are treated as
-        delimiters for series of comments within the overall
-        comment element. If historical is set, that overrides
-        minimal or valid comment parsing.</dd>
+        minimal, any “-->” serves as a terminator
+        for a comment element. When valid, pairs of
+        “--” are treated as delimiters for series of
+        comments within the overall comment element. If historical
+        is set, that overrides minimal or valid comment
+        parsing.</dd>
 
         <dt><code><strong>-nested_tables</strong></code></dt>
 
@@ -3694,7 +3719,7 @@ the other two cannot be saved between sessions.
 
         <dt><code><strong>-noredir</strong></code></dt>
 
-        <dd>don't follow URL redirections</dd>
+        <dd>do not follow URL redirections</dd>
 
         <dt><code><strong>-noreferer</strong></code></dt>
 
@@ -3753,23 +3778,23 @@ the other two cannot be saved between sessions.
         popup windows or as lists of radio buttons. The default
         configuration can be changed in userdefs.h or <a href=
         "#lynx.cfg">lynx.cfg</a>. It also can be set and saved via
-        the 'o'ptions menu. The command line switch toggles the
-        default.</dd>
+        the “o”ptions menu. The command line switch
+        toggles the default.</dd>
 
         <dt><code><strong>-post_data</strong></code></dt>
 
         <dd>properly formatted data for a post form are read in
         from stdin and passed to the form. Input is terminated by a
-        line that starts with '---'.</dd>
+        line that starts with “---”.</dd>
 
         <dt><code><strong>-preparsed</strong></code></dt>
 
         <dd>show source preparsed and reformatted when used with
-        -source or in source view ('<em>\</em>'). May be useful for
-        debugging of broken HTML markup to visualize the difference
-        between SortaSGML and TagSoup <a href=
+        -source or in source view (“<em>\</em>”). May
+        be useful for debugging of broken HTML markup to visualize
+        the difference between SortaSGML and TagSoup <a href=
         "keystrokes/option_help.html#tagsoup">recovery modes</a>,
-        switched by '<em>^V</em>'.</dd>
+        switched by “<em>^V</em>”.</dd>
 
         <dt><code><strong>-prettysrc</strong></code></dt>
 
@@ -3918,7 +3943,8 @@ the other two cannot be saved between sessions.
 
             <dt>goto</dt>
 
-            <dd>disable the '<em>g</em>' (goto) command.</dd>
+            <dd>disable the “<em>g</em>” (goto)
+            command.</dd>
 
             <dt>inside_ftp</dt>
 
@@ -3945,7 +3971,8 @@ the other two cannot be saved between sessions.
 
             <dt>jump</dt>
 
-            <dd>disable the '<em>j</em>' (jump) command.</dd>
+            <dd>disable the “<em>j</em>” (jump)
+            command.</dd>
 
             <dt>lynxcgi</dt>
 
@@ -4069,8 +4096,8 @@ the other two cannot be saved between sessions.
         systems without FANCY_CURSES capabilities. The default
         configuration can be changed in userdefs.h or <a href=
         "#lynx.cfg">lynx.cfg</a>. It also can be set and saved via
-        the 'o'ptions menu. The command line switch toggles the
-        default.</dd>
+        the “o”ptions menu. The command line switch
+        toggles the default.</dd>
 
         <dt><code><strong>-show_rate</strong></code></dt>
 
@@ -4081,8 +4108,8 @@ the other two cannot be saved between sessions.
         <dt><code><strong>-soft_dquotes</strong></code></dt>
 
         <dd>toggles emulation of the old Netscape and Mosaic bug
-        which treated '<em>></em>' as a co-terminator for
-        double-quotes and tags.</dd>
+        which treated “<em>></em>” as a
+        co-terminator for double-quotes and tags.</dd>
 
         <dt><code><strong>-source</strong></code></dt>
 
@@ -4171,9 +4198,10 @@ the other two cannot be saved between sessions.
         keystroke command. Once a log is started for the session,
         all trace and other stderr messages are written to the log.
         The contents of the log can be examined during the session
-        via the TRACE_LOG (normally, '<em>;</em>') keystroke
-        command. If use of a Lynx Trace Log is turned off, any
-        trace output will go to the standard error stream.</dd>
+        via the TRACE_LOG (normally, “<em>;</em>”)
+        keystroke command. If use of a Lynx Trace Log is turned
+        off, any trace output will go to the standard error
+        stream.</dd>
 
         <dt><code><strong>-tna</strong></code></dt>
 
@@ -4186,8 +4214,9 @@ the other two cannot be saved between sessions.
         (<em>Lynx.trace</em> in the home directory) has been
         started for the current session, all trace messages are
         written to that log, and can be examined during the session
-        via the TRACE_LOG (normally, '<em>;</em>') command. If no
-        Trace Log file is in use, trace messages go to stderr.</dd>
+        via the TRACE_LOG (normally, “<em>;</em>”)
+        command. If no Trace Log file is in use, trace messages go
+        to stderr.</dd>
 
         <dt>
         <code><strong>-trace_mask=</strong><em>value</em></code></dt>
@@ -4300,10 +4329,10 @@ the other two cannot be saved between sessions.
 
   <p>No options are required, nor is a startfile argument required.
   White space can be used in place of equal sign separators
-  ('<em>=</em>') appearing in the option list above. It can not be
-  used in place of the equal signs in forms like "-option=on" and
-  "-option=off" for simple switches and toggles, for which
-  "-option" alone (without a value) is valid.</p>
+  (“<em>=</em>”) appearing in the option list above. It
+  can not be used in place of the equal signs in forms like
+  "-option=on" and "-option=off" for simple switches and toggles,
+  for which "-option" alone (without a value) is valid.</p>
 
   <p>[<a href="#ToC-Invoking">ToC</a>]</p>
 
@@ -4347,11 +4376,11 @@ the other two cannot be saved between sessions.
   by alphabet</a>.</p>
 
   <p>To view your current configuration derived from lynx.cfg and
-  any included configuration files, press <em>'g'</em> and type in
-  '<em>lynxcfg:</em>'. If you are using the forms-based <em>Options
-  Menu</em>, you may press <em>'o'</em> for the Options Menu and
-  follow the '<em>Check your lynx.cfg</em>' link near the
-  bottom.</p>
+  any included configuration files, press <em>“g”</em>
+  and type in “<em>lynxcfg:</em>”. If you are using the
+  forms-based <em>Options Menu</em>, you may press
+  <em>“o”</em> for the Options Menu and follow the
+  “<em>Check your lynx.cfg</em>'s link near the bottom.</p>
 
   <p>However, for those who have a restricted account many Lynx
   features may be disabled by the system administrator, you
diff --git a/lynx_help/keystrokes/alt_edit_help.html b/lynx_help/keystrokes/alt_edit_help.html
index 2268a81..514e079 100644
--- a/lynx_help/keystrokes/alt_edit_help.html
+++ b/lynx_help/keystrokes/alt_edit_help.html
@@ -1,4 +1,4 @@
-<!-- $LynxId: alt_edit_help.html,v 1.11 2014/01/08 00:56:30 tom Exp $ -->
+<!-- $LynxId: alt_edit_help.html,v 1.14 2017/04/28 21:24:42 tom Exp $ -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 
 <html>
@@ -19,7 +19,18 @@
   </head>
 
 <body>
-  <h2>Overview</h2>
+  <div class="nav">
+    <ul>
+      <li><a href="#overview">Overview</a></li>
+
+      <li><a href="#alternate_bindings">Table of
+      key-bindings</a></li>
+
+      <li><a href="#notes">Notes</a></li>
+    </ul>
+  </div>
+
+  <h2><a name="overview" id="overview">Overview</a></h2>
 
   <p><strong>Lynx</strong> invokes a built-in <a href=
   "edit_help.html">Line Editor</a> for entering strings in response
@@ -28,15 +39,16 @@
   can be offered by configuring with
   <code>--enable-alt-bindings</code> or by adding them in
   LYEditmap.c before compiling <strong>Lynx</strong>. If available,
-  they may be selected via the 'o'ptions menu, or by editing
-  lineedit_mode in the '.lynxrc' file.</p>
+  they may be selected via the “o”ptions menu, or by
+  editing lineedit_mode in the “.lynxrc” file.</p>
 
   <p>Note: setting emacs/vi keys ON has no direct effect on
   line-editor bindings.</p>
 
   <p>This is the <em>Alternative Binding</em> keymap.</p>
 
-  <h2>Table of key-bindings</h2>
+  <h2><a name="alternate_bindings" id="alternate_bindings">Table of
+  key-bindings</a></h2>
   <pre>
      ENTER  Input complete        -  RETURN
      TAB    Input complete        -  TAB, Do
@@ -69,7 +81,7 @@
           Grow textarea           - Ctrl-X g
 </pre>
 
-  <h2>Notes</h2>
+  <h2><a name="notes" id="notes">Notes</a></h2>
 
   <ol>
     <li>"next" means the character "under" a box or underline style
diff --git a/lynx_help/keystrokes/bashlike_edit_help.html b/lynx_help/keystrokes/bashlike_edit_help.html
index b62e6cb..821c826 100644
--- a/lynx_help/keystrokes/bashlike_edit_help.html
+++ b/lynx_help/keystrokes/bashlike_edit_help.html
@@ -1,4 +1,4 @@
-<!-- $LynxId: bashlike_edit_help.html,v 1.10 2014/01/08 00:50:05 tom Exp $ -->
+<!-- $LynxId: bashlike_edit_help.html,v 1.13 2017/04/28 21:04:38 tom Exp $ -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 
 <html>
@@ -19,7 +19,25 @@
   </head>
 
 <body>
-  <h2>Overview</h2>
+  <div class="nav">
+    <ul>
+      <li><a href="#overview">Overview</a></li>
+
+      <li><a href="#bash_bindings">Bash-like bindings</a></li>
+
+      <li><a href="#examples">Try it yourself</a></li>
+
+      <li><a href="#emacs_bindings">Emacs-like commands</a></li>
+
+      <li><a href="#special_keys">Comments on special keys</a></li>
+
+      <li><a href="#notes">Notes</a></li>
+
+      <li><a href="#miscellaneous">Additional details</a></li>
+    </ul>
+  </div>
+
+  <h2><a name="overview" id="overview">Overview</a></h2>
 
   <p>Lynx invokes a built-in <a href="edit_help.html">Line
   Editor</a> for entering strings in response to prompts, in forms,
@@ -27,15 +45,16 @@
   defined. Several sets of key-bindings can be offered by
   configuring with --enable-alt-bindings or by adding them in
   LYEditmap.c before compiling Lynx. If available, they may be
-  selected via the 'o'ptions menu, or by editing lineedit_mode in
-  the '.lynxrc' file.</p>
+  selected via the “o”ptions menu, or by editing
+  lineedit_mode in the “.lynxrc” file.</p>
 
-  <p>Note: setting emacs/vi keys ON has no direct effect on
-  line-editor bindings.</p>
+  <p><strong>Note:</strong> setting emacs/vi keys ON has no direct
+  effect on line-editor bindings.</p>
 
-  <p>This summarizes the <em>Bash-like Binding</em> keymap.</p>
+  <h2><a name="bash_bindings" id="bash_bindings">Bash-like
+  bindings</a></h2>
 
-  <h2>Basic commands</h2>
+  <p>This summarizes the <em>Bash-like Binding</em> keymap.</p>
   <pre>
      ENTER  Input complete        -  Enter, RETURN
      TAB    Completion / Next     -  TAB, Do (<em>see note 2</em>)
@@ -70,7 +89,7 @@
      PASS!  Grow textarea           - C-x g
 </pre>
 
-  <h2>Try it yourself</h2>
+  <h2><a name="examples" id="examples">Try it yourself</a></h2>
 
   <p>Here is a little textarea for practice:</p>
 
@@ -84,7 +103,8 @@ or add text as you like, using the Line-Editor keys.
 </textarea><input type="reset" value="[reset content]"></p>
   </form>
 
-  <h2>Advanced emacs-like commands</h2>
+  <h2><a name="emacs_bindings" id="emacs_bindings">Emacs-like
+  commands</a></h2>
   <pre>
 
     TPOS    Transpose characters                   -  C-t
@@ -94,7 +114,8 @@ or add text as you like, using the Line-Editor keys.
     YANK    Insert text last killed (with KILLREG) -  C-y
 </pre>
 
-  <h2>Comments on special keys</h2>
+  <h2><a name="special_keys" id="special_keys">Comments on special
+  keys</a></h2>
 
   <p><samp><dfn>C-</dfn><strong>key</strong> means
   Control+<strong><kbd>key</kbd></strong>.
@@ -106,7 +127,7 @@ or add text as you like, using the Line-Editor keys.
 
   <ul>
     <li>First ESC, then the <strong><kbd>key</kbd></strong>. This
-    doesn't work with all systems or on all connections, and if it
+    does not work with all systems or on all connections, and if it
     does may not work for some keys (because the ESC character is
     also part of code sequences for "normal" function keys).</li>
 
@@ -126,7 +147,7 @@ or add text as you like, using the Line-Editor keys.
     vice versa.</li>
   </ul>
 
-  <h2>Notes</h2>
+  <h2><a name="notes" id="notes">Notes</a></h2>
 
   <ol>
     <li>"next" means the character "under" a box or underline style
@@ -156,8 +177,8 @@ or add text as you like, using the Line-Editor keys.
     <li>Key is likely unavailable for Lynx, because it is
     interpreted by operating system, comm program, or curses
     library, or swallowed as part of escape sequence recognition.
-    Binding is provided for the benefit of those where this doesn't
-    apply.</li>
+    Binding is provided for the benefit of those where this does
+    not apply.</li>
 
     <li>where <strong>[FORM]</strong> is marked, indicates that the
     binding is effective only in form text fields. It is ignored by
@@ -173,8 +194,11 @@ or add text as you like, using the Line-Editor keys.
   accessible with the key <kbd>K</kbd> for current
   information).</p>
 
-  <h2>Additional details on other keys, for the curious (very much
-  subject to change)</h2>
+  <h2><a name="miscellaneous" id="miscellaneous">Additional
+  details</a></h2>
+
+  <p>Here are some additional details on other keys, for the
+  curious (very much subject to change)</p>
   <pre>
 Normal key action when used in form fields, subject to remapping
 with KEYMAP: [FORM (except Up-Arrow, Down-Arrow)]
diff --git a/lynx_help/keystrokes/bookmark_help.html b/lynx_help/keystrokes/bookmark_help.html
index 87187fd..9eeb055 100644
--- a/lynx_help/keystrokes/bookmark_help.html
+++ b/lynx_help/keystrokes/bookmark_help.html
@@ -1,4 +1,4 @@
-<!-- $LynxId: bookmark_help.html,v 1.8 2014/01/07 23:32:23 tom Exp $ -->
+<!-- $LynxId: bookmark_help.html,v 1.10 2017/04/28 21:27:36 tom Exp $ -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 
 <html>
@@ -15,22 +15,36 @@
   </head>
 
 <body>
+  <div class="nav">
+    <ul>
+      <li><a href="#overview">Bookmark files</a></li>
+
+      <li><a href="#internal_edit">Updating within Lynx</a></li>
+
+      <li><a href="#external_edit">Updating with a text
+      editor</a></li>
+    </ul>
+  </div>
+
+  <h2><a name="overview" id="overview">Bookmark files</a></h2>
+
   <p><strong>Lynx</strong> stores <em>Bookmark files</em> on your
   local machine. You can update these from within
   <strong>Lynx</strong>, or with a text editor:</p>
 
-  <h2>Updating within Lynx</h2>
+  <h2><a name="internal_edit" id="internal_edit">Updating within
+  Lynx</a></h2>
 
   <ul>
-    <li>The append feature, invoked by pressing an '<em>a</em>'
-    while viewing a document will add the current document or the
-    currently highlighted link to your default <em>Bookmark
-    file</em>, or to one you select if multiple bookmarks are
-    enabled.</li>
+    <li>The append feature, invoked by pressing an
+    “<em>a</em>” while viewing a document will add the
+    current document or the currently highlighted link to your
+    default <em>Bookmark file</em>, or to one you select if
+    multiple bookmarks are enabled.</li>
 
-    <li>The remove feature, invoked by pressing an '<em>r</em>'
-    when a <em>Bookmark file</em> is being displayed, will remove
-    the currently highlighted link.</li>
+    <li>The remove feature, invoked by pressing an
+    “<em>r</em>” when a <em>Bookmark file</em> is being
+    displayed, will remove the currently highlighted link.</li>
 
     <li>You may set and modify the paths and names of your
     <em>Bookmark files</em> and enable or disable multiple
@@ -38,7 +52,8 @@
     Menu</a>.</li>
   </ul>
 
-  <h2>Updating with a text editor</h2>
+  <h2><a name="external_edit" id="external_edit">Updating with a
+  text editor</a></h2>
 
   <p>Lynx stores its bookmarks as an HTML file, using an unordered
   list (<em>UL</em> and <em>LI</em> tags). It expects the list
diff --git a/lynx_help/keystrokes/cookie_help.html b/lynx_help/keystrokes/cookie_help.html
index 0f7378b..7ec6088 100644
--- a/lynx_help/keystrokes/cookie_help.html
+++ b/lynx_help/keystrokes/cookie_help.html
@@ -1,4 +1,4 @@
-<!-- $LynxId: cookie_help.html,v 1.9 2014/01/07 09:14:46 tom Exp $ -->
+<!-- $LynxId: cookie_help.html,v 1.11 2017/04/28 21:32:43 tom Exp $ -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 
 <html>
@@ -15,7 +15,17 @@
   </head>
 
 <body>
-  <h2>Overview</h2>
+  <div class="nav">
+    <ul>
+      <li><a href="#overview">Overview</a></li>
+
+      <li><a href="#showing_cookies">Cookie Details Shown</a></li>
+
+      <li><a href="#removing_cookies">Removing Cookies</a></li>
+    </ul>
+  </div>
+
+  <h2><a name="overview" id="overview">Overview</a></h2>
 
   <p><strong>Lynx</strong>'s <em>Cookie Jar Page</em> displays all
   of the unexpired cookies you have accumulated in the hypothetical
@@ -32,11 +42,12 @@
   address tail-matches a <em>domain</em> in the <em>Cookie
   Jar</em>, all its cookies with a <em>path</em> which head-matches
   the path in the URL for that request are included as a
-  <em>Cookie</em> MIME header. The 'allow' setting for accepting
-  cookies from each domain (always, never, or via prompt) also is
-  indicated in the listing.</p>
+  <em>Cookie</em> MIME header. The “allow” setting for
+  accepting cookies from each domain (always, never, or via prompt)
+  also is indicated in the listing.</p>
 
-  <h2>Cookie Details Shown</h2>
+  <h2><a name="showing_cookies" id="showing_cookies">Cookie Details
+  Shown</a></h2>
 
   <p>The listing also shows the <em>port</em> (normally 80) of the
   URL for the request which caused the cookie to be sent, and
@@ -50,7 +61,8 @@
   <em>Set-Cookie</em> MIME headers, those also are displayed in the
   listing.</p>
 
-  <h2>Removing Cookies</h2>
+  <h2><a name="removing_cookies" id="removing_cookies">Removing
+  Cookies</a></h2>
 
   <p>The <em>domain</em>=value pairs, and each cookie's name=value,
   are links in the listing. Activating a <em>domain</em>=value link
@@ -58,10 +70,10 @@
   <em>domain</em> should be <em>Gobbled</em> (deleted from the
   <em>Cookie Jar</em>), and/or whether the <em>domain</em> entry
   should be <em>Gobbled</em> if all of its cookies have been
-  <em>Gobbled</em>, or whether to change the 'allow' setting for
-  that <em>domain</em>. Activating a cookie's name=value link will
-  cause that particular cookie to be <em>Gobbled</em>. You will be
-  prompted for confirmations of deletions, to avoid any accidental
-  <em>Gobbling</em>.</p>
+  <em>Gobbled</em>, or whether to change the “allow”
+  setting for that <em>domain</em>. Activating a cookie's
+  name=value link will cause that particular cookie to be
+  <em>Gobbled</em>. You will be prompted for confirmations of
+  deletions, to avoid any accidental <em>Gobbling</em>.</p>
 </body>
 </html>
diff --git a/lynx_help/keystrokes/dired_help.html b/lynx_help/keystrokes/dired_help.html
index bf5701b..51a169d 100644
--- a/lynx_help/keystrokes/dired_help.html
+++ b/lynx_help/keystrokes/dired_help.html
@@ -1,4 +1,4 @@
-<!-- $LynxId: dired_help.html,v 1.9 2014/01/08 01:15:55 tom Exp $ -->
+<!-- $LynxId: dired_help.html,v 1.11 2017/04/28 21:36:59 tom Exp $ -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 
 <html>
@@ -15,12 +15,25 @@
   </head>
 
 <body>
-  <h2>Overview</h2>
+  <div class="nav">
+    <ul>
+      <li><a href="#overview">Overview</a></li>
+
+      <li><a href="#dired_bindings">Dired Key bindings</a></li>
+
+      <li><a href="#other_bindings">Other Key bindings</a></li>
+
+      <li><a href="#notes">Notes</a></li>
+    </ul>
+  </div>
+
+  <h2><a name="overview" id="overview">Overview</a></h2>
 
   <p><strong>Lynx</strong> changes into <em>Dired mode</em> when
   you use a URL of the type <em>file://localhost/path/</em>.</p>
 
-  <h2>Key bindings</h2>
+  <h2><a name="dired_bindings" id="dired_bindings">Dired Key
+  bindings</a></h2>
 
   <p>While in Dired mode, some keys are remapped to do the
   following functions:</p>
@@ -46,7 +59,7 @@
     T)ag          - Tag the highlighted file.  Multiple files may
                     be tagged and all other commands except "Create"
                     will be performed on tagged files instead of the
-                    one highlighted.  Press '<em>t</em>' again to untag
+                    one highlighted.  Press “<em>t</em>” again to untag
                     a file.
 
     U)pload       - Upload a file to the current directory using
@@ -54,6 +67,9 @@
 </pre>
   </blockquote>
 
+  <h2><a name="other_bindings" id="other_bindings">Other Key
+  bindings</a></h2>
+
   <p>Some other keys useful in <em>Dired mode</em>:</p>
 
   <blockquote>
@@ -67,7 +83,7 @@
 </pre>
   </blockquote>
 
-  <h2>Notes</h2>
+  <h2><a name="notes" id="notes">Notes</a></h2>
 
   <p><em>Dired mode</em> must be activated at compile time.
   Otherwise, the above commands will not be available and
diff --git a/lynx_help/keystrokes/edit_help.html b/lynx_help/keystrokes/edit_help.html
index eb8b0c6..cc3983a 100644
--- a/lynx_help/keystrokes/edit_help.html
+++ b/lynx_help/keystrokes/edit_help.html
@@ -1,4 +1,4 @@
-<!-- $LynxId: edit_help.html,v 1.17 2014/01/08 21:24:50 tom Exp $ -->
+<!-- $LynxId: edit_help.html,v 1.20 2017/04/28 21:40:03 tom Exp $ -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 
 <html>
@@ -15,7 +15,19 @@
   </head>
 
 <body>
-  <h2>Overview</h2>
+  <div class="nav">
+    <ul>
+      <li><a href="#overview">Overview</a></li>
+
+      <li><a href="#regular_keymap">Regular Keymap</a></li>
+
+      <li><a href="#editing_keymap">Editing Keymap</a></li>
+
+      <li><a href="#notes">Notes</a></li>
+    </ul>
+  </div>
+
+  <h2><a name="overview" id="overview">Overview</a></h2>
 
   <p><strong>Lynx</strong> invokes a built-in <em>Line Editor</em>
   for entering strings in response to prompts, in forms, and for
@@ -23,8 +35,8 @@
   Alternative key bindings are normally available (unless
   <strong>Lynx</strong> was configured with
   <code>--disable-alt-bindings</code>). If available, they may be
-  selected via the 'o'ptions menu, or by editing lineedit_mode in
-  the '.lynxrc' file.</p>
+  selected via the “o”ptions menu, or by editing
+  lineedit_mode in the “.lynxrc” file.</p>
 
   <p>Two such alternative key bindings, which may be available on
   your system, are the</p>
@@ -45,7 +57,8 @@
   <p>Note: setting emacs/vi keys ON has no effect on line-editor
   bindings.</p>
 
-  <h2>Regular Keymap</h2>
+  <h2><a name="regular_keymap" id="regular_keymap">Regular
+  Keymap</a></h2>
 
   <p>This is the <em>Default Binding</em> keymap:</p>
   <pre>
@@ -75,7 +88,8 @@
 
 </pre>
 
-  <h2>Editing Keymap</h2>
+  <h2><a name="editing_keymap" id="editing_keymap">Editing
+  Keymap</a></h2>
 
   <p><a name="TASpecial" id="TASpecial">These are special commands
   for use only in textarea fields</a> (see note 3):</p>
@@ -86,7 +100,7 @@
           Grow textarea           - Ctrl-X g
 </pre>
 
-  <h2>Notes</h2>
+  <h2><a name="notes" id="notes">Notes</a></h2>
 
   <ol>
     <li>"next" means the character "under" a box or underline style
diff --git a/lynx_help/keystrokes/environments.html b/lynx_help/keystrokes/environments.html
index 68425cb..babf0a7 100644
--- a/lynx_help/keystrokes/environments.html
+++ b/lynx_help/keystrokes/environments.html
@@ -1,4 +1,4 @@
-<!-- $LynxId: environments.html,v 1.16 2014/01/08 01:38:23 tom Exp $ -->
+<!-- $LynxId: environments.html,v 1.21 2017/04/28 22:16:55 tom Exp $ -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 
 <html>
@@ -15,9 +15,29 @@
   </head>
 
 <body>
-  <h2>ENVIRONMENT</h2>
+  <div class="nav">
+    <ul>
+      <li><a href="#overview">Environment Variables</a></li>
+
+      <li><a href="#env">Variables Used By Lynx</a></li>
+
+      <li><a href="#setenv">Variables Set or Modified By
+      Lynx</a></li>
+
+      <li><a href="#cgi">Simulated CGI Support</a></li>
+
+      <li><a href="#language">Native Language Support</a></li>
+
+      <li><a href="#proxy">Proxy details and examples</a></li>
+
+      <li><a href="#dos">Win32 (95/NT) and 386 DOS</a></li>
+    </ul>
+  </div>
+
+  <h2><a name="overview" id="overview">Environment
+  Variables</a></h2>
   <pre>
-       In addition to various  "standard"  environment  variables
+       In addition to various  “standard”  environment  variables
        such as HOME, PATH, USER, DISPLAY, TMPDIR, etc, <strong>Lynx</strong> utilizes
        several <strong>Lynx</strong>-specific environment variables, <a href="#env">if they exist</a>.
 
@@ -26,8 +46,8 @@
        listed separately <a href="#setenv">below</a>.
 
        See also the sections on <a href=
-"#cgi">SIMULATED CGI SUPPORT</a> and
-       <a href="#language">NATIVE LANGUAGE SUPPORT</a>, below.
+"#cgi">Simulated CGI Support</a> and
+       <a href="#language">Native Language Support</a>, below.
 
        Note:  Not all environment variables apply to all types of
        platforms supported by <strong>Lynx</strong>, though most do.  Feedback on
@@ -36,8 +56,7 @@
        variables.
 </pre>
 
-  <h2><a name="env" id="env">Environment Variables Used By
-  Lynx</a></h2>
+  <h2><a name="env" id="env">Variables Used By Lynx</a></h2>
   <pre>
        COLORTERM
                            If set, color capability for the terminal
@@ -130,7 +149,7 @@
                            UNIX, it will override the contents of
                            an /etc/organization file, if present.
 
-       PROTOCOL_proxy
+       <em>PROTOCOL</em>_proxy
                            <strong>Lynx</strong> supports the use of proxy servers
                            that  can act as firewall gateways and
                            caching servers.  They are  preferable
@@ -139,22 +158,22 @@
                            Each protocol used by <strong>Lynx</strong> (http, ftp,
                            gopher, etc), can be mapped separately
                            by setting environment variables of
-                           the form PROTOCOL_proxy (literally:
+                           the form <em>PROTOCOL</em>_proxy (literally:
                            http_proxy, ftp_proxy, gopher_proxy,
-                           etc), to "http://some.server.dom:port/".
+                           etc), to “http://some.server.dom:port/”.
                            See <a href=
 "#proxy">Proxy details and examples</a>.
 
-       WWW_access_GATEWAY
+       WWW_<em>access</em>_GATEWAY
                            <strong>Lynx</strong> still  supports  use  of  gateway
                            servers,  with  the  servers specified
-                           via   "WWW_access_GATEWAY"   variables
-                           (where  "access" is lower case and can
-                           be "http", "ftp", "gopher" or "wais"),
+                           via   “WWW_<em>access</em>_GATEWAY”   variables
+                           (where  “access” is lower case and can
+                           be “http”, “ftp”, “gopher” or “wais”),
                            however most gateway servers have been
                            discontinued.  Note that  you  do  not
-                           include  a  terminal '/' for gateways,
-                           but do for proxies specified by PROTOCOL_proxy
+                           include  a  terminal “/” for gateways,
+                           but do for proxies specified by <em>PROTOCOL</em>_proxy
                            environment variables.  See <a href=
 "#proxy">Proxy details</a>.
 
@@ -164,52 +183,52 @@
                            any of the <strong>Lynx</strong> configuration files.
 </pre>
 
-  <h2><a name="setenv" id="setenv">Environment Variables Set or
-  Modified By Lynx</a></h2>
+  <h2><a name="setenv" id="setenv">Variables Set or Modified By
+  Lynx</a></h2>
   <pre>
        LYNX_PRINT_DATE     This  variable  is  set  by  the  <strong>Lynx</strong>
-                           p(rint) function, to the Date:  string
-                           seen  in  the  document's "Information
-                           about" page (= cmd), if  any.   It  is
+                           p(rint) function, to the “Date:”  string
+                           seen  in  the  document's “Information
+                           about” page (= cmd), if  any.   It  is
                            created  for  use  by an external program,
                            as  defined   in   a   lynx.cfg
                            PRINTER: definition statement.  If the
                            field does not exist for the document,
                            the  variable  is set to a null string
-                           under UNIX, or "No Date" under VMS.
+                           under UNIX, or “No Date” under VMS.
 
        LYNX_PRINT_LASTMOD  This  variable  is  set  by  the  <strong>Lynx</strong>
                            p(rint)  function,  to  the  Last Mod:
-                           string seen in the document's  "Information
-                           about"  page  (= cmd), if any.
+                           string seen in the document's  “Information
+                           about”  page  (= cmd), if any.
                            It is created for use by  an  external
                            program,  as  defined  in  a  lynx.cfg
                            PRINTER: definition statement.  If the
                            field does not exist for the document,
                            the variable is set to a  null  string
-                           under UNIX, or "No LastMod" under VMS.
+                           under UNIX, or “No LastMod” under VMS.
 
        LYNX_PRINT_TITLE    This  variable  is  set  by  the  <strong>Lynx</strong>
                            p(rint)  function,  to  the  Linkname:
-                           string seen in the document's  "Information
-                           about"  page  (= cmd), if any.
+                           string seen in the document's  “Information
+                           about”  page  (= cmd), if any.
                            It is created for use by  an  external
                            program,  as  defined  in  a  lynx.cfg
                            PRINTER: definition statement.  If the
                            field does not exist for the document,
                            the variable is set to a  null  string
-                           under UNIX, or "No Title" under VMS.
+                           under UNIX, or “No Title” under VMS.
 
        LYNX_PRINT_URL      This  variable  is  set  by  the  <strong>Lynx</strong>
                            p(rint) function, to the  URL:  string
-                           seen  in  the  document's "Information
-                           about" page (= cmd), if  any.   It  is
+                           seen  in  the  document's “Information
+                           about” page (= cmd), if  any.   It  is
                            created  for  use  by an external program,
                            as  defined   in   a   lynx.cfg
                            PRINTER: definition statement.  If the
                            field does not exist for the document,
                            the  variable  is set to a null string
-                           under UNIX, or "No URL" under VMS.
+                           under UNIX, or “No URL” under VMS.
 
        LYNX_VERSION        This variable is always set  by  <strong>Lynx</strong>,
                            and may be used by an external program
@@ -228,7 +247,7 @@
                            <strong>Lynx</strong> to determine  the  terminal  type
                            being  used  to invoke <strong>Lynx</strong>.  If, however,
                            it is unset at startup time  (or
-                           has  the  value  "unknown"), or if the
+                           has  the  value  “unknown”), or if the
                            -term  command-line option is used,
                            <strong>Lynx</strong> will set or modify its value
                            to the user specified  terminal type
@@ -238,14 +257,14 @@
                            variables may also be changed.
 </pre>
 
-  <h2><a name="cgi" id="cgi">SIMULATED CGI SUPPORT</a></h2>
+  <h2><a name="cgi" id="cgi">Simulated CGI Support</a></h2>
 
   <p>If built with the cgi-links option enabled,
   <strong>Lynx</strong> allows access to a cgi script directly
   without the need for an http daemon.</p>
 
-  <p>When executing such "lynxcgi scripts" (if enabled), the
-  following variables may be set for simulating a CGI
+  <p>When executing such “lynxcgi scripts” (if
+  enabled), the following variables may be set for simulating a CGI
   environment:</p>
   <pre>
        CONTENT_LENGTH
@@ -286,8 +305,8 @@
   should be consulted for general information on CGI script
   programming.</p>
 
-  <h2><a name="language" id="language">NATIVE LANGUAGE
-  SUPPORT</a></h2>
+  <h2><a name="language" id="language">Native Language
+  Support</a></h2>
 
   <p>If configured and installed with Native Language Support,
   <strong>Lynx</strong> will display status and other messages in
@@ -332,8 +351,8 @@
   <p>To set your site's NTTP server as the default host for news
   reading and posting via <strong>Lynx</strong>, set the
   environment variable NNTPSERVER so that it points to its Internet
-  address. The variable "NNTPSERVER" is used to specify the host
-  which will be used as the default for news URLs.</p>
+  address. The variable “NNTPSERVER” is used to specify
+  the host which will be used as the default for news URLs.</p>
 
   <dl>
     <dt>UNIX</dt>
@@ -355,17 +374,20 @@ define/system NNTPSERVER "news.server.dom"
 
   <p><strong>Lynx</strong> still supports use of gateway servers,
   with the servers specified via the variables
-  "WWW_access_GATEWAY", where "access" is lower case and can be
-  "http", "ftp", "gopher" or "wais". Most of the gateway servers
-  have been discontinued, but "http://www.w3.org:8001" is available
-  for wais searches (note that you do not include a terminal '/'
+  “WWW_access_GATEWAY”, where “access” is
+  lower case and can be “http”, “ftp”,
+  “gopher” or “wais”. Most of the gateway
+  servers have been discontinued, but
+  “http://www.w3.org:8001” is available for wais
+  searches (note that you do not include a terminal “/”
   for gateways, but do for proxies; see below).</p>
 
   <p><strong>Lynx</strong> version 2.2 and beyond supports the use
   of proxy servers that can act as firewall gateways and caching
   servers. They are preferable to the older gateway servers. Each
   protocol used by <strong>Lynx</strong> can be mapped separately
-  using PROTOCOL_proxy environment variables of the form:</p>
+  using <em>PROTOCOL</em>_proxy environment variables as shown
+  below:</p>
 
   <dl>
     <dt>UNIX</dt>
@@ -373,20 +395,20 @@ define/system NNTPSERVER "news.server.dom"
     <dd>
       <blockquote>
         <pre>
-setenv http_proxy "http://some.server.dom:port/"
-setenv https_proxy "http://some.server.dom:port/"
-setenv ftp_proxy "http://some.server.dom:port/"
-setenv gopher_proxy "http://some.server.dom:port/"
-setenv news_proxy "http://some.server.dom:port/"
-setenv newspost_proxy "http://some.server.dom:port/"
-setenv newsreply_proxy "http://some.server.dom:port/"
-setenv snews_proxy "http://some.server.dom:port/"
-setenv snewspost_proxy "http://some.server.dom:port/"
-setenv snewsreply_proxy "http://some.server.dom:port/"
-setenv nntp_proxy "http://some.server.dom:port/"
-setenv wais_proxy "http://some.server.dom:port/"
-setenv finger_proxy "http://some.server.dom:port/"
-setenv cso_proxy "http://some.server.dom:port/"
+setenv http_proxy         "http://some.server.dom:port/"
+setenv https_proxy        "http://some.server.dom:port/"
+setenv ftp_proxy          "http://some.server.dom:port/"
+setenv gopher_proxy       "http://some.server.dom:port/"
+setenv news_proxy         "http://some.server.dom:port/"
+setenv newspost_proxy     "http://some.server.dom:port/"
+setenv newsreply_proxy    "http://some.server.dom:port/"
+setenv snews_proxy        "http://some.server.dom:port/"
+setenv snewspost_proxy    "http://some.server.dom:port/"
+setenv snewsreply_proxy   "http://some.server.dom:port/"
+setenv nntp_proxy         "http://some.server.dom:port/"
+setenv wais_proxy         "http://some.server.dom:port/"
+setenv finger_proxy       "http://some.server.dom:port/"
+setenv cso_proxy          "http://some.server.dom:port/"
 </pre>
       </blockquote>
     </dd>
@@ -396,37 +418,38 @@ setenv cso_proxy "http://some.server.dom:port/"
     <dd>
       <blockquote>
         <pre>
-define "http_proxy" "http://some.server.dom:port/"
-define "https_proxy" "http://some.server.dom:port/"
-define "ftp_proxy" "http://some.server.dom:port/"
-define "gopher_proxy" "http://some.server.dom:port/"
-define "news_proxy" "http://some.server.dom:port/"
-define "newspost_proxy" "http://some.server.dom:port/"
-define "newsreply_proxy" "http://some.server.dom:port/"
-define "snews_proxy" "http://some.server.dom:port/"
-define "snewspost_proxy" "http://some.server.dom:port/"
+define "http_proxy"       "http://some.server.dom:port/"
+define "https_proxy"      "http://some.server.dom:port/"
+define "ftp_proxy"        "http://some.server.dom:port/"
+define "gopher_proxy"     "http://some.server.dom:port/"
+define "news_proxy"       "http://some.server.dom:port/"
+define "newspost_proxy"   "http://some.server.dom:port/"
+define "newsreply_proxy"  "http://some.server.dom:port/"
+define "snews_proxy"      "http://some.server.dom:port/"
+define "snewspost_proxy"  "http://some.server.dom:port/"
 define "snewsreply_proxy" "http://some.server.dom:port/"
-define "nntp_proxy" "http://some.server.dom:port/"
-define "wais_proxy" "http://some.server.dom:port/"
-define "finger_proxy" "http://some.server.dom:port/"
-define "cso_proxy" "http://some.server.dom:port/"
+define "nntp_proxy"       "http://some.server.dom:port/"
+define "wais_proxy"       "http://some.server.dom:port/"
+define "finger_proxy"     "http://some.server.dom:port/"
+define "cso_proxy"        "http://some.server.dom:port/"
 </pre>
       </blockquote>
 
       <p>(Encase *BOTH* strings in double-quotes to maintain lower
-      case for the PROTOCOL_proxy variable and for the http access
-      type; include /system if you want proxying for all clients on
-      your system.)</p>
+      case for the <em>PROTOCOL</em>_proxy variable and for the
+      http access type; include /system if you want proxying for
+      all clients on your system.)</p>
     </dd>
   </dl>
 
   <p>If you wish to override the use of a proxy server for specific
-  hosts or entire domains you may use the "no_proxy" environment
-  variable. The no_proxy variable can be a comma-separated list of
-  strings defining no-proxy zones in the DNS domain name space. If
-  a tail substring of the domain-path for a host matches one of
-  these strings, transactions with that node will not be proxied.
-  Here is an example use of "no_proxy":</p>
+  hosts or entire domains you may use the “no_proxy”
+  environment variable. The no_proxy variable can be a
+  comma-separated list of strings defining no-proxy zones in the
+  DNS domain name space. If a tail substring of the domain-path for
+  a host matches one of these strings, transactions with that node
+  will not be proxied. Here is an example use of
+  “no_proxy”:</p>
 
   <dl>
     <dt>UNIX</dt>
@@ -449,20 +472,22 @@ define "no_proxy" "host.domain.dom, domain1.dom, domain2"
   <p>You can include a port number in the no_proxy list to override
   use of a proxy server for the host accessed via that port, but
   not via other ports. For example, if you use
-  "host.domain.dom:119" and/or "host.domain.dom:210", then news
-  (port 119) URLs and/or any wais (port 210) searches on that host
-  would be excluded, but http, ftp, and gopher services (if
-  normally proxied) would still be included, as would any news or
-  wais services on other hosts.</p>
-
-  <p>Warning: Note that setting 'il' as an entry in this list will
-  block proxying for the .mil domain as well as the .il domain. If
-  the entry is '.il' this will not happen.</p>
+  “host.domain.dom:119” and/or
+  “host.domain.dom:210”, then news (port 119) URLs
+  and/or any wais (port 210) searches on that host would be
+  excluded, but http, ftp, and gopher services (if normally
+  proxied) would still be included, as would any news or wais
+  services on other hosts.</p>
+
+  <p>Warning: Note that setting “il” as an entry in
+  this list will block proxying for the .mil domain as well as the
+  .il domain. If the entry is “.il” this will not
+  happen.</p>
 
   <p>If you wish to override the use of a proxy server completely
   (i.e., globally override any existing proxy variables), set the
-  value of "no_proxy" to "*". This is the only allowed use of * in
-  no_proxy.</p>
+  value of “no_proxy” to “*”. This is the
+  only allowed use of * in no_proxy.</p>
 
   <p>Note that <strong>Lynx</strong> treats file URLs on the local
   host as requests for direct access to the file, and does not
@@ -473,8 +498,8 @@ define "no_proxy" "host.domain.dom, domain1.dom, domain2"
   <strong>Lynx</strong> to the proxy server, so no special
   procedure for inducing the proxy server to handle them is
   required. Other WWW clients may require that the http server's
-  configuration file have "Map file:* ftp:*" in it to perform that
-  conversion.</p>
+  configuration file have “Map file:* ftp:*” in it to
+  perform that conversion.</p>
 
   <p>If you have not set NNTPSERVER, proxy or no_proxy environment
   variables you can set them at run time via the configuration file
@@ -482,18 +507,19 @@ define "no_proxy" "host.domain.dom, domain1.dom, domain2"
 
   <h2><a name="dos" id="dos">Win32 (95/NT) and 386 DOS</a></h2>
 
-  <p>(adapted from "readme.txt" by Wayne Buttles<br>
-  and "readme.dos" by Doug Kaufman)</p>
+  <p>(adapted from “readme.txt” by Wayne Buttles<br>
+  and “readme.dos” by Doug Kaufman)</p>
 
   <p>Here are some environment variables that should be set,
   usually in a batch file that runs the <strong>Lynx</strong>
   executable. Make sure that you have enough room left in your
-  environment. You may need to change your "SHELL=" setting in
-  config.sys. In addition, <strong>Lynx</strong> looks for a
-  "SHELL" environment variable when shelling to DOS. If you wish to
-  preserve the environment space when shelling, put a line like
-  this in your AUTOEXEC.BAT file also "SET SHELL=C:\COMMAND.COM
-  /E:2048". It should match CONFIG.SYS.</p>
+  environment. You may need to change your “SHELL=”
+  setting in config.sys. In addition, <strong>Lynx</strong> looks
+  for a “SHELL” environment variable when shelling to
+  DOS. If you wish to preserve the environment space when shelling,
+  put a line like this in your AUTOEXEC.BAT file also “SET
+  SHELL=C:\COMMAND.COM /E:2048”. It should match
+  CONFIG.SYS.</p>
   <pre>
     HOME         Where to keep the bookmark file and personal config files.
     TEMP or TMP  Bookmarks are kept here with no HOME.  Temp files here.
@@ -511,14 +537,17 @@ define "no_proxy" "host.domain.dom, domain1.dom, domain2"
 
   <p>Define these in your batch file for running
   <strong>Lynx</strong>. For example, if your application line is
-  "D:\win32\lynx.bat", lynx.bat for Win32 may look like:</p>
+  “D:\win32\lynx.bat”, lynx.bat for Win32 may look
+  like:</p>
   <pre>
         @ECHO OFF
         set home=d:\win32
         set temp=d:\tmp
         set lynx_cfg=d:\win32\lynx.cfg
         d:\win32\lynx.exe %1 %2 %3 %4 %5
-</pre>In lynx_386, a typical batch file might look like:
+</pre>
+
+  <p>In lynx_386, a typical batch file might look like:</p>
   <pre>
         @echo off
         set HOME=f:/lynx2-8
diff --git a/lynx_help/keystrokes/follow_help.html b/lynx_help/keystrokes/follow_help.html
index 4f18fc2..b9648c4 100644
--- a/lynx_help/keystrokes/follow_help.html
+++ b/lynx_help/keystrokes/follow_help.html
@@ -1,4 +1,4 @@
-<!-- $LynxId: follow_help.html,v 1.13 2014/01/07 01:38:19 tom Exp $ -->
+<!-- $LynxId: follow_help.html,v 1.16 2017/04/28 21:42:43 tom Exp $ -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 
 <html>
@@ -15,7 +15,24 @@
   </head>
 
 <body>
-  <h2>Overview</h2>
+  <div class="nav">
+    <ul>
+      <li><a href="#overview">Overview</a></li>
+
+      <li><a href="#numbering">Zero and other digits</a></li>
+
+      <li><a href="#suffixes">Suffixes</a></li>
+
+      <li><a href="#form_fields">Specifics for Form Fields</a></li>
+
+      <li><a href="#hidden_links">Hidden Links</a></li>
+
+      <li><a href="#goto_hidden_link">Navigating to Hidden
+      Links</a></li>
+    </ul>
+  </div>
+
+  <h2><a name="overview" id="overview">Overview</a></h2>
 
   <p>If a user has set one of these modes, (as the default or for
   the current session via the <em>Options menu</em>) then hypertext
@@ -37,7 +54,8 @@
   potentially multiple digit number corresponding to an indicated
   link number.</p>
 
-  <h2>Zero and other digits</h2>
+  <h2><a name="numbering" id="numbering">Zero and other
+  digits</a></h2>
 
   <p>The prompt can be invoked via typing a zero (<em>0</em>), but
   it will not be treated as the lead digit for the number entry,
@@ -54,7 +72,7 @@
   <em>F_LINK_NUM</em> command for invoking the <em>Follow link (or
   goto link or page) number:</em> prompt.</p>
 
-  <h2>Suffixes</h2>
+  <h2><a name="suffixes" id="suffixes">Suffixes</a></h2>
 
   <p>After accepting a number at the prompt, <strong>Lynx</strong>
   accepts an optional suffix:</p>
@@ -72,26 +90,27 @@
     <dt><code><strong>g</strong></code> (go)</dt>
 
     <dd>
-      <p>If the number entered at the prompt has a '<em>g</em>'
-      suffix (e.g., <em>123g</em>), then <strong>Lynx</strong> will
-      make the link corresponding to that number the current link,
-      paging as appropriate if the link does not appear in the
-      currently displayed page. The '<em>g</em>' suffix is inferred
-      (need not be entered) for form fields in <em>Form fields are
-      numbered</em> or <em>Links and form fields are numbered</em>
-      mode.</p>
+      <p>If the number entered at the prompt has a
+      “<em>g</em>” suffix (e.g., <em>123g</em>), then
+      <strong>Lynx</strong> will make the link corresponding to
+      that number the current link, paging as appropriate if the
+      link does not appear in the currently displayed page. The
+      “<em>g</em>” suffix is inferred (need not be
+      entered) for form fields in <em>Form fields are numbered</em>
+      or <em>Links and form fields are numbered</em> mode.</p>
     </dd>
 
     <dt><code><strong>p</strong></code> (page)</dt>
 
     <dd>
-      <p>Alternatively, if the number is given a '<em>p</em>'
-      suffix (e.g., <em>123p</em>), <strong>Lynx</strong> will make
-      the page corresponding to that number the currently displayed
-      page, and the first link on that page, if any, the current
-      link. The '<em>g</em>' and '<em>p</em>' suffixes thus convert
-      the <em>Follow link (or goto link or page) number:</em>
-      feature to an advanced navigation aid.</p>
+      <p>Alternatively, if the number is given a
+      “<em>p</em>” suffix (e.g., <em>123p</em>),
+      <strong>Lynx</strong> will make the page corresponding to
+      that number the currently displayed page, and the first link
+      on that page, if any, the current link. The
+      “<em>g</em>” and “<em>p</em>”
+      suffixes thus convert the <em>Follow link (or goto link or
+      page) number:</em> feature to an advanced navigation aid.</p>
     </dd>
 
     <dt><code><strong>+</strong></code> or
@@ -123,7 +142,8 @@
     </dd>
   </dl>
 
-  <h2>Specifics for Form Fields</h2>
+  <h2><a name="form_fields" id="form_fields">Specifics for Form
+  Fields</a></h2>
 
   <p>Numbers are associated with form fields only when</p>
 
@@ -150,26 +170,27 @@
     will be displayed in <em>Form fields are numbered</em> or
     <em>Links and form fields are numbered</em> mode.</li>
 
-    <li>In any keypad mode, the <em>F_LINK_NUM</em> ('<em>0</em>')
-    command will invoke a <em>Select option (or page) number:</em>
-    prompt, and you can enter a number, and optionally a
-    '<em>g</em>' or '<em>p</em>' suffix, to select or seek an
-    OPTION in that list.</li>
+    <li>In any keypad mode, the <em>F_LINK_NUM</em>
+    (“<em>0</em>”) command will invoke a <em>Select
+    option (or page) number:</em> prompt, and you can enter a
+    number, and optionally a “<em>g</em>” or
+    “<em>p</em>” suffix, to select or seek an OPTION in
+    that list.</li>
 
     <li>If only a number is entered at the prompt, the
     corresponding OPTION will be selected and the popup will be
     retracted.</li>
 
-    <li>If the '<em>g</em>' suffix is included, then you will be
-    positioned on the corresponding OPTION in the list, paging
-    through the list if necessary, but it will not be treated as
-    selected unless you enter the ACTIVATE (RETURN or right-arrow)
-    command when positioned on the OPTION.</li>
+    <li>If the “<em>g</em>” suffix is included, then
+    you will be positioned on the corresponding OPTION in the list,
+    paging through the list if necessary, but it will not be
+    treated as selected unless you enter the ACTIVATE (RETURN or
+    right-arrow) command when positioned on the OPTION.</li>
 
     <li>For purposes of paging (e.g., in conjunction with the
-    '<em>p</em>' suffix), a <em>page</em> is defined as the number
-    of OPTIONs displayed within the vertical dimension of the popup
-    window.</li>
+    “<em>p</em>” suffix), a <em>page</em> is defined as
+    the number of OPTIONs displayed within the vertical dimension
+    of the popup window.</li>
 
     <li>Finally, the <em>+</em> and <em>-</em> suffixes can be used
     to move forward or back from the current option or page in a
@@ -182,10 +203,11 @@
   whether or not <em>keypad mode</em> is <em>Form fields are
   numbered</em> or <em>Links and form fields are numbered</em>
   since options are numbered internally. If form field numbering is
-  turned off, the option numbers won't appear on screen, but the
+  turned off, the option numbers will not appear on screen, but the
   user can still navigate using these commands.</p>
 
-  <h2>Hidden Links</h2>
+  <h2><a name="hidden_links" id="hidden_links">Hidden
+  Links</a></h2>
 
   <p>HTML can be structured so that it includes <em>hidden
   links</em>, i.e., without a visible link name intended for
@@ -230,34 +252,39 @@
   <em>-hiddenlinks</em> flag at all is equivalent to
   <em>-hiddenlinks=listonly</em>.</p>
 
-  <h2>Navigating to Hidden Links</h2>
+  <h2><a name="goto_hidden_link" id="goto_hidden_link">Navigating
+  to Hidden Links</a></h2>
 
   <p>If a document includes <em>hidden links</em>, they will be
   reported, with appropriate labeling, in the menus created for the
-  LIST ('<em>l</em>') or ADDRLIST ('<em>A</em>') commands, unless
+  LIST (“<em>l</em>”) or ADDRLIST
+  (“<em>A</em>”) commands, unless
   <em>-hiddenlinks=ignore</em> is used. They can then be
   ACTIVATE-ed via those menus.</p>
 
   <p>If a link was hidden because of an ALT attribute in an IMG
   element, it will be converted to a <em>visible link</em> whenever
-  the IMAGE_TOGGLE ('<em>*</em>') command is used to create links
-  for SRC attribute values of IMG elements, because this indicates
-  that the user does have some form of image handling enabled via a
-  helper application, or wishes to download files for subsequent
-  use with a graphic browser or other suitable software.</p>
+  the IMAGE_TOGGLE (“<em>*</em>”) command is used to
+  create links for SRC attribute values of IMG elements, because
+  this indicates that the user does have some form of image
+  handling enabled via a helper application, or wishes to download
+  files for subsequent use with a graphic browser or other suitable
+  software.</p>
 
   <p>HTML forms may have fields with a HIDDEN attribute, indicating
   that a name/value pair for the fields should be included in the
   content submitted for the form, but the value should not be
   displayed in the rendered form. <strong>Lynx</strong> respects
   this attribute as well, and neither displays the HIDDEN field,
-  nor assigns it a number for the F_LINK_NUM ('<em>0</em>') command
-  and <em>Form fields are numbered</em> or <em>Links and form
-  fields are numbered</em> keypad mode handling, nor includes an
-  entry for it in the menus created for the LIST ('<em>l</em>') or
-  ADDRLIST ('<em>A</em>') commands. However, the HIDDEN name/value
-  pairs are included in any displays of submitted form content in
-  the <em>Information about the current document</em> that is
-  invoked by the INFO ('<em>=</em>') command.</p>
+  nor assigns it a number for the F_LINK_NUM
+  (“<em>0</em>”) command and <em>Form fields are
+  numbered</em> or <em>Links and form fields are numbered</em>
+  keypad mode handling, nor includes an entry for it in the menus
+  created for the LIST (“<em>l</em>”) or ADDRLIST
+  (“<em>A</em>”) commands. However, the HIDDEN
+  name/value pairs are included in any displays of submitted form
+  content in the <em>Information about the current document</em>
+  that is invoked by the INFO (“<em>=</em>”)
+  command.</p>
 </body>
 </html>
diff --git a/lynx_help/keystrokes/gopher_types_help.html b/lynx_help/keystrokes/gopher_types_help.html
index d71ca00..2f5c16e 100644
--- a/lynx_help/keystrokes/gopher_types_help.html
+++ b/lynx_help/keystrokes/gopher_types_help.html
@@ -1,4 +1,4 @@
-<!-- $LynxId: gopher_types_help.html,v 1.11 2014/01/09 00:17:28 tom Exp $ -->
+<!-- $LynxId: gopher_types_help.html,v 1.12 2017/04/28 20:47:13 tom Exp $ -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 
 <html>
@@ -15,7 +15,14 @@
   </head>
 
 <body>
-  <h1>Listing of Gopher types</h1>
+  <div class="nav">
+    <ul>
+      <li><a href="#overview">Listing of Gopher types</a></li>
+    </ul>
+  </div>
+
+  <h2><a name="overview" id="overview">Listing of Gopher
+  types</a></h2>
 
   <dl>
     <dt>(FILE)</dt>
diff --git a/lynx_help/keystrokes/history_help.html b/lynx_help/keystrokes/history_help.html
index dd39609..b3992cc 100644
--- a/lynx_help/keystrokes/history_help.html
+++ b/lynx_help/keystrokes/history_help.html
@@ -1,4 +1,4 @@
-<!-- $LynxId: history_help.html,v 1.7 2014/01/07 09:17:47 tom Exp $ -->
+<!-- $LynxId: history_help.html,v 1.9 2017/04/28 21:44:00 tom Exp $ -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 
 <html>
@@ -15,7 +15,15 @@
   </head>
 
 <body>
-  <h2>Overview</h2>
+  <div class="nav">
+    <ul>
+      <li><a href="#overview">Overview</a></li>
+
+      <li><a href="#navigation">Navigation</a></li>
+    </ul>
+  </div>
+
+  <h2><a name="overview" id="overview">Overview</a></h2>
 
   <p><strong>Lynx</strong>'s History Page displays all of the links
   that you have traveled through to reach your current point,
@@ -27,7 +35,7 @@
   link within that document, it <em>will</em> be in the history
   stack.</p>
 
-  <h2>Navigation</h2>
+  <h2><a name="navigation" id="navigation">Navigation</a></h2>
 
   <p>You may <a href="movement_help.html">select</a> any link on
   the History Page to review a document that you have previously
@@ -47,7 +55,7 @@
   file, or document associated with POST content, it can still be
   selected conveniently via the <a href="visited_help.html">Visited
   Links Page</a>. The latter also will include links which were
-  '<em>d</em>'ownloaded or passed to a helper application, and thus
-  were not included in the history stack.</p>
+  “<em>d</em>”ownloaded or passed to a helper
+  application, and thus were not included in the history stack.</p>
 </body>
 </html>
diff --git a/lynx_help/keystrokes/keystroke_help.html b/lynx_help/keystrokes/keystroke_help.html
index 1791245..0191b69 100644
--- a/lynx_help/keystrokes/keystroke_help.html
+++ b/lynx_help/keystrokes/keystroke_help.html
@@ -1,4 +1,4 @@
-<!-- $LynxId: keystroke_help.html,v 1.19 2014/01/07 01:45:02 tom Exp $ -->
+<!-- $LynxId: keystroke_help.html,v 1.21 2017/04/28 21:52:57 tom Exp $ -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 
 <html>
@@ -15,140 +15,167 @@
   </head>
 
 <body>
+  <div class="nav">
+    <ul>
+      <li><a href="#overview">Overview</a></li>
+
+      <li><a href="#movement">Movement</a></li>
+
+      <li><a href="#scrolling">Scrolling</a></li>
+
+      <li><a href="#dired">Dired</a></li>
+
+      <li><a href="#other">Other</a></li>
+    </ul>
+  </div>
+
+  <h2><a name="overview" id="overview">Overview</a></h2>
+
   <p><strong>Lynx</strong> recognizes many single-character
   commands. This is an overview to their default bindings, with
   links to more detailed documentation.</p>
+
+  <h2><a name="movement" href="movement_help.html" id=
+  "movement">Movement</a></h2>
   <pre>
-  <a name="movement" href="movement_help.html" id=
-"movement">MOVEMENT</a>:    Down arrow     - Highlight next topic
-               Up arrow       - Highlight previous topic
-               Right arrow,   - Jump to highlighted topic
-               Return, Enter  - Follow selected link
-               Left arrow     - Return to previous topic
-
-  <a name="scrolling" href="scrolling_help.html" id=
-"scrolling">SCROLLING</a>:   +              - Scroll down to next page (Page-Down)
-               -              - Scroll up to previous page (Page-Up)
-               SPACE          - Scroll down to next page (Page-Down)
-               b              - Scroll up to previous page (Page-Up)
-               CTRL-A         - Go to first page of the current document (Home)
-               CTRL-E         - Go to last page of the current document (End)
-               CTRL-B         - Scroll up to previous page (Page-Up)
-               CTRL-F         - Scroll down to next page (Page-Down)
-               CTRL-N         - Go forward two lines in the current document
-               CTRL-P         - Go back two lines in the current document
-               )              - Go forward half a page in the current document
-               (              - Go back half a page in the current document
-               ^              - Go to the first link on the current line
-               $              - Go to the last link on the current line
-               <              - Go to the previous link in the current column
-               >              - Go to the next link in the current column
-               #              - Go to Toolbar or Banner in the current document
-
-  <a name="dired" href="dired_help.html" id=
-"dired">DIRED</a>:       c              - Create a new file
-               d              - Download selected file
-               e              - Edit selected file
-               f              - Show a full menu of options for current file
-               m              - Modify the name or location of selected file
-               r              - Remove selected file
-               t              - Tag highlighted file
-               u              - Upload a file into the current directory
-
-  <a name="other" href="other_help.html" id=
-"other">OTHER</a>:       ? (or h)       - Help (this screen)
-               a              - Add the current link to a bookmark file
-               c              - Send a comment to the document owner
-               d              - Download the current link
-               e              - Edit the current file
-               E              - Edit the current link's URL (or ACTION) and
-                                use that as a goto URL.
-               g              - Goto a user specified <a href=
+       Down arrow     - Highlight next topic
+       Up arrow       - Highlight previous topic
+       Right arrow,   - Jump to highlighted topic
+       Return, Enter  - Follow selected link
+       Left arrow     - Return to previous topic
+</pre>
+
+  <h2><a name="scrolling" href="scrolling_help.html" id=
+  "scrolling">Scrolling</a></h2>
+  <pre>
+       +              - Scroll down to next page (Page-Down)
+       -              - Scroll up to previous page (Page-Up)
+       SPACE          - Scroll down to next page (Page-Down)
+       b              - Scroll up to previous page (Page-Up)
+       CTRL-A         - Go to first page of the current document (Home)
+       CTRL-E         - Go to last page of the current document (End)
+       CTRL-B         - Scroll up to previous page (Page-Up)
+       CTRL-F         - Scroll down to next page (Page-Down)
+       CTRL-N         - Go forward two lines in the current document
+       CTRL-P         - Go back two lines in the current document
+       )              - Go forward half a page in the current document
+       (              - Go back half a page in the current document
+       ^              - Go to the first link on the current line
+       $              - Go to the last link on the current line
+       <              - Go to the previous link in the current column
+       >              - Go to the next link in the current column
+       #              - Go to Toolbar or Banner in the current document
+</pre>
+
+  <h2><a name="dired" href="dired_help.html" id=
+  "dired">Dired</a></h2>
+  <pre>
+       c              - Create a new file
+       d              - Download selected file
+       e              - Edit selected file
+       f              - Show a full menu of options for current file
+       m              - Modify the name or location of selected file
+       r              - Remove selected file
+       t              - Tag highlighted file
+       u              - Upload a file into the current directory
+</pre>
+
+  <h2><a name="other" href="other_help.html" id=
+  "other">Other</a></h2>
+  <pre>
+       ? (or h)       - Help (this screen)
+       a              - Add the current link to a bookmark file
+       c              - Send a comment to the document owner
+       d              - Download the current link
+       e              - Edit the current file
+       E              - Edit the current link's URL (or ACTION) and
+                        use that as a goto URL.
+       g              - Goto a user specified <a href=
 "../lynx_url_support.html">URL</a> or file
-               G              - Edit the current document's URL and use that
-                                as a goto URL.
-               i              - Show an index of documents
-               j              - Execute a jump operation
-               k              - Show list of actual key mappings
-               l              - List references (links) in current document
-               m              - Return to main screen
-               o              - Set your <a href=
+       G              - Edit the current document's URL and use that
+                        as a goto URL.
+       i              - Show an index of documents
+       j              - Execute a jump operation
+       k              - Show list of actual key mappings
+       l              - List references (links) in current document
+       m              - Return to main screen
+       o              - Set your <a href=
 "option_help.html">options</a>
-               p              - <a href=
+       p              - <a href=
 "print_help.html">Print</a> to a file, mail, printers, or other
-               q              - Quit (Capital 'Q' for quick quit)
-               /              - Search for a string within the current document
-               s              - Enter a search string for an external search
-               n              - Go to the next search string
-               N              - Go to the previous search string
-               v              - View a <a href=
+       q              - Quit (Capital “Q” for quick quit)
+       /              - Search for a string within the current document
+       s              - Enter a search string for an external search
+       n              - Go to the next search string
+       N              - Go to the previous search string
+       v              - View a <a href=
 "bookmark_help.html">bookmark file</a>
-               V              - Go to the <a href=
+       V              - Go to the <a href=
 "visited_help.html">Visited Links Page</a>
-               x              - Force submission of form or link with no-cache
-               z              - Cancel transfer in progress
-               [backspace]    - Go to the <a href=
+       x              - Force submission of form or link with no-cache
+       z              - Cancel transfer in progress
+       [backspace]    - Go to the <a href=
 "history_help.html">History Page</a>
-               =              - Show info about current document, URL and link
-               \              - Toggle document source/rendered view
-               !              - Spawn your default shell
-               '              - Toggle "historical" vs minimal or valid comment
-                                parsing
-               _              - Clear all authorization info for this session
-               `              - Toggle minimal or valid comment parsing
-               *              - Toggle image_links mode on and off
-               @              - Toggle raw 8-bit translations or CJK mode
-                                on or off
-               .              - Run external program on the current link.
-               ,              - Run external program on the current document.
-               {              - Shift the screen left.
-               }              - Shift the screen right.
-               |              - Toggle line-wrap mode.  When line-wrap is
-                                off, you may use { and } to shift the screen
-                                left/right.  The screen width is set to 999.
-               ~              - Toggle parsing of nested tables (experimental).
-               [              - Toggle pseudo_inlines mode on and off
-               ]              - Send a HEAD request for the current doc or link
-               "              - Toggle valid or "soft" double-quote parsing
-               CTRL-R         - Reload current file and refresh the screen
-               CTRL-L         - Refresh the screen
-
-               CTRL-V         - Outside of a text input line or field,
-                                switch to <a href=
+       =              - Show info about current document, URL and link
+       \              - Toggle document source/rendered view
+       !              - Spawn your default shell
+       '              - Toggle "historical" vs minimal or valid comment
+                        parsing
+       _              - Clear all authorization info for this session
+       `              - Toggle minimal or valid comment parsing
+       *              - Toggle image_links mode on and off
+       @              - Toggle raw 8-bit translations or CJK mode
+                        on or off
+       .              - Run external program on the current link.
+       ,              - Run external program on the current document.
+       {              - Shift the screen left.
+       }              - Shift the screen right.
+       |              - Toggle line-wrap mode.  When line-wrap is
+                        off, you may use { and } to shift the screen
+                        left/right.  The screen width is set to 999.
+       ~              - Toggle parsing of nested tables (experimental).
+       [              - Toggle pseudo_inlines mode on and off
+       ]              - Send a HEAD request for the current doc or link
+       "              - Toggle valid or "soft" double-quote parsing
+       CTRL-R         - Reload current file and refresh the screen
+       CTRL-L         - Refresh the screen
+
+       CTRL-V         - Outside of a text input line or field,
+                        switch to <a href=
 "option_help.html#tagsoup">alternative parsing</a> of HTML.
-                              - In a form text input field,
-                                CTRL-V prompts for a key command (allows
-                                <a href=
+                      - In a form text input field,
+                        CTRL-V prompts for a key command (allows
+                        <a href=
 "../Lynx_users_guide.html#CtrlVNote">escaping</a> from the field).
 
-                                Note that on most UNIX hosts, CTRL-V is bound
-                                via stty to the lnext (literal-next) code but
-                                the exact behavior of that is implementation
-                                specific.  On Solaris you must type CTRL-V
-                                twice to use it, since it quotes the following
-                                keystroke.
+                        Note that on most UNIX hosts, CTRL-V is bound
+                        via stty to the lnext (literal-next) code but
+                        the exact behavior of that is implementation
+                        specific.  On Solaris you must type CTRL-V
+                        twice to use it, since it quotes the following
+                        keystroke.
 
-               CTRL-U         - Inside text input line or field,
-                                erase input line (<a href=
+       CTRL-U         - Inside text input line or field,
+                        erase input line (<a href=
 "edit_help.html">more input line commands</a>)
-                              - Outside of text input or field,
-                                undo returning to previous topic.
+                      - Outside of text input or field,
+                        undo returning to previous topic.
 
-               CTRL-G         - Cancel input or transfer
+       CTRL-G         - Cancel input or transfer
 
-               CTRL-T         - Toggle trace mode on and off
-               ;              - View the Lynx Trace Log for the current session
-               CTRL-K         - Invoke the <a href=
+       CTRL-T         - Toggle trace mode on and off
+       ;              - View the Lynx Trace Log for the current session
+       CTRL-K         - Invoke the <a href=
 "cookie_help.html">Cookie Jar Page</a>
-               CTRL-X         - Invoke the <a href=
+       CTRL-X         - Invoke the <a href=
 "../Lynx_users_guide.html#Cache">Cache Jar Page</a>
-               numbers        - Invoke the prompt
-                                <a href=
+       <em>numbers</em>        - Invoke the prompt
+                          <a href=
 "follow_help.html">Follow link (or goto link or page) number:</a>
-                                  or the
-                                  <a href=
+                        or the
+                          <a href=
 "follow_help.html#select-option">Select option (or page) number:</a>
-                                prompt
+                        prompt
 </pre>
 </body>
 </html>
diff --git a/lynx_help/keystrokes/movement_help.html b/lynx_help/keystrokes/movement_help.html
index 18277ee..60d2916 100644
--- a/lynx_help/keystrokes/movement_help.html
+++ b/lynx_help/keystrokes/movement_help.html
@@ -1,4 +1,4 @@
-<!-- $LynxId: movement_help.html,v 1.9 2014/01/08 21:36:06 tom Exp $ -->
+<!-- $LynxId: movement_help.html,v 1.10 2017/04/28 21:55:16 tom Exp $ -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 
 <html>
@@ -15,7 +15,15 @@
   </head>
 
 <body>
-  <h2>Keystroke Commands</h2>
+  <div class="nav">
+    <ul>
+      <li><a href="#overview">Overview</a></li>
+
+      <li><a href="#notes">Notes</a></li>
+    </ul>
+  </div>
+
+  <h2><a name="overview" id="overview">Overview</a></h2>
 
   <p>These are the Lynx <a href=
   "keystroke_help.html#movement">keystroke-movement</a> commands
@@ -38,7 +46,7 @@
                           previous topic.
 </pre>
 
-  <h2>Notes</h2>
+  <h2><a name="notes" id="notes">Notes</a></h2>
 
   <ol>
     <li>If <em>VI Keys</em> are enabled from the options menu or
diff --git a/lynx_help/keystrokes/option_help.html b/lynx_help/keystrokes/option_help.html
index b914860..19b16f5 100644
--- a/lynx_help/keystrokes/option_help.html
+++ b/lynx_help/keystrokes/option_help.html
@@ -1,4 +1,4 @@
-<!-- $LynxId: option_help.html,v 1.28 2014/01/08 22:28:11 tom Exp $ -->
+<!-- $LynxId: option_help.html,v 1.32 2017/04/28 21:12:53 tom Exp $ -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 
 <html>
@@ -15,6 +15,8 @@
   </head>
 
 <body>
+  <h2><a name="overview" id="overview">Options Menu</a></h2>
+
   <p>The <em>Options Menu</em> allows you to set and modify many
   Lynx features.<br>
   <strong>Lynx</strong>'s <em>Options Menu</em> is grouped visually
@@ -23,153 +25,157 @@
   have been compiled in or chosen in
   <code><strong>lynx.cfg</strong></code>.</p>
 
-  <ul>
-    <li>
-      <a href="#GP">General Preferences</a>
+  <div class="nav">
+    <ul>
+      <li><a href="#overview">Options Menu</a></li>
 
-      <ul>
-        <li><a href="#UM">User Mode</a></li>
+      <li>
+        <a href="#GP">General Preferences</a>
 
-        <li><a href="#ED">Editor</a></li>
+        <ul>
+          <li><a href="#UM">User Mode</a></li>
 
-        <li><a href="#ST">Type of Search</a></li>
-      </ul>
-    </li>
+          <li><a href="#ED">Editor</a></li>
 
-    <li>
-      <a href="#SP">Security and Privacy</a>
+          <li><a href="#ST">Type of Search</a></li>
+        </ul>
+      </li>
 
-      <ul>
-        <li><a href="#CK">Cookies</a></li>
+      <li>
+        <a href="#SP">Security and Privacy</a>
 
-        <li><a href="#IK">Invalid-Cookie Prompting</a></li>
+        <ul>
+          <li><a href="#CK">Cookies</a></li>
 
-        <li><a href="#SK">SSL Prompting</a></li>
-      </ul>
-    </li>
+          <li><a href="#IK">Invalid-Cookie Prompting</a></li>
 
-    <li>
-      <a href="#KI">Keyboard Input</a>
+          <li><a href="#SK">SSL Prompting</a></li>
+        </ul>
+      </li>
 
-      <ul>
-        <li><a href="#KM">Keypad mode</a></li>
+      <li>
+        <a href="#KI">Keyboard Input</a>
 
-        <li><a href="#EM">Emacs keys</a></li>
+        <ul>
+          <li><a href="#KM">Keypad mode</a></li>
 
-        <li><a href="#VI">VI keys</a></li>
+          <li><a href="#EM">Emacs keys</a></li>
 
-        <li><a href="#LE">Line edit style</a></li>
-      </ul>
-    </li>
+          <li><a href="#VI">VI keys</a></li>
 
-    <li>
-      <a href="#DP">Display and Character Set</a>
+          <li><a href="#LE">Line edit style</a></li>
+        </ul>
+      </li>
 
-      <ul>
-        <li><a href="#LC">Use locale-based character set</a></li>
+      <li>
+        <a href="#DP">Display and Character Set</a>
 
-        <li><a href="#H5">Use HTML5 charset replacements</a></li>
+        <ul>
+          <li><a href="#LC">Use locale-based character set</a></li>
 
-        <li><a href="#DC">Display Character set</a></li>
+          <li><a href="#H5">Use HTML5 charset replacements</a></li>
 
-        <li><a href="#AD">Assumed document character set</a></li>
+          <li><a href="#DC">Display Character set</a></li>
 
-        <li><a href="#JK">Raw 8-bit or CJK mode</a></li>
+          <li><a href="#AD">Assumed document character set</a></li>
 
-        <li><a href="#DV">X DISPLAY variable</a></li>
-      </ul>
-    </li>
+          <li><a href="#JK">Raw 8-bit or CJK mode</a></li>
 
-    <li>
-      <a href="#AP">Document Appearance</a>
+          <li><a href="#DV">X DISPLAY variable</a></li>
+        </ul>
+      </li>
 
-      <ul>
-        <li><a href="#SC">Show color</a></li>
+      <li>
+        <a href="#AP">Document Appearance</a>
 
-        <li><a href="#CS">Color style</a></li>
+        <ul>
+          <li><a href="#SC">Show color</a></li>
 
-        <li><a href="#C0">Default colors</a></li>
+          <li><a href="#CS">Color style</a></li>
 
-        <li><a href="#CL">Show cursor for current link or
-        option</a></li>
+          <li><a href="#C0">Default colors</a></li>
 
-        <li><a href="#UK">Underline links</a></li>
+          <li><a href="#CL">Show cursor for current link or
+          option</a></li>
 
-        <li><a href="#SS">Show scrollbar</a></li>
+          <li><a href="#UK">Underline links</a></li>
 
-        <li><a href="#PU">Pop-ups for select fields</a></li>
+          <li><a href="#SS">Show scrollbar</a></li>
 
-        <li><a href="#tagsoup">HTML error recovery</a></li>
+          <li><a href="#PU">Pop-ups for select fields</a></li>
 
-        <li><a href="#BH">Bad HTML messages</a></li>
+          <li><a href="#tagsoup">HTML error recovery</a></li>
 
-        <li><a href="#SI">Show Images</a></li>
+          <li><a href="#BH">Bad HTML messages</a></li>
 
-        <li><a href="#VB">Verbose Images</a></li>
-      </ul>
-    </li>
+          <li><a href="#SI">Show Images</a></li>
 
-    <li>
-      <a href="#HP">Headers Transferred to Remote Servers</a>
+          <li><a href="#VB">Verbose Images</a></li>
+        </ul>
+      </li>
 
-      <ul>
-        <li><a href="#PM">Personal mail address</a></li>
+      <li>
+        <a href="#HP">Headers Transferred to Remote Servers</a>
 
-        <li><a href="#PN">Personal name for mail</a></li>
+        <ul>
+          <li><a href="#PM">Personal mail address</a></li>
 
-        <li><a href="#PW">Password for anonymous ftp</a></li>
+          <li><a href="#PN">Personal name for mail</a></li>
 
-        <li><a href="#PT">Preferred media type</a></li>
+          <li><a href="#PW">Password for anonymous ftp</a></li>
 
-        <li><a href="#PE">Preferred encoding</a></li>
+          <li><a href="#PT">Preferred media type</a></li>
 
-        <li><a href="#PC">Preferred Document Charset</a></li>
+          <li><a href="#PE">Preferred encoding</a></li>
 
-        <li><a href="#PL">Preferred Document Language</a></li>
+          <li><a href="#PC">Preferred Document Charset</a></li>
 
-        <li><a href="#SA">Send User-Agent header</a></li>
+          <li><a href="#PL">Preferred Document Language</a></li>
 
-        <li><a href="#UA">User Agent</a></li>
-      </ul>
-    </li>
+          <li><a href="#SA">Send User-Agent header</a></li>
 
-    <li>
-      <a href="#LP">Listing and Accessing Files</a>
+          <li><a href="#UA">User Agent</a></li>
+        </ul>
+      </li>
 
-      <ul>
-        <li><a href="#PF">Use Passive FTP</a></li>
+      <li>
+        <a href="#LP">Listing and Accessing Files</a>
 
-        <li><a href="#FT">FTP sort criteria</a></li>
+        <ul>
+          <li><a href="#PF">Use Passive FTP</a></li>
 
-        <li><a href="#LD">Local directory sort criteria</a></li>
+          <li><a href="#FT">FTP sort criteria</a></li>
 
-        <li><a href="#LO">Local directory sort order</a></li>
+          <li><a href="#LD">Local directory sort criteria</a></li>
 
-        <li><a href="#DF">Show dot files</a></li>
+          <li><a href="#LO">Local directory sort order</a></li>
 
-        <li><a href="#PZ">Pause when showing message</a></li>
+          <li><a href="#DF">Show dot files</a></li>
 
-        <li><a href="#LL">Execution links</a></li>
+          <li><a href="#PZ">Pause when showing message</a></li>
 
-        <li><a href="#TX">Show transfer rate</a></li>
-      </ul>
-    </li>
+          <li><a href="#LL">Execution links</a></li>
 
-    <li>Special Files and Screens
+          <li><a href="#TX">Show transfer rate</a></li>
+        </ul>
+      </li>
 
-      <ul>
-        <li><a href="#MB">Multi-bookmarks</a></li>
+      <li>Special Files and Screens
 
-        <li><a href="#BF">Bookmark file</a></li>
+        <ul>
+          <li><a href="#MB">Multi-bookmarks</a></li>
 
-        <li><a href="#AZ">Auto Session</a></li>
+          <li><a href="#BF">Bookmark file</a></li>
 
-        <li><a href="#SZ">Session file</a></li>
+          <li><a href="#AZ">Auto Session</a></li>
 
-        <li><a href="#VP">Visited Pages</a></li>
-      </ul>
-    </li>
-  </ul>
+          <li><a href="#SZ">Session file</a></li>
+
+          <li><a href="#VP">Visited Pages</a></li>
+        </ul>
+      </li>
+    </ul>
+  </div>
 
   <h2><a name="GP" id="GP">General Preferences</a></h2>
 
@@ -249,10 +255,10 @@
 
   <h3><a name="EM" id="EM">Emacs keys</a></h3>
 
-  <p>If set to 'ON' then the CTRL-P, CTRL-N, CTRL-F and CTRL-B keys
-  will be mapped to up-arrow, down-arrow, right-arrow and
-  left-arrow respectively. Otherwise, they remain mapped to their
-  configured bindings (normally UP_TWO lines, DOWN_TWO lines,
+  <p>If set to “ON” then the CTRL-P, CTRL-N, CTRL-F and
+  CTRL-B keys will be mapped to up-arrow, down-arrow, right-arrow
+  and left-arrow respectively. Otherwise, they remain mapped to
+  their configured bindings (normally UP_TWO lines, DOWN_TWO lines,
   NEXT_PAGE and PREV_PAGE respectively).</p>
 
   <p>Note: setting emacs keys does not affect the line-editor
@@ -260,9 +266,9 @@
 
   <h3><a name="VI" id="VI">VI keys</a></h3>
 
-  <p>If set to 'ON' then the lowercase h, j, k and l keys will be
-  mapped to left-arrow, down-arrow, up-arrow and right-arrow
-  respectively.</p>
+  <p>If set to “ON” then the lowercase h, j, k and l
+  keys will be mapped to left-arrow, down-arrow, up-arrow and
+  right-arrow respectively.</p>
 
   <p>The uppercase H, J, K, and L keys remain mapped to their
   configured bindings (normally HELP, JUMP, KEYMAP and LIST,
@@ -313,8 +319,8 @@
   you browse those broken pages if you know somehow what the
   charset is. When the value given here or by an -assume_charset
   command-line flag is in effect, Lynx will treat documents as if
-  they were encoded accordingly. Option is active when 'Raw 8-bit
-  or CJK Mode' is OFF.</p>
+  they were encoded accordingly. Option is active when “Raw
+  8-bit or CJK Mode” is OFF.</p>
 
   <h3><a name="JK" id="JK">Raw 8-bit or CJK mode</a></h3>
 
@@ -329,11 +335,12 @@
   ISO-8859-1 and no charset parameter was specified in a reply
   header from an HTTP server to indicate what it is), but you have
   no better idea than viewing it as from display character set (see
-  'assumed document character set' for best choice). Should be OFF
-  when an Asian (CJK) set is selected but the document is
-  ISO-8859-1 or another 'assumed document character set'. The
-  setting can also be toggled via the RAW_TOGGLE command, normally
-  mapped to '@', and at startup via the -raw switch.</p>
+  “assumed document character set” for best choice).
+  Should be OFF when an Asian (CJK) set is selected but the
+  document is ISO-8859-1 or another “assumed document
+  character set”. The setting can also be toggled via the
+  RAW_TOGGLE command, normally mapped to “@”, and at
+  startup via the -raw switch.</p>
 
   <h3><a name="DV" id="DV">X DISPLAY variable</a></h3>
 
@@ -357,9 +364,9 @@
     <li>If set to OFF or NEVER, color mode will be turned off.</li>
 
     <li>ALWAYS and NEVER are not offered in anonymous accounts. If
-    saved to a '.lynxrc' file in non-anonymous accounts, ALWAYS
-    will cause Lynx to set color mode on at startup if
-    supported.</li>
+    saved to a “.lynxrc” file in non-anonymous
+    accounts, ALWAYS will cause Lynx to set color mode on at
+    startup if supported.</li>
   </ul>
 
   <p>If Lynx is built with slang, this is equivalent to having
@@ -375,15 +382,15 @@
   terminal at start-up. It is similar to the -nocolor switch, but
   (when the slang library is used) can be overridden with the
   -color switch. If the setting is OFF or ON when the current
-  options are saved to a '.lynxrc' file, the default start-up
-  behavior is retained, such that color mode will be turned on at
-  startup only if the terminal info indicates that you have a
-  color-capable terminal, or (when slang is used) if forced on via
-  the -color switch or COLORTERM variable. This default behavior
-  always is used in anonymous accounts, or if the 'option'_save
-  restriction is set explicitly. If for any reason the start-up
-  color mode is incorrect for your terminal, set it appropriately
-  on or off via this option.</p>
+  options are saved to a “.lynxrc” file, the default
+  start-up behavior is retained, such that color mode will be
+  turned on at startup only if the terminal info indicates that you
+  have a color-capable terminal, or (when slang is used) if forced
+  on via the -color switch or COLORTERM variable. This default
+  behavior always is used in anonymous accounts, or if the
+  “option”_save restriction is set explicitly. If for
+  any reason the start-up color mode is incorrect for your
+  terminal, set it appropriately on or off via this option.</p>
 
   <h3><a name="CS" id="CS">Color style</a></h3>
 
@@ -462,8 +469,8 @@
   <p>If you are curious about what goes on behind the scenes, but
   find that the information from the -trace switch is just too
   much, Lynx can be started with the -preparsed switch; going into
-  SOURCE mode ('\' key) and toggling the parsing mode (with CTRL-V)
-  should then show some of the differences.</p>
+  SOURCE mode (“\” key) and toggling the parsing mode
+  (with CTRL-V) should then show some of the differences.</p>
 
   <h3><a name="BH" id="BH">Bad HTML messages</a></h3>
 
@@ -491,11 +498,11 @@
 
   <h3><a name="SI" id="SI">Show Images</a></h3>
 
-  <p>This option combines the effects of the `*' & `[' keys as
-  follows:</p>
+  <p>This option combines the effects of the “*” &
+  “[” keys as follows:</p>
   <pre>
      <em>ignore</em> all images which lack an ALT= text string,
-     <em>show labels</em>, e.g. [INLINE] — see `Verbose Images' below — ,
+     <em>show labels</em>, e.g. [INLINE] — see “Verbose Images” below — ,
      <em>use links</em> for every image, enabling downloading.
 </pre>
 
@@ -521,7 +528,7 @@
   <p>You may set your mail address here so that when mailing
   messages to other people or mailing files to yourself, your email
   address can be automatically filled in. Your email address will
-  also be sent to HTTP servers in a `from:' field.</p>
+  also be sent to HTTP servers in a “from:” field.</p>
 
   <h3><a name="PN" id="PN">Personal mail name</a></h3>
 
@@ -592,17 +599,17 @@
   those values are always assumed by default. Can be a
   comma-separated list, which may be interpreted by servers as
   descending order of preferences; you can make your order of
-  preference explicit by using `q factors' as defined by the HTTP
-  protocol, for servers which understand it: e.g., <kbd>iso-8859-5,
-  utf-8;q=0.8</kbd>.</p>
+  preference explicit by using “q factors” as defined
+  by the HTTP protocol, for servers which understand it: e.g.,
+  <kbd>iso-8859-5, utf-8;q=0.8</kbd>.</p>
 
   <h3><a name="PL" id="PL">Preferred Document Language</a></h3>
 
   <p>The language you prefer if multi-language files are available
-  from servers. Use RFC 1766 tags, e.g., `en' English, `fr' French.
-  Can be a comma-separated list, and you can use `q factors' (see
-  previous help item): e.g., <kbd>da, en-gb;q=0.8, en;q=0.7</kbd>
-  .</p>
+  from servers. Use RFC 1766 tags, e.g., “en” English,
+  “fr” French. Can be a comma-separated list, and you
+  can use “q factors” (see previous help item): e.g.,
+  <kbd>da, en-gb;q=0.8, en;q=0.7</kbd> .</p>
 
   <h3><a name="SA" id="SA">Send User-Agent header</a></h3>
 
@@ -615,19 +622,20 @@
   -restrictions switch. Otherwise, the header can be changed
   temporarily to e.g., L_y_n_x/2.8.3 for access to sites which
   discriminate against Lynx based on checks for the presence of
-  `Lynx' in the header. If changed during a Lynx session, the
-  default User-Agent header can be restored by deleting the
-  modified string in the Options Menu. Whenever the User-Agent
-  header is changed, the current document is reloaded, with the
-  no-cache flags set, on exit from Options Menu. Changes of the
-  header are not saved in the .lynxrc file.</p>
+  “Lynx” in the header. If changed during a Lynx
+  session, the default User-Agent header can be restored by
+  deleting the modified string in the Options Menu. Whenever the
+  User-Agent header is changed, the current document is reloaded,
+  with the no-cache flags set, on exit from Options Menu. Changes
+  of the header are not saved in the .lynxrc file.</p>
 
   <p>Caveat: Netscape Communications Corp. (for example) claimed
-  that false transmissions of `Mozilla' as the User-Agent are a
-  copyright infringement, which would be prosecuted. The
-  <em>Options Menu</em> issues a warning about possible copyright
-  infringement whenever the header is changed to one which does not
-  include <strong>Lynx</strong> or <strong>lynx</strong>.</p>
+  that false transmissions of “Mozilla” as the
+  User-Agent are a copyright infringement, which would be
+  prosecuted. The <em>Options Menu</em> issues a warning about
+  possible copyright infringement whenever the header is changed to
+  one which does not include <strong>Lynx</strong> or
+  <strong>lynx</strong>.</p>
 
   <h2><a name="LP" id="LP">Listing and Accessing Files</a></h2>
 
@@ -639,8 +647,9 @@
   <h3><a name="FT" id="FT">FTP sort criteria</a></h3>
 
   <p>This allows you to specify how files will be sorted within FTP
-  listings. The current options include `By Filename',
-  `By Size', `By Type', `By Date'.</p>
+  listings. The current options include
+  “By Filename”, “By Size”,
+  “By Type”, “By Date”.</p>
 
   <h3><a name="LD" id="LD">List directory style</a></h3>
 
@@ -682,7 +691,8 @@
 
     <dt>By type</dt>
 
-    <dd>by filename suffix, e.g., the text beginning with '.'</dd>
+    <dd>by filename suffix, e.g., the text beginning with
+    “.”</dd>
 
     <dt>By user</dt>
 
@@ -706,10 +716,11 @@
 
   <h3><a name="LL" id="LL">Execution links</a></h3>
 
-  <p>If set to 'ALWAYS ON', Lynx will locally execute commands
-  contained inside any links. This can be HIGHLY DANGEROUS, so it
-  is recommended that they remain 'ALWAYS OFF' or 'FOR LOCAL FILES
-  ONLY'.</p>
+  <p>If set to “ALWAYS ON”, Lynx will locally execute
+  commands contained inside any links. This can be <strong>HIGHLY
+  DANGEROUS</strong>, so it is recommended that they remain
+  “ALWAYS OFF” or “FOR LOCAL FILES
+  ONLY”.</p>
 
   <h3><a name="TX" id="TX">Show transfer rate</a></h3>
 
@@ -737,7 +748,8 @@
 
   <ul>
     <li>When OFF, the default bookmark file is used for the
-    'v'iew-bookmarks and 'a'dd-bookmark link commands.</li>
+    “v”iew-bookmarks and “a”dd-bookmark
+    link commands.</li>
 
     <li>If set to STANDARD, a menu of available bookmarks is always
     invoked when you seek to view a bookmark file or add a link,
@@ -745,9 +757,9 @@
     menu.</li>
 
     <li>If set to ADVANCED, you are instead prompted for the letter
-    of the desired bookmark file, but can enter '=' to invoke the
-    STANDARD selection menu, or RETURN for the default bookmark
-    file.</li>
+    of the desired bookmark file, but can enter “=” to
+    invoke the STANDARD selection menu, or RETURN for the default
+    bookmark file.</li>
   </ul>
 
   <h3><a name="BF" id="BF">Bookmark file</a></h3>
@@ -756,19 +768,21 @@
 
   <ul>
     <li>If non-empty and multi-bookmarks is OFF, it specifies your
-    default '<a href="bookmark_help.html">Bookmark file</a>'.</li>
+    default “<a href="bookmark_help.html">Bookmark
+    file</a>”.</li>
 
-    <li>If multi-bookmarks is STANDARD or ADVANCED, entering 'B'
-    will invoke a menu in which you can specify filepaths and
-    descriptions of up to 26 bookmark files.</li>
+    <li>If multi-bookmarks is STANDARD or ADVANCED, entering
+    “B” will invoke a menu in which you can specify
+    filepaths and descriptions of up to 26 bookmark files.</li>
   </ul>
 
   <p>The filepaths must be from your home directory and begin with
-  './' if subdirectories are included (e.g.,
-  './BM/lynx_bookmarks.html').</p>
+  “./” if subdirectories are included (e.g.,
+  “./BM/lynx_bookmarks.html”).</p>
 
-  <p>Lynx will create bookmark files when you first 'a'dd a link,
-  but any subdirectories in the filepath must already exist.</p>
+  <p>Lynx will create bookmark files when you first
+  “a”dd a link, but any subdirectories in the filepath
+  must already exist.</p>
 
   <h3><a name="AZ" id="AZ">Auto Session</a></h3>
 
diff --git a/lynx_help/keystrokes/other_help.html b/lynx_help/keystrokes/other_help.html
index 38e4bde..a33cb40 100644
--- a/lynx_help/keystrokes/other_help.html
+++ b/lynx_help/keystrokes/other_help.html
@@ -1,4 +1,4 @@
-<!-- $LynxId: other_help.html,v 1.15 2014/01/10 20:51:10 tom Exp $ -->
+<!-- $LynxId: other_help.html,v 1.18 2017/04/28 21:57:13 tom Exp $ -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 
 <html>
@@ -15,7 +15,14 @@
   </head>
 
 <body>
-  <h2>Summary of Commands</h2>
+  <div class="nav">
+    <ul>
+      <li><a href="#command_list">Summary of Commands</a></li>
+    </ul>
+  </div>
+
+  <h2><a name="command_list" id="command_list">Summary of
+  Commands</a></h2>
   <pre>
        a      - Places the link that you are currently positioned
                 on into a personal <a href=
@@ -71,7 +78,7 @@
        o      - Brings up a list of settable <a href=
 "option_help.html">options</a>.
 
-       q      - Quits <strong>Lynx</strong>. ('Q' quits without asking)
+       q      - Quits <strong>Lynx</strong>. (“Q” quits without asking)
 
        /      - Search for a string of characters in the current document
                 (case insensitive or case sensitive
@@ -140,7 +147,7 @@
                 images which have no ALT string specified will have an
                 "[INLINE]" pseudo-ALT string inserted in the <strong>Lynx</strong> display.
                 When off, they will be treated as having ALT="" (i.e.,
-                they'll be ignored).  If image_links mode is toggled on,
+                they will be ignored).  If image_links mode is toggled on,
                 the pseudo-ALT strings will be restored, to serve as links
                 to the inline images' sources.
 
@@ -151,7 +158,7 @@
                 requests always are sent to the http server, i.e., <strong>Lynx</strong>
                 does not retrieve any previous server replies from its
                 cache.  Note that for form submissions, http servers vary
-                in whether they'll treat HEAD requests as valid and return
+                in whether they will treat HEAD requests as valid and return
                 the CGI script's headers, or treat it as invalid and return
                 an error message.
 
diff --git a/lynx_help/keystrokes/print_help.html b/lynx_help/keystrokes/print_help.html
index 2bd58a0..d57563f 100644
--- a/lynx_help/keystrokes/print_help.html
+++ b/lynx_help/keystrokes/print_help.html
@@ -1,4 +1,4 @@
-<!-- $LynxId: print_help.html,v 1.8 2014/01/07 23:47:13 tom Exp $ -->
+<!-- $LynxId: print_help.html,v 1.9 2017/04/28 21:58:48 tom Exp $ -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 
 <html>
@@ -15,7 +15,15 @@
   </head>
 
 <body>
-  <h2>Overview</h2>
+  <div class="nav">
+    <ul>
+      <li><a href="#overview">Overview</a></li>
+
+      <li><a href="#command_options">Print-command Options</a></li>
+    </ul>
+  </div>
+
+  <h2><a name="overview" id="overview">Overview</a></h2>
 
   <p>After entering the <code><strong>p</strong></code> command you
   will be presented with a list of print options. In all cases the
@@ -23,7 +31,8 @@
   removed. The number of options depends on the level of printing
   that your system allows.</p>
 
-  <h2>Print-command Options</h2>
+  <h2><a name="command_options" id="command_options">Print-command
+  Options</a></h2>
 
   <p>The following print options may be available:</p>
 
diff --git a/lynx_help/keystrokes/scrolling_help.html b/lynx_help/keystrokes/scrolling_help.html
index cedfac8..439fae7 100644
--- a/lynx_help/keystrokes/scrolling_help.html
+++ b/lynx_help/keystrokes/scrolling_help.html
@@ -1,4 +1,4 @@
-<!-- $LynxId: scrolling_help.html,v 1.10 2014/01/08 00:25:16 tom Exp $ -->
+<!-- $LynxId: scrolling_help.html,v 1.12 2017/04/28 22:01:41 tom Exp $ -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 
 <html>
@@ -15,12 +15,32 @@
   </head>
 
 <body>
-  <h2>Paging shortcuts</h2>
+  <div class="nav">
+    <ul>
+      <li><a href="#overview">Overview</a></li>
+
+      <li><a href="#paging_keys">Paging shortcuts</a></li>
+
+      <li><a href="#keypad_keys">Keypad shortcuts</a></li>
+
+      <li><a href="#control_keys">Control-characters</a></li>
+
+      <li><a href="#other_keys">Ordinary characters</a></li>
+    </ul>
+  </div>
+
+  <h2><a name="overview" id="overview">Overview</a></h2>
+
+  <p>This gives an overview and some details on Lynx's
+  scrolling/paging commands. A diagram shows keypad shortcuts.</p>
+
+  <h2><a name="paging_keys" id="paging_keys">Paging
+  shortcuts</a></h2>
 
   <blockquote>
     <pre>
    + (or SPACE,   - If the bottom of the screen informs you
-      or CTRL-F)    that there is 'more' to see, you may
+      or CTRL-F)    that there is “more” to see, you may
                     move to the next page (Page-Down).
 
    - (or b,       - If you have moved down in a document, this
@@ -28,7 +48,8 @@
 </pre>
   </blockquote>
 
-  <h2>Keypad shortcuts</h2>
+  <h2><a name="keypad_keys" id="keypad_keys">Keypad
+  shortcuts</a></h2>
 
   <p><strong>Lynx</strong> can use the digits 0-9 as movement
   shortcuts. They are designed to work best when the <em>Num
@@ -50,7 +71,8 @@
 </pre>
   </blockquote>
 
-  <h2>Control-characters</h2>
+  <h2><a name="control_keys" id=
+  "control_keys">Control-characters</a></h2>
 
   <blockquote>
     <pre>
@@ -72,7 +94,8 @@
 </pre>
   </blockquote>
 
-  <h2>Ordinary characters</h2>
+  <h2><a name="other_keys" id="other_keys">Ordinary
+  characters</a></h2>
 
   <blockquote>
     <pre>
diff --git a/lynx_help/keystrokes/test_display.html b/lynx_help/keystrokes/test_display.html
index 8cc4ab2..eae010c 100644
--- a/lynx_help/keystrokes/test_display.html
+++ b/lynx_help/keystrokes/test_display.html
@@ -1,4 +1,4 @@
-<!-- $LynxId: test_display.html,v 1.9 2014/01/08 00:05:32 tom Exp $ -->
+<!-- $LynxId: test_display.html,v 1.11 2017/04/28 22:04:57 tom Exp $ -->
 <!-- do not use tidy for this page -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 
@@ -16,6 +16,24 @@
   </head>
 
 <body>
+  <div class="nav">
+    <ul>
+      <li><a href="#overview">Overview</a></li>
+
+      <li><a href="#configuration">Configuration</a></li>
+
+      <li><a href="#test_screen">Test-screen</a></li>
+    </ul>
+  </div>
+
+  <h2><a name="overview" id="overview">Overview</a></h2>
+
+  <p>Display a test-page for common problems with Lynx's display
+  character set and/or locale problems.</p>
+
+  <h2><a name="configuration" id=
+  "configuration">Configuration</a></h2>
+
   <p>If you see several letters instead of a single – your
   promised display charset does not support this character so "7
   bit approximation" is in effect. If you see any single letter
@@ -23,13 +41,17 @@
   settings.</p>
 
   <blockquote>
-    <p><em>Press 'o' for Options menu and change "Display character
-    set"</em>.<br>
+    <p><em>Press “o” for Options menu and change
+    "Display character set"</em>.<br>
     Try again if necessary.</p>
   </blockquote>
 
   <p>When you are satisfied save your changes in Options menu,
   thanks.</p>
+
+  <h2><a name="test_screen" id="test_screen">Test-screen</a></h2>
+
+  <p>This is only a quick test to see obvious problems.</p>
   <pre>
 
 0x00A9    ©           # COPYRIGHT SIGN
@@ -59,7 +81,5 @@
 
 0xFB01    fi           # LATIN SMALL LIGATURE FI
 </pre>
-
-  <p>This is only a quick test to see obvious problems.</p>
 </body>
 </html>
diff --git a/lynx_help/keystrokes/visited_help.html b/lynx_help/keystrokes/visited_help.html
index a6dae24..01fa9cc 100644
--- a/lynx_help/keystrokes/visited_help.html
+++ b/lynx_help/keystrokes/visited_help.html
@@ -1,4 +1,4 @@
-<!-- $LynxId: visited_help.html,v 1.9 2014/01/07 09:26:22 tom Exp $ -->
+<!-- $LynxId: visited_help.html,v 1.11 2017/04/28 22:09:23 tom Exp $ -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 
 <html>
@@ -15,21 +15,31 @@
   </head>
 
 <body>
-  <h2>Overview</h2>
+  <div class="nav">
+    <ul>
+      <li><a href="#overview">Overview</a></li>
+
+      <li><a href="#navigation">Navigation</a></li>
+
+      <li><a href="#configuration">Configuration</a></li>
+    </ul>
+  </div>
+
+  <h2><a name="overview" id="overview">Overview</a></h2>
 
   <p><strong>Lynx</strong>'s <em>Visited Links Page</em> displays
   all of the links that you have traveled through during the
   current Lynx session, except for any temporary menu or list
   files, bookmark files, or any documents associated with POST
   content. The VLINKS keystroke command for invoking this page
-  normally is mapped to uppercase '<em>V</em>'. The list of Visited
-  Links is normally in order of recency (most recently visited
-  links first), without repetitions in the list if a link was
-  visited more than once during the session (unless the URLs differ
-  due to appended fragments), and is supplementary to the <a href=
-  "history_help.html">History Page</a>.</p>
+  normally is mapped to uppercase “<em>V</em>”. The
+  list of Visited Links is normally in order of recency (most
+  recently visited links first), without repetitions in the list if
+  a link was visited more than once during the session (unless the
+  URLs differ due to appended fragments), and is supplementary to
+  the <a href="history_help.html">History Page</a>.</p>
 
-  <h2>Navigation</h2>
+  <h2><a name="navigation" id="navigation">Navigation</a></h2>
 
   <p>You may <a href="movement_help.html">select</a> any link on
   the Visited Links Page to retrieve a document that you had
@@ -40,11 +50,12 @@
 
   <p>In contrast to the History Page, the Visited Links Page
   includes any links which were retrieved for
-  '<em>d</em>'ownloading or were passed to helper applications,
-  i.e., not just the links that were rendered and displayed by
-  Lynx, itself.</p>
+  “<em>d</em>”ownloading or were passed to helper
+  applications, i.e., not just the links that were rendered and
+  displayed by Lynx, itself.</p>
 
-  <h2>Configuration</h2>
+  <h2><a name="configuration" id=
+  "configuration">Configuration</a></h2>
 
   <p>You may change the appearance of the Visited Links Page via a
   popup menu on that page (which also appears on the <a href=
diff --git a/lynx_help/keystrokes/xterm_help.html b/lynx_help/keystrokes/xterm_help.html
index 0339f2d..210d7ce 100644
--- a/lynx_help/keystrokes/xterm_help.html
+++ b/lynx_help/keystrokes/xterm_help.html
@@ -1,4 +1,4 @@
-<!-- $LynxId: xterm_help.html,v 1.9 2014/01/09 00:17:28 tom Exp $ -->
+<!-- $LynxId: xterm_help.html,v 1.10 2017/04/28 20:47:13 tom Exp $ -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 
 <html>
@@ -15,7 +15,15 @@
   </head>
 
 <body>
-  <h1>X Terminal Help</h1>
+  <div class="nav">
+    <ul>
+      <li>X Terminal Help</li>
+
+      <li>Notes</li>
+    </ul>
+  </div>
+
+  <h2>X Terminal Help</h2>
 
   <p>An X terminal is an electronic display terminal that
   communicates with a host computer system using the X Window
@@ -33,8 +41,10 @@
   like X Window terminals and are frequently used as X
   terminals.</p>
 
+  <h2>Notes</h2>
+
   <dl>
-    <dt>Note:</dt>
+    <dt>Terminology</dt>
 
     <dd>The terminology used to describe processes associated with
     X terminals can be confusing. An X terminal is also known as an
diff --git a/lynx_help/lynx-dev.html b/lynx_help/lynx-dev.html
index d178e49..077ea46 100644
--- a/lynx_help/lynx-dev.html
+++ b/lynx_help/lynx-dev.html
@@ -1,4 +1,4 @@
-<!-- $LynxId: lynx-dev.html,v 1.17 2015/09/19 17:36:28 tom Exp $ -->
+<!-- $LynxId: lynx-dev.html,v 1.18 2017/04/28 16:47:05 tom Exp $ -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 
 <html>
@@ -25,7 +25,7 @@
 
   <p><strong>Lynx</strong> is maintained and improved by an
   international co-operative of volunteers. Newcomers are welcome
-  to join the group: you needn't be a super programmer, but you
+  to join the group: you need not be a super programmer, but you
   should be prepared to listen and learn, as well as to contribute
   patches if you can. Since everyone is a volunteer, you will
   usually be expected to try to implement any suggestions you
@@ -84,9 +84,9 @@
   to <a href="mailto:lynx-dev at nongnu.org"> the list</a>. Since
   all subscribers are volunteers, you depend on their goodwill and
   will be more likely to get a response if you give the e-mail a
-  meaningful `Subject' and include details of your version of
-  <strong>Lynx</strong>, hardware and software. You can check the
-  Archive to find any responses.</p>
+  meaningful “Subject” and include details of your
+  version of <strong>Lynx</strong>, hardware and software. You can
+  check the Archive to find any responses.</p>
 
   <p>Messages from non-subscribers are not immediately distributed
   to avoid spam. Usually, if your message appears genuine, it will
diff --git a/lynx_help/lynx_url_support.html b/lynx_help/lynx_url_support.html
index ad4de44..78849c2 100644
--- a/lynx_help/lynx_url_support.html
+++ b/lynx_help/lynx_url_support.html
@@ -1,4 +1,4 @@
-<!-- $LynxId: lynx_url_support.html,v 1.34 2015/05/07 00:18:49 tom Exp $ -->
+<!-- $LynxId: lynx_url_support.html,v 1.36 2017/04/28 16:47:05 tom Exp $ -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 
 <html>
@@ -67,13 +67,13 @@
   </ul>
 
   <p>When entering a URL on the command line to be used as the
-  <em>startfile</em>, or at the prompt for a '<em>g</em>'oto entry,
-  a partial host field can be used and the scheme field can be
-  omitted if the scheme and fully qualified domain name can be
-  constructed internally by using the URL_DOMAIN_PREFIXES and
-  URL_DOMAIN_SUFFIXES definitions in the <strong>Lynx</strong>
-  configuration file. See the explanation of those definitions and
-  their use in your <em>lynx.cfg</em>.</p>
+  <em>startfile</em>, or at the prompt for a
+  “<em>g</em>”oto entry, a partial host field can be
+  used and the scheme field can be omitted if the scheme and fully
+  qualified domain name can be constructed internally by using the
+  URL_DOMAIN_PREFIXES and URL_DOMAIN_SUFFIXES definitions in the
+  <strong>Lynx</strong> configuration file. See the explanation of
+  those definitions and their use in your <em>lynx.cfg</em>.</p>
 
   <p>For example, <em>wfbr</em> will be treated as
   <em>http://www.wfbr.edu/</em>, and <em>wfbr/dir/lynx</em> will be
@@ -93,9 +93,9 @@
   <em>file://localhost/current/default/directory</em>.</p>
 
   <p>These expansions are <em>SOLELY</em> for <em>startfile</em> or
-  '<em>g</em>'oto entries! Any partial or relative URLs within HTML
-  documents are resolved according to the rules specified in
-  RFC1808 and subsequent IETF drafts.</p>
+  “<em>g</em>”oto entries! Any partial or relative URLs
+  within HTML documents are resolved according to the rules
+  specified in RFC1808 and subsequent IETF drafts.</p>
   <hr>
 
   <h2><a name="http_url" id="http_url">The <em>http</em> and
@@ -272,16 +272,17 @@
   For anonymous ftp, <strong>Lynx</strong> uses your
   <em>personal_mail_address</em> (user at host) as the
   <em>password</em> if it has been defined via the
-  '<em>o</em>'ptions menu. Otherwise, <strong>Lynx</strong> uses
-  the dummy password <em>WWWUser</em>. (A password can also be
-  embedded in the URL, by replacing <em>username</em> with
-  <em>username:password</em>. This is strongly discouraged for
-  'real' passwords that must be kept secret, since URLs with the
-  completely unencrypted <em>password</em> may show up on the
-  screen, in HISTORY and LIST pages etc., and may even become
-  visible to remote sites for example through Referer headers.) Do
-  not include the <em>@</em> if neither <em>username</em> nor
-  <em>:password</em> is included.</p>
+  “<em>o</em>”ptions menu. Otherwise,
+  <strong>Lynx</strong> uses the dummy password <em>WWWUser</em>.
+  (A password can also be embedded in the URL, by replacing
+  <em>username</em> with <em>username:password</em>. This is
+  strongly discouraged for “real” passwords that must
+  be kept secret, since URLs with the completely unencrypted
+  <em>password</em> may show up on the screen, in HISTORY and LIST
+  pages etc., and may even become visible to remote sites for
+  example through Referer headers.) Do not include the <em>@</em>
+  if neither <em>username</em> nor <em>:password</em> is
+  included.</p>
 
   <p>The <em>;type=</em> parameter can be used with value
   <em>D</em>, <em>I</em>, or <em>A</em> to force handling of the
@@ -547,17 +548,17 @@
   <p>If <em>ENCTYPE="text/plain"</em> is specified for a FORM with
   a mailto ACTION, <strong>Lynx</strong> will not hex escape the
   name=value pairs of the FORM's content, and will use physical
-  newlines instead of '<em>&</em>' or '<em>;</em>' to separate
-  the pairs, so that the content will be readable directly.
-  Otherwise, <strong>Lynx</strong> will mail the content with the
-  default:</p>
+  newlines instead of “<em>&</em>” or
+  “<em>;</em>” to separate the pairs, so that the
+  content will be readable directly. Otherwise,
+  <strong>Lynx</strong> will mail the content with the default:</p>
   <pre>
-      <em>ENCTYPE="application/x-www-form-urlencoded"</em> ('<em>&</em>' separates pairs)
+      <em>ENCTYPE="application/x-www-form-urlencoded"</em> (“<em>&</em>” separates pairs)
 </pre>
 
   <p>or:</p>
   <pre>
-      <em>ENCTYPE="application/sgml-form-urlencoded"</em> ('<em>;</em>' separates pairs)
+      <em>ENCTYPE="application/sgml-form-urlencoded"</em> (“<em>;</em>” separates pairs)
 </pre>
 
   <p>if the latter was indicated.</p>
@@ -694,13 +695,13 @@
 </pre>
 
   <p>where <em>//localhost</em> is optional and always implied; the
-  full path should be specified, as `~' is not recognized; if the
-  script is in the directory <strong>Lynx</strong> was started
-  from, the simple file name is adequate. The output of the script
-  should be text/html and is rendered and displayed by
-  <strong>Lynx</strong>. Restrictions on use of lynxcgi and on
-  acceptable paths can be imposed in <em>userdefs.h</em> and
-  <em>lynx.cfg</em>, qv.</p>
+  full path should be specified, as “~” is not
+  recognized; if the script is in the directory
+  <strong>Lynx</strong> was started from, the simple file name is
+  adequate. The output of the script should be text/html and is
+  rendered and displayed by <strong>Lynx</strong>. Restrictions on
+  use of lynxcgi and on acceptable paths can be imposed in
+  <em>userdefs.h</em> and <em>lynx.cfg</em>, qv.</p>
 
   <p>This is a Lynxism and should be used only in local documents
   intended solely for <strong>Lynx</strong>, or for limited local
@@ -748,8 +749,8 @@
     behavior may be modified without notice, or the context in
     which it is allowed may change.</li>
 
-    <li>If it doesn't work as expected when used outside of the
-    intended purpose, don't expect anyone to "fix" it.</li>
+    <li>If it does not work as expected when used outside of the
+    intended purpose, do not expect anyone to "fix" it.</li>
   </ul>
 
   <p>For example, tempting though it might be, do not use
@@ -759,8 +760,8 @@
       <em>Review your <A HREF="LYNXKEYMAP:">Keymap</A></em>
 </pre>
 
-  <p>(No, they won't do any harm. Yes, they work. But don't rely on
-  it.)</p>
+  <p>(No, they will not do any harm. Yes, they work. But do not
+  rely on it.)</p>
 
   <p>If you must try one, the second is OK from the command
   line:<br></p>
@@ -768,9 +769,10 @@
       <em>lynx LYNXKEYMAP:</em>
 </pre>
 
-  <p>But within <strong>Lynx</strong>, use the '<em>K</em>'
-  keystroke command. Sometimes it may be convenient to use a
-  private scheme with '<em>g</em>'oto, as in:</p>
+  <p>But within <strong>Lynx</strong>, use the
+  “<em>K</em>” keystroke command. Sometimes it may be
+  convenient to use a private scheme with
+  “<em>g</em>”oto, as in:</p>
   <pre>
       <em>g LYNXMESSAGES:</em>
       <em>g LYNXCOMPILEOPTS:</em>
diff --git a/makefile.in b/makefile.in
index c434b62..705cb53 100644
--- a/makefile.in
+++ b/makefile.in
@@ -1,4 +1,4 @@
-# $LynxId: makefile.in,v 1.158 2016/11/15 09:04:25 tom Exp $
+# $LynxId: makefile.in,v 1.160 2017/04/29 12:47:15 tom Exp $
 ##makefile for lynx
 
 SHELL		= @CONFIG_SHELL@
@@ -46,7 +46,7 @@ TAR_UP		= $(TAR) @TAR_UP_OPTIONS@ @TAR_PIPE_OPTIONS@
 TAR_DOWN	= $(TAR) @TAR_DOWN_OPTIONS@ @TAR_PIPE_OPTIONS@
 
 # $Format: "LYNX_VERSION	= $ProjectVersion$"$
-LYNX_VERSION	= 2.8.9dev.11
+LYNX_VERSION	= 2.8.9dev.13
 
 ## This is the version which we are developing (or, upon release, make this
 ## the same).  Use no dots in the name, since it must work on VMS and MS-DOS.
diff --git a/makefile.msc b/makefile.msc
index b256396..f6d9249 100644
--- a/makefile.msc
+++ b/makefile.msc
@@ -1,4 +1,4 @@
-# $LynxId: makefile.msc,v 1.29 2013/12/17 23:01:31 tom Exp $
+# $LynxId: makefile.msc,v 1.30 2017/04/26 23:19:00 tom Exp $
 #
 # Makefile for `Lynx' browser for Microsoft Visual C++ 4.2 or later
 #
@@ -43,14 +43,18 @@ CS_OBJS = "LYHash.obj" "LYStyle.obj"
 SOCK_DEFS = /D "USE_WINSOCK2_H" /D "_WIN32_WINNT=0x0400"
 !endif
 
-# Enable these to build with OpenSSL, adjusting SSL_DIR as needed.
+# Enable these to build with OpenSSL, overriding SSL_DIR, etc., as needed.
 !if "$(OPT_SSL)" != ""
 !if "$(SSL_DIR)" == ""
 SSL_DIR = C:\OpenSSL
 !endif
+!if "$(SSL_DEFS)" == ""
 SSL_DEFS = /D "USE_SSL" -I "$(SSL_DIR)\include" -I"$(SSL_DIR)\include\openssl"
+!endif
+!if "$(SSL_LIBS)" == ""
 SSL_LIBS = "$(SSL_DIR)\lib\ssleay32.lib" "$(SSL_DIR)\lib\libeay32.lib"
 !endif
+!endif
 
 !if "$(SCREEN)" == "pdcurses"
 SCREEN_DEFS = /D "PDCURSES" /D "COLOR_CURSES" /D "FANCY_CURSES" /D "WIDE_CURSES"
diff --git a/po/ca.po b/po/ca.po
index 0302139..c6faabb 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,21 +1,21 @@
 # Catalan translation of the Lynx browser message catalog
 # Copyright (C) 2002 Free Software Foundation, Inc.
 # This file is distributed under the same license as the lynx package.
-# Walter Garcia-fontes <walter.garci at upf.edu>, 2015
+# Walter Garcia-fontes <walter.garci at upf.edu>, 2015,2016
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: lynx 2.8.9-dev5\n"
+"Project-Id-Version: lynx 2.8.9-dev7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-14 20:53-0400\n"
-"PO-Revision-Date: 2015-12-04 08:16+0100\n"
+"POT-Creation-Date: 2015-12-14 20:39-0500\n"
+"PO-Revision-Date: 2016-12-23 08:45+0100\n"
 "Last-Translator: Walter Garcia-Fontes <walter.garcia at upf.edu>\n"
 "Language-Team: Catalan <ca at dodds.net>\n"
 "Language: ca\n"
-"X-Bugs: Report translation errors to the Language-Team address.\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Bugs: Report translation errors to the Language-Team address.\n"
 
 #. ******************************************************************
 #. * The following definitions are for status line prompts, messages, or
@@ -115,1936 +115,2003 @@ msgid "URL too long"
 msgstr "La URL especificada �s massa llarga"
 
 #. Inactive input fields, messages used with -tna option - kw
-#. #define FORM_LINK_TEXT_MESSAGE_INA
+#. #define FORM_LINK_TEXT_ADV_MSG_INA
 #: LYMessages.c:57
+#, c-format
+msgid "(Textfield \"%s\"); Inactive.  Press <return> to activate."
+msgstr "(Camp d'entrada de text �%s�); Inactiu. Premeu <intro> per activar-lo."
+
+#. #define FORM_LINK_TEXT_MESSAGE_INA
+#: LYMessages.c:59
 msgid "(Text entry field) Inactive.  Press <return> to activate."
 msgstr "(Camp d'entrada de text) Inactiu. Premeu <intro> per activar-lo."
 
+#. #define FORM_LINK_TEXTAREA_ADV_MSG_INA
+#: LYMessages.c:61
+#, c-format
+msgid "(Textarea \"%s\"); Inactive.  Press <return> to activate."
+msgstr "(�rea de text �%s�); Inactiva. Premeu <intro> per activar-la."
+
 #. #define FORM_LINK_TEXTAREA_MESSAGE_INA
-#: LYMessages.c:59
+#: LYMessages.c:63
 msgid "(Textarea) Inactive.  Press <return> to activate."
 msgstr "(�rea de text) Inactiva. Premeu <intro> per activar-la."
 
+#. #define FORM_LINK_TEXTAREA_ADV_MSG_INA_E
+#: LYMessages.c:65
+#, c-format
+msgid "(Textarea \"%s\"); Inactive.  Press <return> to activate (%s for editor)."
+msgstr "(�rea de text Reconciled �%s�); Inactiva. Premeu <intro> per activar-la (%s per a l'editor)."
+
 #. #define FORM_LINK_TEXTAREA_MESSAGE_INA_E
-#: LYMessages.c:61
+#: LYMessages.c:67
 #, c-format
 msgid "(Textarea) Inactive.  Press <return> to activate (%s for editor)."
 msgstr "(�rea de text) Inactiva. Premeu <intro> per activar-la (%s per a l'editor)."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_INA
-#: LYMessages.c:63
+#: LYMessages.c:69
 msgid "(Form field) Inactive.  Use <return> to edit."
 msgstr "(Camp de formulari) Inactiu. Useu <intro> per a editar."
 
 #. #define FORM_TEXT_SUBMIT_MESSAGE_INA_X
-#: LYMessages.c:65
+#: LYMessages.c:71
 #, c-format
 msgid "(Form field) Inactive.  Use <return> to edit (%s to submit with no cache)."
 msgstr "(Camp form.) Inactiu. <intro> per a editar (%s per a enviar sense mem. cau)."
 
 #. #define FORM_TEXT_RESUBMIT_MESSAGE_INA
-#: LYMessages.c:67
+#: LYMessages.c:73
 msgid "(Form field) Inactive. Press <return> to edit, press <return> twice to submit."
 msgstr "(Camp form.) Inactiu. <intro> per a editar, <intro> dues vegades per a enviar."
 
 #. #define FORM_TEXT_SUBMIT_MAILTO_MSG_INA
-#: LYMessages.c:69
+#: LYMessages.c:75
 msgid "(mailto form field) Inactive.  Press <return> to change."
 msgstr "(Camp de formulari de correu) Inactiu. Premeu <intro> per a canviar-ho."
 
 #. #define FORM_LINK_PASSWORD_MESSAGE_INA
-#: LYMessages.c:71
+#: LYMessages.c:77
 msgid "(Password entry field) Inactive.  Press <return> to activate."
 msgstr "(Camp de contrasenya) Inactiu. Premeu <intro> per activar-lo."
 
 #. #define FORM_LINK_FILE_UNM_MSG
-#: LYMessages.c:74
+#: LYMessages.c:80
 msgid "UNMODIFIABLE file entry field.  Use UP or DOWN arrows or tab to move off."
 msgstr "Camp de fitxer IMMODIFICABLE. Useu les fletxes o <tab> per a eixir-ne."
 
 #. #define FORM_LINK_FILE_MESSAGE
-#: LYMessages.c:76
+#: LYMessages.c:82
 msgid "(File entry field) Enter filename.  Use UP or DOWN arrows or tab to move off."
 msgstr "(Camp de fitxer) Introdu�u el nom de l'arxiu. Fletxes o <tab> per a eixir-ne."
 
+#. #define FORM_LINK_TEXT_ADV_MSG
 #. #define FORM_LINK_TEXT_MESSAGE
-#: LYMessages.c:78
-msgid "(Text entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
-msgstr "(Camp de text) Introdu�u text. Useu les fletxes o <tab> per a eixir-ne."
+#: LYMessages.c:84 LYMessages.c:86
+#, c-format
+msgid "(Textfield \"%s\"); Enter text.  Use UP or DOWN arrows or tab to move off."
+msgstr "(Camp de text �%s�); Introdu�u text. Useu les fletxes o <tab> per a eixir-ne."
+
+#. #define FORM_LINK_TEXTAREA_ADV_MSG
+#: LYMessages.c:88
+#, c-format
+msgid "(Textarea \"%s\"); Enter text. Use UP/DOWN arrows or TAB to move off."
+msgstr "(�rea de text �%s�); Introdu�u text. Fletxes o <tab> per a eixir-ne."
 
 #. #define FORM_LINK_TEXTAREA_MESSAGE
-#: LYMessages.c:80
+#: LYMessages.c:90
 msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off."
 msgstr "(�rea de text) Introdu�u text. Fletxes o <tab> per a eixir-ne."
 
+#. #define FORM_LINK_TEXTAREA_ADV_MSG_E
+#: LYMessages.c:92
+#, c-format
+msgid "(Textarea \"%s\"); Enter text. Use UP/DOWN arrows or TAB to move off (%s for editor)."
+msgstr "(�rea de text �%s�); Introdu�u text. Fletxes o <tab> per a eixir-ne (%s per a l'editor)."
+
 #. #define FORM_LINK_TEXTAREA_MESSAGE_E
-#: LYMessages.c:82
+#: LYMessages.c:94
 #, c-format
 msgid "(Textarea) Enter text. Use UP/DOWN arrows or TAB to move off (%s for editor)."
 msgstr "(�. text) Introdu�u text. Fletxes o <tab> per a eixir-ne (%s per a l'editor)."
 
 #. #define FORM_LINK_TEXT_UNM_MSG
-#: LYMessages.c:84
+#: LYMessages.c:96
 msgid "UNMODIFIABLE form text field.  Use UP or DOWN arrows or tab to move off."
 msgstr "Camp de text IMMODIFICABLE. Useu les fletxes o <tab> per a eixir-ne."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE
-#: LYMessages.c:86
+#: LYMessages.c:98
 msgid "(Form field) Enter text.  Use <return> to submit."
 msgstr "(Camp de formulari) Introdu�u text. Useu <intro> per a enviar."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MESSAGE_X
-#: LYMessages.c:88
+#: LYMessages.c:100
 #, c-format
 msgid "(Form field) Enter text.  Use <return> to submit (%s for no cache)."
 msgstr "(Camp de formulari) Introdu�u text. <intro> per a enviar (%s sensemem. cau)."
 
 #. #define FORM_LINK_TEXT_RESUBMIT_MESSAGE
-#: LYMessages.c:90
+#: LYMessages.c:102
 msgid "(Form field) Enter text.  Use <return> to submit, arrows or tab to move off."
 msgstr "(C. form.) Introdu�u text. <intro> per a enviar, fletxes o tab per eixir-ne."
 
 #. #define FORM_LINK_TEXT_SUBMIT_UNM_MSG
-#: LYMessages.c:92
+#: LYMessages.c:104
 msgid "UNMODIFIABLE form field.  Use UP or DOWN arrows or tab to move off."
 msgstr "Camp IMMODIFICABLE. Useu les fletxes o el tabulador per a eixir-ne."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MAILTO_MSG
-#: LYMessages.c:94
+#: LYMessages.c:106
 msgid "(mailto form field) Enter text.  Use <return> to submit, arrows to move off."
 msgstr "(correu) Introdu�u text. <intro> per enviar-lo, amb les fletxes n'eixireu."
 
 #. #define FORM_LINK_TEXT_SUBMIT_MAILTO_DIS_MSG
-#: LYMessages.c:96
+#: LYMessages.c:108
 msgid "(mailto form field) Mail is disallowed so you cannot submit."
 msgstr "(Camp form. correu) El correu no est� perm�s: no podeu enviar-ne."
 
 #. #define FORM_LINK_PASSWORD_MESSAGE
-#: LYMessages.c:98
+#: LYMessages.c:110
 msgid "(Password entry field) Enter text.  Use UP or DOWN arrows or tab to move off."
 msgstr "(Contrasenya) Introdu�u text. Useu les fletxes o <tab> per a eixir-ne."
 
 #. #define FORM_LINK_PASSWORD_UNM_MSG
-#: LYMessages.c:100
+#: LYMessages.c:112
 msgid "UNMODIFIABLE form password.  Use UP or DOWN arrows or tab to move off."
 msgstr "Camp de contrasenya IMMODIFICABLE. Fletxes o <tab> per a eixir-ne."
 
+#. #define FORM_LINK_CHECKBOX_ADV_MSG
+#: LYMessages.c:114
+#, c-format
+msgid "(Checkbox \"%s\");   Use right-arrow or <return> to toggle."
+msgstr "(Camp de verificaci� �%s�) Useu fletxa dreta o <intro> per a canviar."
+
 #. #define FORM_LINK_CHECKBOX_MESSAGE
-#: LYMessages.c:102
+#: LYMessages.c:116
 msgid "(Checkbox Field)   Use right-arrow or <return> to toggle."
 msgstr "(Camp de verificaci�) Useu '->' o <intro> per a canviar."
 
 #. #define FORM_LINK_CHECKBOX_UNM_MSG
-#: LYMessages.c:104
+#: LYMessages.c:118
 msgid "UNMODIFIABLE form checkbox.  Use UP or DOWN arrows or tab to move off."
 msgstr "Quadre de verificaci� IMMODIFICABLE. Useu les fletxes per a eixir-ne."
 
+#. #define FORM_LINK_RADIO_ADV_MSG
+#: LYMessages.c:120
+#, c-format
+msgid "(Radio Button \"%s\");   Use right-arrow or <return> to toggle."
+msgstr "(Bot� d'opci� �%s�); Useu fletxa-dreta o <intro> per commutar."
+
 #. #define FORM_LINK_RADIO_MESSAGE
-#: LYMessages.c:106
+#: LYMessages.c:122
 msgid "(Radio Button)   Use right-arrow or <return> to toggle."
 msgstr "(Bot� d'opci�) Useu fletxa-dreta o <intro> per commutar."
 
 #. #define FORM_LINK_RADIO_UNM_MSG
-#: LYMessages.c:108
+#: LYMessages.c:124
 msgid "UNMODIFIABLE form radio button.  Use UP or DOWN arrows or tab to move off."
 msgstr "Bot� de grup IMMODIFICABLE. Useu fletxes o <tab> per a eixir-ne."
 
 #. #define FORM_LINK_SUBMIT_PREFIX
-#: LYMessages.c:110
+#: LYMessages.c:126
 msgid "Submit ('x' for no cache) to "
 msgstr "Enviar a ('x' sense mem. cau) "
 
 #. #define FORM_LINK_RESUBMIT_PREFIX
-#: LYMessages.c:112
+#: LYMessages.c:128
 msgid "Submit to "
 msgstr "Enviar a "
 
 #. #define FORM_LINK_SUBMIT_MESSAGE
-#: LYMessages.c:114
+#: LYMessages.c:130
 msgid "(Form submit button) Use right-arrow or <return> to submit ('x' for no cache)."
 msgstr "(Bot� d'enviament) Useu '->' o <intro> per a enviar ('x' sense mem. cau)."
 
 #. #define FORM_LINK_RESUBMIT_MESSAGE
-#: LYMessages.c:116
+#: LYMessages.c:132
 msgid "(Form submit button) Use right-arrow or <return> to submit."
 msgstr "(Bot� d'enviament) Useu '->' o <intro> per a enviar."
 
 #. #define FORM_LINK_SUBMIT_DIS_MSG
-#: LYMessages.c:118
+#: LYMessages.c:134
 msgid "DISABLED form submit button.  Use UP or DOWN arrows or tab to move off."
 msgstr "Bot� d'enviament DESACTIVAT. Useu les fletxes o <tab> per a eixir-ne."
 
 #. #define FORM_LINK_SUBMIT_MAILTO_PREFIX
-#: LYMessages.c:120
+#: LYMessages.c:136
 msgid "Submit mailto form to "
 msgstr "Enviar correu a "
 
 #. #define FORM_LINK_SUBMIT_MAILTO_MSG
-#: LYMessages.c:122
+#: LYMessages.c:138
 msgid "(mailto form submit button) Use right-arrow or <return> to submit."
 msgstr "(Bot� d'enviament de correu) Useu '->' o <intro> per a enviar-lo."
 
 #. #define FORM_LINK_SUBMIT_MAILTO_DIS_MSG
-#: LYMessages.c:124
+#: LYMessages.c:140
 msgid "(mailto form submit button) Mail is disallowed so you cannot submit."
 msgstr "(Bot� d'enviament de correu) El correu no est� perm�s: no podeuenviar-ne."
 
 #. #define FORM_LINK_RESET_MESSAGE
-#: LYMessages.c:126
+#: LYMessages.c:142
 msgid "(Form reset button)   Use right-arrow or <return> to reset form to defaults."
 msgstr "(Bot� de reinici) Useu '->' o <intro> per a tornar als valors predeterminats."
 
 #. #define FORM_LINK_RESET_DIS_MSG
-#: LYMessages.c:128
+#: LYMessages.c:144
 msgid "DISABLED form reset button.  Use UP or DOWN arrows or tab to move off."
 msgstr "Bot� de reinici DESACTIVAT. Useu les fletxes o <tab> per a eixir-ne."
 
 #. #define FORM_LINK_BUTTON_MESSAGE
-#: LYMessages.c:130
+#: LYMessages.c:146
 msgid "(Script button)   Use UP or DOWN arrows or tab to move off."
 msgstr "(Bot� d'script)  Useu les fletxes cap amunt o cap avall o el tabulador per eixir-ne."
 
+#. #define FORM_LINK_BUTTON_ADV_MSG
+#: LYMessages.c:148
+#, c-format
+msgid "(Script button \"%s\");   Use UP or DOWN arrows or tab to move off."
+msgstr "(Bot� d'script �%s�);  Useu les fletxes cap amunt o cap avall o el tabulador per eixir-ne."
+
 #. #define FORM_LINK_BUTTON_DIS_MSG
-#: LYMessages.c:132
+#: LYMessages.c:150
 msgid "DISABLED Script button.  Use UP or DOWN arrows or tab to move off."
 msgstr "Bot� d'script DESACTIVAT. Useu les fletxes cap amunt o cap avall o el tabulador per eixir-ne."
 
+#. #define FORM_LINK_OPTION_LIST_ADV_MSG
+#: LYMessages.c:152
+#, c-format
+msgid "(Option list \"%s\"); Hit return to select option."
+msgstr "(Llista d'opcions �%s�); Premeu <intro> per a triar una opci�."
+
 #. #define FORM_LINK_OPTION_LIST_MESSAGE
-#: LYMessages.c:134
+#: LYMessages.c:154
 msgid "(Option list) Hit return and use arrow keys and return to select option."
 msgstr "(Opcions) Premeu <intro> i useu les fletxes i <intro> per a triar-ne una."
 
+#. #define CHOICE_LIST_ADV_MSG
+#: LYMessages.c:156
+#, c-format
+msgid "(Choice entry \"%s\"); Use arrow keys and return to select option."
+msgstr "(Trieu l'entrada �%s�); Useu les tecles de fletxes i intro per triar una opci�."
+
 #. #define CHOICE_LIST_MESSAGE
-#: LYMessages.c:136
+#: LYMessages.c:158
 msgid "(Choice list) Hit return and use arrow keys and return to select option."
 msgstr "(Tria) Premeu <intro>; useu les fletxes i <intro> per a triar una opci�."
 
+#. #define MOUSE_CHOICE_MESSAGE
+#: LYMessages.c:160
+msgid "Left mouse button or return to select, arrow keys to scroll."
+msgstr "Bot� esquerre del ratol� o intro per triar, tecles de fletxes pel despla�ament."
+
 #. #define FORM_LINK_OPTION_LIST_UNM_MSG
-#: LYMessages.c:138
+#: LYMessages.c:162
 msgid "UNMODIFIABLE option list.  Use return or arrow keys to review or leave."
 msgstr "Llista IMMODIFICABLE. <intro> per a revisar-la o fletxes per aeixir-ne."
 
 #. #define CHOICE_LIST_UNM_MSG
-#: LYMessages.c:140
+#: LYMessages.c:164
 msgid "UNMODIFIABLE choice list.  Use return or arrow keys to review or leave."
 msgstr "Llista IMMODIFICABLE. <intro> per a revisar-la o les fletxes per aeixir-ne."
 
-#: LYMessages.c:141
+#: LYMessages.c:165
 msgid "Submitting form..."
 msgstr "Enviant..."
 
-#: LYMessages.c:142
+#: LYMessages.c:166
 msgid "Resetting form..."
 msgstr "Restablint els valors inicials del formulari..."
 
 #. #define RELOADING_FORM
-#: LYMessages.c:144
+#: LYMessages.c:168
 msgid "Reloading document.  Any form entries will be lost!"
 msgstr "Recarregant document. Qualsevol entrada anterior es perdr�!"
 
 #. #define LINK_NOT_IN_FORM
-#: LYMessages.c:146
+#: LYMessages.c:170
 msgid "The current link is not in a FORM"
 msgstr "L'enlla�a actual no est� a un FORMULARI"
 
-#: LYMessages.c:147
+#: LYMessages.c:171
 #, c-format
 msgid "Warning: Cannot transcode form data to charset %s!"
 msgstr "Alerta: No es poden convertir les dades al joc de car�cters %s!"
 
 #. #define NORMAL_LINK_MESSAGE
-#: LYMessages.c:150
+#: LYMessages.c:174
 msgid "(NORMAL LINK)   Use right-arrow or <return> to activate."
 msgstr "(ENLLA� NORMAL) Useu la fletxa a la dreta o <return> per a seguir-lo."
 
-#: LYMessages.c:151
+#: LYMessages.c:175
 msgid "The resource requested is not available at this time."
 msgstr "El recurs sol�licitat no est� disponible a hores d'ara."
 
-#: LYMessages.c:152
+#: LYMessages.c:176
 msgid "Enter Lynx keystroke command: "
 msgstr "Introdu�u la combinaci� de tecles: "
 
-#: LYMessages.c:153
+#: LYMessages.c:177
 msgid "Looking up "
 msgstr "Buscant "
 
-#: LYMessages.c:154
+#: LYMessages.c:178
 #, c-format
 msgid "Getting %s"
 msgstr "Rebent %s"
 
-#: LYMessages.c:155
+#: LYMessages.c:179
 #, c-format
 msgid "Skipping %s"
 msgstr "Saltant-se %s"
 
-#: LYMessages.c:156
+#: LYMessages.c:180
 #, c-format
 msgid "Using %s"
 msgstr "Usant %s"
 
-#: LYMessages.c:157
+#: LYMessages.c:181
 #, c-format
 msgid "Illegal URL: %s"
 msgstr "Adre�a il�legal: %s"
 
-#: LYMessages.c:158
+#: LYMessages.c:182
 #, c-format
 msgid "Badly formed address %s"
 msgstr "Adre�a mal formada: %s"
 
-#: LYMessages.c:159
+#: LYMessages.c:183
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: LYMessages.c:160
+#: LYMessages.c:184
 msgid "Unable to access WWW file!!!"
 msgstr "No ha estat possible accedir a l'arxiu!!"
 
-#: LYMessages.c:161
+#: LYMessages.c:185
 #, c-format
 msgid "This is a searchable index.  Use %s to search."
 msgstr "�ndex de recerca. Useu %s per a buscar."
 
 #. #define WWW_INDEX_MORE_MESSAGE
-#: LYMessages.c:163
+#: LYMessages.c:187
 #, c-format
 msgid "--More--  This is a searchable index.  Use %s to search."
 msgstr "--M�s--  �ndex de recerca. Useu %s per a buscar."
 
-#: LYMessages.c:164
+#: LYMessages.c:188
 msgid "You have entered an invalid link number."
 msgstr "Heu introdu�t un n�mero d'enlla� incorrecte."
 
 #. #define SOURCE_HELP
-#: LYMessages.c:166
+#: LYMessages.c:190
 msgid "Currently viewing document source.  Press '\\' to return to rendered version."
 msgstr "Aquest �s el document font. Premeu '\\' per tornar a la versi� interpretada."
 
 #. #define NOVICE_LINE_ONE
-#: LYMessages.c:168
+#: LYMessages.c:192
 msgid "  Arrow keys: Up and Down to move.  Right to follow a link; Left to go back.  \n"
 msgstr "Fletxes amunt i avall per a moure-us. '->' segueix l'enlla�; '<-' tornaenrere\n"
 
 #. #define NOVICE_LINE_TWO
-#: LYMessages.c:170
+#: LYMessages.c:194
 msgid " H)elp O)ptions P)rint G)o M)ain screen Q)uit /=search [delete]=history list \n"
 msgstr "H ajuda O)pcions im(P)rimir  G anar M principal Q ix  / buscar [del] hist�ria\n"
 
 #. #define NOVICE_LINE_TWO_A
-#: LYMessages.c:172
+#: LYMessages.c:196
 msgid "  O)ther cmds  H)elp  K)eymap  G)oto  P)rint  M)ain screen  o)ptions  Q)uit  \n"
 msgstr "O altres  H ajuda  K tecles  G anar  im(P)rimir  M principal o)pcions  Q ix \n"
 
 #. #define NOVICE_LINE_TWO_B
-#: LYMessages.c:174
+#: LYMessages.c:198
 msgid "  O)ther cmds  B)ack  E)dit  D)ownload ^R)eload ^W)ipe screen  search doc: / \n"
 msgstr "O altres  B enrere E)ditar D)escarregar ^R)ecarregar  ^W refrescar  / buscar \n"
 
 #. #define NOVICE_LINE_TWO_C
-#: LYMessages.c:176
+#: LYMessages.c:200
 msgid "O)ther cmds  C)omment  History: <backspace>  Bookmarks: V)iew, A)dd, R)emove \n"
 msgstr "O altres C)omentari  [del] hist�ria  llibreta: V)eure, A)fegir, R eliminar\n"
 
 #. #define FORM_NOVICELINE_ONE
-#: LYMessages.c:178
+#: LYMessages.c:202
 msgid "            Enter text into the field by typing on the keyboard              "
 msgstr "              Useu el teclat per a introduir text en el camp                 "
 
 #. #define FORM_NOVICELINE_TWO
-#: LYMessages.c:180
+#: LYMessages.c:204
 msgid "    Ctrl-U to delete all text in field, [Backspace] to delete a character    "
 msgstr "      Ctrl-U esborra tot el text, [Backspace] esborra nom�s un car�cter      "
 
 #. #define FORM_NOVICELINE_TWO_DELBL
-#: LYMessages.c:182
+#: LYMessages.c:206
 msgid "      Ctrl-U to delete text in field, [Backspace] to delete a character    "
 msgstr "        Ctrl-U esborra el text, [Backspace] esborra nom�s un car�cter      "
 
 #. #define FORM_NOVICELINE_TWO_VAR
-#: LYMessages.c:184
+#: LYMessages.c:208
 #, c-format
 msgid "    %s to delete all text in field, [Backspace] to delete a character    "
 msgstr "      %s esborra tot el text, [Backspace] esborra nom�s un car�cter      "
 
 #. #define FORM_NOVICELINE_TWO_DELBL_VAR
-#: LYMessages.c:186
+#: LYMessages.c:210
 #, c-format
 msgid "      %s to delete text in field, [Backspace] to delete a character    "
 msgstr "       %s esborra el text, [Backspace] esborra nom�s un car�cter      "
 
 #. mailto
-#: LYMessages.c:189
+#: LYMessages.c:213
 msgid "Malformed mailto form submission!  Cancelled!"
 msgstr "Formulari d'enviament de correu mal format! Anul�laci�!"
 
-#: LYMessages.c:190
+#: LYMessages.c:214
 msgid "Warning!  Control codes in mail address replaced by ?"
 msgstr "Alerta! Codis de control en l'adre�a de correu substitu�ts per \"?\""
 
-#: LYMessages.c:191
+#: LYMessages.c:215
 msgid "Mail disallowed!  Cannot submit."
 msgstr "El correu no est� perm�s! No s'ha pogut enviar."
 
-#: LYMessages.c:192
+#: LYMessages.c:216
 msgid "Mailto form submission failed!"
 msgstr "El formulari d'enviament de correu ha fallat!"
 
-#: LYMessages.c:193
+#: LYMessages.c:217
 msgid "Mailto form submission Cancelled!!!"
 msgstr "Enviament cancel�lat!!"
 
-#: LYMessages.c:194
+#: LYMessages.c:218
 msgid "Sending form content..."
 msgstr "Enviant el contingut del formulari..."
 
-#: LYMessages.c:195
+#: LYMessages.c:219
 msgid "No email address is present in mailto URL!"
 msgstr "No hi ha cap adre�a de correu en aquesta URL!"
 
 #. #define MAILTO_URL_TEMPOPEN_FAILED
-#: LYMessages.c:197
+#: LYMessages.c:221
 msgid "Unable to open temporary file for mailto URL!"
 msgstr "Ha estat impossible obrir el fitxer temporal per a enviar correu a URL!"
 
 #. #define INC_ORIG_MSG_PROMPT
-#: LYMessages.c:199
+#: LYMessages.c:223
 msgid "Do you wish to include the original message?"
 msgstr "Voleu incloure-hi el missatge original?"
 
 #. #define INC_PREPARSED_MSG_PROMPT
-#: LYMessages.c:201
+#: LYMessages.c:225
 msgid "Do you wish to include the preparsed source?"
 msgstr "Voleu incloure-hi la font preanalitzada?"
 
 #. #define SPAWNING_EDITOR_FOR_MAIL
-#: LYMessages.c:203
+#: LYMessages.c:227
 msgid "Spawning your selected editor to edit mail message"
 msgstr "Obrint l'editor seleccionat per a editar el missatge de correu"
 
 #. #define ERROR_SPAWNING_EDITOR
-#: LYMessages.c:205
+#: LYMessages.c:229
 msgid "Error spawning editor, check your editor definition in the options menu"
 msgstr "No s'ha pogut obrir l'editor, comproveu-ne la definici� en el men�d'opcions"
 
-#: LYMessages.c:206
+#: LYMessages.c:230
 msgid "Send this comment?"
 msgstr "Enviar aquest comentari?"
 
-#: LYMessages.c:207
+#: LYMessages.c:231
 msgid "Send this message?"
 msgstr "Enviar aquest missatge?"
 
-#: LYMessages.c:208
+#: LYMessages.c:232
 msgid "Sending your message..."
 msgstr "Enviant el missatge..."
 
-#: LYMessages.c:209
+#: LYMessages.c:233
 msgid "Sending your comment:"
 msgstr "Enviant el comentari:"
 
 #. textarea
-#: LYMessages.c:212
+#: LYMessages.c:236
 msgid "Not in a TEXTAREA; cannot use external editor."
 msgstr "No �s una �rea de text; no hi podeu usar l'editor extern."
 
-#: LYMessages.c:213
+#: LYMessages.c:237
 msgid "Not in a TEXTAREA; cannot use command."
 msgstr "No �s una �rea de text; no s'hi pot usar l'ordre indicada."
 
-#: LYMessages.c:215
+#: LYMessages.c:239
 msgid "file: ACTIONs are disallowed!"
 msgstr "fitxer: les accions (ACTIONS) no estan permeses!"
 
 #. #define FILE_SERVED_LINKS_DISALLOWED
-#: LYMessages.c:217
+#: LYMessages.c:241
 msgid "file: URLs via served links are disallowed!"
 msgstr "fitxer: no estan permesos els URL prove�ts per un enlla� servit"
 
-#: LYMessages.c:218
+#: LYMessages.c:242
 msgid "Access to local files denied."
 msgstr "Acc�s als arxius locals denegat."
 
-#: LYMessages.c:219
+#: LYMessages.c:243
 msgid "file: URLs via bookmarks are disallowed!"
 msgstr "fitxer: les URLs del fitxer d'adreces d'inter�s no estan permeses!"
 
 #. #define SPECIAL_VIA_EXTERNAL_DISALLOWED
-#: LYMessages.c:221
+#: LYMessages.c:245
 msgid "This special URL is not allowed in external documents!"
 msgstr "No es permet aquesta URL especial en documents externs!"
 
-#: LYMessages.c:222
+#: LYMessages.c:246
 msgid "Press <return> to return to Lynx."
 msgstr "Premeu <return> per tornar a Lynx."
 
 #. #define SPAWNING_MSG
-#: LYMessages.c:225
+#: LYMessages.c:249
 msgid "Spawning DCL subprocess.  Use 'logout' to return to Lynx.\n"
 msgstr "S'est� engendrant el subproc�s DCL. Useu �logout� per tornar al Lynx.\n"
 
 #. #define SPAWNING_MSG
-#: LYMessages.c:229
+#: LYMessages.c:253
 msgid "Type EXIT to return to Lynx.\n"
 msgstr "Escriviu 'exit' per a tornar a Lynx.\n"
 
 #. #define SPAWNING_MSG
-#: LYMessages.c:232
+#: LYMessages.c:256
 msgid "Spawning your default shell.  Use 'exit' to return to Lynx.\n"
 msgstr "Obrint la shell predeterminada. Useu \"exit\" per a tornar a Lynx.\n"
 
-#: LYMessages.c:235
+#: LYMessages.c:259
 msgid "Spawning is currently disabled."
 msgstr "Actualment no est� habilitat engendrar."
 
-#: LYMessages.c:236
+#: LYMessages.c:260
 msgid "The 'd'ownload command is currently disabled."
 msgstr "Actualment l'opci� de (d)esc�rrega no est� activa."
 
-#: LYMessages.c:237
+#: LYMessages.c:261
 msgid "You cannot download an input field."
 msgstr "No �s possible descarregar un camp d'entrada de dades."
 
-#: LYMessages.c:238
+#: LYMessages.c:262
 msgid "Form has a mailto action!  Cannot download."
 msgstr "El formulari t� una acci� mailto. No es pot descarregar."
 
-#: LYMessages.c:239
+#: LYMessages.c:263
 msgid "You cannot download a mailto: link."
 msgstr "No es pot descarregar un enlla� a una adre�a de correu."
 
-#: LYMessages.c:240
+#: LYMessages.c:264
 msgid "You cannot download cookies."
 msgstr "Les cookies es poden descarregar."
 
-#: LYMessages.c:241
+#: LYMessages.c:265
 msgid "You cannot download a printing option."
 msgstr "No es poden descarregar les opcions d'impressi�."
 
-#: LYMessages.c:242
+#: LYMessages.c:266
 msgid "You cannot download an upload option."
 msgstr "No es poden descarregar les opcions de c�rrega."
 
-#: LYMessages.c:243
+#: LYMessages.c:267
 msgid "You cannot download an permit option."
 msgstr "No podeu descarregar una opci� de perm�s."
 
-#: LYMessages.c:244
+#: LYMessages.c:268
 msgid "This special URL cannot be downloaded!"
 msgstr "Aquesta URL especial no es pot descarregar!"
 
-#: LYMessages.c:245
+#: LYMessages.c:269
 msgid "Nothing to download."
 msgstr "No hi ha res per descarregar."
 
-#: LYMessages.c:246
+#: LYMessages.c:270
 msgid "Trace ON!"
 msgstr "Rastreig activat! (Trace ON!)"
 
-#: LYMessages.c:247
+#: LYMessages.c:271
 msgid "Trace OFF!"
 msgstr "Rastreig desactivat! (Trace OFF!)"
 
 #. #define CLICKABLE_IMAGES_ON
-#: LYMessages.c:249
+#: LYMessages.c:273
 msgid "Links will be included for all images!  Reloading..."
 msgstr "S'hi inclouran els enlla�os a totes les imatges! Recarregant..."
 
 #. #define CLICKABLE_IMAGES_OFF
-#: LYMessages.c:251
+#: LYMessages.c:275
 msgid "Standard image handling restored!  Reloading..."
 msgstr "Manejament est�ndar d'imatges restaurat! Recarregant..."
 
 #. #define PSEUDO_INLINE_ALTS_ON
-#: LYMessages.c:253
+#: LYMessages.c:277
 msgid "Pseudo_ALTs will be inserted for inlines without ALT strings!  Reloading..."
 msgstr "S'inseriran pseudo-ALTs per a les imatges sense cadena ALT! Recarrega..."
 
 #. #define PSEUDO_INLINE_ALTS_OFF
-#: LYMessages.c:255
+#: LYMessages.c:279
 msgid "Inlines without an ALT string specified will be ignored!  Reloading..."
 msgstr "S'ignoraran les imatges sense cadena alternativa ("
 
-#: LYMessages.c:256
+#: LYMessages.c:280
 msgid "Raw 8-bit or CJK mode toggled OFF!  Reloading..."
 msgstr "Mode 8-bits cru o CJK activat! Rec�rrega..."
 
-#: LYMessages.c:257
+#: LYMessages.c:281
 msgid "Raw 8-bit or CJK mode toggled ON!  Reloading..."
 msgstr "Mode 8-bits cru o CJK desactivat!  Rec�rrega..."
 
 #. #define HEAD_D_L_OR_CANCEL
-#: LYMessages.c:259
+#: LYMessages.c:283
 msgid "Send HEAD request for D)ocument or L)ink, or C)ancel? (d,l,c): "
 msgstr "Voleu enviar una sol�licitud HEAD per al D)ocument o l'en(L)la�, or C)ancel�lar? (d,l,c):"
 
 #. #define HEAD_D_OR_CANCEL
-#: LYMessages.c:261
+#: LYMessages.c:285
 msgid "Send HEAD request for D)ocument, or C)ancel? (d,c): "
 msgstr "Voleu enviar una sol�licitud HEAD per al D)ocument o C)ancel�lar? (d,c):"
 
-#: LYMessages.c:262
+#: LYMessages.c:286
 msgid "Sorry, the document is not an http URL."
 msgstr "El document no �s una URL http."
 
-#: LYMessages.c:263
+#: LYMessages.c:287
 msgid "Sorry, the link is not an http URL."
 msgstr "L'enlla� no �s una URL http."
 
-#: LYMessages.c:264
+#: LYMessages.c:288
 msgid "Sorry, the ACTION for this form is disabled."
 msgstr "L'ACCI� del formulari no est� disponible."
 
 #. #define FORM_ACTION_NOT_HTTP_URL
-#: LYMessages.c:266
+#: LYMessages.c:290
 msgid "Sorry, the ACTION for this form is not an http URL."
 msgstr "L'ACCI� del formulari no �s una adre�a de http."
 
-#: LYMessages.c:267
+#: LYMessages.c:291
 msgid "Not an http URL or form ACTION!"
 msgstr "No �s una URL http ni una ACCIO de formulari!"
 
-#: LYMessages.c:268
+#: LYMessages.c:292
 msgid "This special URL cannot be a form ACTION!"
 msgstr "Aquesta URL especial no pot ser una ACCIO de formulari!"
 
-#: LYMessages.c:269
+#: LYMessages.c:293
 msgid "URL is not in starting realm!"
 msgstr "La URL no est� en el domini inicial!"
 
-#: LYMessages.c:270
+#: LYMessages.c:294
 msgid "News posting is disabled!"
 msgstr "L'enviament de missatges als f�rums de discusi� est� desactivada!"
 
-#: LYMessages.c:271
+#: LYMessages.c:295
 msgid "File management support is disabled!"
 msgstr "L'administraci� de fitxers est� desactivada!"
 
-#: LYMessages.c:272
+#: LYMessages.c:296
 msgid "No jump file is currently available."
 msgstr "No hi ha cap fitxer de salts disponible."
 
-#: LYMessages.c:273
+#: LYMessages.c:297
 msgid "Jump to (use '?' for list): "
 msgstr "Saltar a (premeu '?' per veure la llista): "
 
-#: LYMessages.c:274
+#: LYMessages.c:298
 msgid "Jumping to a shortcut URL is disallowed!"
 msgstr "El salt a una URL de drecera esta deshabilitat!"
 
-#: LYMessages.c:275
+#: LYMessages.c:299
 msgid "Random URL is disallowed!  Use a shortcut."
 msgstr "Les adreces aleat�ries estan desactivades. Useu una drecera."
 
-#: LYMessages.c:276
+#: LYMessages.c:300
 msgid "No random URLs have been used thus far."
 msgstr "Fins ara no s'han usat URLs aleat�ries."
 
-#: LYMessages.c:277
+#: LYMessages.c:301
 msgid "Bookmark features are currently disabled."
 msgstr "Els \"favorits\" estan desactivats."
 
-#: LYMessages.c:278
+#: LYMessages.c:302
 msgid "Execution via bookmarks is disabled."
 msgstr "L'execuci� a trav�s del fitxer d'adreces est� desactivada."
 
 #. #define BOOKMARK_FILE_NOT_DEFINED
-#: LYMessages.c:280
+#: LYMessages.c:304
 #, c-format
 msgid "Bookmark file is not defined. Use %s to see options."
 msgstr "El fitxer de favorits no est� definit. Useu %s per a veure les opcions."
 
 #. #define NO_TEMP_FOR_HOTLIST
-#: LYMessages.c:282
+#: LYMessages.c:306
 msgid "Unable to open tempfile for X Mosaic hotlist conversion."
 msgstr "No ha estat possible obrir el fitxer temporal per a convertir el fitxer d'adreces de Mosaic."
 
-#: LYMessages.c:283
+#: LYMessages.c:307
 msgid "ERROR - unable to open bookmark file."
 msgstr "ERROR: ha estat impossible obrir l'arxiu d'adreces"
 
 #. #define BOOKMARK_OPEN_FAILED_FOR_DEL
-#: LYMessages.c:285
+#: LYMessages.c:309
 msgid "Unable to open bookmark file for deletion of link."
 msgstr "No ha estat possible obrir l'arxiu d'adreces per esborrar l'enlla�."
 
 #. #define BOOKSCRA_OPEN_FAILED_FOR_DEL
-#: LYMessages.c:287
+#: LYMessages.c:311
 msgid "Unable to open scratch file for deletion of link."
 msgstr "No s'ha pogut obrir el fitxer de treball per a l'esborrament de l'enlla�"
 
-#: LYMessages.c:289
+#: LYMessages.c:313
 msgid "Error renaming scratch file."
 msgstr "S'ha produ�t un error en reanomenar el fitxer de treball."
 
-#: LYMessages.c:291
+#: LYMessages.c:315
 msgid "Error renaming temporary file."
 msgstr "Error quan s'intentava reanomenar un arxiu temporal."
 
 #. #define BOOKTEMP_COPY_FAIL
-#: LYMessages.c:293
+#: LYMessages.c:317
 msgid "Unable to copy temporary file for deletion of link."
 msgstr "No s'ha pogut copiar el fitxer temporari per l'esborrament de l'enlla�."
 
 #. #define BOOKTEMP_REOPEN_FAIL_FOR_DEL
-#: LYMessages.c:295
+#: LYMessages.c:319
 msgid "Unable to reopen temporary file for deletion of link."
 msgstr "No s'ha pogut reobrir el fitxer temporari per l'esborrament de l'enlla�.<"
 
 #. #define BOOKMARK_LINK_NOT_ONE_LINE
-#: LYMessages.c:298
+#: LYMessages.c:322
 msgid "Link is not by itself all on one line in bookmark file."
 msgstr "Hi ha d'haver un "
 
-#: LYMessages.c:299
+#: LYMessages.c:323
 msgid "Bookmark deletion failed."
 msgstr "Ha fallat l'esborrament del marcador."
 
 #. #define BOOKMARKS_NOT_TRAVERSED
-#: LYMessages.c:301
+#: LYMessages.c:325
 msgid "Bookmark files cannot be traversed (only http URLs)."
 msgstr "Els fitxers de marcadors no es poden rec�rrer (sols el URL d'http)."
 
 #. #define BOOKMARKS_NOT_OPEN
-#: LYMessages.c:303
+#: LYMessages.c:327
 msgid "Unable to open bookmark file, use 'a' to save a link first"
 msgstr "Impossible obrir el fitxer d'adreces, useu 'a' per a guardar-neuna primer."
 
-#: LYMessages.c:304
+#: LYMessages.c:328
 msgid "There are no links in this bookmark file!"
 msgstr "No hi ha enlla�os en aquest fitxer d'adreces!"
 
 #. #define CACHE_D_OR_CANCEL
-#: LYMessages.c:306
+#: LYMessages.c:330
 msgid "D)elete cached document or C)ancel? (d,c): "
 msgstr "D)ocument a la mem�ria cau s'ha d'esborrar o C)ancel�la? (d,c): "
 
 #. #define BOOK_D_L_OR_CANCEL
-#: LYMessages.c:308
+#: LYMessages.c:332
 msgid "Save D)ocument or L)ink to bookmark file or C)ancel? (d,l,c): "
 msgstr "Guardar com a adre�a d'inter�s D)ocument o en(L)la�,o C)ancel�lar? (d,l,c): "
 
-#: LYMessages.c:309
+#: LYMessages.c:333
 msgid "Save D)ocument to bookmark file or C)ancel? (d,c): "
 msgstr "Guardar D)ocument en l'arxiu d'adreces d'inter�so C)ancel�lar? (d, c): "
 
-#: LYMessages.c:310
+#: LYMessages.c:334
 msgid "Save L)ink to bookmark file or C)ancel? (l,c): "
 msgstr "Guardar en(L)la� en l'arxiu d'adreces d'inter�so C)ancel�lar? (l, c): "
 
 #. #define NOBOOK_POST_FORM
-#: LYMessages.c:312
+#: LYMessages.c:336
 msgid "Documents from forms with POST content cannot be saved as bookmarks."
 msgstr "No es pot guardar al fitxer d'adreces documents procedents de formularis POST."
 
-#: LYMessages.c:313
+#: LYMessages.c:337
 msgid "Cannot save form fields/links"
 msgstr "No es poden desar el camps dels formularis/enlla�os"
 
 #. #define NOBOOK_HSML
-#: LYMessages.c:315
+#: LYMessages.c:339
 msgid "History, showinfo, menu and list files cannot be saved as bookmarks."
 msgstr "Els fitxers historial, informaci�, men� i lista no es poden guardar al fitxer d'adreces."
 
 #. #define CONFIRM_BOOKMARK_DELETE
-#: LYMessages.c:317
+#: LYMessages.c:341
 msgid "Do you really want to delete this link from your bookmark file?"
 msgstr "Esteu segurs que voleu esborrar aquest enlla� de l'arxiu d'adreces?"
 
-#: LYMessages.c:318
+#: LYMessages.c:342
 msgid "Malformed address."
 msgstr "Adre�a mal formada."
 
 #. #define HISTORICAL_ON_MINIMAL_OFF
-#: LYMessages.c:320
+#: LYMessages.c:344
 msgid "Historical comment parsing ON (Minimal is overridden)!"
 msgstr "L'analitzador dels comentaris hist�rics est� activada (El m�nim est� anul�lat)!"
 
 #. #define HISTORICAL_OFF_MINIMAL_ON
-#: LYMessages.c:322
+#: LYMessages.c:346
 msgid "Historical comment parsing OFF (Minimal is in effect)!"
 msgstr "L'analitzador dels comentaris hist�rics est� desactivada (El m�nim est� en efecte)!"
 
 #. #define HISTORICAL_ON_VALID_OFF
-#: LYMessages.c:324
+#: LYMessages.c:348
 msgid "Historical comment parsing ON (Valid is overridden)!"
 msgstr "L'analitzador dels comentaris hist�rics est� activada (V�lid est� anul�lat)!"
 
 #. #define HISTORICAL_OFF_VALID_ON
-#: LYMessages.c:326
+#: LYMessages.c:350
 msgid "Historical comment parsing OFF (Valid is in effect)!"
 msgstr "L'analitzador dels comentaris hist�rics est� desactivada (V�lid est� en efecte)!<"
 
 #. #define MINIMAL_ON_IN_EFFECT
-#: LYMessages.c:328
+#: LYMessages.c:352
 msgid "Minimal comment parsing ON (and in effect)!"
 msgstr "L'analitzador del comentari m�nim esta activat (i en efecte)!"
 
 #. #define MINIMAL_OFF_VALID_ON
-#: LYMessages.c:330
+#: LYMessages.c:354
 msgid "Minimal comment parsing OFF (Valid is in effect)!"
 msgstr "L'analitzador del comentari m�nim esta desactivat (V�lid est� en efecte)!<"
 
 #. #define MINIMAL_ON_BUT_HISTORICAL
-#: LYMessages.c:332
+#: LYMessages.c:356
 msgid "Minimal comment parsing ON (but Historical is in effect)!"
 msgstr "L'analitzador del comentari m�nim esta activat (per� Hist�ric est� en efecte)!"
 
 #. #define MINIMAL_OFF_HISTORICAL_ON
-#: LYMessages.c:334
+#: LYMessages.c:358
 msgid "Minimal comment parsing OFF (Historical is in effect)!"
 msgstr "L'analitzador del comentari m�nim esta desactivat (Hist�ric est� en efecte)!<"
 
-#: LYMessages.c:335
+#: LYMessages.c:359
 msgid "Soft double-quote parsing ON!"
 msgstr "L'analitzador cometes doble suau est� activat!"
 
-#: LYMessages.c:336
+#: LYMessages.c:360
 msgid "Soft double-quote parsing OFF!"
 msgstr "L'analitzador cometes doble suau est� activat!<"
 
-#: LYMessages.c:337
+#: LYMessages.c:361
 msgid "Now using TagSoup parsing of HTML."
 msgstr "Utilitzant l'analitzador d'HTML TagSoup."
 
-#: LYMessages.c:338
+#: LYMessages.c:362
 msgid "Now using SortaSGML parsing of HTML!"
 msgstr "Utilitzant l'analitzador d'HTML SortaSGML!"
 
-#: LYMessages.c:339
+#: LYMessages.c:363
 msgid "You are already at the end of this document."
 msgstr "�s a��, el final del document."
 
-#: LYMessages.c:340
+#: LYMessages.c:364
 msgid "You are already at the beginning of this document."
 msgstr "�s ac�, el principi del document."
 
-#: LYMessages.c:341
+#: LYMessages.c:365
 #, c-format
 msgid "You are already at page %d of this document."
 msgstr "�s aquesta, la %da p�gina del document."
 
-#: LYMessages.c:342
+#: LYMessages.c:366
 #, c-format
 msgid "Link number %d already is current."
 msgstr "�s aquest, l'enlla� n�mero %d."
 
-#: LYMessages.c:343
+#: LYMessages.c:367
 msgid "You are already at the first document"
 msgstr "Aquest �s el primer document"
 
-#: LYMessages.c:344
+#: LYMessages.c:368
 msgid "There are no links above this line of the document."
 msgstr "No hi ha enlla�os per damunt d'aquesta l�nia."
 
-#: LYMessages.c:345
+#: LYMessages.c:369
 msgid "There are no links below this line of the document."
 msgstr "No hi ha enlla�os per sota d'aquesta l�nia."
 
 #. #define MAXLEN_REACHED_DEL_OR_MOV
-#: LYMessages.c:347
+#: LYMessages.c:371
 msgid "Maximum length reached!  Delete text or move off field."
 msgstr "S'ha assolit la longitud m�xima! Esborreu text o eixiu del camp."
 
 #. #define NOT_ON_SUBMIT_OR_LINK
-#: LYMessages.c:349
+#: LYMessages.c:373
 msgid "You are not on a form submission button or normal link."
 msgstr "No �s ni un bot� d'enviament ni un enlla� normal."
 
 #. #define NEED_CHECKED_RADIO_BUTTON
-#: LYMessages.c:351
+#: LYMessages.c:375
 msgid "One radio button must be checked at all times!"
 msgstr "Sempre s'ha de triar una opci�!"
 
-#: LYMessages.c:352
+#: LYMessages.c:376
 msgid "No submit button for this form, submit single text field?"
 msgstr "No hi ha cap bot� d'enviament, enviar simplemtent el camp de text?"
 
-#: LYMessages.c:353
+#: LYMessages.c:377
 msgid "Do you want to go back to the previous document?"
 msgstr "Voleu tornar al document anterior?"
 
-#: LYMessages.c:354
+#: LYMessages.c:378
 msgid "Use arrows or tab to move off of field."
 msgstr "Useu les fletxes o <tab> per a eixir-ne."
 
 #. #define ENTER_TEXT_ARROWS_OR_TAB
-#: LYMessages.c:356
+#: LYMessages.c:380
 msgid "Enter text.  Use arrows or tab to move off of field."
 msgstr "Introdu�u text. Useu les fletxes o el tabulador per a eixir-ne."
 
-#: LYMessages.c:357
+#: LYMessages.c:381
 msgid "** Bad HTML!!  No form action defined. **"
 msgstr "** Codi HTML incorrecte!! No hi ha cap acci� definida. **"
 
-#: LYMessages.c:358
+#: LYMessages.c:382
 msgid "Bad HTML!!  Unable to create popup window!"
 msgstr "Codi HTML incorrecte! Ha estat impossible crear la finestra emergent!"
 
-#: LYMessages.c:359
+#: LYMessages.c:383
 msgid "Unable to create popup window!"
 msgstr "Ha estat impossible crear la finestra emergent!"
 
-#: LYMessages.c:360
+#: LYMessages.c:384
 msgid "Goto a random URL is disallowed!"
 msgstr "El salt a una URL aleat�ria est� desactivat!"
 
-#: LYMessages.c:361
+#: LYMessages.c:385
 msgid "Goto a non-http URL is disallowed!"
 msgstr "L'acc�s a URLs que no compleixen el protocol http no est� perm�s!"
 
-#: LYMessages.c:362
+#: LYMessages.c:386
 #, c-format
 msgid "You are not allowed to goto \"%s\" URLs"
 msgstr "No teniu perm�s per a anar a URLs \"%s\""
 
-#: LYMessages.c:363
+#: LYMessages.c:387
 msgid "URL to open: "
 msgstr "Anar a: "
 
-#: LYMessages.c:364
+#: LYMessages.c:388
 msgid "Edit the current Goto URL: "
 msgstr "Editar l'adre�a actual: "
 
-#: LYMessages.c:365
+#: LYMessages.c:389
 msgid "Edit the previous Goto URL: "
 msgstr "Editar l'adre�a anterior: "
 
-#: LYMessages.c:366
+#: LYMessages.c:390
 msgid "Edit a previous Goto URL: "
 msgstr "Editar adreces anteriors: "
 
-#: LYMessages.c:367
+#: LYMessages.c:391
 msgid "Current document has POST data."
 msgstr "El document actual cont� dades POST."
 
-#: LYMessages.c:368
+#: LYMessages.c:392
 msgid "Edit this document's URL: "
 msgstr "Editar l'adre�a d'aquest document: "
 
-#: LYMessages.c:369
+#: LYMessages.c:393
 msgid "Edit the current link's URL: "
 msgstr "Editar l'adre�a de l'enlla� actual: "
 
-#: LYMessages.c:370
+#: LYMessages.c:394
 msgid "Edit the form's submit-URL: "
 msgstr "Edita el formulari submit-URL: "
 
-#: LYMessages.c:371
+#: LYMessages.c:395
 msgid "You cannot edit File Management URLs"
 msgstr "No es poden editar les URLs del gestor de fitxers."
 
-#: LYMessages.c:372
+#: LYMessages.c:396
 msgid "Enter a database query: "
 msgstr "Introdu�u una consulta a la base de dades: "
 
-#: LYMessages.c:373
+#: LYMessages.c:397
 msgid "Enter a whereis query: "
 msgstr "Introdu�u la paraula que voleu trobar: "
 
-#: LYMessages.c:374
+#: LYMessages.c:398
 msgid "Edit the current query: "
 msgstr "Editar la consulta: "
 
-#: LYMessages.c:375
+#: LYMessages.c:399
 msgid "Edit the previous query: "
 msgstr "Editar la consulta anterior: "
 
-#: LYMessages.c:376
+#: LYMessages.c:400
 msgid "Edit a previous query: "
 msgstr "Editar una consulta anterior: "
 
 #. #define USE_C_R_TO_RESUB_CUR_QUERY
-#: LYMessages.c:378
+#: LYMessages.c:402
 msgid "Use Control-R to resubmit the current query."
 msgstr "Useu Ctrl-R per a reenviar la consulta actual."
 
-#: LYMessages.c:379
+#: LYMessages.c:403
 msgid "Edit the current shortcut: "
 msgstr "Editar la drecera actual: "
 
-#: LYMessages.c:380
+#: LYMessages.c:404
 msgid "Edit the previous shortcut: "
 msgstr "Editar la drecera anterior: "
 
-#: LYMessages.c:381
+#: LYMessages.c:405
 msgid "Edit a previous shortcut: "
 msgstr "Editar una drecera anterior: "
 
-#: LYMessages.c:382
+#: LYMessages.c:406
 #, c-format
 msgid "Key '%c' is not mapped to a jump file!"
 msgstr "La tecla '%c' no est� assignada a cap fitxer de salt!"
 
-#: LYMessages.c:383
+#: LYMessages.c:407
 msgid "Cannot locate jump file!"
 msgstr "No s'ha pogut trobar el fitxer de salts!"
 
-#: LYMessages.c:384
+#: LYMessages.c:408
 msgid "Cannot open jump file!"
 msgstr "No s'ha pogut obrir el fitxer de salts!"
 
-#: LYMessages.c:385
+#: LYMessages.c:409
 msgid "Error reading jump file!"
 msgstr "Error de lectura en el fitxer de salts!"
 
-#: LYMessages.c:386
+#: LYMessages.c:410
 msgid "Out of memory reading jump file!"
 msgstr "Mem�ria exhaurida durant la lectura del fitxer de salts!"
 
-#: LYMessages.c:387
+#: LYMessages.c:411
 msgid "Out of memory reading jump table!"
 msgstr "Mem�ria exhaurida durant la lectura de la taula de salts!"
 
-#: LYMessages.c:388
+#: LYMessages.c:412
 msgid "No index is currently available."
 msgstr "No hi ha cap �ndex disponible."
 
 #. #define CONFIRM_MAIN_SCREEN
-#: LYMessages.c:390
+#: LYMessages.c:414
 msgid "Do you really want to go to the Main screen?"
 msgstr "Esteu segur de voler anar a la p�gina principal?"
 
-#: LYMessages.c:391
+#: LYMessages.c:415
 msgid "You are already at main screen!"
 msgstr "�s aquesta, la p�gina principal!"
 
 #. #define NOT_ISINDEX
-#: LYMessages.c:393
+#: LYMessages.c:417
 msgid "Not a searchable indexed document -- press '/' to search for a text string"
 msgstr "No �s un document indexat: premeu '/' per a buscar una cadena de text"
 
 #. #define NO_OWNER
-#: LYMessages.c:395
+#: LYMessages.c:419
 msgid "No owner is defined for this file so you cannot send a comment"
 msgstr "No consta el propietari de l'arxiu: no podeu enviar-li cap comentari"
 
-#: LYMessages.c:396
+#: LYMessages.c:420
 #, c-format
 msgid "No owner is defined. Use %s?"
 msgstr "No consta el propietari. Usar %s?"
 
-#: LYMessages.c:397
+#: LYMessages.c:421
 msgid "Do you wish to send a comment?"
 msgstr "Voleu enviar un comentari?"
 
-#: LYMessages.c:398
+#: LYMessages.c:422
 msgid "Mail is disallowed so you cannot send a comment"
 msgstr "El correu no est� perm�s; per tant, no podeu enviar comentaris."
 
-#: LYMessages.c:399
+#: LYMessages.c:423
 msgid "The 'e'dit command is currently disabled."
 msgstr "L'ordre Editar est� desactivada."
 
-#: LYMessages.c:400
+#: LYMessages.c:424
 msgid "External editing is currently disabled."
 msgstr "L'edici� externa est� desactivada."
 
-#: LYMessages.c:401
+#: LYMessages.c:425
 msgid "System error - failure to get status."
 msgstr "Error del sistema: no s'ha pogut obtenir l'estat."
 
-#: LYMessages.c:402
+#: LYMessages.c:426
 msgid "No editor is defined!"
 msgstr "No hi ha cap editor definit!"
 
-#: LYMessages.c:403
+#: LYMessages.c:427
 msgid "The 'p'rint command is currently disabled."
 msgstr "L'ordre imPrimir est� desactivada."
 
-#: LYMessages.c:404
+#: LYMessages.c:428
 msgid "Document has no Toolbar links or Banner."
 msgstr "El document no t� barra d'enlla�os ni banner."
 
-#: LYMessages.c:405
+#: LYMessages.c:429
 msgid "Unable to open traversal file."
 msgstr "No s'ha pogut obrir el fitxer de travessada"
 
-#: LYMessages.c:406
+#: LYMessages.c:430
 msgid "Unable to open traversal found file."
 msgstr "No s'ha pogut obrir el fitxer trobat de travessada<"
 
-#: LYMessages.c:407
+#: LYMessages.c:431
 msgid "Unable to open reject file."
 msgstr "No s'ha pogut obrir el fitxer de rebuig."
 
-#: LYMessages.c:408
+#: LYMessages.c:432
 msgid "Unable to open traversal errors output file"
 msgstr "No s'ha pogut obrir el fitxer de sortida d'errors de travessada"
 
-#: LYMessages.c:409
+#: LYMessages.c:433
 msgid "TRAVERSAL WAS INTERRUPTED"
 msgstr "LA TRAVESSADA S'HA INTERROMPUT"
 
-#: LYMessages.c:410
+#: LYMessages.c:434
 msgid "Follow link (or goto link or page) number: "
 msgstr "Seguir l'enlla� (o anar a la p�gina) n�mero: "
 
-#: LYMessages.c:411
+#: LYMessages.c:435
 msgid "Select option (or page) number: "
 msgstr "Triar opci� (o p�gina) n�mero: "
 
-#: LYMessages.c:412
+#: LYMessages.c:436
 #, c-format
 msgid "Option number %d already is current."
 msgstr "�s aquesta, l'opci� n�mero %d."
 
 #. #define ALREADY_AT_OPTION_END
-#: LYMessages.c:414
+#: LYMessages.c:438
 msgid "You are already at the end of this option list."
 msgstr "�s ac�, el final de la llista d'opcions."
 
 #. #define ALREADY_AT_OPTION_BEGIN
-#: LYMessages.c:416
+#: LYMessages.c:440
 msgid "You are already at the beginning of this option list."
 msgstr "�s ac�, el comen�ament de la llista d'opcions."
 
 #. #define ALREADY_AT_OPTION_PAGE
-#: LYMessages.c:418
+#: LYMessages.c:442
 #, c-format
 msgid "You are already at page %d of this option list."
 msgstr "�s aquesta, la p�gina %d de la llista d'opcions."
 
-#: LYMessages.c:419
+#: LYMessages.c:443
 msgid "You have entered an invalid option number."
 msgstr "Heu introdu�t un n�mero d'opci� que no �s v�lid."
 
-#: LYMessages.c:420
+#: LYMessages.c:444
 msgid "** Bad HTML!!  Use -trace to diagnose. **"
 msgstr "** HTML erroni!! Useu l'opci� -trace per a obtenir un diagn�stic. **"
 
-#: LYMessages.c:421
+#: LYMessages.c:445
 msgid "Give name of file to save in"
 msgstr "Cal un nom per a l'arxiu."
 
-#: LYMessages.c:422
+#: LYMessages.c:446
 msgid "Can't save data to file -- please run WWW locally"
 msgstr "No s'ha pogut guardar les dades al fitxer: executeu WWW localment."
 
-#: LYMessages.c:423
+#: LYMessages.c:447
 msgid "Can't open temporary file!"
 msgstr "No ha estat possible obrir l'arxiu temporal!"
 
-#: LYMessages.c:424
+#: LYMessages.c:448
 msgid "Can't open output file!  Cancelling!"
 msgstr "No ha estat possible obrir l'arxiu d'eixida! Anul�lat!"
 
-#: LYMessages.c:425
+#: LYMessages.c:449
 msgid "Execution is disabled."
 msgstr "L'execuci� no est� activada."
 
 #. #define EXECUTION_DISABLED_FOR_FILE
-#: LYMessages.c:427
+#: LYMessages.c:451
 #, c-format
 msgid "Execution is not enabled for this file.  See the Options menu (use %s)."
 msgstr "L'execuci� no est� activada. Vegeu el men� d'opcions (useu %s)."
 
 #. #define EXECUTION_NOT_COMPILED
-#: LYMessages.c:429
+#: LYMessages.c:453
 msgid "Execution capabilities are not compiled into this version."
 msgstr "La capacitat d'executar programes no s'ha compilat en aquesta versi�."
 
-#: LYMessages.c:430
+#: LYMessages.c:454
 msgid "This file cannot be displayed on this terminal."
 msgstr "El fitxer no es pot mostrar en aquest terminal."
 
 #. #define CANNOT_DISPLAY_FILE_D_OR_C
-#: LYMessages.c:432
+#: LYMessages.c:456
 msgid "This file cannot be displayed on this terminal:  D)ownload, or C)ancel"
 msgstr "El fitxer no es pot mostrar en aquest terminal: D)escarregar oC)ancel�lar."
 
-#: LYMessages.c:433
+#: LYMessages.c:457
 #, c-format
 msgid "%s  D)ownload, or C)ancel"
 msgstr "%s D)escarregar o C)ancel�lar"
 
-#: LYMessages.c:434
+#: LYMessages.c:458
 msgid "Cancelling file."
 msgstr "Cancel�lant."
 
-#: LYMessages.c:435
+#: LYMessages.c:459
 msgid "Retrieving file.  - PLEASE WAIT -"
 msgstr "Descarregant fitxer. - ESPEREU, PER FAVOR -"
 
-#: LYMessages.c:436
+#: LYMessages.c:460
 msgid "Enter a filename: "
 msgstr "Introdu�u un nom per a l'arxiu: "
 
-#: LYMessages.c:437
+#: LYMessages.c:461
 msgid "Edit the previous filename: "
 msgstr "Editar el nom anterior: "
 
-#: LYMessages.c:438
+#: LYMessages.c:462
 msgid "Edit a previous filename: "
 msgstr "Editar els noms anteriors: "
 
-#: LYMessages.c:439
+#: LYMessages.c:463
 msgid "Enter a new filename: "
 msgstr "Introdu�u un nom nou: "
 
-#: LYMessages.c:440
+#: LYMessages.c:464
 msgid "File name may not begin with a dot."
 msgstr "Els noms d'arxiu no poden comen�ar amb punt."
 
-#: LYMessages.c:442
+#: LYMessages.c:466
 msgid "File exists.  Create higher version?"
 msgstr "El fitxer existeix. Voleu crear una versi� m�s alta?"
 
-#: LYMessages.c:444
+#: LYMessages.c:468
 msgid "File exists.  Overwrite?"
 msgstr "L'arxiu existeix. Voleu sobreescriure'l?"
 
-#: LYMessages.c:446
+#: LYMessages.c:470
 msgid "Cannot write to file."
 msgstr "No es pot escriure en el fitxer."
 
-#: LYMessages.c:447
+#: LYMessages.c:471
 msgid "ERROR! - download command is misconfigured."
 msgstr "ERROR: l'ordre _descarregar_ est� mal configurada."
 
-#: LYMessages.c:448
+#: LYMessages.c:472
 msgid "Unable to download file."
 msgstr "Ha estat impossible descarregar el fitxer."
 
-#: LYMessages.c:449
+#: LYMessages.c:473
 msgid "Reading directory..."
 msgstr "Llegint directori..."
 
-#: LYMessages.c:450
+#: LYMessages.c:474
 msgid "Building directory listing..."
 msgstr "Construint la llista del directori..."
 
-#: LYMessages.c:451
+#: LYMessages.c:475
 msgid "Saving..."
 msgstr "Gravant..."
 
-#: LYMessages.c:452
+#: LYMessages.c:476
 #, c-format
 msgid "Could not edit file '%s'."
 msgstr "No ha estat possible editar el fitxer '%s'."
 
-#: LYMessages.c:453
+#: LYMessages.c:477
 msgid "Unable to access document!"
 msgstr "No ha estat possible accedir al document!"
 
-#: LYMessages.c:454
+#: LYMessages.c:478
 msgid "Could not access file."
 msgstr "No ha estat possible accedir a l'arxiu."
 
-#: LYMessages.c:455
+#: LYMessages.c:479
 msgid "Could not access directory."
 msgstr "No ha estat possible accedir al directori."
 
-#: LYMessages.c:456
+#: LYMessages.c:480
 msgid "Could not load data."
 msgstr "No ha estat possible carregar les dades."
 
 #. #define CANNOT_EDIT_REMOTE_FILES
-#: LYMessages.c:458
+#: LYMessages.c:482
 msgid "Lynx cannot currently (e)dit remote WWW files."
 msgstr "Lynx no pot editar fitxers WWW remots."
 
 #. #define CANNOT_EDIT_FIELD
-#: LYMessages.c:460
+#: LYMessages.c:484
 msgid "This field cannot be (e)dited with an external editor."
 msgstr "Aquest camp no es pot editar amb un editor extern."
 
-#: LYMessages.c:461
+#: LYMessages.c:485
 msgid "Bad rule"
 msgstr "Regla incorrecta"
 
-#: LYMessages.c:462
+#: LYMessages.c:486
 msgid "Insufficient operands:"
 msgstr "Nombre d'operands insuficient:"
 
-#: LYMessages.c:463
+#: LYMessages.c:487
 msgid "You are not authorized to edit this file."
 msgstr "No teniu autoritzaci� per a editar aquest arxiu."
 
-#: LYMessages.c:464
+#: LYMessages.c:488
 msgid "Title: "
 msgstr "T�tol: "
 
-#: LYMessages.c:465
+#: LYMessages.c:489
 msgid "Subject: "
 msgstr "Tema: "
 
-#: LYMessages.c:466
+#: LYMessages.c:490
 msgid "Username: "
 msgstr "Nom d'usuari: "
 
-#: LYMessages.c:467
+#: LYMessages.c:491
 msgid "Password: "
 msgstr "Contrassenya: "
 
-#: LYMessages.c:468
+#: LYMessages.c:492
 msgid "lynx: Username and Password required!!!"
 msgstr "lynx: fa falta el nom d'usuari i la contrasenya!!"
 
-#: LYMessages.c:469
+#: LYMessages.c:493
 msgid "lynx: Password required!!!"
 msgstr "lynx: fa falta la contrasenya!!"
 
-#: LYMessages.c:470
+#: LYMessages.c:494
 msgid "Clear all authorization info for this session?"
 msgstr "Esborrar tota la informaci� sobre autoritzaci� d'aquesta sessi�?"
 
-#: LYMessages.c:471
+#: LYMessages.c:495
 msgid "Authorization info cleared."
 msgstr "Informaci� esborrada."
 
-#: LYMessages.c:472
+#: LYMessages.c:496
 msgid "Authorization failed.  Retry?"
 msgstr "Autoritzaci� fallida. Reintentar?"
 
-#: LYMessages.c:473
+#: LYMessages.c:497
 msgid "cgi support has been disabled."
 msgstr "s'ha desactivat el suport per a CGI."
 
 #. #define CGI_NOT_COMPILED
-#: LYMessages.c:475
+#: LYMessages.c:499
 msgid "Lynxcgi capabilities are not compiled into this version."
 msgstr "La capacitat d'usar CGI no ha estat compilada en aquesta versi�."
 
-#: LYMessages.c:476
+#: LYMessages.c:500
 #, c-format
 msgid "Sorry, no known way of converting %s to %s."
 msgstr "Em sap greu, no s� com convertir %s a %s."
 
-#: LYMessages.c:477
+#: LYMessages.c:501
 msgid "Unable to set up connection."
 msgstr "Ha estat impossible establir la connexi�."
 
-#: LYMessages.c:478
+#: LYMessages.c:502
 msgid "Unable to make connection"
 msgstr "Ha estat impossible fer la connexi�."
 
 #. #define MALFORMED_EXEC_REQUEST
-#: LYMessages.c:480
+#: LYMessages.c:504
 msgid "Executable link rejected due to malformed request."
 msgstr "Enlla� executable rebutjat a causa d'una sol�licitud mal formada."
 
 #. #define BADCHAR_IN_EXEC_LINK
-#: LYMessages.c:482
+#: LYMessages.c:506
 #, c-format
 msgid "Executable link rejected due to `%c' character."
 msgstr "Enlla� executable rebutjat a causa del car�cter \"%c\"."
 
 #. #define RELPATH_IN_EXEC_LINK
-#: LYMessages.c:484
+#: LYMessages.c:508
 msgid "Executable link rejected due to relative path string ('../')."
 msgstr "Enlla� executable rebutjat a causa d'un cam� relatiu (\"../\")."
 
 #. #define BADLOCPATH_IN_EXEC_LINK
-#: LYMessages.c:486
+#: LYMessages.c:510
 msgid "Executable link rejected due to location or path."
 msgstr "Enlla� executable rebutjat a causa de la localitzaci� o la ruta."
 
-#: LYMessages.c:487
+#: LYMessages.c:511
 msgid "Mail access is disabled!"
 msgstr "L'acc�s a correu no est� activat!"
 
 #. #define ACCESS_ONLY_LOCALHOST
-#: LYMessages.c:489
+#: LYMessages.c:513
 msgid "Only files and servers on the local host can be accessed."
 msgstr "Nom�s podeu accedir a fitxers i servidors en la m�quina local."
 
-#: LYMessages.c:490
+#: LYMessages.c:514
 msgid "Telnet access is disabled!"
 msgstr "L'acc�s a telnet no est� activat"
 
 #. #define TELNET_PORT_SPECS_DISABLED
-#: LYMessages.c:492
+#: LYMessages.c:516
 msgid "Telnet port specifications are disabled."
 msgstr "Les especificacions del port telnet estan desactivades."
 
-#: LYMessages.c:493
+#: LYMessages.c:517
 msgid "USENET news access is disabled!"
 msgstr "L'acc�s als f�rums de discusi� (USENET) no est� activat!"
 
-#: LYMessages.c:494
+#: LYMessages.c:518
 msgid "Rlogin access is disabled!"
 msgstr "L'acc�s a trav�s de rlogin est� desactivat!"
 
-#: LYMessages.c:495
+#: LYMessages.c:519
 msgid "Ftp access is disabled!"
 msgstr "L'acc�s a ftp no est� activat!"
 
-#: LYMessages.c:496
+#: LYMessages.c:520
 msgid "There are no references from this document."
 msgstr "No hi ha refer�ncies d'aquest document."
 
-#: LYMessages.c:497
+#: LYMessages.c:521
 msgid "There are only hidden links from this document."
 msgstr "En aquest document nom�s hi ha enlla�os ocults."
 
-#: LYMessages.c:499
+#: LYMessages.c:523
 msgid "Unable to open command file."
 msgstr "No ha estat possible obrir el fitxer d'ordres."
 
-#: LYMessages.c:501
+#: LYMessages.c:525
 msgid "News Post Cancelled!!!"
 msgstr "Missatge cancel�lat!!"
 
 #. #define SPAWNING_EDITOR_FOR_NEWS
-#: LYMessages.c:503
+#: LYMessages.c:527
 msgid "Spawning your selected editor to edit news message"
 msgstr "Creant el proc�s fill que obri l'editor per a editar el missatge"
 
-#: LYMessages.c:504
+#: LYMessages.c:528
 msgid "Post this message?"
 msgstr "Esteu segur que voleu enviar aquest missatge?"
 
-#: LYMessages.c:505
+#: LYMessages.c:529
 #, c-format
 msgid "Append '%s'?"
 msgstr "Afegir \"%s\"?"
 
-#: LYMessages.c:506
+#: LYMessages.c:530
 msgid "Posting to newsgroup(s)..."
 msgstr "Enviant al(s) f�rum(s)..."
 
-#: LYMessages.c:508
+#: LYMessages.c:532
 msgid "*** You have unread mail. ***"
 msgstr "*** Teniu correu pendent. ***"
 
-#: LYMessages.c:510
+#: LYMessages.c:534
 msgid "*** You have mail. ***"
 msgstr "*** Teniu correu. ***"
 
-#: LYMessages.c:512
+#: LYMessages.c:536
 msgid "*** You have new mail. ***"
 msgstr "*** Teniu correu nou. ***"
 
-#: LYMessages.c:513
+#: LYMessages.c:537
 msgid "File insert cancelled!!!"
 msgstr "Inserci� del fitxer cancel�lada!!"
 
-#: LYMessages.c:514
+#: LYMessages.c:538
 msgid "Not enough memory for file!"
 msgstr "No hi ha prou mem�ria per al fitxer!"
 
-#: LYMessages.c:515
+#: LYMessages.c:539
 msgid "Can't open file for reading."
 msgstr "No ha estat possible llegir l'arxiu."
 
-#: LYMessages.c:516
+#: LYMessages.c:540
 msgid "File does not exist."
 msgstr "L'arxiu no existeix."
 
-#: LYMessages.c:517
+#: LYMessages.c:541
 msgid "File does not exist - reenter or cancel:"
 msgstr "L'arxiu no existeix. Reescriviu-ne el nom o cancel�leu:"
 
-#: LYMessages.c:518
+#: LYMessages.c:542
 msgid "File is not readable."
 msgstr "L'arxiu no es pot llegir."
 
-#: LYMessages.c:519
+#: LYMessages.c:543
 msgid "File is not readable - reenter or cancel:"
 msgstr "L'arxiu no es pot llegir. Reescriviu-ne el nom o cancel�leu:"
 
-#: LYMessages.c:520
+#: LYMessages.c:544
 msgid "Nothing to insert - file is 0-length."
 msgstr "No hi ha res per a inserir: el fitxer t� longitud 0."
 
-#: LYMessages.c:521
+#: LYMessages.c:545
 msgid "Save request cancelled!!!"
 msgstr "(Gravar) Operaci� cancel�lada!!"
 
-#: LYMessages.c:522
+#: LYMessages.c:546
 msgid "Mail request cancelled!!!"
 msgstr "Sol�licitud de correu cancel�lada!!"
 
 #. #define CONFIRM_MAIL_SOURCE_PREPARSED
-#: LYMessages.c:524
+#: LYMessages.c:548
 msgid "Viewing preparsed source.  Are you sure you want to mail it?"
 msgstr "Font preanalitzada. Segur que voleu enviar-la?"
 
-#: LYMessages.c:525
+#: LYMessages.c:549
 msgid "Please wait..."
 msgstr "Per favor, espereu..."
 
-#: LYMessages.c:526
+#: LYMessages.c:550
 msgid "Mailing file.  Please wait..."
 msgstr "Enviant arxiu. Per favor, espereu..."
 
-#: LYMessages.c:527
+#: LYMessages.c:551
 msgid "ERROR - Unable to mail file"
 msgstr "ERROR: ha estat impossible enviar l'arxiu"
 
 #. #define CONFIRM_LONG_SCREEN_PRINT
-#: LYMessages.c:529
+#: LYMessages.c:553
 #, c-format
 msgid "File is %d screens long.  Are you sure you want to print?"
 msgstr "L'arxiu ocupa %d pantalles. Esteu segur que voleu imprimir-lo?"
 
-#: LYMessages.c:530
+#: LYMessages.c:554
 msgid "Print request cancelled!!!"
 msgstr "Impressi� cancel�lada!!"
 
-#: LYMessages.c:531
+#: LYMessages.c:555
 msgid "Press <return> to begin: "
 msgstr "Premeu <return> per comen�ar: "
 
-#: LYMessages.c:532
+#: LYMessages.c:556
 msgid "Press <return> to finish: "
 msgstr "Premeu <return> per finalitzar: "
 
 #. #define CONFIRM_LONG_PAGE_PRINT
-#: LYMessages.c:534
+#: LYMessages.c:558
 #, c-format
 msgid "File is %d pages long.  Are you sure you want to print?"
 msgstr "L'arxiu ocupa %d p�gines. Esteu segur que voleu imprimir-lo?"
 
 #. #define CHECK_PRINTER
-#: LYMessages.c:536
+#: LYMessages.c:560
 msgid "Be sure your printer is on-line.  Press <return> to start printing:"
 msgstr "Assegureu-vos que la impressora est� connectada. Premeu <intro>per comen�ar:"
 
-#: LYMessages.c:537
+#: LYMessages.c:561
 msgid "ERROR - Unable to allocate file space!!!"
 msgstr "ERROR - No s'ha pogut assignar espai per a fitxers!!!"
 
-#: LYMessages.c:538
+#: LYMessages.c:562
 msgid "Unable to open tempfile"
 msgstr "No ha estat possible obrir l'arxiu temporal"
 
-#: LYMessages.c:539
+#: LYMessages.c:563
 msgid "Unable to open print options file"
 msgstr "No ha estat possible obrir l'arxiu d'opcions d'impressi�"
 
-#: LYMessages.c:540
+#: LYMessages.c:564
 msgid "Printing file.  Please wait..."
 msgstr "Imprimint l'arxiu. Per favor, espereu..."
 
-#: LYMessages.c:541
+#: LYMessages.c:565
 msgid "Please enter a valid internet mail address: "
 msgstr "Per favor, introdu�u una adre�a de correu v�lida: "
 
-#: LYMessages.c:542
+#: LYMessages.c:566
 msgid "ERROR! - printer is misconfigured!"
 msgstr "ERROR: la impressora no est� ben configurada!"
 
-#: LYMessages.c:543
+#: LYMessages.c:567
 msgid "Image map from POST response not available!"
 msgstr "El mapa d'imatge de la resposta POST no est� disponible!"
 
-#: LYMessages.c:544
+#: LYMessages.c:568
 msgid "Misdirected client-side image MAP request!"
 msgstr "Demanda de MAPA d'imatge del costat de client mal dirigida"
 
-#: LYMessages.c:545
+#: LYMessages.c:569
 msgid "Client-side image MAP is not accessible!"
 msgstr "El MAPA d'imatge del costat del client no est� accessible!"
 
-#: LYMessages.c:546
+#: LYMessages.c:570
 msgid "No client-side image MAPs are available!"
 msgstr "No ha MAPES d'imatge del costat de client disponibles!"
 
-#: LYMessages.c:547
+#: LYMessages.c:571
 msgid "Client-side image MAP is not available!"
 msgstr "El MAPA d'imatge de costat de clients no est� disponible!"
 
 #. #define OPTION_SCREEN_NEEDS_24
-#: LYMessages.c:550
+#: LYMessages.c:574
 msgid "Screen height must be at least 24 lines for the Options menu!"
 msgstr "La pantalla ha de tenir si m�s no 24 l�nies per al men� d'opcions!"
 
 #. #define OPTION_SCREEN_NEEDS_23
-#: LYMessages.c:552
+#: LYMessages.c:576
 msgid "Screen height must be at least 23 lines for the Options menu!"
 msgstr "La pantalla ha de tenir si m�s no 23 l�nies per al men� d'opcions"
 
 #. #define OPTION_SCREEN_NEEDS_22
-#: LYMessages.c:554
+#: LYMessages.c:578
 msgid "Screen height must be at least 22 lines for the Options menu!"
 msgstr "La pantalla ha de tenir si m�s no 22 l�nies per al men� d'opcions"
 
-#: LYMessages.c:556
+#: LYMessages.c:580
 msgid "That key requires Advanced User mode."
 msgstr "Per a usar aquesta tecla cal activar el mode d'usuari avan�at"
 
-#: LYMessages.c:557
+#: LYMessages.c:581
 #, c-format
 msgid "Content-type: %s"
 msgstr "Tipus de contingut: %s"
 
-#: LYMessages.c:558
+#: LYMessages.c:582
 msgid "Command: "
 msgstr "Ordre: "
 
-#: LYMessages.c:559
+#: LYMessages.c:583
 msgid "Unknown or ambiguous command"
 msgstr "Ordre desconeguda o ambigua"
 
-#: LYMessages.c:560
+#: LYMessages.c:584
 msgid " Version "
 msgstr " Versi� "
 
-#: LYMessages.c:561
+#: LYMessages.c:585
 msgid " first"
 msgstr " primer"
 
-#: LYMessages.c:562
+#: LYMessages.c:586
 msgid ", guessing..."
 msgstr ", provant..."
 
-#: LYMessages.c:563
+#: LYMessages.c:587
 msgid "Permissions for "
 msgstr "Permisos per a "
 
-#: LYMessages.c:564
+#: LYMessages.c:588
 msgid "Select "
 msgstr "Seleccioneu"
 
-#: LYMessages.c:565
+#: LYMessages.c:589
 msgid "capital letter"
 msgstr "la lletra maj�scula"
 
-#: LYMessages.c:566
+#: LYMessages.c:590
 msgid " of option line,"
 msgstr "de la l�nia d'opcions"
 
-#: LYMessages.c:567
+#: LYMessages.c:591
 msgid " to save,"
 msgstr "per desar"
 
-#: LYMessages.c:568
+#: LYMessages.c:592
 msgid " to "
 msgstr "a"
 
-#: LYMessages.c:569
+#: LYMessages.c:593
 msgid " or "
 msgstr " o "
 
-#: LYMessages.c:570
+#: LYMessages.c:594
 msgid " index"
 msgstr " �ndex"
 
-#: LYMessages.c:571
+#: LYMessages.c:595
 msgid " to return to Lynx."
 msgstr " per a tornar a Lynx."
 
-#: LYMessages.c:572
+#: LYMessages.c:596
 msgid "Accept Changes"
 msgstr "Acceptar els canvis"
 
-#: LYMessages.c:573
+#: LYMessages.c:597
 msgid "Reset Changes"
 msgstr "Anul�lar els canvis"
 
-#: LYMessages.c:574
+#: LYMessages.c:598
 msgid "Left Arrow cancels changes"
 msgstr "'<-' cancel�la els canvis"
 
-#: LYMessages.c:575
+#: LYMessages.c:599
 msgid "Save options to disk"
 msgstr "Gravar les opcions al disc"
 
-#: LYMessages.c:576
+#: LYMessages.c:600
 msgid "Hit RETURN to accept entered data."
 msgstr "Premeu <return> per acceptar les dades introdu�des."
 
 #. #define ACCEPT_DATA_OR_DEFAULT
-#: LYMessages.c:578
+#: LYMessages.c:602
 msgid "Hit RETURN to accept entered data.  Delete data to invoke the default."
 msgstr "<intro> accepta les dades. Esborreu-les si voleu els valors preestablerts"
 
-#: LYMessages.c:579
+#: LYMessages.c:603
 msgid "Value accepted!"
 msgstr "Valor acceptat!"
 
 #. #define VALUE_ACCEPTED_WARNING_X
-#: LYMessages.c:581
+#: LYMessages.c:605
 msgid "Value accepted! -- WARNING: Lynx is configured for XWINDOWS!"
 msgstr "Valor acceptat!  ALERTA: Lynx est� configurat per a XWINDOWS!"
 
 #. #define VALUE_ACCEPTED_WARNING_NONX
-#: LYMessages.c:583
+#: LYMessages.c:607
 msgid "Value accepted! -- WARNING: Lynx is NOT configured for XWINDOWS!"
 msgstr "Valor acceptat!  ALERTA: Lynx no est� configurat per a XWINDOWS!"
 
-#: LYMessages.c:584
+#: LYMessages.c:608
 msgid "You are not allowed to change which editor to use!"
 msgstr "No teniu perm�s per a canviar l'editor!"
 
-#: LYMessages.c:585
+#: LYMessages.c:609
 msgid "Failed to set DISPLAY variable!"
 msgstr "Ha estat impossible especificar el nou valor de la variable DISPLAY!"
 
-#: LYMessages.c:586
+#: LYMessages.c:610
 msgid "Failed to clear DISPLAY variable!"
 msgstr "Ha estat impossible eliminar el valor de la variable DISPLAY!"
 
 #. #define BOOKMARK_CHANGE_DISALLOWED
-#: LYMessages.c:588
+#: LYMessages.c:612
 msgid "You are not allowed to change the bookmark file!"
 msgstr "No teniu perm�s per a canviar l'arxiu d'adreces!"
 
-#: LYMessages.c:589
+#: LYMessages.c:613
 msgid "Terminal does not support color"
 msgstr "El terminal no pot mostrar colors"
 
-#: LYMessages.c:590
+#: LYMessages.c:614
 #, c-format
 msgid "Your '%s' terminal does not support color."
 msgstr "El terminal '%s' no pot mostrar colors."
 
-#: LYMessages.c:591
+#: LYMessages.c:615
 msgid "Access to dot files is disabled!"
 msgstr "L'acc�s als arxius que comencen amb un punt no est� activat!"
 
 #. #define UA_NO_LYNX_WARNING
-#: LYMessages.c:593
+#: LYMessages.c:617
 msgid "User-Agent string does not contain \"Lynx\" or \"L_y_n_x\""
 msgstr "La cadena que identifica el navegador no cont� ni \"Lynx\" ni \"L_y_n_x\""
 
 #. #define UA_PLEASE_USE_LYNX
-#: LYMessages.c:595
+#: LYMessages.c:619
 msgid "Use \"L_y_n_x\" or \"Lynx\" in User-Agent, or it looks like intentional deception!"
 msgstr "Useu \"L_y_n_x\" o \"Lynx\" en l'identificador o semblareu desertors!"
 
 #. #define UA_CHANGE_DISABLED
-#: LYMessages.c:597
+#: LYMessages.c:621
 msgid "Changing of the User-Agent string is disabled!"
 msgstr "El canvi de la cadena identificadora del navegador est� desactivat!"
 
 #. #define CHANGE_OF_SETTING_DISALLOWED
-#: LYMessages.c:599
+#: LYMessages.c:623
 msgid "You are not allowed to change this setting."
 msgstr "No teniu perm�s per a canviar aquesta opci�."
 
-#: LYMessages.c:600
+#: LYMessages.c:624
 msgid "Saving Options..."
 msgstr "Gravant les opcions..."
 
-#: LYMessages.c:601
+#: LYMessages.c:625
 msgid "Options saved!"
 msgstr "Opcions gravades!"
 
-#: LYMessages.c:602
+#: LYMessages.c:626
 msgid "Unable to save Options!"
 msgstr "No ha estat possible gravar les opcions!"
 
-#: LYMessages.c:603
+#: LYMessages.c:627
 msgid " 'r' to return to Lynx "
 msgstr " 'r' per tornar a Lynx "
 
-#: LYMessages.c:604
+#: LYMessages.c:628
 msgid " '>' to save, or 'r' to return to Lynx "
 msgstr " '>' per gravar, 'r' per tornar a Lynx "
 
 #. #define ANY_KEY_CHANGE_RET_ACCEPT
-#: LYMessages.c:606
+#: LYMessages.c:630
 msgid "Hit any key to change value; RETURN to accept."
 msgstr "Premeu qualsevol tecla per canviar el valor; <intro> per acceptar."
 
-#: LYMessages.c:607
+#: LYMessages.c:631
 msgid "Error uncompressing temporary file!"
 msgstr "Error descomprimint l'arxiu temporal!"
 
-#: LYMessages.c:608
+#: LYMessages.c:632
 msgid "Unsupported URL scheme!"
 msgstr "URL no suportada!"
 
-#: LYMessages.c:609
+#: LYMessages.c:633
 msgid "Unsupported data: URL!  Use SHOWINFO, for now."
 msgstr "Dades no suportades: URL! Useu SHOWINFO, per ara."
 
-#: LYMessages.c:610
+#: LYMessages.c:634
 msgid "Redirection limit of 10 URL's reached."
 msgstr "S'ha assolit el l�mit de redireccions: 10 URLs."
 
-#: LYMessages.c:611
+#: LYMessages.c:635
 msgid "Illegal redirection URL received from server!"
 msgstr "S'ha rebut del servidor una URL de redirecci� il�legal!"
 
 #. #define SERVER_ASKED_FOR_REDIRECTION
-#: LYMessages.c:613
+#: LYMessages.c:637
 #, c-format
 msgid "Server asked for %d redirection of POST content to"
 msgstr "El servidor ha demanat una redirecci� %d per a contingut POST a"
 
-#: LYMessages.c:616
+#: LYMessages.c:640
 msgid "P)roceed, use G)ET or C)ancel "
 msgstr "P)rocedir, usar G)ET o C)ancel�lar "
 
-#: LYMessages.c:617
+#: LYMessages.c:641
 msgid "P)roceed, or C)ancel "
 msgstr "P)rocedir o C)ancel�lar "
 
 #. #define ADVANCED_POST_GET_REDIRECT
-#: LYMessages.c:619
+#: LYMessages.c:643
 msgid "Redirection of POST content.  P)roceed, see U)RL, use G)ET or C)ancel"
 msgstr "Redirecci� de contingut POST. P)rocedeix, vegeu U)RL, usa G)ET o C)ancel�la"
 
 #. #define ADVANCED_POST_REDIRECT
-#: LYMessages.c:621
+#: LYMessages.c:645
 msgid "Redirection of POST content.  P)roceed, see U)RL, or C)ancel"
 msgstr "Redirecci� de contingut POST. P)rocedeix, vegeu U)RL, o C)ancel�la<"
 
 #. #define CONFIRM_POST_RESUBMISSION
-#: LYMessages.c:623
+#: LYMessages.c:647
 msgid "Document from Form with POST content.  Resubmit?"
 msgstr "El document procedeix d'un formulari amb contingut POST. Reenviar?"
 
 #. #define CONFIRM_POST_RESUBMISSION_TO
-#: LYMessages.c:625
+#: LYMessages.c:649
 #, c-format
 msgid "Resubmit POST content to %s ?"
 msgstr "Reenviar el contingut del POST a %s?"
 
 #. #define CONFIRM_POST_LIST_RELOAD
-#: LYMessages.c:627
+#: LYMessages.c:651
 #, c-format
 msgid "List from document with POST data.  Reload %s ?"
 msgstr "La llista prov� d'un document amb dades POST. Voleu recarregar %s?"
 
 #. #define CONFIRM_POST_DOC_HEAD
-#: LYMessages.c:629
+#: LYMessages.c:653
 msgid "Document from POST action, HEAD may not be understood.  Proceed?"
 msgstr "Document de l'acci� POST, potser HEAD no s'ent�n. Voleu procedir?"
 
 #. #define CONFIRM_POST_LINK_HEAD
-#: LYMessages.c:631
+#: LYMessages.c:655
 msgid "Form submit action is POST, HEAD may not be understood.  Proceed?"
 msgstr "L'acci� de lliurament del formulari �s POST, potser HEAD no s'ent�n. Voleu procedir?"
 
-#: LYMessages.c:632
+#: LYMessages.c:656
 msgid "Proceed without a username and password?"
 msgstr "Continuar sense nom d'usuari i sense contrasenya?"
 
-#: LYMessages.c:633
+#: LYMessages.c:657
 #, c-format
 msgid "Proceed (%s)?"
 msgstr "Continuar (%s)?"
 
-#: LYMessages.c:634
+#: LYMessages.c:658
 msgid "Cannot POST to this host."
 msgstr "No es pot fer POST a aquest amfriti�."
 
-#: LYMessages.c:635
+#: LYMessages.c:659
 msgid "POST not supported for this URL - ignoring POST data!"
 msgstr "POST no est� suportat per a aquesta URL - s'ignoraran les dades POST!"
 
-#: LYMessages.c:636
+#: LYMessages.c:660
 msgid "Discarding POST data..."
 msgstr "Descartant les dades del POST..."
 
-#: LYMessages.c:637
+#: LYMessages.c:661
 msgid "Document will not be reloaded!"
 msgstr "No es recarregar� el document!"
 
-#: LYMessages.c:638
+#: LYMessages.c:662
 msgid "Location: "
 msgstr "Ubicaci�: "
 
-#: LYMessages.c:639
+#: LYMessages.c:663
 #, c-format
 msgid "'%s' not found!"
 msgstr "no s'ha trobat \"%s\""
 
-#: LYMessages.c:640
+#: LYMessages.c:664
 msgid "Default Bookmark File"
 msgstr "Fitxer de favorits predeterminat"
 
-#: LYMessages.c:641
+#: LYMessages.c:665
 msgid "Screen too small! (8x35 min)"
 msgstr "Pantalla massa xicoteta! (8x35 min)"
 
-#: LYMessages.c:642
+#: LYMessages.c:666
 msgid "Select destination or ^G to Cancel: "
 msgstr "Trieu destinaci� o ^G per cancel�lar: "
 
 #. #define MULTIBOOKMARKS_SELECT
-#: LYMessages.c:644
+#: LYMessages.c:668
 msgid "Select subbookmark, '=' for menu, or ^G to cancel: "
 msgstr "Trieu fitxer de favorits, \"=\" mostra el men� i ^G cancel�la: "
 
 #. #define MULTIBOOKMARKS_SELF
-#: LYMessages.c:646
+#: LYMessages.c:670
 msgid "Reproduce L)ink in this bookmark file or C)ancel? (l,c): "
 msgstr "Reproduir l'en(L)la� en aquest fitxer de favorits o C)ancel�lar? (l,c):"
 
-#: LYMessages.c:647
+#: LYMessages.c:671
 msgid "Multiple bookmark support is not available."
 msgstr "El suport per a m�s d'un fitxer d'adreces no est� activat."
 
-#: LYMessages.c:648
+#: LYMessages.c:672
 #, c-format
 msgid " Select Bookmark (screen %d of %d)"
 msgstr " Trieu el fitxer de favorits (pantalla %d de %d)"
 
-#: LYMessages.c:649
+#: LYMessages.c:673
 msgid "       Select Bookmark"
 msgstr "       Trieu fitxer de favorits"
 
 #. #define MULTIBOOKMARKS_EHEAD_MASK
-#: LYMessages.c:651
+#: LYMessages.c:675
 #, c-format
 msgid "Editing Bookmark DESCRIPTION and FILEPATH (%d of 2)"
 msgstr "Edici� de la descripci� i del cam� del fitxer d'adreces interessants (%d de 2)"
 
 #. #define MULTIBOOKMARKS_EHEAD
-#: LYMessages.c:653
+#: LYMessages.c:677
 msgid "         Editing Bookmark DESCRIPTION and FILEPATH"
 msgstr "Edici� de la descripci� i el cam� del fitxer d'adreces d'inter�s"
 
-#: LYMessages.c:654
+#: LYMessages.c:678
 msgid "Letter: "
 msgstr "Lletra: "
 
 #. #define USE_PATH_OFF_HOME
-#: LYMessages.c:657
+#: LYMessages.c:681
 msgid "Use a filepath off your login directory in SHELL syntax!"
 msgstr "Useu un cam� per al fitxers fora del vostre directori d'inici a la sintaxi de l'int�rpret d'ordres "
 
-#: LYMessages.c:659
+#: LYMessages.c:683
 msgid "Use a filepath off your home directory!"
 msgstr "Useu un cam� que no pertanga al vostre directori!"
 
 #. #define MAXLINKS_REACHED
-#: LYMessages.c:662
+#: LYMessages.c:686
 msgid "Maximum links per page exceeded!  Use half-page or two-line scrolling."
 msgstr "Superat el nre. d'enlla�os/p�g.! Useu mitja p�g. o despla�ament de dues l�nies."
 
-#: LYMessages.c:663
+#: LYMessages.c:687
 msgid "No previously visited links available!"
 msgstr "No hi ha disponible cap enlla� anterior!"
 
-#: LYMessages.c:664
+#: LYMessages.c:688
 msgid "Memory exhausted!  Program aborted!"
 msgstr "Mem�ria exhaurida! Programa vortat!"
 
-#: LYMessages.c:665
+#: LYMessages.c:689
 msgid "Memory exhausted!  Aborting..."
 msgstr "Mem�ria exhaurida! Avortant..."
 
-#: LYMessages.c:666
+#: LYMessages.c:690
 msgid "Not enough memory!"
 msgstr "No hi ha prou mem�ria!"
 
-#: LYMessages.c:667
+#: LYMessages.c:691
 msgid "Directory/File Manager not available"
 msgstr "No hi ha cap administrador de fitxers disponible"
 
-#: LYMessages.c:668
+#: LYMessages.c:692
 msgid "HREF in BASE tag is not an absolute URL."
 msgstr "La refer�ncia (HREF) en l'etiqueta BASE no �s una URL absoluta."
 
-#: LYMessages.c:669
+#: LYMessages.c:693
 msgid "Location URL is not absolute."
 msgstr "La URL no �s absoluta."
 
-#: LYMessages.c:670
+#: LYMessages.c:694
 msgid "Refresh URL is not absolute."
 msgstr "La URL de refresc no �s absoluta."
 
 #. #define SENDING_MESSAGE_WITH_BODY_TO
-#: LYMessages.c:672
+#: LYMessages.c:696
 msgid ""
 "You are sending a message with body to:\n"
 "  "
@@ -2052,7 +2119,7 @@ msgstr ""
 "Esteu enviant un missatge no buit a:\n"
 "  "
 
-#: LYMessages.c:673
+#: LYMessages.c:697
 msgid ""
 "You are sending a comment to:\n"
 "  "
@@ -2060,7 +2127,7 @@ msgstr ""
 "Esteu enviant un comentari a:\n"
 "  "
 
-#: LYMessages.c:674
+#: LYMessages.c:698
 msgid ""
 "\n"
 " With copy to:\n"
@@ -2070,7 +2137,7 @@ msgstr ""
 " Amb c�pia a:\n"
 "  "
 
-#: LYMessages.c:675
+#: LYMessages.c:699
 msgid ""
 "\n"
 " With copies to:\n"
@@ -2081,7 +2148,7 @@ msgstr ""
 "  "
 
 #. #define CTRL_G_TO_CANCEL_SEND
-#: LYMessages.c:677
+#: LYMessages.c:701
 msgid ""
 "\n"
 "\n"
@@ -2092,7 +2159,7 @@ msgstr ""
 "Useu Ctrl-G per a cancel�lar si no voleu enviar el missatge\n"
 
 #. #define ENTER_NAME_OR_BLANK
-#: LYMessages.c:679
+#: LYMessages.c:703
 msgid ""
 "\n"
 " Please enter your name, or leave it blank to remain anonymous\n"
@@ -2101,7 +2168,7 @@ msgstr ""
 " Escriviu el vostre nom o deixeu l'espai en blanc si voleu que siga an�nim\n"
 
 #. #define ENTER_MAIL_ADDRESS_OR_OTHER
-#: LYMessages.c:681
+#: LYMessages.c:705
 msgid ""
 "\n"
 " Please enter a mail address or some other\n"
@@ -2110,11 +2177,11 @@ msgstr ""
 " Introdu�u una adre�a de correu o alguna altra\n"
 
 #. #define MEANS_TO_CONTACT_FOR_RESPONSE
-#: LYMessages.c:683
+#: LYMessages.c:707
 msgid " means to contact you, if you desire a response.\n"
 msgstr " forma de contactar, si voleu resposta.\n"
 
-#: LYMessages.c:684
+#: LYMessages.c:708
 msgid ""
 "\n"
 " Please enter a subject line.\n"
@@ -2123,7 +2190,7 @@ msgstr ""
 " Introdu�u l'assumpte.\n"
 
 #. #define ENTER_ADDRESS_FOR_CC
-#: LYMessages.c:686
+#: LYMessages.c:710
 msgid ""
 "\n"
 " Enter a mail address for a CC of your message.\n"
@@ -2131,11 +2198,11 @@ msgstr ""
 "\n"
 " Escriviu l'adre�a a qu� voleu enviar una c�pia del missatge.\n"
 
-#: LYMessages.c:687
+#: LYMessages.c:711
 msgid " (Leave blank if you don't want a copy.)\n"
 msgstr " (Deixeu la l�nia en blanc si no en voleu enviar c�pia.)\n"
 
-#: LYMessages.c:688
+#: LYMessages.c:712
 msgid ""
 "\n"
 " Please review the message body:\n"
@@ -2145,7 +2212,7 @@ msgstr ""
 " Per favor, reviseu el cos del missatge:\n"
 "\n"
 
-#: LYMessages.c:689
+#: LYMessages.c:713
 msgid ""
 "\n"
 "Press RETURN to continue: "
@@ -2153,7 +2220,7 @@ msgstr ""
 "\n"
 "Premeu <intro> per continuar: "
 
-#: LYMessages.c:690
+#: LYMessages.c:714
 msgid ""
 "\n"
 "Press RETURN to clean up: "
@@ -2161,11 +2228,11 @@ msgstr ""
 "\n"
 "Premeu <intro> per esborrar: "
 
-#: LYMessages.c:691
+#: LYMessages.c:715
 msgid " Use Control-U to erase the default.\n"
 msgstr " Premeu Ctrl-U per esborrar el valor suggerit.\n"
 
-#: LYMessages.c:692
+#: LYMessages.c:716
 msgid ""
 "\n"
 " Please enter your message below."
@@ -2174,7 +2241,7 @@ msgstr ""
 " Escriviu el missatge a partir d'ac�."
 
 #. #define ENTER_PERIOD_WHEN_DONE_A
-#: LYMessages.c:694 src/LYNews.c:360
+#: LYMessages.c:718 src/LYNews.c:360
 msgid ""
 "\n"
 " When you are done, press enter and put a single period (.)"
@@ -2183,7 +2250,7 @@ msgstr ""
 " Quan acabeu, premeu <intro> i escriviu nom�s un punt (.)"
 
 #. #define ENTER_PERIOD_WHEN_DONE_B
-#: LYMessages.c:696 src/LYNews.c:361
+#: LYMessages.c:720 src/LYNews.c:361
 msgid ""
 "\n"
 " on a line and press enter again."
@@ -2193,272 +2260,272 @@ msgstr ""
 
 #. Cookies messages
 #. #define ADVANCED_COOKIE_CONFIRMATION
-#: LYMessages.c:700
+#: LYMessages.c:724
 #, c-format
 msgid "%s cookie: %.*s=%.*s  Allow? (Y/N/Always/neVer)"
 msgstr "Cookie de %s: %.*s=%.*s Admetre-la? (S/N/semPre/Mai)"
 
 #. #define INVALID_COOKIE_DOMAIN_CONFIRMATION
-#: LYMessages.c:702
+#: LYMessages.c:726
 #, c-format
 msgid "Accept invalid cookie domain=%s for '%s'?"
 msgstr "Voleu acceptar la cookie amb el domini inv�lid %s en comptes de '%s'?"
 
 #. #define INVALID_COOKIE_PATH_CONFIRMATION
-#: LYMessages.c:704
+#: LYMessages.c:728
 #, c-format
 msgid "Accept invalid cookie path=%s as a prefix of '%s'?"
 msgstr "Accepteu la cookie amb el cam� (no v�lid) %s com a prefix de '%s'?"
 
-#: LYMessages.c:705
+#: LYMessages.c:729
 msgid "Allowing this cookie."
 msgstr "Tolerant aquesta cookie."
 
-#: LYMessages.c:706
+#: LYMessages.c:730
 msgid "Rejecting this cookie."
 msgstr "Rebutjant aquesta cookie."
 
-#: LYMessages.c:707
+#: LYMessages.c:731
 msgid "The Cookie Jar is empty."
 msgstr "El recipient de les cookies �s buit."
 
-#: LYMessages.c:708
+#: LYMessages.c:732
 msgid "The Cache Jar is empty."
 msgstr "El recipient de mem�ria cau �s buit."
 
 #. #define ACTIVATE_TO_GOBBLE
-#: LYMessages.c:710
+#: LYMessages.c:734
 msgid "Activate links to gobble up cookies or entire domains,"
 msgstr "Seguiu els enlla�os per eliminar les cookies o els dominis,"
 
-#: LYMessages.c:711
+#: LYMessages.c:735
 msgid "or to change a domain's 'allow' setting."
 msgstr "o per a canviar l\"�ndex de toler�ncia\"."
 
-#: LYMessages.c:712
+#: LYMessages.c:736
 msgid "(Cookies never allowed.)"
 msgstr "(Cookies sempre prohibides)"
 
-#: LYMessages.c:713
+#: LYMessages.c:737
 msgid "(Cookies always allowed.)"
 msgstr "(Cookies sempre tolerades)"
 
-#: LYMessages.c:714
+#: LYMessages.c:738
 msgid "(Cookies allowed via prompt.)"
 msgstr "(Es pregunta abans d'acceptar cookies)"
 
-#: LYMessages.c:715
+#: LYMessages.c:739
 msgid "(Persistent Cookies.)"
 msgstr "(Cookies persistents)"
 
-#: LYMessages.c:716
+#: LYMessages.c:740
 msgid "(No title.)"
 msgstr "(Sense t�tol)"
 
-#: LYMessages.c:717
+#: LYMessages.c:741
 msgid "(No name.)"
 msgstr "(Sense nom)"
 
-#: LYMessages.c:718
+#: LYMessages.c:742
 msgid "(No value.)"
 msgstr "(Sense valor)"
 
-#: LYMessages.c:719 src/LYOptions.c:2424
+#: LYMessages.c:743 src/LYOptions.c:2424
 msgid "None"
 msgstr "Cap"
 
-#: LYMessages.c:720
+#: LYMessages.c:744
 msgid "(End of session.)"
 msgstr "(Fi de la sessi�)"
 
-#: LYMessages.c:721
+#: LYMessages.c:745
 msgid "Delete this cookie?"
 msgstr "Esborrar aquesta cookie?"
 
-#: LYMessages.c:722
+#: LYMessages.c:746
 msgid "The cookie has been eaten!"
 msgstr "La cookie ha estat esborrada!"
 
-#: LYMessages.c:723
+#: LYMessages.c:747
 msgid "Delete this empty domain?"
 msgstr "Esborrar aquest domini buit?"
 
-#: LYMessages.c:724
+#: LYMessages.c:748
 msgid "The domain has been eaten!"
 msgstr "El domini ha estat esborrat!"
 
 #. #define DELETE_COOKIES_SET_ALLOW_OR_CANCEL
-#: LYMessages.c:726
+#: LYMessages.c:750
 msgid "D)elete domain's cookies, set allow A)lways/P)rompt/neV)er, or C)ancel? "
 msgstr "D esborrar el domini, admetre  A sempre/P)reguntar/V mai, o C)ancel�lar? "
 
 #. #define DELETE_DOMAIN_SET_ALLOW_OR_CANCEL
-#: LYMessages.c:728
+#: LYMessages.c:752
 msgid "D)elete domain, set allow A)lways/P)rompt/neV)er, or C)ancel? "
 msgstr "D esborrar domini, admetre  A sempre/P)reguntar/V mai, o C)ancel�lar?"
 
-#: LYMessages.c:729
+#: LYMessages.c:753
 msgid "All cookies in the domain have been eaten!"
 msgstr "Totes les cookies del domini han estat esborrades!"
 
-#: LYMessages.c:730
+#: LYMessages.c:754
 #, c-format
 msgid "'A'lways allowing from domain '%s'."
 msgstr "Toler(A)r-les sempre que provinguen del domini '%s'."
 
-#: LYMessages.c:731
+#: LYMessages.c:755
 #, c-format
 msgid "ne'V'er allowing from domain '%s'."
 msgstr "Rebutjar-les sempre que provinguen del domini '%s'."
 
-#: LYMessages.c:732
+#: LYMessages.c:756
 #, c-format
 msgid "'P'rompting to allow from domain '%s'."
 msgstr "(P)reguntar sempre que provinguen del domini '%s'."
 
-#: LYMessages.c:733
+#: LYMessages.c:757
 msgid "Delete all cookies in this domain?"
 msgstr "Esborrar totes les cookies del domini?"
 
-#: LYMessages.c:734
+#: LYMessages.c:758
 msgid "All of the cookies in the jar have been eaten!"
 msgstr "Totes les cookies han estat esborrades!"
 
-#: LYMessages.c:736
+#: LYMessages.c:760
 msgid "Port 19 not permitted in URLs."
 msgstr "El port 19 no est� perm�s en les URLs."
 
-#: LYMessages.c:737
+#: LYMessages.c:761
 msgid "Port 25 not permitted in URLs."
 msgstr "El port 25 no est� perm�s en les URLs."
 
-#: LYMessages.c:738
+#: LYMessages.c:762
 #, c-format
 msgid "Port %lu not permitted in URLs."
 msgstr "El port %lu no est� perm�s en les URLs."
 
-#: LYMessages.c:739
+#: LYMessages.c:763
 msgid "URL has a bad port field."
 msgstr "L'URL t� un camp incorrecte de port."
 
-#: LYMessages.c:740
+#: LYMessages.c:764
 msgid "Maximum nesting of HTML elements exceeded."
 msgstr "S'ha excedit el m�xim nombre d'anidaments perm�s per a l'HTML."
 
-#: LYMessages.c:741
+#: LYMessages.c:765
 msgid "Bad partial reference!  Stripping lead dots."
 msgstr "Refer�ncia parcial incorrecta! S'esborraran els punts inicials."
 
-#: LYMessages.c:742
+#: LYMessages.c:766
 msgid "Trace Log open failed.  Trace off!"
 msgstr "No s'ha pogut obrir el fitxer de rastreig. Rastreig desactivat!"
 
-#: LYMessages.c:743
+#: LYMessages.c:767
 msgid "Lynx Trace Log"
 msgstr "Rastreig (Lynx Trace Log)"
 
-#: LYMessages.c:744
+#: LYMessages.c:768
 msgid "No trace log has been started for this session."
 msgstr "No s'ha iniciat el rastreig en aquesta sessi�."
 
 #. #define MAX_TEMPCOUNT_REACHED
-#: LYMessages.c:746
+#: LYMessages.c:770
 msgid "The maximum temporary file count has been reached!"
 msgstr "S'ha assolit el nombre m�xim de fitxers temporals!"
 
 #. #define FORM_VALUE_TOO_LONG
-#: LYMessages.c:748
+#: LYMessages.c:772
 msgid "Form field value exceeds buffer length!  Trim the tail."
 msgstr "El valor del camp excedeix la longitud de la mem�ria interm�dia! Es tallar�."
 
 #. #define FORM_TAIL_COMBINED_WITH_HEAD
-#: LYMessages.c:750
+#: LYMessages.c:774
 msgid "Modified tail combined with head of form field value."
 msgstr "Es combina la cua modificada amb la cap�alera del valor del camp del formulari."
 
 #. HTFile.c
-#: LYMessages.c:753
+#: LYMessages.c:777
 msgid "Directory"
 msgstr "Directori"
 
-#: LYMessages.c:754
+#: LYMessages.c:778
 msgid "Directory browsing is not allowed."
 msgstr "La navegaci� pel directori est� prohibida."
 
-#: LYMessages.c:755
+#: LYMessages.c:779
 msgid "Selective access is not enabled for this directory"
 msgstr "No est� habilitat l'acc�s selectiu a aquest directori"
 
-#: LYMessages.c:756
+#: LYMessages.c:780
 msgid "Multiformat: directory scan failed."
 msgstr "Format m�ltiple: l'escaneig del directori ha fallat."
 
-#: LYMessages.c:757
+#: LYMessages.c:781
 msgid "This directory is not readable."
 msgstr "No es pot llegir el directori."
 
-#: LYMessages.c:758
+#: LYMessages.c:782
 msgid "Can't access requested file."
 msgstr "No es pot accedir al fitxer sol�licitat."
 
-#: LYMessages.c:759
+#: LYMessages.c:783
 msgid "Could not find suitable representation for transmission."
 msgstr "No s'ha pogut trobar una representaci� adequada per a la transmissi�."
 
-#: LYMessages.c:760
+#: LYMessages.c:784
 msgid "Could not open file for decompression!"
 msgstr "No s'ha pogut obrir el fitxer per a descomprimir-lo!"
 
-#: LYMessages.c:761
+#: LYMessages.c:785
 msgid "Files:"
 msgstr "Arxius:"
 
-#: LYMessages.c:762
+#: LYMessages.c:786
 msgid "Subdirectories:"
 msgstr "Subdirectoris:"
 
-#: LYMessages.c:763
+#: LYMessages.c:787
 msgid " directory"
 msgstr " directori"
 
-#: LYMessages.c:764
+#: LYMessages.c:788
 msgid "Up to "
 msgstr "De "
 
-#: LYMessages.c:765
+#: LYMessages.c:789
 msgid "Current directory is "
 msgstr "El directori actual �s "
 
 #. HTFTP.c
-#: LYMessages.c:768
+#: LYMessages.c:792
 msgid "Symbolic Link"
 msgstr "Enlla� simb�lic"
 
 #. HTGopher.c
-#: LYMessages.c:771
+#: LYMessages.c:795
 msgid "No response from server!"
 msgstr "El servidor no respon!"
 
-#: LYMessages.c:772
+#: LYMessages.c:796
 msgid "CSO index"
 msgstr "�ndex CSO"
 
-#: LYMessages.c:773
+#: LYMessages.c:797
 msgid ""
 "\n"
 "This is a searchable index of a CSO database.\n"
 msgstr "\n"
 
-#: LYMessages.c:774
+#: LYMessages.c:798
 msgid "CSO Search Results"
 msgstr "Resultats de la recerca CSO"
 
-#: LYMessages.c:775
+#: LYMessages.c:799
 #, c-format
 msgid "Seek fail on %s\n"
 msgstr "Ha fallat la cerca sobre %s\n"
 
-#: LYMessages.c:776
+#: LYMessages.c:800
 msgid ""
 "\n"
 "Press the 's' key and enter search keywords.\n"
@@ -2466,41 +2533,41 @@ msgstr ""
 "\n"
 "Premeu 's' i introdu�u els mots que voleu cercar.\n"
 
-#: LYMessages.c:777
+#: LYMessages.c:801
 msgid ""
 "\n"
 "This is a searchable Gopher index.\n"
 msgstr "\n"
 
-#: LYMessages.c:778
+#: LYMessages.c:802
 msgid "Gopher index"
 msgstr "�"
 
-#: LYMessages.c:779
+#: LYMessages.c:803
 msgid "Gopher Menu"
 msgstr "Men� gopher"
 
-#: LYMessages.c:780
+#: LYMessages.c:804
 msgid " Search Results"
 msgstr " Resultats de la recerca"
 
-#: LYMessages.c:781
+#: LYMessages.c:805
 msgid "Sending CSO/PH request."
 msgstr "S'est� enviant una sol�licitud CSO/PH."
 
-#: LYMessages.c:782
+#: LYMessages.c:806
 msgid "Sending Gopher request."
 msgstr "S'est� enviant la sol�licitud gopher"
 
-#: LYMessages.c:783
+#: LYMessages.c:807
 msgid "CSO/PH request sent; waiting for response."
 msgstr "Sol�licitud COS/PH enviada; s'est� esperant resposta."
 
-#: LYMessages.c:784
+#: LYMessages.c:808
 msgid "Gopher request sent; waiting for response."
 msgstr "S'ha enviat la sol�licitud gopher; s'est� esperant resposta."
 
-#: LYMessages.c:785
+#: LYMessages.c:809
 msgid ""
 "\n"
 "Please enter search keywords.\n"
@@ -2508,7 +2575,7 @@ msgstr ""
 "\n"
 "Per favor, introdu�u els mots que voleu cercar.\n"
 
-#: LYMessages.c:786
+#: LYMessages.c:810
 msgid ""
 "\n"
 "The keywords that you enter will allow you to search on a"
@@ -2516,205 +2583,205 @@ msgstr ""
 "\n"
 "Els mots que heu introdu�t us permetran cercar en un"
 
-#: LYMessages.c:787
+#: LYMessages.c:811
 msgid " person's name in the database.\n"
 msgstr " nom de persona en una base de dades.\n"
 
 #. HTNews.c
-#: LYMessages.c:790
+#: LYMessages.c:814
 msgid "Connection closed ???"
 msgstr "Connexi� tancada ??"
 
-#: LYMessages.c:791
+#: LYMessages.c:815
 msgid "Cannot open temporary file for news POST."
 msgstr "No ha estat possible obrir el fitxer temporal per enviar el missatge."
 
-#: LYMessages.c:792
+#: LYMessages.c:816
 msgid "This client does not contain support for posting to news with SSL."
 msgstr "Aquest client no pot enviar missatges als f�rums amb SSL."
 
 #. HTStyle.c
-#: LYMessages.c:795
+#: LYMessages.c:819
 #, c-format
 msgid "Style %d `%s' SGML:%s.  Font %s %.1f point.\n"
 msgstr "Estil %d `%s' SGML:%s.  Font %s %.1f punt.\n"
 
-#: LYMessages.c:797
+#: LYMessages.c:821
 #, c-format
 msgid "\tAlign=%d, %d tabs. (%.0f before, %.0f after)\n"
 msgstr "\tAlinea=%d, %d tabulacions. (%.0f abans, %.0f despr�s)\n"
 
-#: LYMessages.c:798
+#: LYMessages.c:822
 #, c-format
 msgid "\t\tTab kind=%d at %.0f\n"
 msgstr "\t\tTipus de tabulaci�=%d a %.0f\n"
 
 #. HTTP.c
-#: LYMessages.c:801
+#: LYMessages.c:825
 msgid "Can't proceed without a username and password."
 msgstr "No es pot continuar sense un nom d'usuari i una contrasenya."
 
-#: LYMessages.c:802
+#: LYMessages.c:826
 msgid "Can't retry with authorization!  Contact the server's WebMaster."
 msgstr "No es pot reintentar sense autoritzaci�! Poseu-vos en contacte amb el webmestre."
 
-#: LYMessages.c:803
+#: LYMessages.c:827
 msgid "Can't retry with proxy authorization!  Contact the server's WebMaster."
 msgstr "No es pot reintentar sense autoritzaci� del proxy! Poseu-vos en contacte amb el webmestre."
 
-#: LYMessages.c:804
+#: LYMessages.c:828
 msgid "Retrying with proxy authorization information."
 msgstr "Reintent amb la informaci� de autoritzaci� del servidor intermediari (proxy)."
 
-#: LYMessages.c:805
+#: LYMessages.c:829
 #, c-format
 msgid "SSL error:%s-Continue?"
 msgstr "Error SSL:%s-Voleu continuar?"
 
 #. HTWAIS.c
-#: LYMessages.c:808
+#: LYMessages.c:832
 msgid "HTWAIS: Return message too large."
 msgstr "HTWAIS: El missatge de retorn �s massa llarg."
 
-#: LYMessages.c:809
+#: LYMessages.c:833
 msgid "Enter WAIS query: "
 msgstr "Introdu�u la consulta de tipus WAIS:"
 
 #. Miscellaneous status
-#: LYMessages.c:812
+#: LYMessages.c:836
 msgid "Retrying as HTTP0 request."
 msgstr "Reintentant com a sol�licitud HTTP0."
 
-#: LYMessages.c:813
+#: LYMessages.c:837
 #, c-format
 msgid "Transferred %d bytes"
 msgstr "%d bytes transferits"
 
-#: LYMessages.c:814
+#: LYMessages.c:838
 msgid "Data transfer complete"
 msgstr "Transfer�ncia completa"
 
-#: LYMessages.c:815
+#: LYMessages.c:839
 #, c-format
 msgid "Error processing line %d of %s\n"
 msgstr "Error mentre es processava la l�nia %d de %s\n"
 
 #. Lynx internal page titles
-#: LYMessages.c:818
+#: LYMessages.c:842
 msgid "Address List Page"
 msgstr "P�gina d'adreces"
 
-#: LYMessages.c:819
+#: LYMessages.c:843
 msgid "Bookmark file"
 msgstr "Agenda d'adreces d'inter�s"
 
-#: LYMessages.c:820
+#: LYMessages.c:844
 msgid "Configuration Definitions"
 msgstr "Configuraci�"
 
-#: LYMessages.c:821
+#: LYMessages.c:845
 msgid "Cookie Jar"
 msgstr "Pot de les galetes (cookie jar) :-)"
 
-#: LYMessages.c:822
+#: LYMessages.c:846
 msgid "Current Edit-Key Map"
 msgstr "Mapa actual de tecles d'edici�"
 
-#: LYMessages.c:823
+#: LYMessages.c:847
 msgid "Current Key Map"
 msgstr "Combinacions de tecles actual"
 
-#: LYMessages.c:824
+#: LYMessages.c:848
 msgid "File Management Options"
 msgstr "Opcions d'administraci� de fitxers"
 
-#: LYMessages.c:825
+#: LYMessages.c:849
 msgid "Download Options"
 msgstr "Opcions de desc�rrega"
 
-#: LYMessages.c:826
+#: LYMessages.c:850
 msgid "History Page"
 msgstr "Historial"
 
-#: LYMessages.c:827
+#: LYMessages.c:851
 msgid "Cache Jar"
 msgstr "Jar en mem�ria cau"
 
-#: LYMessages.c:828
+#: LYMessages.c:852
 msgid "List Page"
 msgstr "P�gina de llista"
 
-#: LYMessages.c:829
+#: LYMessages.c:853
 msgid "Lynx.cfg Information"
 msgstr "Informaci� del fitxer lynx.cfg"
 
-#: LYMessages.c:830
+#: LYMessages.c:854
 msgid "Converted Mosaic Hotlist"
 msgstr "Fitxer d'adreces d'inter�s de Mosaic convertit"
 
-#: LYMessages.c:831
+#: LYMessages.c:855
 msgid "Options Menu"
 msgstr "Men� d'opcions"
 
-#: LYMessages.c:832
+#: LYMessages.c:856
 msgid "File Permission Options"
 msgstr "Opcions dels permissos dels fitxers"
 
-#: LYMessages.c:833
+#: LYMessages.c:857
 msgid "Printing Options"
 msgstr "Opcions d'impressi�"
 
-#: LYMessages.c:834
+#: LYMessages.c:858
 msgid "Information about the current document"
 msgstr "Informaci� del document actual"
 
-#: LYMessages.c:835
+#: LYMessages.c:859
 msgid "Your recent statusline messages"
 msgstr "Missatges recents apareguts en la l�nia d'estat"
 
-#: LYMessages.c:836
+#: LYMessages.c:860
 msgid "Upload Options"
 msgstr "Opcions de c�rrega"
 
-#: LYMessages.c:837
+#: LYMessages.c:861
 msgid "Visited Links Page"
 msgstr "P�gina dels enlla�os visitats"
 
 #. CONFIG_DEF_TITLE subtitles
-#: LYMessages.c:840
+#: LYMessages.c:864
 msgid "See also"
 msgstr "Vegeu tamb�"
 
-#: LYMessages.c:841
+#: LYMessages.c:865
 msgid "your"
 msgstr "el vostre"
 
-#: LYMessages.c:842
+#: LYMessages.c:866
 msgid "for runtime options"
 msgstr "opcions en temps d'execuci�"
 
-#: LYMessages.c:843
+#: LYMessages.c:867
 msgid "compile time options"
 msgstr "opcions en temps de compilaci�"
 
-#: LYMessages.c:844
+#: LYMessages.c:868
 msgid "color-style configuration"
 msgstr "configuraci� d'estil de colors"
 
-#: LYMessages.c:845
+#: LYMessages.c:869
 msgid "latest release"
 msgstr "�ltima versi�"
 
-#: LYMessages.c:846
+#: LYMessages.c:870
 msgid "pre-release version"
 msgstr "versi� de prova"
 
-#: LYMessages.c:847
+#: LYMessages.c:871
 msgid "development version"
 msgstr "versi� de desenvolupament"
 
 #. #define AUTOCONF_CONFIG_CACHE
-#: LYMessages.c:849
+#: LYMessages.c:873
 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"
@@ -2725,7 +2792,7 @@ msgstr ""
 "per favor, incloeu una c�pia d'aquesta p�gina."
 
 #. #define AUTOCONF_LYNXCFG_H
-#: LYMessages.c:853
+#: LYMessages.c:877
 msgid ""
 "The following data were used as automatically-configured compile-time\n"
 "definitions when this copy of Lynx was built."
@@ -2734,53 +2801,53 @@ msgstr ""
 "quan es va compilar aquesta c�pia de Lynx."
 
 #. #define DIRED_NOVICELINE
-#: LYMessages.c:858
+#: LYMessages.c:882
 msgid "  C)reate  D)ownload  E)dit  F)ull menu  M)odify  R)emove  T)ag  U)pload     \n"
 msgstr "  C)rea  D)escarrega  E)dita  M)en� complet  C)anvia  R)emou  S)enyalado  P)uja     \n"
 
-#: LYMessages.c:859
+#: LYMessages.c:883
 msgid "Failed to obtain status of current link!"
 msgstr "Ha estat impossible obtenir l'estat de l'enlla� actual!"
 
 #. #define INVALID_PERMIT_URL
-#: LYMessages.c:862
+#: LYMessages.c:886
 msgid "Special URL only valid from current File Permission menu!"
 msgstr "URL especial que nom�s �s v�lida des del men� permisos de fitxer actual!"
 
-#: LYMessages.c:866
+#: LYMessages.c:890
 msgid "External support is currently disabled."
 msgstr "El suport extern est� deshabilitat actualment."
 
 #. new with 2.8.4dev.21
-#: LYMessages.c:870
+#: LYMessages.c:894
 msgid "Changing working-directory is currently disabled."
 msgstr "El canvi de directori de treball est� desactivat."
 
-#: LYMessages.c:871
+#: LYMessages.c:895
 msgid "Linewrap OFF!"
 msgstr "Salt de l�nia autom�tic desactivat!"
 
-#: LYMessages.c:872
+#: LYMessages.c:896
 msgid "Linewrap ON!"
 msgstr "Salt de l�nia autom�tic activat!"
 
-#: LYMessages.c:873
+#: LYMessages.c:897
 msgid "Parsing nested-tables toggled OFF!  Reloading..."
 msgstr "An�lisi de taules imbricades desactivat! Rec�rrega..."
 
-#: LYMessages.c:874
+#: LYMessages.c:898
 msgid "Parsing nested-tables toggled ON!  Reloading..."
 msgstr "Analisi de taules imbricades activat! Rec�rrega..."
 
-#: LYMessages.c:875
+#: LYMessages.c:899
 msgid "Shifting is disabled while line-wrap is in effect"
 msgstr "El despla�ament est� deshabilitat mentre l'ajustament de l�nies est� en efecte"
 
-#: LYMessages.c:876
+#: LYMessages.c:900
 msgid "Trace not supported"
 msgstr "Rastreig no suportat"
 
-#: LYMessages.c:796
+#: LYMessages.c:820
 #, c-format
 msgid "\tIndents: first=%.0f others=%.0f, Height=%.1f Desc=%.1f\n"
 msgstr "\tSagnats: primer=%.0f altres=%.0f, Al�ada=%.1f Desc=%.1f\n"
@@ -3096,100 +3163,105 @@ msgstr "No s'ha pogut restaurar el s
 msgid "Socket read failed (too many tries)."
 msgstr "La lectura del s�col ha fallat (massa intents)."
 
-#: WWW/Library/Implementation/HTTP.c:81
+#: WWW/Library/Implementation/HTTP.c:136
 #, c-format
 msgid "SSL callback:%s, preverify_ok=%d, ssl_okay=%d"
 msgstr "Crida de retorn SSL:%s, preverify_ok=%d, ssl_okay=%d"
 
-#: WWW/Library/Implementation/HTTP.c:438
+#: WWW/Library/Implementation/HTTP.c:516
 #, c-format
 msgid "Address contains a username: %s"
 msgstr "L'adre�a cont� un nom d'usuari: %s"
 
-#: WWW/Library/Implementation/HTTP.c:492
+#: WWW/Library/Implementation/HTTP.c:570
 #, c-format
 msgid "Certificate issued by: %s"
 msgstr "El certificat ha estat expedit per: %s"
 
-#: WWW/Library/Implementation/HTTP.c:679
+#: WWW/Library/Implementation/HTTP.c:757
 msgid "This client does not contain support for HTTPS URLs."
 msgstr "Aquest client no admet adreces HTTPS."
 
-#: WWW/Library/Implementation/HTTP.c:704
+#: WWW/Library/Implementation/HTTP.c:782
 msgid "Unable to connect to remote host."
 msgstr "No ha estat possible connectar amb el servidor."
 
-#: WWW/Library/Implementation/HTTP.c:744
+#: WWW/Library/Implementation/HTTP.c:825
 msgid "Retrying connection without TLS."
 msgstr "S'est� reintentant la connexi� sense TLS."
 
-#: WWW/Library/Implementation/HTTP.c:794
+#: WWW/Library/Implementation/HTTP.c:877
 msgid "GnuTLS error when trying to verify certificate."
 msgstr "S'ha produ�t un error GnuTLS quan s'estava intentant verificar el certificat"
 
-#: WWW/Library/Implementation/HTTP.c:806
+#: WWW/Library/Implementation/HTTP.c:889
 msgid "the certificate has no known issuer"
 msgstr "el certificat no t� un emissor conegut"
 
-#: WWW/Library/Implementation/HTTP.c:808
+#: WWW/Library/Implementation/HTTP.c:891
 msgid "no issuer was found"
 msgstr "no s'ha trobat cap emissor"
 
-#: WWW/Library/Implementation/HTTP.c:810
+#: WWW/Library/Implementation/HTTP.c:893
 msgid "issuer is not a CA"
 msgstr "l'emissor no �s un CA"
 
-#: WWW/Library/Implementation/HTTP.c:812
+#: WWW/Library/Implementation/HTTP.c:895
 msgid "the certificate has been revoked"
 msgstr "el certificat ha estat revocat"
 
-#: WWW/Library/Implementation/HTTP.c:814
+#: WWW/Library/Implementation/HTTP.c:897
 msgid "the certificate is not trusted"
 msgstr "el certificat no �s de confian�a"
 
-#: WWW/Library/Implementation/HTTP.c:889
+#: WWW/Library/Implementation/HTTP.c:972
 #, c-format
 msgid "Verified connection to %s (cert=%s)"
 msgstr "Connexi� verificada a %s (cert=%s)"
 
-#: WWW/Library/Implementation/HTTP.c:937 WWW/Library/Implementation/HTTP.c:979
+#: WWW/Library/Implementation/HTTP.c:1022
+#: WWW/Library/Implementation/HTTP.c:1064
 #, c-format
 msgid "Verified connection to %s (subj=%s)"
 msgstr "Connexi� verificada a %s (subj=%s)"
 
-#: WWW/Library/Implementation/HTTP.c:1009
+#: WWW/Library/Implementation/HTTP.c:1094
 msgid "Can't find common name in certificate"
 msgstr "No es pot trobar el nom com� al certificat"
 
-#: WWW/Library/Implementation/HTTP.c:1012
+#: WWW/Library/Implementation/HTTP.c:1097
 #, c-format
 msgid "SSL error:host(%s)!=cert(%s)-Continue?"
 msgstr "Error SSL: servidor(%s)!=cert(%s). Voleu continuar?"
 
-#: WWW/Library/Implementation/HTTP.c:1025
+#: WWW/Library/Implementation/HTTP.c:1104
+msgid "SSL error"
+msgstr "Error de SSL"
+
+#: WWW/Library/Implementation/HTTP.c:1112
 #, c-format
 msgid "UNVERIFIED connection to %s (cert=%s)"
 msgstr "Connexi� NO VERIFICADA a %s (cert=%s)"
 
-#: WWW/Library/Implementation/HTTP.c:1034
+#: WWW/Library/Implementation/HTTP.c:1121
 #, c-format
 msgid "Secure %d-bit %s (%s) HTTP connection"
 msgstr "%d-bit %s segur (%s) connexi� HTTP"
 
-#: WWW/Library/Implementation/HTTP.c:1497
+#: WWW/Library/Implementation/HTTP.c:1584
 msgid "Sending HTTP request."
 msgstr "Enviant sol�licitud HTTP."
 
-#: WWW/Library/Implementation/HTTP.c:1539
+#: WWW/Library/Implementation/HTTP.c:1626
 msgid "Unexpected network write error; connection aborted."
 msgstr "Error inesperat d'escriptura "
 
-#: WWW/Library/Implementation/HTTP.c:1545
+#: WWW/Library/Implementation/HTTP.c:1632
 msgid "HTTP request sent; waiting for response."
 msgstr "Sol�licitud HTTP enviada; esperant resposta."
 
-#: WWW/Library/Implementation/HTTP.c:1618
-#: WWW/Library/Implementation/HTTP.c:1628
+#: WWW/Library/Implementation/HTTP.c:1705
+#: WWW/Library/Implementation/HTTP.c:1715
 msgid "Unexpected network read error; connection aborted."
 msgstr "Error inesperat de lectura en la xarxa; s'ha avortat la connexi�."
 
@@ -3202,7 +3274,7 @@ msgstr "Error inesperat de lectura en la xarxa; s'ha avortat la connexi
 #. * 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:1830
+#: WWW/Library/Implementation/HTTP.c:1917
 msgid "Got unexpected Informational Status."
 msgstr "S'ha obtingut un estat d'informaci� no esperat"
 
@@ -3212,7 +3284,7 @@ msgstr "S'ha obtingut un estat d'informaci
 #. * content.  We'll instruct the user to do that, and
 #. * restore the current document.  - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:1864
+#: WWW/Library/Implementation/HTTP.c:1951
 msgid "Request fulfilled.  Reset Content."
 msgstr "S'ha completat la demanda.  Restablaix el contingut."
 
@@ -3222,27 +3294,27 @@ msgstr "S'ha completat la demanda.  Restablaix el contingut."
 #. * 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:1979
+#: WWW/Library/Implementation/HTTP.c:2066
 msgid "Got unexpected 304 Not Modified status."
 msgstr "S'ha obtingut un codi 304 Not Modified inesperat (el document no ha estat modificat)."
 
-#: WWW/Library/Implementation/HTTP.c:2042
+#: WWW/Library/Implementation/HTTP.c:2129
 msgid "Redirection of POST content requires user approval."
 msgstr "La redirecci� del contingut POST requereix l'aprovaci� de l'usuari."
 
-#: WWW/Library/Implementation/HTTP.c:2057
+#: WWW/Library/Implementation/HTTP.c:2144
 msgid "Have POST content.  Treating Permanent Redirection as Temporary.\n"
 msgstr "Hi ha un contingut POST.  Es tractar� la redirecci� permanent com a tempor�ria.\n"
 
-#: WWW/Library/Implementation/HTTP.c:2101
+#: WWW/Library/Implementation/HTTP.c:2188
 msgid "Retrying with access authorization information."
 msgstr "Estic reintentant amb la informaci� d'acc�s."
 
-#: WWW/Library/Implementation/HTTP.c:2113
+#: WWW/Library/Implementation/HTTP.c:2200
 msgid "Show the 401 message body?"
 msgstr "Mostrar el cos del missatge d'error 401?"
 
-#: WWW/Library/Implementation/HTTP.c:2157
+#: WWW/Library/Implementation/HTTP.c:2244
 msgid "Show the 407 message body?"
 msgstr "Mostrar el cos del missatge d'error 407?"
 
@@ -3250,7 +3322,7 @@ msgstr "Mostrar el cos del missatge d'error 407?"
 #. * Bad or unknown server_status number.  Take a chance and hope
 #. * there is something to display.  - FM
 #.
-#: WWW/Library/Implementation/HTTP.c:2257
+#: WWW/Library/Implementation/HTTP.c:2344
 msgid "Unknown status reply from server!"
 msgstr "Resposta desconeguda del servidor!"
 
@@ -3631,31 +3703,31 @@ msgstr "no"
 msgid "Y/N/A/V"
 msgstr "S/N/P/M"
 
-#: src/HTML.c:5915
+#: src/HTML.c:5931
 msgid "Description:"
 msgstr "Descripci�:"
 
-#: src/HTML.c:5920
+#: src/HTML.c:5936
 msgid "(none)"
 msgstr "(cap)"
 
-#: src/HTML.c:5924
+#: src/HTML.c:5940
 msgid "Filepath:"
 msgstr "Cam�:"
 
-#: src/HTML.c:5930
+#: src/HTML.c:5946
 msgid "(unknown)"
 msgstr "(desconegut)"
 
-#: src/HTML.c:7370
+#: src/HTML.c:7386
 msgid "Document has only hidden links.  Use the 'l'ist command."
 msgstr "El document nom�s cont� enlla�os ocults. Useu el comand L)ist."
 
-#: src/HTML.c:7869
+#: src/HTML.c:7885
 msgid "Source cache error - disk full?"
 msgstr "Source cache error: disc ple?"
 
-#: src/HTML.c:7882
+#: src/HTML.c:7898
 msgid "Source cache error - not enough memory!"
 msgstr "Source cache error: no hi ha prou mem�ria!"
 
@@ -3747,19 +3819,19 @@ msgstr "D
 msgid "Exiting via interrupt:"
 msgstr "Eixint a causa de la interrupci�:"
 
-#: src/LYCookie.c:2538
+#: src/LYCookie.c:2541
 msgid "(from a previous session)"
 msgstr "(d'una sessi� anterior)"
 
-#: src/LYCookie.c:2599
+#: src/LYCookie.c:2602
 msgid "Maximum Gobble Date:"
 msgstr "Data l�mit d'eliminaci�:"
 
-#: src/LYCookie.c:2638
+#: src/LYCookie.c:2641
 msgid "Internal"
 msgstr "Intern"
 
-#: src/LYCookie.c:2639
+#: src/LYCookie.c:2642
 msgid "cookie_domain_flag_set error, aborting program"
 msgstr "error cookie_domain_flag_see, s'avortar� el programa"
 
@@ -4267,19 +4339,19 @@ msgstr "Aquest missatge va ser generat autom
 msgid "No system mailer configured"
 msgstr "No hi ha cap servidor de correu de sistema configurat"
 
-#: src/LYMain.c:1069
+#: src/LYMain.c:1071
 msgid "No Winsock found, sorry."
 msgstr "No s'ha trobat Winsock."
 
-#: src/LYMain.c:1260
+#: src/LYMain.c:1262
 msgid "You MUST define a valid TMP or TEMP area!"
 msgstr "Heu de definir una �rea TMP o TEMP v�lida!"
 
-#: src/LYMain.c:1313 src/LYMainLoop.c:5283
+#: src/LYMain.c:1315 src/LYMainLoop.c:5283
 msgid "No such directory"
 msgstr "No existeix el directori"
 
-#: src/LYMain.c:1507
+#: src/LYMain.c:1509
 #, c-format
 msgid ""
 "\n"
@@ -4290,7 +4362,7 @@ msgstr ""
 "El fitxer de configuraci� �%s� no est� disponible\n"
 "\n"
 
-#: src/LYMain.c:1517
+#: src/LYMain.c:1519
 #, c-format
 msgid ""
 "\n"
@@ -4300,66 +4372,66 @@ msgstr ""
 "\n"
 "Els jocs de car�cters no estan declarats.\n"
 
-#: src/LYMain.c:1654
+#: src/LYMain.c:1675
 #, c-format
 msgid "Ignored %d characters from standard input.\n"
 msgstr "S'han ignorat %d car�cters de l'entrada est�ndard.\n"
 
-#: src/LYMain.c:1656
+#: src/LYMain.c:1677
 #, c-format
 msgid "Use \"-stdin\" or \"-\" to tell how to handle piped input.\n"
 msgstr "Useu �-stdin� o �-� per especificar com gestionar l'entrada canalitzada.\n"
 
-#: src/LYMain.c:1814
+#: src/LYMain.c:1835
 msgid "Warning:"
 msgstr "Alerta:"
 
-#: src/LYMain.c:2384
+#: src/LYMain.c:2405
 msgid "persistent cookies state will be changed in next session only."
 msgstr "l'estat de les cookies persistents no es canviar� fins la seg�ent sessi�"
 
-#: src/LYMain.c:2621 src/LYMain.c:2666
+#: src/LYMain.c:2642 src/LYMain.c:2687
 #, c-format
 msgid "Lynx: ignoring unrecognized charset=%s\n"
 msgstr "Lynx: joc de car�cters %s no reconegut. S'ignorar�.\n"
 
-#: src/LYMain.c:3185
+#: src/LYMain.c:3206
 #, c-format
 msgid "%s Version %s (%s)"
 msgstr "%s Versi� %s (%s)"
 
-#: src/LYMain.c:3223
+#: src/LYMain.c:3247
 #, c-format
-msgid "Built on %s %s %s\n"
-msgstr "Compilat per a %s el %s a les %s\n"
+msgid "Built on %s%s.\n"
+msgstr "Compilat el %s a les %s.\n"
 
-#: src/LYMain.c:3245
+#: src/LYMain.c:3261
 msgid "Copyrights held by the Lynx Developers Group,"
 msgstr "Els Copyright els mant� el Lynx Developers Group."
 
-#: src/LYMain.c:3246
+#: src/LYMain.c:3262
 msgid "the University of Kansas, CERN, and other contributors."
 msgstr "la Universitat de Kansas, el CERN i altres contribu�dors."
 
-#: src/LYMain.c:3247
+#: src/LYMain.c:3263
 msgid "Distributed under the GNU General Public License (Version 2)."
 msgstr "Distribu�t sota la Llic�ncia P�blica General GNU (Versi� 2)."
 
-#: src/LYMain.c:3248
-msgid "See http://lynx.isc.org/ and the online help for more information."
-msgstr "Vegeu http://lynx.isc.org/ i l'ajuda en l�nia per a m�s informaci�."
+#: src/LYMain.c:3264
+msgid "See http://lynx.invisible-island.net/ and the online help for more information."
+msgstr "Vegeu http://lynx.invisible-island.net/ i l'ajuda en l�nia per a m�s informaci�."
 
-#: src/LYMain.c:4091
+#: src/LYMain.c:4107
 #, c-format
 msgid "USAGE: %s [options] [file]\n"
 msgstr "UTILITZACI�: %s [opcions] [arxiu]\n"
 
-#: src/LYMain.c:4092
+#: src/LYMain.c:4108
 #, c-format
 msgid "Options are:\n"
 msgstr "Les opcions s�n:\n"
 
-#: src/LYMain.c:4395
+#: src/LYMain.c:4411
 #, c-format
 msgid "%s: Invalid Option: %s\n"
 msgstr "%s: l'opci� no �s v�lida: %s\n"
@@ -4800,108 +4872,116 @@ msgstr "bzip2"
 msgid "All"
 msgstr "Tot"
 
-#: src/LYOptions.c:2798 src/LYOptions.c:2827
+#: src/LYOptions.c:2801 src/LYOptions.c:2830
 #, c-format
 msgid "Use %s to invoke the Options menu!"
 msgstr "Useu %s per a invocar el men� d'opcions"
 
-#: src/LYOptions.c:3675
+#: src/LYOptions.c:3688
 msgid "(options marked with (!) will not be saved)"
 msgstr "(les opcions marcades amb (!) no es desen)"
 
-#: src/LYOptions.c:3683
+#: src/LYOptions.c:3696
 msgid "General Preferences"
 msgstr "Prefer�ncies generals"
 
 #. ***************************************************************
 #. User Mode: SELECT
-#: src/LYOptions.c:3687
+#: src/LYOptions.c:3700
 msgid "User mode"
 msgstr "Tipus d'usuari"
 
 #. Editor: INPUT
-#: src/LYOptions.c:3693
+#: src/LYOptions.c:3706
 msgid "Editor"
 msgstr "Editor"
 
 #. Search Type: SELECT
-#: src/LYOptions.c:3698
+#: src/LYOptions.c:3711
 msgid "Type of Search"
 msgstr "Tipus de recerca"
 
-#: src/LYOptions.c:3703
+#: src/LYOptions.c:3716
 msgid "Security and Privacy"
 msgstr "Seguretat i privacitat"
 
 #. ***************************************************************
 #. Cookies: SELECT
-#: src/LYOptions.c:3707
+#: src/LYOptions.c:3720
 msgid "Cookies"
 msgstr "Cookies"
 
 #. Cookie Prompting: SELECT
-#: src/LYOptions.c:3721
+#: src/LYOptions.c:3734
 msgid "Invalid-Cookie Prompting"
 msgstr "Demanda de cookie no v�lida"
 
 #. SSL Prompting: SELECT
-#: src/LYOptions.c:3728
+#: src/LYOptions.c:3741
 msgid "SSL Prompting"
 msgstr "Demanda de SSL"
 
-#: src/LYOptions.c:3734
+#: src/LYOptions.c:3746
+msgid "SSL client certificate file"
+msgstr "Fitxer de certificat de client SSL"
+
+#: src/LYOptions.c:3750
+msgid "SSL client key file"
+msgstr "Fitxer de clau de client SSL"
+
+#: src/LYOptions.c:3756
 msgid "Keyboard Input"
 msgstr "Teclat"
 
 #. ***************************************************************
 #. Keypad Mode: SELECT
-#: src/LYOptions.c:3738
+#: src/LYOptions.c:3760
 msgid "Keypad mode"
 msgstr "Mode del teclat"
 
 #. Emacs keys: ON/OFF
-#: src/LYOptions.c:3744
+#: src/LYOptions.c:3766
 msgid "Emacs keys"
 msgstr "Tecles d'emacs"
 
 #. VI Keys: ON/OFF
-#: src/LYOptions.c:3750
+#: src/LYOptions.c:3772
 msgid "VI keys"
 msgstr "Tecles de VI"
 
 #. Line edit style: SELECT
 #. well, at least 2 line edit styles available
-#: src/LYOptions.c:3757
+#: src/LYOptions.c:3779
 msgid "Line edit style"
 msgstr "Estil d'edici� de la l�nia"
 
 #. Keyboard layout: SELECT
-#: src/LYOptions.c:3769
+#: src/LYOptions.c:3791
 msgid "Keyboard layout"
 msgstr "Configuraci� del teclat"
 
 #.
 #. * Display and Character Set
 #.
-#: src/LYOptions.c:3783
+#: src/LYOptions.c:3805
 msgid "Display and Character Set"
 msgstr "Pantalla i joc de car�cters"
 
 #. Use locale-based character set: ON/OFF
-#: src/LYOptions.c:3788
+#: src/LYOptions.c:3810
 msgid "Use locale-based character set"
 msgstr "Usa el conjunt de car�cters basats en el locale"
 
-#: src/LYOptions.c:3795
+#: src/LYOptions.c:3817
 msgid "Use HTML5 charset replacements"
 msgstr "Usa reempla�aments del conjunt de car�cters de l'HTML5"
 
 #. Display Character Set: SELECT
-#: src/LYOptions.c:3801
+#: src/LYOptions.c:3823
 msgid "Display character set"
 msgstr "Joc de car�cters"
 
-#: src/LYOptions.c:3832
+#: src/LYOptions.c:3854
 msgid "Assumed document character set"
 msgstr "Joc de car�cters predeterminat"
 
@@ -4910,211 +4990,211 @@ msgstr "Joc de car
 #. * we split the header to make it more readable:
 #. * "CJK mode" for CJK display charsets, and "Raw 8-bit" for others.
 #.
-#: src/LYOptions.c:3852
+#: src/LYOptions.c:3874
 msgid "CJK mode"
 msgstr "mode CJK"
 
-#: src/LYOptions.c:3854
+#: src/LYOptions.c:3876
 msgid "Raw 8-bit"
 msgstr "8-bits cru"
 
 #. X Display: INPUT
-#: src/LYOptions.c:3862
+#: src/LYOptions.c:3884
 msgid "X Display"
 msgstr "Pantalla X"
 
 #.
 #. * Document Appearance
 #.
-#: src/LYOptions.c:3868
+#: src/LYOptions.c:3890
 msgid "Document Appearance"
 msgstr "Apari�ncia dels documents"
 
-#: src/LYOptions.c:3874
+#: src/LYOptions.c:3896
 msgid "Show color"
 msgstr "En color"
 
 #. Color style: ON/OFF
-#: src/LYOptions.c:3899
+#: src/LYOptions.c:3921
 msgid "Color style"
 msgstr "Estil de color"
 
-#: src/LYOptions.c:3908
+#: src/LYOptions.c:3930
 msgid "Default colors"
 msgstr "Color predeterminats"
 
 #. Show cursor: ON/OFF
-#: src/LYOptions.c:3916
+#: src/LYOptions.c:3938
 msgid "Show cursor"
 msgstr "Mostrar cursor"
 
 #. Underline links: ON/OFF
-#: src/LYOptions.c:3922
+#: src/LYOptions.c:3944
 msgid "Underline links"
 msgstr "Subratlla els enlla�os"
 
 #. Show scrollbar: ON/OFF
-#: src/LYOptions.c:3929
+#: src/LYOptions.c:3951
 msgid "Show scrollbar"
 msgstr "Mostrar la barra de despla�ament"
 
 #. Select Popups: ON/OFF
-#: src/LYOptions.c:3936
+#: src/LYOptions.c:3958
 msgid "Popups for select fields"
 msgstr "Finestres emergents per a camps de selecci�"
 
 #. HTML error recovery: SELECT
-#: src/LYOptions.c:3942
+#: src/LYOptions.c:3964
 msgid "HTML error recovery"
 msgstr "Recuperaci� d'errors de HTML"
 
 #. Bad HTML messages: SELECT
-#: src/LYOptions.c:3948
+#: src/LYOptions.c:3970
 msgid "Bad HTML messages"
 msgstr "Missatges incorrectes d'HTML"
 
 #. Show Images: SELECT
-#: src/LYOptions.c:3954
+#: src/LYOptions.c:3976
 msgid "Show images"
 msgstr "Mostra les imatges"
 
 #. Verbose Images: ON/OFF
-#: src/LYOptions.c:3968
+#: src/LYOptions.c:3990
 msgid "Verbose images"
 msgstr "Detalls sobre imatges"
 
 #.
 #. * Headers Transferred to Remote Servers
 #.
-#: src/LYOptions.c:3976
+#: src/LYOptions.c:3998
 msgid "Headers Transferred to Remote Servers"
 msgstr "Cap�aleres que es transmeten als servidors remots"
 
 #. ***************************************************************
 #. Mail Address: INPUT
-#: src/LYOptions.c:3980
+#: src/LYOptions.c:4002
 msgid "Personal mail address"
 msgstr "Adre�a electr�nica personal"
 
-#: src/LYOptions.c:3985
+#: src/LYOptions.c:4007
 msgid "Personal name for mail"
 msgstr "Adre�a personal del correu electr�nic"
 
-#: src/LYOptions.c:3992
+#: src/LYOptions.c:4014
 msgid "Password for anonymous ftp"
 msgstr "Contrasenya per al ftp an�nimo"
 
 #. Preferred media type: SELECT
-#: src/LYOptions.c:3998
+#: src/LYOptions.c:4020
 msgid "Preferred media type"
 msgstr "Tipus de suport preferit"
 
 #. Preferred encoding: SELECT
-#: src/LYOptions.c:4004
+#: src/LYOptions.c:4026
 msgid "Preferred encoding"
 msgstr "Codificaci� preferida"
 
 #. Preferred Document Character Set: INPUT
-#: src/LYOptions.c:4010
+#: src/LYOptions.c:4032
 msgid "Preferred document character set"
 msgstr "Joc de car�cters preferit"
 
 #. Preferred Document Language: INPUT
-#: src/LYOptions.c:4015
+#: src/LYOptions.c:4037
 msgid "Preferred document language"
 msgstr "Idioma preferit"
 
-#: src/LYOptions.c:4021
+#: src/LYOptions.c:4043
 msgid "Send User-Agent header"
 msgstr "Envia la cap�alera de l'agent d'usuari"
 
-#: src/LYOptions.c:4023
+#: src/LYOptions.c:4045
 msgid "User-Agent header"
 msgstr "Identificaci� del navegador"
 
 #.
 #. * Listing and Accessing Files
 #.
-#: src/LYOptions.c:4031
+#: src/LYOptions.c:4053
 msgid "Listing and Accessing Files"
 msgstr "Fitxers: llistat i acc�s"
 
 #. FTP sort: SELECT
-#: src/LYOptions.c:4036
+#: src/LYOptions.c:4058
 msgid "Use Passive FTP"
 msgstr "Usa el FTP passiu"
 
 #. FTP sort: SELECT
-#: src/LYOptions.c:4042
+#: src/LYOptions.c:4064
 msgid "FTP sort criteria"
 msgstr "Criteri d'ordenaci� per a FTP"
 
 #. Local Directory Sort: SELECT
-#: src/LYOptions.c:4050
+#: src/LYOptions.c:4072
 msgid "Local directory sort criteria"
 msgstr "Criteri d'ordenaci� local"
 
 #. Local Directory Order: SELECT
-#: src/LYOptions.c:4056
+#: src/LYOptions.c:4078
 msgid "Local directory sort order"
 msgstr "Criteri d'ordenaci� de directoris locals"
 
-#: src/LYOptions.c:4065
+#: src/LYOptions.c:4087
 msgid "Show dot files"
 msgstr "Mostrar fitxers .*"
 
-#: src/LYOptions.c:4073
+#: src/LYOptions.c:4095
 msgid "Execution links"
 msgstr "Enlla�os d'execuci�"
 
-#: src/LYOptions.c:4091
+#: src/LYOptions.c:4113
 msgid "Pause when showing message"
 msgstr "Pausa quan s'estiguin mostrant els missatges"
 
 #. Show transfer rate: SELECT
-#: src/LYOptions.c:4098
+#: src/LYOptions.c:4120
 msgid "Show transfer rate"
 msgstr "Mostrar taxa de transfer�ncia"
 
 #.
 #. * Special Files and Screens
 #.
-#: src/LYOptions.c:4118
+#: src/LYOptions.c:4140
 msgid "Special Files and Screens"
 msgstr "Fitxers i pantalles especials"
 
-#: src/LYOptions.c:4123
+#: src/LYOptions.c:4145
 msgid "Multi-bookmarks"
 msgstr "Marcadors multiples"
 
-#: src/LYOptions.c:4131
+#: src/LYOptions.c:4153
 msgid "Review/edit Bookmarks files"
 msgstr "Editar fitxers de favorits"
 
-#: src/LYOptions.c:4134
+#: src/LYOptions.c:4156
 msgid "Goto multi-bookmark menu"
 msgstr "Veure el men� de m�ltiples fitxers d'adreces"
 
-#: src/LYOptions.c:4136
+#: src/LYOptions.c:4158
 msgid "Bookmarks file"
 msgstr "Fitxer de favorits"
 
 #. Auto Session: ON/OFF
-#: src/LYOptions.c:4143
+#: src/LYOptions.c:4165
 msgid "Auto Session"
 msgstr "Sessi� autom�tica"
 
 #. Session File Menu: INPUT
-#: src/LYOptions.c:4149
+#: src/LYOptions.c:4171
 msgid "Session file"
 msgstr "Fitxer de sessi�"
 
 #. Visited Pages: SELECT
-#: src/LYOptions.c:4155
+#: src/LYOptions.c:4177
 msgid "Visited Pages"
 msgstr "P�gines visitades"
 
-#: src/LYOptions.c:4160
+#: src/LYOptions.c:4182
 msgid "View the file "
 msgstr "Veure el fitxer"
 
@@ -5235,38 +5315,38 @@ msgstr "Lynx: impossible iniciar, el fitxer de regles del CERN %s no est
 msgid "(no name)"
 msgstr "(sense nom)"
 
-#: src/LYReadCFG.c:2073
+#: src/LYReadCFG.c:2075
 #, c-format
 msgid "More than %d nested lynx.cfg includes -- perhaps there is a loop?!?\n"
 msgstr "M�s de %d includes imbricats en lynx.cfg: potser hi ha un bucle?\n"
 
-#: src/LYReadCFG.c:2075
+#: src/LYReadCFG.c:2077
 #, c-format
 msgid "Last attempted include was '%s',\n"
 msgstr "L'�ltim include ha estat \"%s\", \n"
 
-#: src/LYReadCFG.c:2076
+#: src/LYReadCFG.c:2078
 #, c-format
 msgid "included from '%s'.\n"
 msgstr "incl�s des de \"%s\".\n"
 
-#: src/LYReadCFG.c:2479 src/LYReadCFG.c:2492 src/LYReadCFG.c:2550
+#: src/LYReadCFG.c:2481 src/LYReadCFG.c:2494 src/LYReadCFG.c:2552
 msgid "The following is read from your lynx.cfg file."
 msgstr "Les dades seg�ents s'han llegit del vostre fitxer lynx.cfg."
 
-#: src/LYReadCFG.c:2480 src/LYReadCFG.c:2493
+#: src/LYReadCFG.c:2482 src/LYReadCFG.c:2495
 msgid "Please read the distribution"
 msgstr "Per favor, llegiu "
 
-#: src/LYReadCFG.c:2486 src/LYReadCFG.c:2496
+#: src/LYReadCFG.c:2488 src/LYReadCFG.c:2498
 msgid "for more comments."
 msgstr "si necessiteu m�s informaci�."
 
-#: src/LYReadCFG.c:2532
+#: src/LYReadCFG.c:2534
 msgid "RELOAD THE CHANGES"
 msgstr "RECARREGAR ELS CANVIS"
 
-#: src/LYReadCFG.c:2540
+#: src/LYReadCFG.c:2542
 msgid "Your primary configuration"
 msgstr "Configuraci� prim�ria"
 
@@ -6019,7 +6099,7 @@ msgstr ""
 "La variable visited_links controla la forma en qu� Lynx organitza la\n"
 "informaci� en la p�gina d'enlla�os visitats.\n"
 
-#: src/LYrcFile.c:861
+#: src/LYrcFile.c:863
 msgid ""
 "If keypad_mode is set to \"NUMBERS_AS_ARROWS\", then the numbers on\n"
 "your keypad when the numlock is on will act as arrow keys:\n"
@@ -6030,7 +6110,7 @@ msgid ""
 "regardless of whether numlock is on.\n"
 msgstr "Si poseu keypad_mode \n"
 
-#: src/LYrcFile.c:870
+#: src/LYrcFile.c:872
 msgid ""
 "If keypad_mode is set to \"LINKS_ARE_NUMBERED\", then numbers will\n"
 "appear next to each link and numbers are used to select links.\n"
@@ -6039,7 +6119,7 @@ msgstr ""
 "aleshores apareixer� un n�mero al costat de cada enlla� i podreu triar\n"
 "l'enlla� desitjat prement la tecla del n�mero corresponent.\n"
 
-#: src/LYrcFile.c:874
+#: src/LYrcFile.c:876
 msgid ""
 "If keypad_mode is set to \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\", then\n"
 "numbers will appear next to each link and visible form input field.\n"
@@ -6059,7 +6139,7 @@ msgstr ""
 "de llista tamb� enumeren les entrades dels formularis.\n"
 "\n"
 
-#: src/LYrcFile.c:883
+#: src/LYrcFile.c:885
 msgid ""
 "NOTE: Some fixed format documents may look disfigured when\n"
 "\"LINKS_ARE_NUMBERED\" or \"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\" are\n"
@@ -6070,13 +6150,13 @@ msgstr ""
 "\"LINKS_AND_FORM_FIELDS_ARE_NUMBERED\" (enlla�os i camps de formulari\n"
 "numerats.\n"
 
-#: src/LYrcFile.c:915
+#: src/LYrcFile.c:917
 msgid ""
 "Lynx User Defaults File\n"
 "\n"
 msgstr "Fitxer dels valors predeterminats d'usuari del Lynx\n"
 
-#: src/LYrcFile.c:924
+#: src/LYrcFile.c:926
 msgid ""
 "This file contains options saved from the Lynx Options Screen (normally\n"
 "with the 'o' key).  To save options with that screen, you must select the\n"
@@ -6086,7 +6166,7 @@ msgstr ""
 "amb la tecla �o�).  Per desar opcions amb aquesta pantalla, heu de seleccionar\n"
 "la casella de selecci�:\n"
 
-#: src/LYrcFile.c:931
+#: src/LYrcFile.c:933
 msgid ""
 "You must then save the settings using the link on the line above the\n"
 "checkbox:\n"
@@ -6094,7 +6174,7 @@ msgstr ""
 "Heu de desar els par�metres usant l'enlla� a la l�nia a sobre de\n"
 "la casella de selecci�:\n"
 
-#: src/LYrcFile.c:938
+#: src/LYrcFile.c:940
 msgid ""
 "You may also use the command-line option \"-forms_options\", which displays\n"
 "the simpler Options Menu instead.  Save options with that using the '>' key.\n"
@@ -6104,7 +6184,7 @@ msgstr ""
 "el men� m�s simple de Men� d'Opcions. Deseu les opcions amb aix� usant la tecla\n"
 "�>�.\n"
 
-#: src/LYrcFile.c:945
+#: src/LYrcFile.c:947
 msgid ""
 "This file contains options saved from the Lynx Options Screen (normally\n"
 "with the '>' key).\n"
@@ -6113,7 +6193,7 @@ msgstr ""
 "Aquest fitxer cont� opcions desada de la Pantalla d'Opcions del Lynx (normalment\n"
 "amb la tecla �>�)\n"
 
-#: src/LYrcFile.c:952
+#: src/LYrcFile.c:954
 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"
diff --git a/src/GridText.c b/src/GridText.c
index 810a38d..a3abbe7 100644
--- a/src/GridText.c
+++ b/src/GridText.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: GridText.c,v 1.287 2015/12/16 01:20:01 tom Exp $
+ * $LynxId: GridText.c,v 1.294 2017/02/11 00:50:00 tom Exp $
  *
  *		Character grid hypertext object
  *		===============================
@@ -1000,13 +1000,7 @@ HText *HText_new(HTParentAnchor *anchor)
      * the previous object may become invalid.  - kw
      */
     if (HTMainText) {
-	if (HText_hasUTF8OutputSet(HTMainText) &&
-	    HTLoadedDocumentEightbit() &&
-	    IS_UTF8_TTY) {
-	    self->had_utf8 = HTMainText->has_utf8;
-	} else {
-	    self->had_utf8 = HTMainText->has_utf8;
-	}
+	self->had_utf8 = HTMainText->has_utf8;
 	HTMainText->has_utf8 = NO;
     }
 
@@ -3136,8 +3130,6 @@ static void split_line(HText *text, unsigned split)
 	if (!temp)
 	    outofmem(__FILE__, "split_line_2");
 
-	assert(temp != NULL);
-
 	memcpy(temp, previous, LINE_SIZE(previous->size));
 #if defined(USE_COLOR_STYLE)
 	POOLallocstyles(temp->styles, previous->numstyles);
@@ -4313,14 +4305,18 @@ void HText_appendCharacter(HText *text, int ch)
 	       (int) (line->data[line->size - 1] == LY_SOFT_HYPHEN ? 1 : 0))
 	      - ctrl_chars_on_this_line);
 
-    if (((text->permissible_split
+    if ((
+#ifndef USE_SLANG
+	    (text->permissible_split
 #ifdef USE_CURSES_PADS
-	  || !LYwideLines
+	     || !LYwideLines
 #endif
-	 ) && (actual
-	       + (int) style->rightIndent
-	       + ((IS_CJK_TTY && text->kanji_buf) ? 1 : 0)
-	 ) >= WRAP_COLS(text))
+	    ) &&
+#endif
+	    (actual
+	     + (int) style->rightIndent
+	     + ((IS_CJK_TTY && text->kanji_buf) ? 1 : 0)
+	    ) >= WRAP_COLS(text))
 	|| (text->T.output_utf8
 	    && ((actual
 		 + UTFXTRA_ON_THIS_LINE
@@ -4452,14 +4448,12 @@ void HText_appendCharacter(HText *text, int ch)
 
 		case SJIS:
 		    if ((text->kcode == EUC) || (text->kcode == JIS)) {
-			if (!conv_jisx0201kana && IS_EUC_X0201KANA(hi, lo)) {
-			    if (IS_EUC_X0201KANA(hi, lo)) {
-				line->data[line->size++] = (char) lo;
-			    } else {
-				EUC_TO_SJIS1(hi, lo, tmp);
-				line->data[line->size++] = (char) tmp[0];
-				line->data[line->size++] = (char) tmp[1];
-			    }
+			if (!conv_jisx0201kana && IS_EUC_X0201KANA(hi, lo))
+			    line->data[line->size++] = (char) lo;
+			else {
+			    EUC_TO_SJIS1(hi, lo, tmp);
+			    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++] = (char) hi;
@@ -4549,7 +4543,7 @@ void _internal_HTC(HText *text, int style, int dir)
 	    if ((int) line->styles[line->numstyles].sc_horizpos >= ctrl_chars_on_this_line) {
 		line->styles[line->numstyles].sc_horizpos -= ctrl_chars_on_this_line;
 	    }
-	    line->styles[line->numstyles].sc_style = style;
+	    line->styles[line->numstyles].sc_style = (unsigned short) style;
 	    line->styles[line->numstyles].sc_direction = dir;
 	    CTRACE_STYLE((tfp, "internal_HTC %d:style[%d] %d (dir=%d)\n",
 			  line->size,
@@ -5164,8 +5158,6 @@ int HText_beginAnchor(HText *text, int underline,
     if (a == NULL)
 	outofmem(__FILE__, "HText_beginAnchor");
 
-    assert(a != NULL);
-
     a->inUnderline = (BOOLEAN) underline;
 
     a->sgml_offset = SGML_offset();
@@ -7997,7 +7989,6 @@ static AnchorIndex **allocAnchorIndex(unsigned *size)
 		    if (p == NULL)
 			outofmem(__FILE__, "allocAnchorIndex");
 
-		    assert(p != NULL);
 		    p->type = input->type;
 		    p->size = input->size;
 		    p->offset = anchor->line_pos;
@@ -9322,7 +9313,6 @@ void HText_setTabID(HText *text, const char *name)
 	StrAllocCopy(Tab->name, name);
     }
 
-    assert(Tab != NULL);
     Tab->column = HText_getCurrentColumn(text);
     return;
 }
@@ -9537,8 +9527,6 @@ void HText_beginForm(char *action,
     if (newform == NULL)
 	outofmem(__FILE__, "HText_beginForm");
 
-    assert(newform != NULL);
-
     PerFormInfo_free(HTCurrentForm);	/* shouldn't happen here - kw */
     HTCurrentForm = newform;
 
@@ -9862,7 +9850,6 @@ char *HText_setLastOptionValue(HText *text, char *value,
 		outofmem(__FILE__, "HText_setLastOptionValue");
 	}
 
-	assert(new_ptr != NULL);
 	new_ptr->name = NULL;
 	new_ptr->cp_submit_value = NULL;
 	new_ptr->next = NULL;
@@ -10033,9 +10020,6 @@ int HText_beginInput(HText *text,
     if (a == NULL || f == NULL)
 	outofmem(__FILE__, "HText_beginInput");
 
-    assert(a != NULL);
-    assert(f != NULL);
-
     a->sgml_offset = SGML_offset();
     a->inUnderline = (BOOLEAN) underline;
     a->line_num = text->Lines;
@@ -10714,9 +10698,6 @@ static void UpdateBoundary(char **Boundary,
     char *text = BStrData(data);
     char *want = *Boundary;
 
-    assert(want != NULL);
-    assert(text != NULL);
-
     for (j = 0; (long) j <= (long) (last - have); ++j) {
 	if (want[0] == text[j]
 	    && !memcmp(want, text + j, have)) {
@@ -10766,7 +10747,6 @@ static char *convert_to_base64(const char *src,
     if ((dest = (char *) malloc(rlen + 1)) == NULL) {
 	outofmem(__FILE__, "convert_to_base64");
     }
-    assert(dest != NULL);
     r = dest;
 
     /* encode */
@@ -11135,7 +11115,6 @@ int HText_SubmitForm(FormInfo * submit_item, DocInfo *doc,
 	my_data = typecallocn(PostData, (size_t) anchor_limit);
 	if (my_data == 0)
 	    outofmem(__FILE__, "HText_SubmitForm");
-	assert(my_data != NULL);
     }
 
     if (target_csname == NULL) {
@@ -12626,14 +12605,12 @@ static int increment_tagged_htline(HTLine *ht, TextAnchor *a, int *lx_val,
 	allocHTLine(temp, strlen(buf));
 	if (!temp)
 	    outofmem(__FILE__, "increment_tagged_htline");
-	assert(temp != NULL);
 
 	memcpy(temp, ht, LINE_SIZE(0));
 #if defined(USE_COLOR_STYLE)
 	POOLallocstyles(temp->styles, ht->numstyles);
 	if (!temp->styles)
 	    outofmem(__FILE__, "increment_tagged_htline");
-	assert(temp->styles != NULL);
 	memcpy(temp->styles, ht->styles, sizeof(HTStyleChange) * ht->numstyles);
 #endif
 	ht = temp;
@@ -12695,10 +12672,6 @@ static void insert_new_textarea_anchor(TextAnchor **curr_anchor, HTLine **exit_h
     if (a == NULL || l == NULL || f == NULL)
 	outofmem(__FILE__, "insert_new_textarea_anchor");
 
-    assert(a != NULL);
-    assert(f != NULL);
-    assert(l != NULL);
-
     /*  Init all the fields in the new TextAnchor.                 */
     /*  [anything "special" needed based on ->show_anchor value ?] */
     a->next = anchor->next;
@@ -12963,8 +12936,6 @@ static char *readEditedFile(char *ed_temp)
 
 	if (!ebuf)
 	    outofmem(__FILE__, "HText_EditTextArea");
-
-	assert(ebuf != NULL);
     } else {
 	ebuf = typecallocn(char, size + 1);
 
@@ -12978,7 +12949,6 @@ static char *readEditedFile(char *ed_temp)
 	    HTAlwaysAlert(NULL, MEMORY_EXHAUSTED_FILE);
 	    return 0;
 	}
-	assert(ebuf != NULL);
 
 	if ((fp = fopen(ed_temp, "r")) != 0) {
 	    size = fread(ebuf, (size_t) 1, size, fp);
@@ -13040,8 +13010,6 @@ static int finish_ExtEditForm(LinkInfo * form_link, TextAnchor *start_anchor,
     if ((line = typeMallocn(char, line_used)) == 0)
 	  outofmem(__FILE__, "HText_EditTextArea");
 
-    assert(line != NULL);
-
     anchor_ptr = start_anchor;
     display_size = anchor_ptr->input_field->size;
     if (display_size <= 4 ||
@@ -13615,10 +13583,6 @@ int HText_InsertFile(LinkInfo * form_link)
     if (a == NULL || l == NULL || f == NULL)
 	outofmem(__FILE__, "HText_InsertFile");
 
-    assert(a != NULL);
-    assert(f != NULL);
-    assert(l != NULL);
-
     /*  Init all the fields in the new TextAnchor.                 */
     /*  [anything "special" needed based on ->show_anchor value ?] */
     /* *INDENT-EQLS* */
@@ -13700,8 +13664,6 @@ int HText_InsertFile(LinkInfo * form_link)
     if ((line = typeMallocn(char, MAX_LINE)) == 0)
 	  outofmem(__FILE__, "HText_InsertFile");
 
-    assert(line != NULL);
-
     match_tag = anchor_ptr->number;
 
     lp = fbuf;
@@ -14702,7 +14664,7 @@ static int LYHandleCache(const char *arg,
     target = HTStreamStack(format_in,
 			   format_out,
 			   sink, anAnchor);
-    if (!target || target == NULL) {
+    if (target == NULL) {
 	HTSprintf0(&buf, CANNOT_CONVERT_I_TO_O,
 		   HTAtom_name(format_in), HTAtom_name(format_out));
 	HTAlert(buf);
diff --git a/src/HTAlert.c b/src/HTAlert.c
index 34ddfa9..aa18568 100644
--- a/src/HTAlert.c
+++ b/src/HTAlert.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTAlert.c,v 1.101 2013/11/28 11:17:04 tom Exp $
+ * $LynxId: HTAlert.c,v 1.102 2016/11/24 23:56:05 tom Exp $
  *
  *	Displaying messages and getting input for Lynx Browser
  *	==========================================================
@@ -668,20 +668,22 @@ char *HTPrompt(const char *Msg, const char *deflt)
  *	Prompt for password without echoing the reply.	HTPromptPassword()
  *	----------------------------------------------
  */
-char *HTPromptPassword(const char *Msg)
+char *HTPromptPassword(const char *Msg, const char *given)
 {
     char *result = NULL;
     bstring *data = NULL;
 
+    if (isEmpty(given))
+	given = "";
     if (!dump_output_immediately) {
 	_statusline(Msg ? Msg : PASSWORD_PROMPT);
-	BStrCopy0(data, "");
+	BStrCopy0(data, given);
 	(void) LYgetBString(&data, TRUE, 0, NORECALL);
 	StrAllocCopy(result, data->str);
 	BStrFree(data);
     } else {
 	printf("\n%s\n", PASSWORD_REQUIRED);
-	StrAllocCopy(result, "");
+	StrAllocCopy(result, given);
     }
     return result;
 }
@@ -755,7 +757,7 @@ void HTPromptUsernameAndPassword(const char *Msg,
 	    } else {
 		FREE(authentication_info[0]);
 	    }
-	} else {
+	} else if (isEmpty(*username)) {
 	    /*
 	     * Default to "WWWuser".  - FM
 	     */
@@ -773,7 +775,7 @@ void HTPromptUsernameAndPassword(const char *Msg,
 	    } else {
 		FREE(authentication_info[1]);
 	    }
-	} else {
+	} else if (isEmpty(*password)) {
 	    /*
 	     * Default to a zero-length string.  - FM
 	     */
@@ -822,11 +824,7 @@ void HTPromptUsernameAndPassword(const char *Msg,
 		FREE(authentication_info[1]);
 	    }
 	} else if (non_empty(*username)) {
-	    /*
-	     * We have a non-zero length username,
-	     * so prompt for the password.  - FM
-	     */
-	    *password = HTPromptPassword(PASSWORD_PROMPT);
+	    *password = HTPromptPassword(PASSWORD_PROMPT, *password);
 	} else {
 	    /*
 	     * Return a zero-length password.  - FM
diff --git a/src/HTAlert.h b/src/HTAlert.h
index 9c96755..03106f5 100644
--- a/src/HTAlert.h
+++ b/src/HTAlert.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTAlert.h,v 1.34 2010/09/26 16:36:38 tom Exp $
+ * $LynxId: HTAlert.h,v 1.35 2016/11/24 23:44:49 tom Exp $
  *
  *      Displaying messages and getting input for WWW Library
  *      =====================================================
@@ -90,7 +90,7 @@ extern "C" {
 
 /*      Prompt for password without echoing the reply
  */
-    extern char *HTPromptPassword(const char *Msg);
+    extern char *HTPromptPassword(const char *Msg, const char *given);
 
 /*      Prompt both username and password       HTPromptUsernameAndPassword()
  *      ---------------------------------
diff --git a/src/HTFWriter.c b/src/HTFWriter.c
index b893ea2..6f04ea0 100644
--- a/src/HTFWriter.c
+++ b/src/HTFWriter.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTFWriter.c,v 1.106 2013/11/28 11:17:04 tom Exp $
+ * $LynxId: HTFWriter.c,v 1.111 2017/02/11 00:28:32 tom Exp $
  *
  *		FILE WRITER				HTFWrite.h
  *		===========
@@ -143,6 +143,81 @@ static void HTFWriter_write(HTStream *me, const char *s, int l)
     }
 }
 
+static void decompress_gzip(HTStream *me)
+{
+    char *in_name = me->anchor->FileCache;
+    char copied[LY_MAXPATH];
+    FILE *fp = LYOpenTemp(copied, ".tmp.gz", BIN_W);
+
+    if (fp != 0) {
+#ifdef USE_ZLIB
+	char buffer[BUFSIZ];
+	gzFile gzfp;
+	int status;
+
+	CTRACE((tfp, "decompressing '%s'\n", in_name));
+	if ((gzfp = gzopen(in_name, BIN_R)) != 0) {
+	    BOOL success = TRUE;
+	    size_t actual = 0;
+
+	    CTRACE((tfp, "...opened '%s'\n", copied));
+	    while ((status = gzread(gzfp, buffer, sizeof(buffer))) > 0) {
+		size_t want = (size_t) status;
+		size_t have = fwrite(buffer, sizeof(char), want, fp);
+
+		actual += have;
+		if (want != have) {
+		    success = FALSE;
+		    break;
+		}
+	    }
+	    gzclose(gzfp);
+	    LYCloseTempFP(fp);
+	    CTRACE((tfp, "...decompress %ld to %ld\n",
+		    me->anchor->actual_length,
+		    actual));
+	    if (success) {
+		if (rename(copied, in_name) == 0)
+		    me->anchor->actual_length = (off_t) actual;
+		LYRemoveTemp(copied);
+	    }
+	}
+#else
+#define FMT "%s %s"
+	const char *program;
+
+	if (LYCopyFile(in_name, copied) == 0) {
+	    char expanded[LY_MAXPATH];
+	    char *command = NULL;
+
+	    if ((program = HTGetProgramPath(ppUNCOMPRESS)) != NULL) {
+		HTAddParam(&command, FMT, 1, program);
+		HTAddParam(&command, FMT, 2, copied);
+		HTEndParam(&command, FMT, 2);
+	    }
+	    if (LYSystem(command) == 0) {
+		struct stat stat_buf;
+
+		strcpy(expanded, copied);
+		*strrchr(expanded, '.') = '\0';
+		if (rename(expanded, in_name) != 0) {
+		    CTRACE((tfp, "rename failed %s to %s\n", expanded, in_name));
+		} else if (stat(in_name, &stat_buf) != 0) {
+		    CTRACE((tfp, "stat failed for %s\n", in_name));
+		} else {
+		    me->anchor->actual_length = stat_buf.st_size;
+		}
+	    } else {
+		CTRACE((tfp, "command failed: %s\n", command));
+	    }
+	    free(command);
+	    LYRemoveTemp(copied);
+	}
+#undef FMT
+#endif
+    }
+}
+
 /*	Free an HTML object
  *	-------------------
  *
@@ -168,6 +243,19 @@ static void HTFWriter_free(HTStream *me)
 	fflush(me->fp);
     if (me->end_command) {	/* Temp file */
 	LYCloseTempFP(me->fp);
+	/*
+	 * Handle a special case where the server used "Content-Type:  gzip". 
+	 * Normally that feeds into the presentation stages, but if the link
+	 * happens to point to something that will not be presented, but
+	 * instead offered as a download, it comes here.  In that case, ungzip
+	 * the content before prompting the user for the place to store it.
+	 */
+	if (me->anchor->FileCache != NULL
+	    && me->anchor->no_content_encoding == FALSE
+	    && me->input_format == HTAtom_for("application/x-gzip")
+	    && !strcmp(me->anchor->content_encoding, "gzip")) {
+	    decompress_gzip(me);
+	}
 #ifdef VMS
 	if (0 == strcmp(me->end_command, "SaveVMSBinaryFile")) {
 	    /*
@@ -536,8 +624,6 @@ HTStream *HTFWriter_new(FILE *fp)
     if (me == NULL)
 	outofmem(__FILE__, "HTFWriter_new");
 
-    assert(me != NULL);
-
     me->isa = &HTFWriter;
 
     me->fp = fp;
@@ -635,8 +721,6 @@ HTStream *HTSaveAndExecute(HTPresentation *pres,
     if (me == NULL)
 	outofmem(__FILE__, "HTSaveAndExecute");
 
-    assert(me != NULL);
-
     me->isa = &HTFWriter;
     me->input_format = pres->rep;
     me->output_format = pres->rep_out;
@@ -772,8 +856,6 @@ HTStream *HTSaveToFile(HTPresentation *pres,
     if (ret_obj == NULL)
 	outofmem(__FILE__, "HTSaveToFile");
 
-    assert(ret_obj != NULL);
-
     ret_obj->isa = &HTFWriter;
     ret_obj->remove_command = NULL;
     ret_obj->end_command = NULL;
@@ -1129,8 +1211,6 @@ HTStream *HTCompressed(HTPresentation *pres,
     if (me == NULL)
 	outofmem(__FILE__, "HTCompressed");
 
-    assert(me != NULL);
-
     me->isa = &HTFWriter;
     me->input_format = pres->rep;
     me->output_format = pres->rep_out;
@@ -1276,8 +1356,6 @@ HTStream *HTDumpToStdout(HTPresentation *pres GCC_UNUSED,
     if (ret_obj == NULL)
 	outofmem(__FILE__, "HTDumpToStdout");
 
-    assert(ret_obj != NULL);
-
     ret_obj->isa = &HTFWriter;
     ret_obj->remove_command = NULL;
     ret_obj->end_command = NULL;
diff --git a/src/HTInit.c b/src/HTInit.c
index 7341bee..c2c6c71 100644
--- a/src/HTInit.c
+++ b/src/HTInit.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTInit.c,v 1.88 2014/02/13 21:39:04 tom Exp $
+ * $LynxId: HTInit.c,v 1.89 2016/11/24 15:35:29 tom Exp $
  *
  *		Configuration-specific Initialization		HTInit.c
  *		----------------------------------------
@@ -275,8 +275,6 @@ static char *GetCommand(char *s, char **t)
     if (!s2)
 	ExitWithError(MEMORY_EXHAUSTED_ABORT);
 
-    assert(s2 != NULL);
-
     *t = s2;
     while (non_empty(s)) {
 	if (quoted) {
@@ -376,8 +374,6 @@ static int ProcessMailcapEntry(FILE *fp, struct MailcapEntry *mc, AcceptMedia me
     if (!rawentry)
 	ExitWithError(MEMORY_EXHAUSTED_ABORT);
 
-    assert(rawentry != NULL);
-
     *rawentry = '\0';
     while (LYSafeGets(&LineBuf, fp) != 0) {
 	LYTrimNewline(LineBuf);
@@ -391,8 +387,6 @@ static int ProcessMailcapEntry(FILE *fp, struct MailcapEntry *mc, AcceptMedia me
 
 	    if (!rawentry)
 		ExitWithError(MEMORY_EXHAUSTED_ABORT);
-
-	    assert(rawentry != NULL);
 	}
 	if (len > 0 && LineBuf[len - 1] == ESCAPE) {
 	    LineBuf[len - 1] = '\0';
@@ -862,8 +856,6 @@ static int RememberTestResult(int mode, char *cmd, int result)
 	if (cur == NULL)
 	    outofmem(__FILE__, "RememberTestResult");
 
-	assert(cur != NULL);
-
 	cur->next = cmdlist;
 	StrAllocCopy(cur->cmd, cmd);
 	cur->result = result;
diff --git a/src/HTML.c b/src/HTML.c
index e10efe7..e74d239 100644
--- a/src/HTML.c
+++ b/src/HTML.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTML.c,v 1.166 2015/12/13 23:08:45 Kihara.Hideto Exp $
+ * $LynxId: HTML.c,v 1.168 2016/11/24 18:18:18 tom Exp $
  *
  *		Structured stream to Rich hypertext converter
  *		============================================
@@ -762,7 +762,6 @@ static void addClassName(const char *prefix,
 	}
 	if (Style_className == NULL)
 	    outofmem(__FILE__, "addClassName");
-	assert(Style_className != NULL);
 	Style_className_end = Style_className + have;
     }
     if (offset)
@@ -4384,6 +4383,7 @@ static int HTML_start_element(HTStructured * me, int element_number,
 		     * Ugh, it's a button for a script.  - FM
 		     */
 		    I.type = value[HTML_BUTTON_TYPE];
+		    CTRACE((tfp, "found button for a script\n"));
 		}
 	    } else {
 		/* default, if no type given, is a submit button */
@@ -7674,7 +7674,6 @@ HTStructured *HTML_new(HTParentAnchor *anchor,
     me = typecalloc(HTStructured);
     if (me == NULL)
 	outofmem(__FILE__, "HTML_new");
-    assert(me != NULL);
 
     /*
      * This used to call 'get_styles()' only on the first time through this
@@ -8034,8 +8033,6 @@ static HTStream *CacheThru_new(HTParentAnchor *anchor,
     if (!stream)
 	outofmem(__FILE__, "CacheThru_new");
 
-    assert(stream != NULL);
-
     stream->isa = &PassThruCache;
     stream->anchor = anchor;
     stream->fp = NULL;
diff --git a/src/LYCgi.c b/src/LYCgi.c
index 31833ea..f4c2bde 100644
--- a/src/LYCgi.c
+++ b/src/LYCgi.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYCgi.c,v 1.68 2014/07/24 22:02:26 tom Exp $
+ * $LynxId: LYCgi.c,v 1.70 2016/11/24 16:38:22 tom Exp $
  *                   Lynx CGI support                              LYCgi.c
  *                   ================
  *
@@ -114,7 +114,6 @@ static void add_environment_value(const char *env_value)
 	if (env == NULL) {
 	    outofmem(__FILE__, "LYCgi");
 	}
-	assert(env != NULL);
     }
 
     env[envc++] = DeConst(env_value);
@@ -390,7 +389,7 @@ static int LYLoadCGI(const char *arg,
 			       format_out,
 			       sink, anAnchor);
 
-	if (!target || target == NULL) {
+	if (target == NULL) {
 	    char *tmp = 0;
 
 	    HTSprintf0(&tmp, CANNOT_CONVERT_I_TO_O,
@@ -599,7 +598,6 @@ static int LYLoadCGI(const char *arg,
 		if (argv == NULL) {
 		    outofmem(__FILE__, "LYCgi");
 		}
-		assert(argv != NULL);
 
 		cur_argv = argv + 1;	/* For argv[0] */
 		if (pgm_args != NULL) {
diff --git a/src/LYCharUtils.c b/src/LYCharUtils.c
index 15909dc..d717786 100644
--- a/src/LYCharUtils.c
+++ b/src/LYCharUtils.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYCharUtils.c,v 1.128 2014/12/10 10:30:58 tom Exp $
+ * $LynxId: LYCharUtils.c,v 1.129 2016/11/24 15:35:29 tom Exp $
  *
  *  Functions associated with LYCharSets.c and the Lynx version of HTML.c - FM
  *  ==========================================================================
@@ -3389,8 +3389,6 @@ void LYformTitle(char **dst,
 	if ((tmp_buffer = (char *) malloc(strlen(src) + 1)) == 0)
 	    outofmem(__FILE__, "LYformTitle");
 
-	assert(tmp_buffer != NULL);
-
 	switch (kanji_code) {	/* 1997/11/22 (Sat) 09:28:00 */
 	case EUC:
 	    TO_EUC((const unsigned char *) src, (unsigned char *) tmp_buffer);
diff --git a/src/LYCookie.c b/src/LYCookie.c
index 5743485..4f9fba5 100644
--- a/src/LYCookie.c
+++ b/src/LYCookie.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYCookie.c,v 1.131 2015/09/30 22:05:41 tom Exp $
+ * $LynxId: LYCookie.c,v 1.134 2016/11/24 17:24:12 tom Exp $
  *
  *			       Lynx Cookie Support		   LYCookie.c
  *			       ===================
@@ -148,8 +148,6 @@ static cookie *newCookie(void)
     if (p == NULL)
 	outofmem(__FILE__, "newCookie");
 
-    assert(p != NULL);
-
     HTSprintf0(&(p->lynxID), "%p", (void *) p);
     p->port = 80;
     return p;
@@ -571,8 +569,6 @@ static void store_cookie(cookie * co, const char *hostname,
 	if (de == NULL)
 	    outofmem(__FILE__, "store_cookie");
 
-	assert(de != NULL);
-
 	de->bv = QUERY_USER;
 	de->invcheck_bv = DEFAULT_INVCHECK_BV;	/* should this go here? */
 	cookie_list = de->cookie_list = HTList_new();
@@ -676,7 +672,7 @@ static void store_cookie(cookie * co, const char *hostname,
 	 * If it's a replacement for a cookie that had not expired, and never
 	 * allow has not been set, add it again without confirmation.  - FM
 	 */
-    } else if ((Replacement == TRUE && de) && de->bv != REJECT_ALWAYS) {
+    } else if ((Replacement == TRUE) && de->bv != REJECT_ALWAYS) {
 	HTList_insertObjectAt(cookie_list, co, pos);
 	total_cookies++;
 
@@ -2444,7 +2440,7 @@ static int LYHandleCookies(const char *arg,
     target = HTStreamStack(format_in,
 			   format_out,
 			   sink, anAnchor);
-    if (!target || target == NULL) {
+    if (target == NULL) {
 	HTSprintf0(&buf, CANNOT_CONVERT_I_TO_O,
 		   HTAtom_name(format_in), HTAtom_name(format_out));
 	HTAlert(buf);
@@ -2676,8 +2672,6 @@ static void cookie_domain_flag_set(char *domainstr,
 	    if (de == NULL)
 		outofmem(__FILE__, "cookie_domain_flag_set");
 
-	    assert(de != NULL);
-
 	    de->bv = ACCEPT_ALWAYS;
 	    de->invcheck_bv = INVCHECK_QUERY;
 
diff --git a/src/LYCurses.c b/src/LYCurses.c
index ab264b2..63b73ec 100644
--- a/src/LYCurses.c
+++ b/src/LYCurses.c
@@ -1,4 +1,4 @@
-/* $LynxId: LYCurses.c,v 1.181 2016/11/04 21:54:57 tom Exp $ */
+/* $LynxId: LYCurses.c,v 1.183 2017/03/18 21:42:48 tom Exp $ */
 #include <HTUtils.h>
 #include <HTAlert.h>
 
@@ -1696,7 +1696,7 @@ void lynx_enable_mouse(int state)
 void lynx_nl2crlf(int normal GCC_UNUSED)
 {
 #if defined(NCURSES_VERSION_PATCH) && defined(SET_TTY) && defined(TERMIOS) && defined(ONLCR)
-    static TTY saved_tty;
+    static struct termios saved_tty;
     static int did_save = FALSE;
     static int waiting = FALSE;
     static int can_fix = TRUE;
@@ -1705,8 +1705,10 @@ void lynx_nl2crlf(int normal GCC_UNUSED)
 	if (cur_term == 0) {
 	    can_fix = FALSE;
 	} else {
-	    saved_tty = cur_term->Nttyb;
+	    tcgetattr(fileno(stdout), &saved_tty);
 	    did_save = TRUE;
+	    if ((saved_tty.c_oflag & ONLCR))
+		can_fix = FALSE;
 #if NCURSES_VERSION_PATCH < 20010529
 	    /* workaround for optimizer bug with nonl() */
 	    if ((tigetstr("cud1") != 0 && *tigetstr("cud1") == '\n')
@@ -1718,14 +1720,18 @@ void lynx_nl2crlf(int normal GCC_UNUSED)
     if (can_fix) {
 	if (normal) {
 	    if (!waiting) {
-		cur_term->Nttyb.c_oflag |= ONLCR;
+		struct termios alter_tty = saved_tty;
+
+		alter_tty.c_oflag |= ONLCR;
+		tcsetattr(fileno(stdout), TCSAFLUSH, &alter_tty);
+		def_prog_mode();
 		waiting = TRUE;
 		nonl();
 	    }
 	} else {
 	    if (waiting) {
-		cur_term->Nttyb = saved_tty;
-		SET_TTY(fileno(stdout), &saved_tty);
+		tcsetattr(fileno(stdout), TCSAFLUSH, &saved_tty);
+		def_prog_mode();
 		waiting = FALSE;
 		nl();
 		LYrefresh();
@@ -2203,6 +2209,8 @@ void LYwaddnstr(WINDOW * w GCC_UNUSED,
     int y, x;
     size_t inx;
 
+    (void) y;
+    (void) y0;
 #ifdef USE_CURSES_PADS
     /*
      * If we've configured to use pads for left/right scrolling, that can
diff --git a/src/LYGetFile.c b/src/LYGetFile.c
index a6ed48d..3b06cc9 100644
--- a/src/LYGetFile.c
+++ b/src/LYGetFile.c
@@ -1,4 +1,4 @@
-/* $LynxId: LYGetFile.c,v 1.93 2015/04/06 10:33:23 tom Exp $ */
+/* $LynxId: LYGetFile.c,v 1.94 2016/11/24 15:35:29 tom Exp $ */
 #include <HTUtils.h>
 #include <HTTP.h>
 #include <HTAnchor.h>		/* Anchor class */
@@ -1279,8 +1279,6 @@ static struct trust *new_trust(const char *src, const char *path, int type)
     if (tp == NULL)
 	outofmem(__FILE__, "new_trust");
 
-    assert(tp != NULL);
-
     tp->type = type;
     StrAllocCopy(tp->src, src);
     StrAllocCopy(tp->path, path);
diff --git a/src/LYHistory.c b/src/LYHistory.c
index 3f13bbd..c3b7dd4 100644
--- a/src/LYHistory.c
+++ b/src/LYHistory.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYHistory.c,v 1.87 2015/12/16 01:45:14 tom Exp $
+ * $LynxId: LYHistory.c,v 1.89 2016/11/24 16:38:22 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTTP.h>
@@ -181,8 +181,6 @@ void LYAddVisitedLink(DocInfo *doc)
     if ((tmp = typecalloc(VisitedLink)) == NULL)
 	outofmem(__FILE__, "LYAddVisitedLink");
 
-    assert(tmp != NULL);
-
     StrAllocCopy(tmp->address, doc->address);
     LYformTitle(&(tmp->title), title);
 
@@ -358,8 +356,6 @@ void LYAllocHistory(int entries)
 	if (history == 0)
 	    outofmem(__FILE__, "LYAllocHistory");
 
-	assert(history != NULL);
-
 	while (save < size_history) {
 	    memset(&history[save++], 0, sizeof(history[0]));
 	}
@@ -1100,7 +1096,7 @@ static int LYLoadMESSAGES(const char *arg GCC_UNUSED,
      */
     target = HTStreamStack(format_in, format_out, sink, anAnchor);
 
-    if (!target || target == NULL) {
+    if (target == NULL) {
 	HTSprintf0(&buf, CANNOT_CONVERT_I_TO_O,
 		   HTAtom_name(format_in), HTAtom_name(format_out));
 	HTAlert(buf);
diff --git a/src/LYIcon.rc b/src/LYIcon.rc
index 2752f8f..b351577 100644
--- a/src/LYIcon.rc
+++ b/src/LYIcon.rc
@@ -1,12 +1,12 @@
-// $LynxId: LYIcon.rc,v 1.25 2016/11/15 09:04:25 tom Exp $
+// $LynxId: LYIcon.rc,v 1.28 2017/04/29 12:47:15 tom Exp $
 
 #include <windows.h>
 
 100	ICON	"../samples/lynx.ico"
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION    2,8,9,1011
-PRODUCTVERSION 2,8,9,1011
+FILEVERSION    2,8,9,1013
+PRODUCTVERSION 2,8,9,1013
 FILEFLAGSMASK  VS_FFI_FILEFLAGSMASK
 FILEFLAGS      0
 FILEOS         VOS_NT_WINDOWS32
@@ -19,12 +19,12 @@ BEGIN
     BEGIN
       VALUE "CompanyName",      "http://invisible-island.net/lynx"
       VALUE "FileDescription",  "Lynx - web browser"
-      VALUE "FileVersion",      "2.8.9.1011"
+      VALUE "FileVersion",      "2.8.9.1013"
       VALUE "InternalName",     "Lynx"
-      VALUE "LegalCopyright",   "�1997-2016 Thomas E. Dickey"
+      VALUE "LegalCopyright",   "�1997-2017 Thomas E. Dickey"
       VALUE "OriginalFilename", "lynx.exe"
       VALUE "ProductName",      "Lynx - web browser"
-      VALUE "ProductVersion",   "2.8.9.1011"
+      VALUE "ProductVersion",   "2.8.9.1013"
     END
   END
   BLOCK "VarFileInfo"
diff --git a/src/LYJump.c b/src/LYJump.c
index 98632df..0847fd3 100644
--- a/src/LYJump.c
+++ b/src/LYJump.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYJump.c,v 1.50 2014/01/19 11:43:21 tom Exp $
+ * $LynxId: LYJump.c,v 1.51 2016/11/24 15:35:29 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTAlert.h>
@@ -89,8 +89,6 @@ BOOL LYJumpInit(char *config)
 	outofmem(__FILE__, "LYJumpInit");
     }
 
-    assert(jtp != NULL);
-
     /*
      * config is JUMPFILE:path[:optional_key[:optional_prompt]]
      *
@@ -153,8 +151,6 @@ BOOL LYJumpInit(char *config)
 	    outofmem(__FILE__, "LYJumpInit");
 	}
 
-	assert(jtp != NULL);
-
 	StrAllocCopy(jtp->file, JThead->file);
     }
 
diff --git a/src/LYKeymap.c b/src/LYKeymap.c
index 4d24983..b059564 100644
--- a/src/LYKeymap.c
+++ b/src/LYKeymap.c
@@ -1,4 +1,4 @@
-/* $LynxId: LYKeymap.c,v 1.118 2015/12/17 01:27:51 tom Exp $ */
+/* $LynxId: LYKeymap.c,v 1.119 2016/11/24 16:38:22 tom Exp $ */
 #include <HTUtils.h>
 #include <LYUtils.h>
 #include <LYGlobalDefs.h>
@@ -1003,7 +1003,7 @@ static int LYLoadKeymap(const char *arg GCC_UNUSED,
      * Set up the stream.  - FM
      */
     target = HTStreamStack(format_in, format_out, sink, anAnchor);
-    if (!target || target == NULL) {
+    if (target == NULL) {
 	HTSprintf0(&buf, CANNOT_CONVERT_I_TO_O,
 		   HTAtom_name(format_in), HTAtom_name(format_out));
 	HTAlert(buf);
diff --git a/src/LYLeaks.c b/src/LYLeaks.c
index f6c7174..d1bdaf9 100644
--- a/src/LYLeaks.c
+++ b/src/LYLeaks.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYLeaks.c,v 1.37 2013/12/07 13:46:58 tom Exp $
+ * $LynxId: LYLeaks.c,v 1.38 2016/11/24 15:35:29 tom Exp $
  *
  *	Copyright (c) 1994, University of Kansas, All Rights Reserved
  *	(this file was rewritten twice - 1998/1999 and 2003/2004)
@@ -858,13 +858,9 @@ void LYLeakSABCopy(bstring **dest,
 	    == NULL)
 	      outofmem(__FILE__, "HTSABCopy");
 
-	assert(t != NULL);
-
 	if ((t->str = (char *) LYLeakMalloc(need, cp_File, ssi_Line)) == NULL)
 	    outofmem(__FILE__, "HTSABCopy");
 
-	assert(t->str != NULL);
-
 	MemCpy(t->str, src, len);
 	t->len = len;
 	t->str[t->len] = '\0';
@@ -915,15 +911,11 @@ void LYLeakSABCat(bstring **dest,
 					      ssi_Line)) == NULL)
 		  outofmem(__FILE__, "HTSACat");
 
-	    assert(t != NULL);
-
 	    t->str = (char *) LYLeakMalloc(need, cp_File, ssi_Line);
 	}
 	if (t->str == NULL)
 	    outofmem(__FILE__, "HTSACat");
 
-	assert(t->str != NULL);
-
 	MemCpy(t->str + t->len, src, len);
 	t->len += len;
 	t->str[t->len] = '\0';
diff --git a/src/LYLocal.c b/src/LYLocal.c
index b72bf82..fcecce1 100644
--- a/src/LYLocal.c
+++ b/src/LYLocal.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYLocal.c,v 1.129 2015/01/05 01:28:10 Thorsten.Glaser Exp $
+ * $LynxId: LYLocal.c,v 1.131 2016/11/24 17:18:55 tom Exp $
  *
  *  Routines to manipulate the local filesystem.
  *  Written by: Rick Mallett, Carleton University
@@ -848,7 +848,7 @@ static int modify_tagged(char *testpath)
 
 	    if (isEmpty(old_path) || strcmp(old_path, src_path)) {
 		if (!ok_stat(src_path, &src_info)
-		    || same_location(&src_info, &dst_info)
+		    || same_location(&dst_info, &src_info)
 		    || !dir_has_same_owner(&dst_info, &src_info)) {
 		    FREE(src_path);
 		    BStrFree(given_target);
@@ -2511,8 +2511,6 @@ void add_menu_item(char *str)
     if (tmp == NULL)
 	outofmem(__FILE__, "add_menu_item");
 
-    assert(tmp != NULL);
-
     /*
      * Conditional on tagged != NULL ?
      */
diff --git a/src/LYMain.c b/src/LYMain.c
index f70bc3b..fcb87ba 100644
--- a/src/LYMain.c
+++ b/src/LYMain.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYMain.c,v 1.260 2015/12/18 00:34:45 tom Exp $
+ * $LynxId: LYMain.c,v 1.261 2017/04/27 22:34:12 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTTP.h>
@@ -3779,7 +3779,7 @@ with partial-display logic"
 #endif
 #ifndef DISABLE_FTP
    PARSE_SET(
-      "passive-ftp",	4|TOGGLE_ARG,		ftp_passive,
+      "passive_ftp",	4|TOGGLE_ARG,		ftp_passive,
       "toggles passive ftp connection"
    ),
 #endif
@@ -3931,7 +3931,7 @@ bug which treated '>' as a co-terminator for\ndouble-quotes and tags"
       "=text\ninformation for syslog call"
    ),
    PARSE_SET(
-      "syslog-urls",	4|SET_ARG,		syslog_requested_urls,
+      "syslog_urls",	4|SET_ARG,		syslog_requested_urls,
       "log requested URLs with syslog"
    ),
 #endif
@@ -4039,7 +4039,7 @@ with filenames of these images"
    ),
 #endif
    PARSE_SET(
-      "xhtml-parsing",	4|SET_ARG,		LYxhtml_parsing,
+      "xhtml_parsing",	4|SET_ARG,		LYxhtml_parsing,
       "enable XHTML 1.0 parsing"
    ),
    PARSE_NIL
diff --git a/src/LYMainLoop.c b/src/LYMainLoop.c
index 0edda47..b2bfbdd 100644
--- a/src/LYMainLoop.c
+++ b/src/LYMainLoop.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYMainLoop.c,v 1.232 2014/12/21 21:27:23 tom Exp $
+ * $LynxId: LYMainLoop.c,v 1.233 2016/11/24 19:50:02 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTAccess.h>
@@ -8133,7 +8133,7 @@ static void status_link(char *curlink_name,
     prefix = (int) strlen(format);
     length = (int) strlen(curlink_name);
 
-    if (prefix > MAX_STATUS || prefix >= MAX_LINE - 1) {
+    if (prefix > MAX_STATUS || prefix >= MAX_LINE - 10) {
 	_user_message("%s", format);	/* no room for url */
     } else {
 	sprintf(format + prefix, "%%.%ds", MAX_STATUS - prefix);
diff --git a/src/LYMap.c b/src/LYMap.c
index b975eca..b34ae6d 100644
--- a/src/LYMap.c
+++ b/src/LYMap.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYMap.c,v 1.48 2013/11/28 11:21:09 tom Exp $
+ * $LynxId: LYMap.c,v 1.49 2016/11/24 16:38:22 tom Exp $
  *			Lynx Client-side Image MAP Support	       LYMap.c
  *			==================================
  *
@@ -522,7 +522,7 @@ static int LYLoadIMGmap(const char *arg,
 			   format_out,
 			   sink, anAnchor);
 
-    if (!target || target == NULL) {
+    if (target == NULL) {
 	HTSprintf0(&buf, CANNOT_CONVERT_I_TO_O,
 		   HTAtom_name(format_in), HTAtom_name(format_out));
 	HTAlert(buf);
diff --git a/src/LYOptions.c b/src/LYOptions.c
index 5ee1853..8e795c5 100644
--- a/src/LYOptions.c
+++ b/src/LYOptions.c
@@ -1,4 +1,4 @@
-/* $LynxId: LYOptions.c,v 1.168 2015/12/18 01:01:21 tom Exp $ */
+/* $LynxId: LYOptions.c,v 1.171 2017/01/01 01:49:49 tom Exp $ */
 #include <HTUtils.h>
 #include <HTFTP.h>
 #include <HTTP.h>		/* 'reloading' flag */
@@ -981,7 +981,7 @@ void LYoptions(void)
 		    if (!LYSelectPopups)
 #endif /* !VMS && !USE_SLANG */
 		    {
-			LYmove(L_Rawmode, COL_OPTION_VALUES);
+			LYmove(L_RAWMODE + 1, COL_OPTION_VALUES);
 			LYclrtoeol();
 			ShowBool(LYRawMode);
 		    }
@@ -2513,7 +2513,7 @@ static BOOLEAN GetOptValues(OptValues * table, char *value,
 
 #ifdef USE_COLOR_STYLE
 #ifdef LY_FIND_LEAKS
-static void free_colorstyle_leaks(void)
+void free_colorstyle_leaks(void)
 {
     FREE(color_style_values);
 }
@@ -2617,8 +2617,6 @@ static PostPair *break_data(bstring *data)
     if (q == NULL)
 	outofmem(__FILE__, "break_data(calloc)");
 
-    assert(q != NULL);
-
     do {
 	/*
 	 * First, break up on '&', sliding 'p' on down the line.
@@ -2673,8 +2671,6 @@ static PostPair *break_data(bstring *data)
 	if (q == NULL)
 	    outofmem(__FILE__, "break_data(realloc)");
 
-	assert(q != NULL);
-
 	q[count].tag = NULL;
     } while (p != NULL && p[0] != '\0');
     return q;
diff --git a/src/LYOptions.h b/src/LYOptions.h
index 0c5f5f2..2811f2a 100644
--- a/src/LYOptions.h
+++ b/src/LYOptions.h
@@ -1,4 +1,4 @@
-/* $LynxId: LYOptions.h,v 1.31 2013/10/22 00:37:32 tom Exp $ */
+/* $LynxId: LYOptions.h,v 1.32 2017/01/01 01:51:23 tom Exp $ */
 #ifndef LYOPTIONS_H
 #define LYOPTIONS_H
 
@@ -36,6 +36,10 @@ extern "C" {
     extern void build_lss_enum(HTList *);
 #endif
 
+#if defined(USE_COLOR_STYLE) && defined(LY_FIND_LEAKS)
+    extern void free_colorstyle_leaks(void);
+#endif
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/LYReadCFG.c b/src/LYReadCFG.c
index 6d50977..7524c0a 100644
--- a/src/LYReadCFG.c
+++ b/src/LYReadCFG.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYReadCFG.c,v 1.188 2016/10/11 23:44:06 tom Exp $
+ * $LynxId: LYReadCFG.c,v 1.189 2016/11/24 15:35:29 tom Exp $
  */
 #ifndef NO_RULES
 #include <HTRules.h>
@@ -243,8 +243,6 @@ static void add_item_to_list(char *buffer,
 	if (cur_item == NULL)
 	    outofmem(__FILE__, "read_cfg");
 
-	assert(cur_item != NULL);
-
 	*list_ptr = cur_item;
 #ifdef LY_FIND_LEAKS
 	atexit(free_all_item_lists);
@@ -262,8 +260,6 @@ static void add_item_to_list(char *buffer,
 	    outofmem(__FILE__, "read_cfg");
 	else
 	    prev_item->next = cur_item;
-
-	assert(cur_item != NULL);
     }
     /* fill-in nonzero default values */
     cur_item->pagelen = 66;
@@ -474,13 +470,9 @@ static void parse_color(char *buffer)
     if (NULL == (fg = find_colon(buffer)))
 	exit_with_color_syntax(buffer);
 
-    assert(fg != NULL);
-
     if (NULL == (bg = find_colon(++fg)))
 	exit_with_color_syntax(buffer);
 
-    assert(bg != NULL);
-
     StrAllocCopy(temp_fg, fg);
     temp_fg[bg++ - fg] = '\0';
 
@@ -625,8 +617,6 @@ static int assumed_color_fun(char *buffer)
 	if (NULL == (bg = find_colon(fg)))
 	    exit_with_color_syntax(buffer);
 
-	assert(bg != NULL);
-
 	StrAllocCopy(temp_fg, fg);
 	temp_fg[bg++ - fg] = '\0';
 
@@ -1275,8 +1265,6 @@ static int parse_html_src_spec(HTlexeme lexeme_code, char *value,
     if (!ts2)
 	BS();
 
-    assert(ts2 != NULL);
-
     *ts2 = '\0';
 
     CTRACE2(TRACE_CFG, (tfp,
diff --git a/src/LYStrings.c b/src/LYStrings.c
index b9411f8..9f0ef0f 100644
--- a/src/LYStrings.c
+++ b/src/LYStrings.c
@@ -1,4 +1,4 @@
-/* $LynxId: LYStrings.c,v 1.263 2015/12/16 01:18:53 tom Exp $ */
+/* $LynxId: LYStrings.c,v 1.267 2017/04/29 14:38:32 tom Exp $ */
 #include <HTUtils.h>
 #include <HTCJK.h>
 #include <UCAux.h>
@@ -1004,12 +1004,13 @@ static const char *expand_tiname(const char *first, size_t len, char **result, c
 {
     char name[BUFSIZ];
     int code;
+    TERMTYPE *tp = (TERMTYPE *) (cur_term);
 
     LYStrNCpy(name, first, len);
     if ((code = lookup_tiname(name, strnames)) >= 0
 	|| (code = lookup_tiname(name, strfnames)) >= 0) {
-	if (cur_term->type.Strings[code] != 0) {
-	    LYStrNCpy(*result, cur_term->type.Strings[code], (final - *result));
+	if (tp->Strings[code] != 0) {
+	    LYStrNCpy(*result, tp->Strings[code], (final - *result));
 	    (*result) += strlen(*result);
 	}
     }
@@ -3104,15 +3105,21 @@ static int cell2char(char *s, int cells)
     int have;
 
     CTRACE_EDIT((tfp, "cell2char(%d) %d:%s\n", cells, len, s));
-    /* FIXME - make this a binary search */
     if (len != 0) {
+	int best = -1;
+
 	for (pos = 0; pos <= len; ++pos) {
 	    have = LYstrExtent2(s, pos);
 	    CTRACE_EDIT((tfp, "  %2d:%2d:%.*s\n", pos, have, pos, s));
 	    if (have >= cells) {
-		break;
+		if (cells <= 0)
+		    break;
+		/* the best solution is the one with the most bytes */
+		best = pos;
 	    }
 	}
+	if (best >= 0)
+	    pos = best;
 	if (pos > len)
 	    pos = len;
     } else {
@@ -3995,8 +4002,6 @@ static char **sortedList(HTList *list, int ignorecase)
     if (result == 0)
 	outofmem(__FILE__, "sortedList");
 
-    assert(result != 0);
-
     while (!HTList_isEmpty(list))
 	result[j++] = (char *) HTList_nextObject(list);
 
@@ -5913,7 +5918,6 @@ char *SNACopy(char **target,
 	if (*target == NULL) {
 	    CTRACE((tfp, "Tried to malloc %lu bytes\n", (unsigned long) n));
 	    outofmem(__FILE__, "SNACopy");
-	    assert(*target != NULL);
 	}
 	LYStrNCpy(*target, source, n);
     }
@@ -5936,14 +5940,12 @@ char *SNACat(char **target,
 
 	    if (*target == NULL)
 		outofmem(__FILE__, "SNACat");
-	    assert(*target != NULL);
 	    LYStrNCpy(*target + length, source, n);
 	} else {
 	    *target = typeMallocn(char, n + 1);
 
 	    if (*target == NULL)
 		outofmem(__FILE__, "SNACat");
-	    assert(*target != NULL);
 	    MemCpy(*target, source, n);
 	    (*target)[n] = '\0';	/* terminate */
 	}
diff --git a/src/LYUtils.c b/src/LYUtils.c
index b47779e..f9f4fb6 100644
--- a/src/LYUtils.c
+++ b/src/LYUtils.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYUtils.c,v 1.275 2016/11/15 09:34:30 tom Exp $
+ * $LynxId: LYUtils.c,v 1.276 2016/11/24 15:35:29 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTTCP.h>
@@ -1437,8 +1437,6 @@ void statusline(const char *text)
 	if ((temp = typecallocn(unsigned char, strlen(text_buff) + 1)) == NULL)
 	      outofmem(__FILE__, "statusline");
 
-	assert(temp != NULL);
-
 	if (kanji_code == EUC) {
 	    TO_EUC((const unsigned char *) text_buff, temp);
 	} else if (kanji_code == SJIS) {
diff --git a/src/LYrcFile.c b/src/LYrcFile.c
index 31ada64..2c39c11 100644
--- a/src/LYrcFile.c
+++ b/src/LYrcFile.c
@@ -1,4 +1,4 @@
-/* $LynxId: LYrcFile.c,v 1.95 2015/12/18 01:57:45 tom Exp $ */
+/* $LynxId: LYrcFile.c,v 1.96 2016/11/24 16:42:46 tom Exp $ */
 #include <HTUtils.h>
 #include <HTFTP.h>
 #include <LYUtils.h>
@@ -705,6 +705,7 @@ BOOL LYsetRcValue(const char *name, const char *param)
 	 */
 	if (tbl->name == 0) {
 	    CTRACE((tfp, "LYrcFile: ignored %s=%s\n", name, value));
+	    FREE(orig_value);
 	    return FALSE;
 	}
     }
diff --git a/src/TRSTable.c b/src/TRSTable.c
index 9b9b3eb..a988615 100644
--- a/src/TRSTable.c
+++ b/src/TRSTable.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: TRSTable.c,v 1.34 2016/09/14 01:02:44 tom Exp $
+ * $LynxId: TRSTable.c,v 1.37 2016/11/24 18:14:41 tom Exp $
  *		Simple table object
  *		===================
  * Authors
@@ -582,18 +582,10 @@ static int Stbl_finishCellInRow(STable_rowinfo *me, STable_states *s, int end_td
 	    case CS__0eb:
 		newstate = empty ? CS__0eb : CS__ebc;
 		s->state = newstate;
-		if (me->fixed_line) {
-		    if (empty) {
-			ret = (lastcell->len <= 0 ? 0 : lastcell->len);
-		    } else {
-			ret = (lastcell->len <= 0 ? 0 : -1);
-		    }
+		if (empty) {
+		    ret = (lastcell->len <= 0 ? 0 : lastcell->len);
 		} else {
-		    if (empty) {
-			ret = (lastcell->len <= 0 ? 0 : lastcell->len);
-		    } else {
-			ret = (lastcell->len <= 0 ? 0 : 0);
-		    }
+		    ret = (lastcell->len <= 0 ? 0 : -1);
 		}
 		goto trace_and_return;
 	    case CS__0cb:
@@ -620,18 +612,10 @@ static int Stbl_finishCellInRow(STable_rowinfo *me, STable_states *s, int end_td
 	    case CS__eb:	/* ##484_set_pending_ret_0_if_empty? */
 		newstate = empty ? CS__eb : CS__ebc;
 		s->state = newstate;
-		if (me->fixed_line) {
-		    if (empty) {
-			ret = (lastcell->len <= 0 ? 0 : lastcell->len);
-		    } else {
-			ret = (lastcell->len <= 0 ? 0 : -1);
-		    }
+		if (empty) {
+		    ret = (lastcell->len <= 0 ? 0 : lastcell->len);
 		} else {
-		    if (empty) {
-			ret = (lastcell->len <= 0 ? 0 : lastcell->len);
-		    } else {
-			ret = (lastcell->len <= 0 ? 0 : -1);
-		    }
+		    ret = (lastcell->len <= 0 ? 0 : -1);
 		}
 		goto trace_and_return;
 	    case CS__cb:
@@ -704,18 +688,10 @@ static int Stbl_finishCellInRow(STable_rowinfo *me, STable_states *s, int end_td
 	    case CS__0eb:
 		newstate = empty ? CS__0ef : CS__0cf;	/* ebc?? */
 		s->state = newstate;
-		if (me->fixed_line) {
-		    if (empty) {
-			ret = (lastcell->len <= 0 ? 0 : lastcell->len);
-		    } else {
-			ret = (lastcell->len <= 0 ? 0 : -1);
-		    }
+		if (empty) {
+		    ret = (lastcell->len <= 0 ? 0 : lastcell->len);
 		} else {
-		    if (empty) {
-			ret = (lastcell->len <= 0 ? 0 : lastcell->len);
-		    } else {
-			ret = (lastcell->len <= 0 ? 0 : 0);
-		    }
+		    ret = (lastcell->len <= 0 ? 0 : -1);
 		}
 		goto trace_and_return;
 	    case CS__0cb:
@@ -752,20 +728,12 @@ static int Stbl_finishCellInRow(STable_rowinfo *me, STable_states *s, int end_td
 		newstate = empty ? CS__ef : CS__cf;
 		break;
 	    case CS__eb:
-		newstate = empty ? CS__ef : CS__ef;	/* ##579??? !!!!! */
+		newstate = CS__ef;
 		s->state = newstate;
-		if (me->fixed_line) {
-		    if (empty) {
-			ret = (lastcell->len <= 0 ? 0 : lastcell->len);
-		    } else {
-			ret = (lastcell->len <= 0 ? 0 : -1);
-		    }
+		if (empty) {
+		    ret = (lastcell->len <= 0 ? 0 : lastcell->len);
 		} else {
-		    if (empty) {
-			ret = (lastcell->len <= 0 ? 0 : lastcell->len);
-		    } else {
-			ret = (lastcell->len <= 0 ? 0 : -1);
-		    }
+		    ret = (lastcell->len <= 0 ? 0 : -1);
 		}
 		goto trace_and_return;
 	    case CS__cb:
@@ -889,7 +857,7 @@ static int Stbl_finishCellInRow(STable_rowinfo *me, STable_states *s, int end_td
 		newstate = empty ? CS__0ef : CS__0cf;
 		break;		/* ##630 */
 	    case CS__0eb:
-		newstate = empty ? CS__0ef : CS__0ef;
+		newstate = CS__0ef;
 		break;		/* ??? */
 	    case CS__0cb:
 		newstate = empty ? CS__0cf : CS__cbc;
@@ -923,7 +891,7 @@ static int Stbl_finishCellInRow(STable_rowinfo *me, STable_states *s, int end_td
 		newstate = empty ? CS__ef : CS__cf;
 		break;		/* ??? */
 	    case CS__cb:
-		newstate = empty ? CS__cf : CS__cf;
+		newstate = CS__cf;
 		break;		/* ??? */
 	    case CS__ef:	/* ignored error */
 	    case CS__cf:	/* ignored error */
@@ -1540,9 +1508,7 @@ int Stbl_addCellToTable(STable_info *me, int colspan,
     if (ncells > 0)
 	sumpos += me->sumcols[ncells - 1].pos - lastrow->cells[ncells - 1].pos;
     update_sumcols0(me->sumcols, lastrow, sumpos,
-		    sumpos - ((ncells > 0)
-			      ? me->sumcols[icell].pos
-			      : me->sumcols[icell].pos),
+		    sumpos - me->sumcols[icell].pos,
 		    icell, 0, me->allocated_sumcols);
 
     me->maxpos = me->sumcols[me->allocated_sumcols - 1].pos;
diff --git a/src/UCAuto.c b/src/UCAuto.c
index d6c064c..1d93faa 100644
--- a/src/UCAuto.c
+++ b/src/UCAuto.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: UCAuto.c,v 1.53 2013/11/29 00:22:00 tom Exp $
+ * $LynxId: UCAuto.c,v 1.54 2016/11/24 15:35:29 tom Exp $
  *
  *  This file contains code for changing the Linux console mode.
  *  Currently some names for font files are hardwired in here.
@@ -312,8 +312,6 @@ void UCChangeTerminalCodepage(int newcs,
 	if (old_font == NULL)
 	    outofmem(__FILE__, "UCChangeTerminalCodepage");
 
-	assert(old_font != NULL);
-
 	if ((fp1 = LYOpenTemp(old_font, ".fnt", BIN_W)) != 0)
 	    fp2 = LYOpenTemp(old_umap, ".uni", BIN_W);
 
diff --git a/src/UCdomap.c b/src/UCdomap.c
index 3023bbb..7c2ef7c 100644
--- a/src/UCdomap.c
+++ b/src/UCdomap.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: UCdomap.c,v 1.101 2015/10/02 11:25:55 tom Exp $
+ * $LynxId: UCdomap.c,v 1.103 2017/02/08 01:23:33 tom Exp $
  *
  *  UCdomap.c
  *  =========
@@ -457,17 +457,12 @@ static int con_insert_unipair(unsigned unicode, unsigned fontpos, int fordefault
     else
 	p1 = uni_pagedir[n = unicode >> 11];
     if (!p1) {
-	p1 = (u16 * *)malloc(32 * sizeof(u16 *));
+	if ((p1 = typecallocn(u16 *, 32)) == NULL)
+	    return ucError;
 	if (fordefault)
 	    unidefault_pagedir[n] = p1;
 	else
 	    uni_pagedir[n] = p1;
-	if (!p1)
-	    return ucError;
-
-	for (i = 0; i < 32; i++) {
-	    p1[i] = NULL;
-	}
     }
 
     if (!(p2 = p1[n = (unicode >> 6) & 0x1f])) {
@@ -488,7 +483,6 @@ static int con_insert_unipair(unsigned unicode, unsigned fontpos, int fordefault
 static int con_insert_unipair_str(unsigned unicode, const char *replace_str,
 				  int fordefault)
 {
-    int i;
     unsigned n;
     char ***p1;
     const char **p2;
@@ -498,31 +492,19 @@ static int con_insert_unipair_str(unsigned unicode, const char *replace_str,
     else
 	p1 = uni_pagedir_str[n = unicode >> 11];
     if (!p1) {
-	p1 = (char ***) malloc(32 * sizeof(char **));
+	if ((p1 = typecallocn(char **, 32)) == NULL)
+	      return ucError;
 
 	if (fordefault)
 	    unidefault_pagedir_str[n] = p1;
 	else
 	    uni_pagedir_str[n] = p1;
-	if (!p1)
-	    return ucError;
-
-	for (i = 0; i < 32; i++) {
-	    p1[i] = NULL;
-	}
     }
 
     n = ((unicode >> 6) & 0x1f);
     if (!p1[n]) {
-	p1[n] = (char **) malloc(64 * sizeof(char *));
-
-	if (!p1[n])
-	    return ucError;
-
-	p2 = (const char **) p1[n];
-	for (i = 0; i < 64; i++) {
-	    p2[i] = NULL;	/* No replace string this character (yet) */
-	}
+	if ((p1[n] = typecallocn(char *, 64)) == NULL)
+	      return ucError;
     }
     p2 = (const char **) p1[n];
 
@@ -1736,19 +1718,13 @@ static STRING2PTR UC_setup_LYCharSets_repl(int UC_charset_in_hndl,
     /*
      * Create a temporary table for reverse lookup of latin1 codes:
      */
-    tp = (const char **) malloc(96 * sizeof(char *));
+    if ((tp = typecallocn(const char *, 96)) == NULL)
+	  return NULL;
 
-    if (!tp)
-	return NULL;
-    for (i = 0; i < 96; i++)
-	tp[i] = NULL;
-    ti = (u8 *) malloc(96 * sizeof(u8));
-    if (!ti) {
+    if ((ti = typecallocn(u8, 96)) == NULL) {
 	FREE(tp);
 	return NULL;
     }
-    for (i = 0; i < 96; i++)
-	ti[i] = 0;
 
     pp = UCInfo[UC_charset_in_hndl].unitable;
 
diff --git a/src/tidy_tls.c b/src/tidy_tls.c
index f2e7334..aa8be75 100644
--- a/src/tidy_tls.c
+++ b/src/tidy_tls.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: tidy_tls.c,v 1.34 2016/04/17 15:15:06 tom Exp $
+ * $LynxId: tidy_tls.c,v 1.35 2016/11/24 18:48:02 tom Exp $
  * Copyright 2008-2015,2016 Thomas E. Dickey
  * with fix Copyright 2008 by Thomas Viehmann
  *
@@ -637,8 +637,9 @@ char *X509_NAME_oneline(X509_NAME * source, char *target, int len)
  */
 X509_NAME *X509_get_issuer_name(const X509 * cert)
 {
-    X509_NAME *result;
+    static X509_NAME *result;
 
+    free(result);
     if ((result = typeCalloc(X509_NAME)) != 0) {
 	if (ExtractCertificate(cert, result, 1) < 0) {
 	    free(result);
@@ -653,8 +654,9 @@ X509_NAME *X509_get_issuer_name(const X509 * cert)
  */
 X509_NAME *X509_get_subject_name(const X509 * cert)
 {
-    X509_NAME *result;
+    static X509_NAME *result;
 
+    free(result);
     if ((result = typeCalloc(X509_NAME)) != 0) {
 	if (ExtractCertificate(cert, result, 0) < 0) {
 	    free(result);
diff --git a/userdefs.h b/userdefs.h
index edec5b8..018f1a3 100644
--- a/userdefs.h
+++ b/userdefs.h
@@ -1,12 +1,12 @@
 /*
- * $LynxId: userdefs.h,v 1.321 2016/11/15 09:04:25 tom Exp $
+ * $LynxId: userdefs.h,v 1.325 2017/04/29 12:47:15 tom Exp $
  *
  * Lynx - Hypertext navigation system
  *
  *   (c) Copyright 1992, 1993, 1994 University of Kansas
  *	 1995, 1996: GNU General Public License
  *
- *   Copyright 1996-2015,2016 Thomas E. Dickey and Lynx Developers Group
+ *   Copyright 1996-2016,2017 Thomas E. Dickey and Lynx Developers Group
  *   Note: GNU General Public License is not a copyright.
  */
 
@@ -1442,11 +1442,11 @@
  * the version definition with the Project Version on checkout.  Just
  * ignore it. - kw */
 /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */
-#define LYNX_VERSION "2.8.9dev.11"
+#define LYNX_VERSION "2.8.9dev.13"
 #define LYNX_WWW_HOME "http://lynx.invisible-island.net/"
 #define LYNX_WWW_DIST "http://lynx.invisible-island.net/current/"
 /* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */
-#define LYNX_DATE "Tue, 15 Nov 2016 04:04:25 -0500"
+#define LYNX_DATE "Sat, 29 Apr 2017 08:47:15 -0400"
 #define LYNX_DATE_OFF 5		/* truncate the automatically-generated date */
 #define LYNX_DATE_LEN 11	/* truncate the automatically-generated date */
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-lynx/lynx-cur.git



More information about the pkg-lynx-commits mailing list